diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index b3ae570..2f6a7df 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:05:44-06:00 +created: 2026-01-29T23:06:32-06:00 diff --git a/modules/core/network/crab-hole.nix b/modules/core/network/crab-hole.nix index 83683b7..7588973 100644 --- a/modules/core/network/crab-hole.nix +++ b/modules/core/network/crab-hole.nix @@ -2,14 +2,14 @@ den.aspects.crab-hole = { nixos = { ... }: { services.crab-hole = { - enable = true; + enable = false; settings = { 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/box.nix b/modules/hosts/box.nix index 6a6e31a..131f31c 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -34,6 +34,12 @@ hashedPasswordFile = "/home/bug/users/levi.passwd"; }; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/30f357aa-fc86-4bcd-bed7-c91fc8afbdbc"; + fsType = "ext4"; + options = [ "defaults" "noatime" ]; + }; }; }; } diff --git a/modules/hosts/nix.nix b/modules/hosts/nix.nix index a1ce26c..b1c58d5 100644 --- a/modules/hosts/nix.nix +++ b/modules/hosts/nix.nix @@ -9,22 +9,6 @@ janitor - - - cloudflared - - portmap - searxng - copyparty - # glances - invidious - mailserver - # matrix - # redlib - # sish - # vscode-server - gitea - ollama ]; diff --git a/modules/services/copyparty.nix b/modules/services/copyparty.nix index 33c5715..2af790c 100644 --- a/modules/services/copyparty.nix +++ b/modules/services/copyparty.nix @@ -32,7 +32,7 @@ volumes = { "/" = { - path = "/srv/copyparty"; + path = "/home/copyparty"; access = { r = "*"; @@ -58,19 +58,6 @@ scan = 60; }; }; - - /* "/sang" = { - path = "/srv/sang"; - - access = { - rw = [ "bug" ]; #"sang" ]; - }; - - flags = { - fk = 4; - scan = 60; - }; - }; */ }; openFilesLimit = 8192; diff --git a/modules/services/invidious.nix b/modules/services/invidious.nix index 504cb1a..ed0b435 100644 --- a/modules/services/invidious.nix +++ b/modules/services/invidious.nix @@ -3,7 +3,7 @@ nixos = { pkgs, config, ... }: let companionPort = 8282; companionPath = "/companion"; - companionKey = "kKg3RKeZjE7frmvw"; + companionKey = "kKg3RKeZjE7frmvr"; port = config.den.portmap.tube; in { den.tunnels = [ "tube" ]; diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix index a7a312a..433d191 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 = "0j3q1i80zcb94ylivyyqfid4h2js1dycf0fa6y5gdbr48ldgz3nb"; + sha256 = "0bw68h902j6cz4nshzd9iy2c6slg91026l3gydkgj4d7amsjvmg4"; }) ]; diff --git a/modules/software/gaming/emulators.nix b/modules/software/gaming/emulators.nix new file mode 100644 index 0000000..78da08d --- /dev/null +++ b/modules/software/gaming/emulators.nix @@ -0,0 +1,9 @@ +{ ... }: { + den.aspects.emulators = { + nixos = { pkgs, ... }: { + users.users.bug.packages = with pkgs; [ + ppsspp + ]; + }; + }; +} diff --git a/modules/software/gaming/gaming.nix b/modules/software/gaming/gaming.nix index c8ed239..0ecc12e 100644 --- a/modules/software/gaming/gaming.nix +++ b/modules/software/gaming/gaming.nix @@ -1,5 +1,5 @@ { den, ... }: { den.aspects.gaming = { - includes = with den.aspects; [ steam roblox hytale polytoria game-tools ]; + includes = with den.aspects; [ steam roblox hytale polytoria game-tools emulators ]; }; } diff --git a/modules/software/ollama.nix b/modules/software/ollama.nix index 7879df3..71eec20 100644 --- a/modules/software/ollama.nix +++ b/modules/software/ollama.nix @@ -4,7 +4,7 @@ services.ollama = { enable = true; - loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b" ]; + loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b" "qwen2.5-coder:7b" "qwen3.5:9b" "aratan/qwen3.5-agent-multimodal:9b" "qwen3-coder:30b" ]; }; }; };