diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index 2f6a7df..b3ae570 100644 --- a/.stfolder/syncthing-folder-a0745f.txt +++ b/.stfolder/syncthing-folder-a0745f.txt @@ -2,4 +2,4 @@ # Do not delete. folderID: nix -created: 2026-01-29T23:06:32-06:00 +created: 2026-01-29T23:05:44-06:00 diff --git a/modules/core/network/crab-hole.nix b/modules/core/network/crab-hole.nix index 400a7c0..83683b7 100644 --- a/modules/core/network/crab-hole.nix +++ b/modules/core/network/crab-hole.nix @@ -8,8 +8,8 @@ blocklist = { include_subdomains = true; lists = [ - "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn/hosts" - "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" + #"https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn/hosts" + #"https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" ]; }; diff --git a/modules/hosts/nix.nix b/modules/hosts/nix.nix index 02035f5..a1ce26c 100644 --- a/modules/hosts/nix.nix +++ b/modules/hosts/nix.nix @@ -8,6 +8,24 @@ catppuccin janitor + + + + cloudflared + + portmap + searxng + copyparty + # glances + invidious + mailserver + # matrix + # redlib + # sish + # vscode-server + gitea + + ollama ]; nixos = { diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix index f75e2fd..a7a312a 100644 --- a/modules/services/mailserver.nix +++ b/modules/services/mailserver.nix @@ -4,7 +4,7 @@ imports = [ (fetchTarball { url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master.tar.gz"; - sha256 = "1n5yxya54mdsjmdix0pjzlqbk49jqf0gfhmgqc3lywxifrdi6k0q"; + sha256 = "0j3q1i80zcb94ylivyyqfid4h2js1dycf0fa6y5gdbr48ldgz3nb"; }) ]; diff --git a/modules/software/ollama.nix b/modules/software/ollama.nix new file mode 100644 index 0000000..7879df3 --- /dev/null +++ b/modules/software/ollama.nix @@ -0,0 +1,11 @@ +{ ... }: { + den.aspects.ollama = { + nixos = { + services.ollama = { + enable = true; + + loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b" ]; + }; + }; + }; +} diff --git a/modules/software/utilities/system.nix b/modules/software/utilities/system.nix index 31b8172..4ca38d9 100644 --- a/modules/software/utilities/system.nix +++ b/modules/software/utilities/system.nix @@ -18,11 +18,6 @@ virt-manager.enable = true; }; - - services.ollama = { - enable = false; - loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b" ]; - }; }; }; }