fix containers and mullvad

This commit is contained in:
atagen 2024-08-15 12:19:55 +10:00
parent f623faa0ef
commit c8ee397794
20 changed files with 370 additions and 115 deletions

View file

@ -4,7 +4,8 @@
./util/local-webapp.nix
./util/containers.nix
# ./programs/stable-diffusion.nix
./programs/openwebui.nix
# ./programs/openwebui.nix
./programs/sillytavern.nix
];
home = rec {

View file

@ -69,11 +69,6 @@ in {
config.cosmic = {
enable = true;
defaultKeybindings = false;
# otherSettings = {
# "com.system76.CosmicPanel.Dock" = {
# option.opacity = 0.8;
# };
# };
keybindings =
winManagementBindings
++ [
@ -98,11 +93,11 @@ in {
(binding "grave" ["Super" "Shift"] "MoveToPreviousOutput")
(spawnBinding "equal" ["Super"] "keepassxc")
(systemBinding "f" ["Super"] "WebBrowser")
(systemBinding "e" ["Super"] "HomeFolder")
# broken at the moment
# my mime handling is fucked
# (systemBinding "e" ["Super"] "HomeFolder")
# (systemBinding "return" ["Super"] "Terminal")
(spawnBinding "return" ["Super"] "kitty")
(systemBinding "s" ["Super" "Shift"] "Screenshot")
# (systemBinding "s" ["Super" "Shift"] "Screenshot")
(systemBinding null ["Super"] "Launcher")
(systemBinding "d" ["Super"] "AppLibrary")
(systemBinding "XF86AudioRaiseVolume" [] "VolumeRaise")
@ -136,10 +131,10 @@ in {
# (binding "grave" ["Super"] "PreviousOutput")
# (binding "grave" ["Super" "Shift"] "MoveToPreviousOutput")
# (spawnBinding "f" ["Super"] "firefox")
# (spawnBinding "e" ["Super"] "nautilus")
(spawnBinding "e" ["Super"] "nautilus")
# (spawnBinding "equal" ["Super"] "keepassxc")
# (spawnBinding "return" ["Super"] "kitty")
# (spawnBinding "s" ["Super" "Shift"] "cosmic-screenshot")
(spawnBinding "s" ["Super" "Shift"] "cosmic-screenshot")
# (spawnBinding null ["Super"] "cosmic-launcher")
# (spawnBinding "d" ["Super"] "cosmic-app-library")
# (spawnBinding "XF86AudioRaiseVolume" [] "amixer sset Master 5%+")

View file

@ -1,11 +1,14 @@
{...}: {
{pkgs, ...}: {
imports = [
../util/flatpak.nix
];
home.packages = with pkgs; [
libreoffice
];
flatpaks = [
"md.obsidian.Obsidian"
"com.logseq.Logseq"
"org.libreoffice.LibreOffice"
# "org.libreoffice.LibreOffice"
"com.jgraph.drawio.desktop"
];
}

View file

@ -0,0 +1,35 @@
{
lib,
pkgs,
...
}: let
port = 3021;
in {
imports = [./ollama.nix];
localWebApps = {
anything-llm = {
name = "Anything LLM";
genericName = "Chatbot";
icon = ../icons/openwebui.png;
inherit port;
requires.containers = ["anything-llm" "ollama"];
};
};
services.podman = {
containers.anything-llm = let
str = builtins.toString;
in {
image = "mintplexlabs/anythingllm";
ports = ["${str port}:3001"];
autostart = false;
networks = ["ollama"];
unitConfig = {Requires = ["podman-ollama.service"];};
extraOptions = [
"--health-cmd"
(lib.escapeShellArg "bash -c 'cat < /dev/null > /dev/tcp/localhost/3001'")
];
};
};
}

View file

@ -49,6 +49,7 @@ in {
"keepassxc-browser@keepassxc.org" = officialAddon "keepassxc-browser";
"vimium-c@gdh1995.cn" = officialAddon "vimium-c";
"{b86e4813-687a-43e6-ab65-0bde4ab75758}" = officialAddon "localcdn-fork-of-decentraleyes";
"jid1-5Fs7iTLscUaZBgwr@jetpack" = officialAddon "happy-bonobo-disable-webrtc";
};
Preferences = {

View file

@ -5,9 +5,7 @@
}: {
services.podman = {
containers.ollama = {
# serviceName = "ollama";
image = "ollama/ollama:latest";
# ports = ["11434:11434"];
devices = ["nvidia.com/gpu=all"];
autostart = false;
networks = ["ollama"];
@ -15,6 +13,7 @@
"--health-cmd"
(lib.escapeShellArg "bash -c 'cat < /dev/null > /dev/tcp/localhost/11434'")
];
# TODO make a volume lol
};
networks.ollama = {