push

.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

flake.lock

@@ -191,6 +191,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -241,7 +257,10 @@
     },
     "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nix-citizen",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1772408722,
@@ -258,6 +277,42 @@
       }
     },
     "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -330,6 +385,51 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nix-gaming",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770726378,
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-gaming",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -384,6 +484,31 @@
         "type": "github"
       }
     },
+    "nix-citizen": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nix-gaming": [
+          "nix-gaming"
+        ],
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_2",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1772758266,
+        "narHash": "sha256-Z6hXOIgFrl1jRVL9UnVf0SIYj7MaMn+0UYpSh3m5VhQ=",
+        "owner": "LovingMelody",
+        "repo": "nix-citizen",
+        "rev": "68d3aab61b813484ff0d0250139c2cc71872a215",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LovingMelody",
+        "repo": "nix-citizen",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1767983141,
@@ -400,11 +525,52 @@
         "type": "github"
       }
     },
+    "nix-gaming": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1772764431,
+        "narHash": "sha256-Lkj9b2Lajgdnfj42Uhkui5gRYPRnq8DEuCrZH+CRiDI=",
+        "owner": "fufexan",
+        "repo": "nix-gaming",
+        "rev": "758f449e9c0b4e8b6f3e8720537fa8d958e1c103",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fufexan",
+        "repo": "nix-gaming",
+        "type": "github"
+      }
+    },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-citizen",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737420293,
+        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixcord": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1772641310,
@@ -437,6 +603,21 @@
       }
     },
     "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1769909678,
+        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1772328832,
         "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
@@ -467,6 +648,38 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1772624091,
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1772173633,
+        "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1772465433,
         "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=",
@@ -482,7 +695,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1772615108,
         "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=",
@@ -534,14 +747,16 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "import-tree": "import-tree",
+        "nix-citizen": "nix-citizen",
         "nix-flatpak": "nix-flatpak",
+        "nix-gaming": "nix-gaming",
         "nixcord": "nixcord",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_6",
         "nixpkgs-lib": [
           "nixpkgs"
         ],
         "stylix": "stylix",
-        "systems": "systems_3"
+        "systems": "systems_4"
       }
     },
     "stylix": {
@@ -551,13 +766,13 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_5",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -623,6 +838,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -703,6 +933,27 @@
         "repo": "base16-zed",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-citizen",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772660329,
+        "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "3710e0e1218041bbad640352a0440114b1e10428",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -44,10 +44,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # nix-citizen.url = "github:LovingMelody/nix-citizen";
+    nix-citizen.url = "github:LovingMelody/nix-citizen";
 
-    # nix-gaming.url = "github:fufexan/nix-gaming";
+    nix-gaming.url = "github:fufexan/nix-gaming";
-    # nix-citizen.inputs.nix-gaming.follows = "nix-gaming";
+    nix-citizen.inputs.nix-gaming.follows = "nix-gaming";
 
     # hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
   };

modules/core/network/crab-hole.nix

@@ -2,7 +2,7 @@
   den.aspects.crab-hole = {
     nixos = { ... }: {
       services.crab-hole = {
-        enable = true;
+        enable = false;
 
         settings = {
           blocklist = {

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" ];
+      };
     };
   };
 }

modules/hosts/common.nix

@@ -23,7 +23,7 @@
       social
       gaming
 
-      crab-hole
+      #crab-hole
     ];
   };
 }

modules/hosts/nix.nix

@@ -8,6 +8,8 @@
       catppuccin
 
       janitor
+
+      ollama
     ];
 
     nixos = {

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;

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" ];

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 = "0bw68h902j6cz4nshzd9iy2c6slg91026l3gydkgj4d7amsjvmg4";
         })
       ];
 

modules/services/pstream.nix

@@ -0,0 +1,3 @@
+{
+
+}

modules/software/fish.nix

@@ -10,6 +10,9 @@
         dock = "sh -c 'ssh -N -D \"$1\" box.bug.tools &' --";
 
         pico = "ssh pico.sh";
+
+        ns = "nh os switch ~/nix --impure -H (hostname)";
+        rebuild = "ns";
       };
 
       environment.systemPackages = with pkgs.fishPlugins; [

modules/software/flatpak.nix

@@ -9,6 +9,9 @@
         remotes = lib.mkOptionDefault [{
           name = "flathub-beta";
           location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
+        } {
+          name = "RSILauncher";
+          location = "https://mactan-sc.github.io/rsilauncher/RSILauncher.flatpakrepo";
         }];
 
         update.auto.enable = true;
@@ -22,4 +25,4 @@
       };
     };
   };
-}
+}

modules/software/gaming/emulators.nix

@@ -0,0 +1,9 @@
+{ ... }: {
+  den.aspects.emulators = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        ppsspp
+      ];
+    };
+  };
+}

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 star-citizen ];
   };
 }

modules/software/gaming/star-citizen.nix

@@ -1,3 +1,11 @@
-{
+{ inputs, ... }: {
+  den.aspects.star-citizen = {
+    nixos = { pkgs, ... }: {
+      imports = [ inputs.nix-citizen.nixosModules.default ];
 
+      environment.systemPackages = with pkgs; [
+        inputs.nix-citizen.packages.${system}.rsi-launcher
+      ];
+    };
+  };
 }

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" "qwen2.5-coder:7b" "qwen3.5:9b" "aratan/qwen3.5-agent-multimodal:9b" "qwen3-coder:30b" ];
+      };
+    };
+  };
+}

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" ];
-      };
     };
   };
 }