added the basic router config

.github/workflows/build_systems.yml

@@ -1,4 +1,4 @@
-name: build_systems
+name: build_jeeves
 on:
   workflow_dispatch:
   pull_request:
@@ -14,11 +14,10 @@ jobs:
         system:
           - "bob"
           - "jeeves"
+          - "muninn"
           - "rhapsody-in-green"
-          - "brendans-system"
+          - "router"
     steps:
       - uses: actions/checkout@v4
       - name: Build default package
         run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
-      - name: copy to nix-cache
-        run: nix copy --to ssh://jeeves .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel

.github/workflows/treefmt.yml

@@ -1,15 +0,0 @@
-name: treefmt
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches: [main]
-
-jobs:
-  treefmt:
-    name: nix fmt
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-      - name: runs treefmt
-        run: "treefmt --ci"

.github/workflows/update-flake-lock.yml

@@ -15,7 +15,6 @@ jobs:
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@main
         with:
-          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
           pr-title: "Update flake.lock"
           pr-labels: |
             dependencies

.gitignore

@@ -162,6 +162,3 @@ cython_debug/
 #.idea/
 
 test.*
-
-# syncthing
-.stfolder

.vscode/settings.json

@@ -6,9 +6,7 @@
     "advplyr",
     "ahci",
     "aioesphomeapi",
-    "aiounifi",
     "alsa",
-    "apiclient",
     "archlinux",
     "ashift",
     "asrouter",
@@ -19,10 +17,8 @@
     "auditd",
     "autofetch",
     "autologin",
-    "automations",
     "autopull",
     "autotrim",
-    "autoupdate",
     "azuretools",
     "bantime",
     "bazarr",
@@ -42,8 +38,6 @@
     "Compat",
     "contentblocking",
     "cookiebanners",
-    "createdb",
-    "createrole",
     "crlite",
     "cryptsetup",
     "darkreader",
@@ -107,7 +101,6 @@
     "ioit",
     "iperf",
     "isal",
-    "jellyfin",
     "jnoortheen",
     "jsbc",
     "kagi",
@@ -118,7 +111,6 @@
     "libsodium",
     "libssh",
     "libvirtd",
-    "llms",
     "localtime",
     "louislam",
     "lsnew",
@@ -137,6 +129,7 @@
     "mountpoints",
     "mousewheel",
     "mtxr",
+    "muninn",
     "ncdu",
     "nemo",
     "neofetch",
@@ -146,7 +139,6 @@
     "Networkd",
     "networkmanager",
     "newtabpage",
-    "nixfmt",
     "nixos",
     "nixpkgs",
     "nmap",
@@ -170,6 +162,7 @@
     "peerconnection",
     "PESKYFOX",
     "PGID",
+    "photoprism",
     "pipewire",
     "pkgs",
     "plugdev",
@@ -186,10 +179,8 @@
     "PUID",
     "pulseaudio",
     "punycode",
-    "pychromecast",
     "pylance",
     "pymetno",
-    "pyownet",
     "qbit",
     "qbittorrent",
     "qbittorrentvpn",
@@ -197,14 +188,12 @@
     "quicksuggest",
     "radarr",
     "readahead",
-    "receiveencrypted",
     "Redistributable",
     "referer",
     "REFERERS",
     "relatime",
     "Rhosts",
     "ripgrep",
-    "rokuecp",
     "routable",
     "rspace",
     "rtkit",
@@ -226,7 +215,6 @@
     "sponsorblock",
     "sqltools",
     "ssdp",
-    "SSHOPTS",
     "stdenv",
     "subresource",
     "substituters",
@@ -234,7 +222,6 @@
     "sysstat",
     "tabmanager",
     "tamasfe",
-    "TCPIP",
     "tiktok",
     "timonwong",
     "tmmworkshop",
@@ -242,11 +229,9 @@
     "topsites",
     "topstories",
     "torrenting",
-    "treefmt",
     "twimg",
     "uaccess",
     "ublock",
-    "uiprotect",
     "uitour",
     "unrar",
     "unsubmitted",

build.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+nixos-rebuild build --flake /home/richie/projects/dotfiles#bob
+nixos-rebuild build --flake /home/richie/projects/dotfiles#jeeves
+nixos-rebuild build --flake /home/richie/projects/dotfiles#muninn
+nixos-rebuild build --flake /home/richie/projects/dotfiles#rhapsody-in-green

common/global/default.nix

@@ -23,7 +23,7 @@
   boot = {
     tmp.useTmpfs = true;
     kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
-    zfs.package = lib.mkDefault pkgs.zfs_2_3;
+    zfs.package = lib.mkDefault pkgs.zfs;
   };
 
   hardware.enableRedistributableFirmware = true;
@@ -31,27 +31,18 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = { inherit inputs outputs; };
+    extraSpecialArgs = {inherit inputs outputs;};
-    backupFileExtension = "backup";
   };
 
   nixpkgs = {
     overlays = builtins.attrValues outputs.overlays;
-    config.allowUnfree = true;
+    config = {
-  };
+      allowUnfree = true;
-
-  services = {
-    # firmware update
-    fwupd.enable = true;
-
-    snapshot_manager.enable = lib.mkDefault true;
-
-    zfs = {
-      trim.enable = lib.mkDefault true;
-      autoScrub.enable = lib.mkDefault true;
     };
   };
 
+  services.fwupd.enable = true;
+
   programs.zsh.enable = true;
 
   security.auditd.enable = lib.mkDefault true;

common/global/nix.nix

@@ -2,11 +2,9 @@
   inputs,
   lib,
   ...
-}:
+}: let
-let
   flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-in
+in {
-{
   nix = {
     settings = {
       trusted-users = [
@@ -39,7 +37,7 @@ in
     };
 
     # Add each flake input as a registry and nix_path
-    registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
+    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
     nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 }

common/global/snapshot_manager.nix

@@ -1,10 +1,4 @@
-{
+{ inputs, pkgs, lib, config, ... }:
-  inputs,
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 let
   cfg = config.services.snapshot_manager;
 in
@@ -47,4 +41,4 @@ in
       };
     };
   };
-}
+}

common/global/ssh.nix

@@ -67,5 +67,5 @@
     };
   };
 
-  networking.firewall.allowedTCPPorts = [ 22 ];
+    networking.firewall.allowedTCPPorts = [ 22 ];
 }

common/optional/desktop.nix

@@ -2,17 +2,9 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_6_12;
-    zfs.package = pkgs.zfs_2_3;
+    zfs.package = pkgs.zfs;
   };
 
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-
-  # rtkit is optional but recommended for pipewire
-  security.rtkit.enable = true;
-
   services = {
     displayManager.sddm = {
       enable = true;
@@ -29,8 +21,6 @@
       };
     };
 
-    pulseaudio.enable = false;
-
     pipewire = {
       enable = true;
       alsa.enable = true;

common/optional/printing.nix

@@ -2,9 +2,6 @@
 {
   services.printing = {
     enable = true;
-    drivers = with pkgs; [
+    drivers = with pkgs; [ gutenprint hplip ];
-      gutenprint
-      hplip
-    ];
   };
 }

common/optional/steam.nix

@@ -1,9 +1,6 @@
 { pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [mangohud steam-run];
-    mangohud
-    steam-run
-  ];
   hardware.steam-hardware.enable = true;
 
   programs = {
@@ -14,7 +11,7 @@
       remotePlay.openFirewall = true;
       localNetworkGameTransfers.openFirewall = true;
       protontricks.enable = true;
-      extraCompatPackages = with pkgs; [ proton-ge-bin ];
+      extraCompatPackages = with pkgs; [proton-ge-bin];
       extest.enable = true;
     };
     gamescope = {

common/optional/syncthing_base.nix

@@ -6,12 +6,14 @@
     overrideFolders = true;
     dataDir = "/home/richie/Syncthing";
     configDir = "/home/richie/.config/syncthing";
-    settings.devices = {
+    settings = {
-      phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
+      devices = {
-      jeeves.id = "ICRHXZW-ECYJCUZ-I4CZ64R-3XRK7CG-LL2HAAK-FGOHD22-BQA4AI6-5OAL6AG"; # cspell:disable-line
+        phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
-      ipad.id = "KI76T3X-SFUGV2L-VSNYTKR-TSIUV5L-SHWD3HE-GQRGRCN-GY4UFMD-CW6Z6AX"; # cspell:disable-line
+        jeeves.id = "ICRHXZW-ECYJCUZ-I4CZ64R-3XRK7CG-LL2HAAK-FGOHD22-BQA4AI6-5OAL6AG"; # cspell:disable-line
-      bob.id = "CJIAPEJ-VO74RR4-F75VU6M-QNZAMYG-FYUJG7Y-6AT62HJ-355PRPL-PJFETAZ"; # cspell:disable-line
+        ipad.id = "KI76T3X-SFUGV2L-VSNYTKR-TSIUV5L-SHWD3HE-GQRGRCN-GY4UFMD-CW6Z6AX"; # cspell:disable-line
-      rhapsody-in-green.id = "ASL3KC4-3XEN6PA-7BQBRKE-A7JXLI6-DJT43BY-Q4WPOER-7UALUAZ-VTPQ6Q4"; # cspell:disable-line
+        bob.id = "CJIAPEJ-VO74RR4-F75VU6M-QNZAMYG-FYUJG7Y-6AT62HJ-355PRPL-PJFETAZ"; # cspell:disable-line
+        rhapsody-in-green.id = "ASL3KC4-3XEN6PA-7BQBRKE-A7JXLI6-DJT43BY-Q4WPOER-7UALUAZ-VTPQ6Q4"; # cspell:disable-line
+      };
     };
   };
 }

common/optional/update.nix

@@ -1,9 +1,32 @@
+{  lib, pkgs, ... }:
 {
+  systemd = {
+    services."autopull@dotfiles" = {
+      requires = [ "multi-user.target" ];
+      after = [ "multi-user.target" ];
+      description = "Pull the latest data for dotfiles";
+      serviceConfig = {
+        Type = "oneshot";
+        User = "root";
+        WorkingDirectory = /root/dotfiles;
+        ExecStart = "${pkgs.git}/bin/git pull --all --prune";
+      };
+    };
+    timers."autopull@dotfiles" = {
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnBootSec = "1h";
+        OnUnitActiveSec = "1h";
+        Unit = "autopull@dotfiles.service";
+      };
+    };
+  };
+
   system.autoUpgrade = {
-    enable = true;
+    enable = lib.mkDefault true;
     flags = [ "--accept-flake-config" ];
     randomizedDelaySec = "1h";
     persistent = true;
-    flake = "github:RichieCahill/dotfiles";
+    flake = "github:RAD-Development/nix-dotfiles";
   };
 }

flake.lock

@@ -9,11 +9,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1738382607,
+        "lastModified": 1736279099,
-        "narHash": "sha256-ppR81tMrcQk/wHm8MmKtp3mrtYmMTgF2lxLLXYwRsOM=",
+        "narHash": "sha256-WXbwHw+JeIOo3KvGDjrfsuwj8JWBUkFFxmlm07w9i7Q=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "dc86c8feffa328d9050e039a1286e175af6d76d8",
+        "rev": "0ad9cf75bae6a9290e9c83cef19f60595f189979",
         "type": "gitlab"
       },
       "original": {
@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738415006,
+        "lastModified": 1736277415,
-        "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=",
+        "narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2",
+        "rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1",
         "type": "github"
       },
       "original": {
@@ -120,14 +120,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable",
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1738343111,
+        "lastModified": 1736214624,
-        "narHash": "sha256-y9st4Y0p5ry+6QdlIGeqxAA6rbEIOO1uXdAc5jxV2Bc=",
+        "narHash": "sha256-Pi70vbASZ1O9cR8RO5d2hBiNjIJBKKLoABl4sxWyOgg=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "51b9cce097da369550f45ac07879274dc8be81e4",
+        "rev": "0830abeebf3b2d1bae44652ffb2c89cf0d56ddaa",
         "type": "github"
       },
       "original": {
@@ -138,11 +139,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1738391520,
+        "lastModified": 1736283893,
-        "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=",
+        "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773",
+        "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6",
         "type": "github"
       },
       "original": {
@@ -154,11 +155,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1736012469,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
         "type": "github"
       },
       "original": {
@@ -170,11 +171,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1738422722,
+        "lastModified": 1736294919,
-        "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=",
+        "narHash": "sha256-6Epm0TQkXt0DcS3akYSeT0PzYMpgkZf0V14+5UGe6oE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1",
+        "rev": "ed6183b173fe27e1d7dceef1ddca2aa64d07aad4",
         "type": "github"
       },
       "original": {
@@ -186,11 +187,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1738163270,
+        "lastModified": 1736061677,
-        "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
+        "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0",
+        "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
         "type": "github"
       },
       "original": {
@@ -231,11 +232,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1736884309,
+        "lastModified": 1731205797,
-        "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=",
+        "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b",
+        "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e",
         "type": "github"
       },
       "original": {
@@ -258,6 +259,27 @@
         "systems": "systems_3"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736130662,
+        "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -265,11 +287,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
+        "lastModified": 1736203741,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773",
         "type": "github"
       },
       "original": {
@@ -287,11 +309,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1738431375,
+        "lastModified": 1733083480,
-        "narHash": "sha256-jk6JrgqNe0dEPxV2xX/pBVsrPDfWaa033LKcyERkHJw=",
+        "narHash": "sha256-B13faNyBbA3MeI7Jp6pFVbp58rI2Rx5Uvd83csW2p48=",
         "owner": "RichieCahill",
         "repo": "system_tools",
-        "rev": "36764189680c9be26192ee94da1a3f33f890ff0d",
+        "rev": "bc357d8fabd83c1423611829091e5b1d86dd913c",
         "type": "github"
       },
       "original": {
@@ -325,9 +347,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "id": "systems",
-        "repo": "default",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "systems_3": {

flake.nix

@@ -49,60 +49,61 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    home-manager,
-      home-manager,
+    systems,
-      systems,
+    nixos-cosmic,
-      nixos-cosmic,
+    sops-nix,
-      sops-nix,
+    ...
-      ...
+  } @ inputs: let
-    }@inputs:
+    inherit (self) outputs;
-    let
+    lib = nixpkgs.lib // home-manager.lib;
-      inherit (self) outputs;
+    forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
-      lib = nixpkgs.lib // home-manager.lib;
+    pkgsFor = lib.genAttrs (import systems) (
-      forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
+      system:
-      pkgsFor = lib.genAttrs (import systems) (
-        system:
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
         }
-      );
+    );
-    in
+  in {
-    {
+    inherit lib;
-      inherit lib;
+    overlays = import ./overlays {inherit inputs outputs;};
-      overlays = import ./overlays { inherit inputs outputs; };
 
-      devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
+    devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
-      formatter = forEachSystem (pkgs: pkgs.treefmt);
+    formatter = forEachSystem (pkgs: pkgs.alejandra);
 
-      nixosConfigurations = {
+    nixosConfigurations = {
-        bob = lib.nixosSystem {
+      bob = lib.nixosSystem {
-          modules = [
+        modules = [
-            ./systems/bob
+          ./systems/bob
-          ];
+        ];
-          specialArgs = { inherit inputs outputs; };
+        specialArgs = {inherit inputs outputs;};
-        };
+      };
-        jeeves = lib.nixosSystem {
+      jeeves = lib.nixosSystem {
-          modules = [
+        modules = [
-            ./systems/jeeves
+          ./systems/jeeves
-          ];
+        ];
-          specialArgs = { inherit inputs outputs; };
+        specialArgs = {inherit inputs outputs;};
-        };
+      };
-        rhapsody-in-green = lib.nixosSystem {
+      rhapsody-in-green = lib.nixosSystem {
-          modules = [
+        modules = [
-            ./systems/rhapsody-in-green
+          ./systems/rhapsody-in-green
-          ];
+        ];
-          specialArgs = { inherit inputs outputs; };
+        specialArgs = {inherit inputs outputs;};
-        };
+      };
-        brendans-system = lib.nixosSystem {
+      muninn = lib.nixosSystem {
-          modules = [
+        modules = [
-            ./systems/brendans-system
+          ./systems/muninn
-          ];
+        ];
-          specialArgs = { inherit inputs outputs; };
+        specialArgs = {inherit inputs outputs;};
-        };
+      };
+      router = lib.nixosSystem {
+        modules = [./systems/router];
+        specialArgs = {inherit inputs outputs;};
       };
     };
+  };
 }

overlays/default.nix

@@ -1,5 +1,4 @@
-{ inputs, ... }:
+{inputs, ...}: {
-{
   # When applied, the stable nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.stable'
   stable = final: _prev: {
     stable = import inputs.nixpkgs-stable {

shell.nix

@@ -1,8 +1,4 @@
-{
+{pkgs ? import <nixpkgs> {}, ...}: {
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
-{
   default = pkgs.mkShell {
     NIX_CONFIG = "extra-experimental-features = nix-command flakes ca-derivations";
     nativeBuildInputs = with pkgs; [

systems/bob/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ../../users/richie
-    ../../users/gaming
     ../../common/global
     ../../common/optional/desktop.nix
     ../../common/optional/docker.nix
@@ -9,14 +8,11 @@
     ../../common/optional/steam.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/systemd-boot.nix
-    ../../common/optional/update.nix
     ../../common/optional/yubikey.nix
     ../../common/optional/zerotier.nix
     ./hardware.nix
     ./nvidia.nix
     ./syncthing.nix
-    ./games.nix
-    ./llms.nix
   ];
 
   networking = {
@@ -26,17 +22,26 @@
     networkmanager.enable = true;
   };
 
-  services = {
+  hardware = {
-    displayManager = {
+    pulseaudio.enable = false;
+    bluetooth = {
       enable = true;
-      autoLogin = {
+      powerOnBoot = true;
-        user = "gaming";
-        enable = true;
-      };
-      defaultSession = "plasma";
     };
+  };
+
+  security.rtkit.enable = true;
+
+  services = {
 
     openssh.ports = [ 262 ];
+
+    snapshot_manager.enable = true;
+
+    zfs = {
+      trim.enable = true;
+      autoScrub.enable = true;
+    };
   };
 
   system.stateVersion = "24.05";

systems/bob/games.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    osu-lazer-bin
-    jellyfin-media-player
-  ];
-}

systems/bob/hardware.nix

@@ -26,8 +26,6 @@
         device = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_with_Heatsink_1TB_S73JNJ0X114418B-part2";
         bypassWorkqueues = true;
         allowDiscards = true;
-        keyFileSize = 4096;
-        keyFile = "/dev/disk/by-id/usb-Samsung_Flash_Drive_FIT_0374620080067131-0:0";
       };
     };
     kernelModules = [ "kvm-amd" ];
@@ -66,4 +64,4 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
+}

systems/bob/llms.nix

@@ -1,24 +0,0 @@
-{
-  services = {
-    ollama = {
-      enable = true;
-      loadModels = [
-        "codellama:7b"
-        "deepseek-r1:1.5b"
-        "deepseek-r1:7b"
-        "deepseek-r1:8b"
-        "deepseek-r1:14b"
-        "deepseek-r1:32b"
-        "llama3.2:3b"
-        "mistral-nemo:12b"
-      ];
-      acceleration = "cuda";
-      openFirewall = true;
-    };
-    open-webui = {
-      enable = true;
-      openFirewall = true;
-      host = "192.168.90.25";
-    };
-  };
-}

systems/bob/syncthing.nix

@@ -1,7 +1,8 @@
-{
+{    
   services.syncthing.settings.folders = {
-    "dotfiles" = {
+    "notes" = {
-      path = "/home/richie/dotfiles";
+      id = "l62ul-lpweo"; # cspell:disable-line
+      path = "/home/richie/notes";
       devices = [
         "jeeves"
         "rhapsody-in-green"
@@ -29,5 +30,29 @@
       ];
       fsWatcherEnabled = true;
     };
+    "projects" = {
+      id = "vyma6-lqqrz"; # cspell:disable-line
+      path = "/home/richie/projects";
+      devices = [
+        "jeeves"
+        "rhapsody-in-green"
+      ];
+      fsWatcherEnabled = true;
+    };
+    "temp" = {
+      id = "bob_temp";
+      path = "/home/richie/temp";
+      devices = [
+        "jeeves"
+      ];
+      fsWatcherEnabled = true;
+    };
+    "vault" = {
+      path = "/home/richie/vault";
+      devices = [
+        "rhapsody-in-green"
+      ];
+      fsWatcherEnabled = true;
+    };
   };
 }

systems/brendans-system/default.nix

@@ -1,37 +0,0 @@
-{
-  imports = [
-    ../../users/brendan
-    ../../common/global
-    ../../common/optional/desktop.nix
-    ../../common/optional/docker.nix
-    ../../common/optional/steam.nix
-    ../../common/optional/systemd-boot.nix
-    ../../common/optional/update.nix
-    ../../common/optional/zerotier.nix
-    ./hardware.nix
-    ./nvidia.nix
-    ./programs.nix
-  ];
-
-  networking = {
-    hostName = "brendans-system";
-    hostId = "7c678a41";
-    firewall.enable = true;
-    networkmanager.enable = true;
-  };
-
-  services = {
-    displayManager = {
-      enable = true;
-      autoLogin = {
-        user = "gaming";
-        enable = true;
-      };
-      defaultSession = "plasma";
-    };
-
-    openssh.ports = [ 262 ];
-  };
-
-  system.stateVersion = "24.05";
-}

systems/brendans-system/nvidia.nix

@@ -1,14 +0,0 @@
-{ config, ... }:
-{
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware = {
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
-      nvidiaSettings = true;
-      open = true;
-    };
-    nvidia-container-toolkit.enable = true;
-  };
-}

systems/brendans-system/programs.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    jellyfin-media-player
-  ];
-}

systems/jeeves/default.nix

@@ -1,3 +1,6 @@
+let
+  vars = import ./vars.nix;
+in
 {
   imports = [
     ../../users/richie
@@ -7,11 +10,12 @@
     ../../common/optional/syncthing_base.nix
     ../../common/optional/zerotier.nix
     ./docker
-    ./services
     ./hardware.nix
+    ./home_assistant.nix
     ./networking.nix
     ./programs.nix
-    ./runners
+    ./runner.nix
+    ./services.nix
     ./syncthing.nix
   ];
 
@@ -24,9 +28,31 @@
   services = {
     openssh.ports = [ 629 ];
 
+    nix-serve = {
+      enable = true;
+      secretKeyFile = "${vars.storage_secrets}/services/nix-cache/cache-priv-key.pem";
+      openFirewall = true;
+    };
+
+    plex = {
+      enable = true;
+      dataDir = vars.media_plex;
+      openFirewall = true;
+    };
+
     smartd.enable = true;
 
-    snapshot_manager.path = ./snapshot_config.toml;
+    snapshot_manager = {
+      enable = true;
+      path = ./snapshot_config.toml;
+    };
+
+    sysstat.enable = true;
+
+    zfs = {
+      trim.enable = true;
+      autoScrub.enable = true;
+    };
   };
 
   system.stateVersion = "24.05";

systems/jeeves/docker/audiobookshelf.nix

@@ -0,0 +1,19 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  virtualisation.oci-containers.containers.audiobookshelf = {
+    image = "ghcr.io/advplyr/audiobookshelf:latest";
+    volumes = [
+      "${vars.media_docker_configs}/audiobookshelf:/config"
+      "${vars.media_docker_configs}/audiobookshelf:/metadata"
+      "${vars.storage_library}/audiobooks:/audiobooks"
+      "${vars.storage_library}/books:/books"
+    ];
+    environment = {
+      TZ = "America/New_York";
+    };
+    extraOptions = [ "--network=web" ];
+    autoStart = true;
+  };
+}

systems/jeeves/docker/filebrowser.nix

@@ -0,0 +1,15 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  virtualisation.oci-containers.containers.filebrowser = {
+    image = "hurlenko/filebrowser:latest";
+    extraOptions = [ "--network=web" ];
+    volumes = [
+      "/zfs:/data"
+      "${vars.media_docker_configs}/filebrowser:/config"
+    ];
+    autoStart = true;
+    user = "1000:users";
+  };
+}

systems/jeeves/docker/grafana.nix

@@ -0,0 +1,12 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  virtualisation.oci-containers.containers.grafana = {
+    image = "grafana/grafana-enterprise:latest";
+    volumes = [ "${vars.media_docker_configs}/grafana:/var/lib/grafana" ];
+    user = "600:600";
+    extraOptions = [ "--network=web" ];
+    autoStart = true;
+  };
+}

systems/jeeves/docker/haproxy.cfg

@@ -22,52 +22,56 @@ defaults
 #Application Setup
 frontend ContentSwitching
   bind *:80
-  bind *:443 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
+  bind *:443 ssl crt /etc/ssl/certs/cloudflare.pem
   mode  http
   # tmmworkshop.com
   acl host_audiobookshelf  hdr(host) -i audiobookshelf.tmmworkshop.com
   acl host_cache  hdr(host) -i cache.tmmworkshop.com
   acl host_filebrowser  hdr(host) -i filebrowser.tmmworkshop.com
+  acl host_grafana  hdr(host) -i grafana.tmmworkshop.com
   acl host_homeassistant  hdr(host) -i homeassistant.tmmworkshop.com
-  acl host_jellyfin  hdr(host) -i jellyfin.tmmworkshop.com
+  acl host_photoprism  hdr(host) -i photoprism.tmmworkshop.com
   acl host_share  hdr(host) -i share.tmmworkshop.com
   acl host_uptime_kuma  hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
 
   use_backend audiobookshelf_nodes if host_audiobookshelf
   use_backend cache_nodes  if host_cache
   use_backend filebrowser_nodes  if host_filebrowser
+  use_backend grafana_nodes  if host_grafana
   use_backend homeassistant_nodes  if host_homeassistant
-  use_backend jellyfin if host_jellyfin
+  use_backend photoprism_nodes  if host_photoprism
   use_backend share_nodes  if host_share
   use_backend uptime_kuma_nodes  if host_uptime_kuma
 
 backend audiobookshelf_nodes
   mode http
-  server server 192.168.90.40:8000
+  server server audiobookshelf:80
 
 backend cache_nodes
   mode http
   server server 192.168.90.40:5000
 
+backend grafana_nodes
+  mode http
+  server server grafana:3000
+
 backend filebrowser_nodes
   mode http
-  server server 192.168.90.40:8080
+  server server filebrowser:8080
 
 backend homeassistant_nodes
   mode http
   server server 192.168.95.14:8123
 
-backend jellyfin
+backend photoprism_nodes
-    option httpchk
+  mode http
-    option forwardfor
+  server server photoprism:2342
-    http-check send meth GET uri /health
-    http-check expect string Healthy
-    server jellyfin 192.168.95.14:8096
 
 backend share_nodes
   mode http
-  server server 192.168.95.14:8091
+  server server share:80
 
 backend uptime_kuma_nodes
   mode http
-  server server 192.168.95.14:3001
+  server server uptime_kuma:3001
+

systems/jeeves/docker/photoprism.nix

@@ -0,0 +1,53 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  virtualisation.oci-containers.containers.photoprism = {
+    image = "photoprism/photoprism:latest";
+    volumes = [ 
+      "${vars.media_docker_configs}/photoprism:/photoprism/storage"
+      "${vars.storage_photos}/originals:/photoprism/originals"
+      "${vars.storage_photos}/import:/photoprism/import"
+    ];
+    environment = {
+      PHOTOPRISM_ADMIN_USER="admin";
+      PHOTOPRISM_AUTH_MODE="password";
+      PHOTOPRISM_DISABLE_TLS="false";
+      PHOTOPRISM_DEFAULT_TLS="true";
+      PHOTOPRISM_ORIGINALS_LIMIT="30000";
+      PHOTOPRISM_HTTP_COMPRESSION="gzip";
+      PHOTOPRISM_LOG_LEVEL="info";
+      PHOTOPRISM_READONLY="false";
+      PHOTOPRISM_EXPERIMENTAL="false";
+      PHOTOPRISM_DISABLE_CHOWN="false";
+      PHOTOPRISM_DISABLE_WEBDAV="false";
+      PHOTOPRISM_DISABLE_SETTINGS="false";
+      PHOTOPRISM_DISABLE_TENSORFLOW="false";
+      PHOTOPRISM_DISABLE_FACES="false";
+      PHOTOPRISM_DISABLE_CLASSIFICATION="false";
+      PHOTOPRISM_DISABLE_VECTORS="false";
+      PHOTOPRISM_DISABLE_RAW="false";
+      PHOTOPRISM_RAW_PRESETS="false";
+      PHOTOPRISM_SIDECAR_YAML="true";
+      PHOTOPRISM_BACKUP_ALBUMS="true";
+      PHOTOPRISM_BACKUP_DATABASE="true";
+      PHOTOPRISM_BACKUP_SCHEDULE="daily";
+      PHOTOPRISM_INDEX_SCHEDULE="";
+      PHOTOPRISM_AUTO_INDEX="300";
+      PHOTOPRISM_AUTO_IMPORT= "-1";
+      PHOTOPRISM_DETECT_NSFW="false";
+      PHOTOPRISM_UPLOAD_NSFW="true";
+      PHOTOPRISM_DATABASE_DRIVER="sqlite";
+      PHOTOPRISM_SITE_CAPTION="AI-Powered Photos App";
+      PHOTOPRISM_SITE_DESCRIPTION="";
+      PHOTOPRISM_SITE_AUTHOR="";
+      PHOTOPRISM_UID="600";
+      PHOTOPRISM_GID="600";
+      # PHOTOPRISM_UMASK: 0000
+    };
+    environmentFiles = ["${vars.storage_secrets}/docker/photoprism"];
+    autoStart = true;
+    extraOptions = [ "--network=web" ];
+  };
+}
+

systems/jeeves/docker/postgresql.nix

@@ -0,0 +1,32 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  users = {
+    users.postgres = {
+      isSystemUser = true;
+      group = "postgres";
+      uid = 999;
+    };
+    groups.postgres = {
+      gid = 999;
+    };
+  };
+
+  virtualisation.oci-containers.containers = {
+    postgres = {
+      image = "postgres:17";
+      ports = [ "5432:5432" ];
+      volumes = [ "${vars.media_database}/postgres:/var/lib/postgresql/data" ];
+      environment = {
+        POSTGRES_USER = "admin";
+        POSTGRES_DB = "archive";
+        POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256";
+      };
+      environmentFiles = [ "${vars.storage_secrets}/docker/postgres" ];
+      autoStart = true;
+      user = "postgres:postgres";
+    };
+  };
+
+}

systems/jeeves/docker/qbit.nix

@@ -3,15 +3,8 @@ let
 in
 {
   networking.firewall = {
-    allowedTCPPorts = [
+    allowedTCPPorts = [ 6881 8082 29432 ]; 
-      6881
+    allowedUDPPorts = [ 6881 29432 ];
-      8082
-      29432
-    ];
-    allowedUDPPorts = [
-      6881
-      29432
-    ];
   };
   virtualisation.oci-containers.containers.qbit = {
     image = "ghcr.io/linuxserver/qbittorrent:5.0.2";

systems/jeeves/docker/qbitvpn.nix

@@ -3,11 +3,7 @@ let
 in
 {
   networking.firewall = {
-    allowedTCPPorts = [
+    allowedTCPPorts = [ 6882 8081 8118 ];
-      6882
-      8081
-      8118
-    ];
     allowedUDPPorts = [ 6882 ];
   };
   virtualisation.oci-containers.containers.qbitvpn = {
@@ -40,7 +36,7 @@ in
       DELUGE_DAEMON_LOG_LEVEL = "debug";
       DELUGE_WEB_LOG_LEVEL = "debug";
     };
-    environmentFiles = [ "${vars.storage_secrets}/docker/qbitvpn" ];
+    environmentFiles = ["${vars.storage_secrets}/docker/qbitvpn"];
     autoStart = true;
   };
 }

systems/jeeves/docker/reverse_proxy.nix

@@ -0,0 +1,39 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  virtualisation.oci-containers.containers = {
+    haproxy = {
+      image = "haproxy:latest";
+      user = "600:600";
+      environment = {
+        TZ = "Etc/EST";
+      };
+      volumes = [
+        "${vars.storage_secrets}/docker/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
+        "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg"
+      ];
+      dependsOn = [
+        "audiobookshelf"
+        "filebrowser"
+        "grafana"
+        "photoprism"
+        "uptime_kuma"
+      ];
+      extraOptions = [ "--network=web" ];
+      autoStart = true;
+    };
+    cloud_flare_tunnel = {
+      image = "cloudflare/cloudflared:latest";
+      user = "600:600";
+      cmd = [
+        "tunnel"
+        "run"
+      ];
+      environmentFiles = ["${vars.storage_secrets}/docker/cloud_flare_tunnel"];
+      dependsOn = [ "haproxy" ];
+      extraOptions = [ "--network=web" ];
+      autoStart = true;
+    };
+  };
+}

systems/jeeves/docker/share.nix

@@ -3,8 +3,7 @@ let
 in
 {
   virtualisation.oci-containers.containers.share = {
-    image = "ubuntu/apache2:2.4-22.04_beta";
+    image = "ubuntu/apache2:latest";
-    ports = [ "8091:80" ];
     volumes = [
       "${../../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
       "${vars.media_share}:/data"

systems/jeeves/docker/uptime_kuma.nix

@@ -4,8 +4,7 @@ in
 {
   virtualisation.oci-containers.containers = {
     uptime_kuma = {
-      ports = [ "3001:3001" ];
+      image = "louislam/uptime-kuma:latest";
-      image = "louislam/uptime-kuma:1.23.16-debian";
       volumes = [
         "${vars.media_docker_configs}/uptime_kuma:/app/data"
         "/var/run/docker.sock:/var/run/docker.sock"

systems/jeeves/hardware.nix

@@ -1,11 +1,6 @@
+{ config, lib, modulesPath, ... }:
 {
-  config,
+  imports =[ (modulesPath + "/installer/scan/not-detected.nix") ];
-  lib,
-  modulesPath,
-  ...
-}:
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
     loader = {
@@ -93,32 +88,22 @@
           bypassWorkqueues = true;
           allowDiscards = true;
         };
-        "luks-storage_pool-wwn-0x5000cca23bc438dd-part1".device =
+        "luks-storage_pool-wwn-0x5000cca23bc438dd-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bc438dd-part1";
-          "/dev/disk/by-id/wwn-0x5000cca23bc438dd-part1";
+        "luks-storage_pool-wwn-0x5000cca23bd035f5-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bd035f5-part1";
-        "luks-storage_pool-wwn-0x5000cca23bd035f5-part1".device =
+        "luks-storage_pool-wwn-0x5000cca23bd00ad6-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-part1";
-          "/dev/disk/by-id/wwn-0x5000cca23bd035f5-part1";
+        "luks-storage_pool-wwn-0x5000cca23bcf313e-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bcf313e-part1";
-        "luks-storage_pool-wwn-0x5000cca23bd00ad6-part1".device =
+        "luks-storage_pool-wwn-0x5000cca23bcdf3b8-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bcdf3b8-part1";
-          "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-part1";
+        "luks-storage_pool-wwn-0x5000cca23bd02746-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bd02746-part1";
-        "luks-storage_pool-wwn-0x5000cca23bcf313e-part1".device =
+        "luks-storage_pool-wwn-0x5000cca23bcf9f89-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bcf9f89-part1";
-          "/dev/disk/by-id/wwn-0x5000cca23bcf313e-part1";
+        "luks-storage_pool-wwn-0x5000cca23bd00ae9-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bd00ae9-part1";
-        "luks-storage_pool-wwn-0x5000cca23bcdf3b8-part1".device =
-          "/dev/disk/by-id/wwn-0x5000cca23bcdf3b8-part1";
-        "luks-storage_pool-wwn-0x5000cca23bd02746-part1".device =
-          "/dev/disk/by-id/wwn-0x5000cca23bd02746-part1";
-        "luks-storage_pool-wwn-0x5000cca23bcf9f89-part1".device =
-          "/dev/disk/by-id/wwn-0x5000cca23bcf9f89-part1";
-        "luks-storage_pool-wwn-0x5000cca23bd00ae9-part1".device =
-          "/dev/disk/by-id/wwn-0x5000cca23bd00ae9-part1";
         # Torrenting pool
         "luks-torrenting_pool-wwn-0x500a0751e6c3c01e-part1" = {
           device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01e-part1";
           bypassWorkqueues = true;
           allowDiscards = true;
         };
-        "luks-torrenting_pool-wwn-0x5000cca264f080a3-part1".device =
+        "luks-torrenting_pool-wwn-0x5000cca264f080a3-part1".device = "/dev/disk/by-id/wwn-0x5000cca264f080a3-part1";
-          "/dev/disk/by-id/wwn-0x5000cca264f080a3-part1";
+        "luks-torrenting_pool-wwn-0x5000cca298c33ae5-part1".device = "/dev/disk/by-id/wwn-0x5000cca298c33ae5-part1";
-        "luks-torrenting_pool-wwn-0x5000cca298c33ae5-part1".device =
-          "/dev/disk/by-id/wwn-0x5000cca298c33ae5-part1";
         # cspell:enable
       };
     };
@@ -137,8 +122,8 @@
       fsType = "zfs";
     };
 
-    "/nix" = {
+    "/nix" =
-      device = "root_pool/nix";
+    { device = "root_pool/nix";
       fsType = "zfs";
     };
 
@@ -161,7 +146,7 @@
       options = [
         "fmask=0077"
         "dmask=0077"
-      ];
+      ];    
     };
   };
 

systems/jeeves/home_assistant.nix

@@ -0,0 +1,57 @@
+let
+  vars = import ./vars.nix;
+in
+{
+  services.home-assistant = {
+    enable = true;
+    openFirewall = true;
+    configDir = vars.media_home_assistant;
+    config = {
+      http = {
+        server_port = 8123;
+        server_host = [
+          "192.168.95.14"
+          "192.168.90.40"
+          "192.168.98.4"
+        ];
+        use_x_forwarded_for = true;
+        trusted_proxies = "172.18.0.0/24";
+      };
+      homeassistant = {
+        time_zone = "America/New_York";
+        unit_system = "imperial";
+        temperature_unit = "F";
+      };
+      assist_pipeline = { };
+      backup = { };
+      bluetooth = { };
+      config = { };
+      dhcp = { };
+      energy = { };
+      history = { };
+      homeassistant_alerts = { };
+      image_upload = { };
+      logbook = { };
+      media_source = { };
+      mobile_app = { };
+      ssdp = { };
+      sun = { };
+      webhook = { };
+      zeroconf = { };
+      automation = "!include automations.yaml";
+      script = "!include scripts.yaml";
+      scene = "!include scenes.yaml";
+      group = "!include groups.yaml";
+    };
+    extraPackages =
+      python3Packages: with python3Packages; [
+        psycopg2
+        gtts
+        aioesphomeapi
+        esphome-dashboard-api
+        bleak-esphome
+        pymetno
+      ];
+    extraComponents = [ "isal" ];
+  };
+}

systems/jeeves/networking.nix

@@ -7,12 +7,25 @@
   };
 
   systemd.network = {
+
     enable = true;
+
+    netdevs = {
+      "20-ioit-vlan" = {
+        netdevConfig = {
+          Kind = "vlan";
+          Name = "ioit-vlan";
+        };
+        vlanConfig.Id = 20;
+      };
+    };
+
     networks = {
       "10-1GB_Primary" = {
         matchConfig.Name = "enp98s0f0";
         address = [ "192.168.95.14/24" ];
-        routes = [ { Gateway = "192.168.95.1"; } ];
+        routes = [{ Gateway = "192.168.95.1"; }];
+        vlan = [ "ioit-vlan" ];
         linkConfig.RequiredForOnline = "routable";
       };
       "10-1GB_Secondary" = {
@@ -28,6 +41,15 @@
         matchConfig.Name = "enp97s0f1np1";
         DHCP = "yes";
       };
+      "40-ioit-vlan" = {
+        matchConfig.Name = "ioit-vlan";
+        DHCP = "yes";
+      };
     };
   };
+
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = [ "e4da7455b2ae64ca" ];
+  };
 }

systems/jeeves/runner.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+let
+  vars = import ./vars.nix;
+in
+{
+  users = {
+    users.github-runners = {
+      isSystemUser = true;
+      group = "github-runners";
+      uid = 601;
+    };
+    groups.github-runners = {
+      gid = 601;
+    };
+  };
+  
+  services.github-runners.nix_builder = {
+    enable = true;
+    replace = true;
+    workDir = "/zfs/media/github-runners/nix_builder/";
+    url = "https://github.com/RichieCahill/dotfiles";
+    extraLabels = [ "nixos" ];
+    tokenFile = "${vars.storage_secrets}/services/github_runners/nix_builder";
+    user = "github-runners";
+    group = "github-runners";
+    extraPackages = [ pkgs.nixos-rebuild ];
+    # extraEnvironment
+  };
+}

systems/jeeves/runners/default.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [ ./nix_builder.nix ];
-
-  users = {
-    users.github-runners = {
-      shell = pkgs.bash;
-      isSystemUser = true;
-      group = "github-runners";
-      uid = 601;
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/S8i+BNX/12JNKg+5EKGX7Aqimt5KM+ve3wt/SyWuO github-runners" # cspell:disable-line
-      ];
-    };
-    groups.github-runners.gid = 601;
-  };
-
-  services.nix_builder.containers = {
-    nix-builder-0.enable = true;
-    nix-builder-1.enable = true;
-    nix-builder-2.enable = true;
-    nix-builder-3.enable = true;
-    nix-builder-4.enable = true;
-    nix-builder-5.enable = true;
-  };
-}

systems/jeeves/runners/nix_builder.nix

@@ -1,101 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  vars = import ../vars.nix;
-in
-{
-  options.services.nix_builder.containers = mkOption {
-    type = types.attrsOf (
-      types.submodule (
-        { name, ... }:
-        {
-          options.enable = mkEnableOption "GitHub runner container";
-        }
-      )
-    );
-    default = { };
-    description = "GitHub runner container configurations";
-  };
-
-  config.containers = mapAttrs (
-    name: cfg:
-    mkIf cfg.enable {
-      autoStart = true;
-      bindMounts = {
-        "/storage" = {
-          mountPoint = "/zfs/media/github-runners/${name}";
-          isReadOnly = false;
-        };
-        "/secrets".mountPoint = "${vars.storage_secrets}/services/github-runners/${name}";
-        "ssh-keys".mountPoint = "${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners";
-      };
-      config =
-        {
-          config,
-          pkgs,
-          lib,
-          ...
-        }:
-        {
-          nix.settings = {
-            trusted-substituters = [
-              "https://cache.nixos.org"
-              "https://cache.tmmworkshop.com"
-              "https://nix-community.cachix.org"
-            ];
-            substituters = [
-              "https://cache.nixos.org/?priority=2&want-mass-query=true"
-              "https://cache.tmmworkshop.com/?priority=2&want-mass-query=true"
-              "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
-            ];
-            trusted-public-keys = [
-              "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-              "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA="
-              "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-            ];
-            experimental-features = [
-              "flakes"
-              "nix-command"
-            ];
-          };
-          programs.ssh.extraConfig = ''
-            Host jeeves
-              Port 629
-              User github-runners
-              HostName 192.168.95.14
-              IdentityFile ${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners
-              StrictHostKeyChecking no
-              UserKnownHostsFile /dev/null
-          '';
-          services.github-runners.${name} = {
-            enable = true;
-            replace = true;
-            workDir = "/zfs/media/github-runners/${name}";
-            url = "https://github.com/RichieCahill/dotfiles";
-            extraLabels = [ "nixos" ];
-            tokenFile = "${vars.storage_secrets}/services/github-runners/${name}";
-            user = "github-runners";
-            group = "github-runners";
-            extraPackages = with pkgs; [
-              nixfmt-rfc-style
-              nixos-rebuild
-              openssh
-              treefmt
-            ];
-          };
-          users = {
-            users.github-runners = {
-              shell = pkgs.bash;
-              isSystemUser = true;
-              group = "github-runners";
-              uid = 601;
-            };
-            groups.github-runners.gid = 601;
-          };
-          system.stateVersion = "24.11";
-        };
-    }
-  ) config.services.nix_builder.containers;
-}

systems/jeeves/scripts/zfs.sh

@@ -20,8 +20,8 @@ sudo zfs create -o compression=zstd-9 media/docker
 sudo zfs create -o recordsize=1M -o compression=zstd-19 media/library
 sudo zfs create -o compression=zstd-9 -o sync=disabled media/github-runners
 sudo zfs create -o copies=3 media/notes
+sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/photoprism_mariadb media/photoprism_mariadb
 sudo zfs create -o compression=zstd-9 media/plex
-sudo zfs create -o compression=zstd-9 media/services
 sudo zfs create -o compression=zstd-19 media/home_assistant
 sudo zfs create -o exec=off media/share
 sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/postgres media/postgres

systems/jeeves/services.nix

@@ -4,7 +4,7 @@
   ...
 }:
 let
-  vars = import ../vars.nix;
+  vars = import ./vars.nix;
 in
 {
   systemd = {
@@ -13,7 +13,7 @@ in
         description = "maintains /zfs/storage/plex permissions";
         serviceConfig = {
           Type = "oneshot";
-          ExecStart = "${pkgs.bash}/bin/bash ${../scripts/plex_permission.sh}";
+          ExecStart = "${pkgs.bash}/bin/bash ${./scripts/plex_permission.sh}";
         };
       };
       startup_validation = {
@@ -25,7 +25,7 @@ in
         serviceConfig = {
           EnvironmentFile = "${vars.storage_secrets}/services/server-validation";
           Type = "oneshot";
-          ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_system --config-file='${./validate_system.toml}'";
+          ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
         };
       };
     };

systems/jeeves/services/audiobookshelf.nix

@@ -1,14 +0,0 @@
-{ lib, ... }:
-let
-  vars = import ../vars.nix;
-in
-{
-  services.audiobookshelf = {
-    enable = true;
-    openFirewall = true;
-    host = "192.168.90.40";
-  };
-  systemd.services.audiobookshelf.serviceConfig.WorkingDirectory =
-    lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
-  users.users.audiobookshelf.home = lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
-}

systems/jeeves/services/cloud_flare_tunnel.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-let
-  vars = import ../vars.nix;
-in
-{
-  systemd.services.cloud_flare_tunnel = {
-    description = "cloud_flare_tunnel proxy's traffic through cloudflare";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      Type = "simple";
-      EnvironmentFile = "${vars.storage_secrets}/docker/cloud_flare_tunnel";
-      ExecStart = "${pkgs.cloudflared}/bin/cloudflared --no-autoupdate tunnel run";
-      Restart = "on-failure";
-    };
-  };
-}

systems/jeeves/services/default.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-{
-  imports =
-    let
-      files = builtins.attrNames (builtins.readDir ./.);
-      nixFiles = builtins.filter (name: lib.hasSuffix ".nix" name && name != "default.nix") files;
-    in
-    map (file: ./. + "/${file}") nixFiles;
-}

systems/jeeves/services/duckdns.nix

@@ -1,10 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  services.duckdns = {
-    enable = true;
-    tokenFile = "${vars.storage_secrets}/services/duckdns/token";
-    domainsFile = "${vars.storage_secrets}/services/duckdns/domains";
-  };
-}

systems/jeeves/services/filebrowser.nix

@@ -1,23 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-let
-  vars = import ../vars.nix;
-in
-{
-  networking.firewall.allowedTCPPorts = [ 8080 ];
-
-  systemd.services.filebrowser = {
-    description = "filebrowser";
-    after = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      Type = "simple";
-      User = "richie";
-      Group = "users";
-      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.media_docker_configs}/filebrowser/filebrowser.db";
-      Restart = "on-failure";
-    };
-  };
-}

systems/jeeves/services/haproxy.nix

@@ -1,11 +0,0 @@
-{
-  networking.firewall.allowedTCPPorts = [
-    80
-    443
-  ];
-
-  services.haproxy = {
-    enable = true;
-    config = builtins.readFile ./haproxy.cfg;
-  };
-}

systems/jeeves/services/home_assistant.nix

@@ -1,69 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  services = {
-    home-assistant = {
-      enable = true;
-      openFirewall = true;
-      configDir = vars.media_home_assistant;
-      config = {
-        http = {
-          server_port = 8123;
-          server_host = [
-            "192.168.95.14"
-            "192.168.90.40"
-          ];
-          use_x_forwarded_for = true;
-          trusted_proxies = "192.168.95.0/24";
-        };
-        homeassistant = {
-          time_zone = "America/New_York";
-          unit_system = "us_customary";
-          temperature_unit = "F";
-        };
-        assist_pipeline = { };
-        backup = { };
-        bluetooth = { };
-        config = { };
-        dhcp = { };
-        energy = { };
-        history = { };
-        homeassistant_alerts = { };
-        image_upload = { };
-        logbook = { };
-        media_source = { };
-        mobile_app = { };
-        ssdp = { };
-        sun = { };
-        webhook = { };
-        zeroconf = { };
-        automation = "!include automations.yaml";
-        script = "!include scripts.yaml";
-        scene = "!include scenes.yaml";
-        group = "!include groups.yaml";
-      };
-      extraPackages =
-        python3Packages: with python3Packages; [
-          aioesphomeapi
-          aiounifi
-          bleak-esphome
-          esphome-dashboard-api
-          gtts
-          jellyfin-apiclient-python
-          psycopg2
-          pymetno
-          pyownet
-          rokuecp
-          uiprotect
-          wakeonlan
-        ];
-      extraComponents = [ "isal" ];
-    };
-    esphome = {
-      enable = true;
-      openFirewall = true;
-      address = "192.168.90.40";
-    };
-  };
-}

systems/jeeves/services/jellyfin.nix

@@ -1,10 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  services.jellyfin = {
-    enable = true;
-    openFirewall = true;
-    dataDir = "${vars.media_services}/jellyfin";
-  };
-}

systems/jeeves/services/nix_serve.nix

@@ -1,10 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  services.nix-serve = {
-    enable = true;
-    secretKeyFile = "${vars.storage_secrets}/services/nix-cache/cache-priv-key.pem";
-    openFirewall = true;
-  };
-}

systems/jeeves/services/postgress.nix

@@ -1,127 +0,0 @@
-{ pkgs, ... }:
-let
-  vars = import ../vars.nix;
-in
-{
-  networking.firewall.allowedTCPPorts = [ 5432 ];
-
-  services.postgresql = {
-    enable = true;
-    package = pkgs.postgresql_17_jit;
-    enableTCPIP = true;
-    enableJIT = true;
-    dataDir = "${vars.media_database}/postgres";
-
-    authentication = pkgs.lib.mkOverride 10 ''
-
-      #type database DBuser origin-address auth-method
-      local all       all     trust
-
-      # ipv4
-      host  all      all     127.0.0.1/32    trust
-      host  all      all     192.168.90.1/24 trust
-
-      # ipv6
-      host all       all     ::1/128         trust
-    '';
-
-    identMap = ''
-      # ArbitraryMapName systemUser DBUser
-        superuser_map      root      postgres
-        superuser_map      postgres  postgres
-        # Let other names login as themselves
-        superuser_map      richie    postgres
-    '';
-    ensureUsers = [
-      {
-        name = "postgres";
-        ensureClauses = {
-          superuser = true;
-          login = true;
-          createrole = true;
-          createdb = true;
-          replication = true;
-        };
-      }
-      {
-        name = "richie";
-        ensureClauses = {
-          superuser = true;
-          login = true;
-          createrole = true;
-          createdb = true;
-          replication = true;
-        };
-      }
-    ];
-    # Thank you NotAShelf
-    # https://github.com/NotAShelf/nyx/blob/d407b4d6e5ab7f60350af61a3d73a62a5e9ac660/modules/core/roles/server/system/services/databases/postgresql.nix#L74
-    settings = {
-      # Connectivity;
-      max_connections = 100;
-      superuser_reserved_connections = 3;
-
-      # Memory Settings;
-      shared_buffers = "1024 MB";
-      work_mem = "32 MB";
-      maintenance_work_mem = "320 MB";
-      huge_pages = "off";
-      effective_cache_size = "2 GB";
-      effective_io_concurrency = 100; # concurrent IO only really activated if OS supports posix_fadvise function;
-      random_page_cost = 1.25; # speed of random disk access relative to sequential access (1.0);
-
-      # Monitoring;
-      shared_preload_libraries = "pg_stat_statements,auto_explain"; # per statement resource usage stats & log explain statements for slow queries
-      track_io_timing = "on"; # measure exact block IO times;
-      track_functions = "pl"; # track execution times of pl-language procedures if any;
-      # Replication;
-      wal_level = "replica"; # consider using at least "replica";
-      max_wal_senders = 0;
-      synchronous_commit = "on";
-
-      # Checkpointing: ;
-      checkpoint_timeout = "15 min";
-      checkpoint_completion_target = 0.9;
-      max_wal_size = "1024 MB";
-      min_wal_size = "512 MB";
-
-      # WAL writing;
-      wal_compression = "on";
-      wal_buffers = -1; # auto-tuned by Postgres till maximum of segment size (16MB by default);
-      wal_writer_delay = "200ms";
-      wal_writer_flush_after = "1MB";
-
-      # Background writer;
-      bgwriter_delay = "200ms";
-      bgwriter_lru_maxpages = 100;
-      bgwriter_lru_multiplier = 2.0;
-      bgwriter_flush_after = 0;
-
-      # Parallel queries: ;
-      max_worker_processes = 6;
-      max_parallel_workers_per_gather = 3;
-      max_parallel_maintenance_workers = 3;
-      max_parallel_workers = 6;
-      parallel_leader_participation = "on";
-
-      # Advanced features ;
-      enable_partitionwise_join = "on";
-      enable_partitionwise_aggregate = "on";
-      jit = "on";
-
-      jit_above_cost = 100000;
-      jit_inline_above_cost = 150000;
-      jit_optimize_above_cost = 500000;
-
-      # log slow queries
-      log_min_duration_statement = 100;
-      "auto_explain.log_min_duration" = 100;
-
-      # logging configuration
-      log_connections = true;
-      log_statement = "all";
-      logging_collector = true;
-      log_disconnections = true;
-    };
-  };
-}

systems/jeeves/services/validate_system.toml

@@ -1,13 +0,0 @@
-zpool = ["root_pool", "storage", "torrenting", "media"]
-services = [
-    "audiobookshelf",
-    "cloud_flare_tunnel",
-    "haproxy",
-    "docker-qbit",
-    "docker-qbitvpn",
-    "docker-uptime_kuma",
-    "docker",
-    "filebrowser",
-    "home-assistant",
-    "jellyfin",
-]

systems/jeeves/syncthing.nix

@@ -2,127 +2,61 @@ let
   vars = import ./vars.nix;
 in
 {
-  networking.firewall.allowedTCPPorts = [ 8384 ];
-
   services.syncthing = {
     guiAddress = "192.168.90.40:8384";
-    settings = {
+    settings.folders = {
-      devices.davids-server.id = "7GXTDGR-AOXFW2O-K6J7NM3-XYZNRRW-AKHAFWM-GBOWUPQ-OA6JIWD-ER7RDQL"; # cspell:disable-line
+      "bob_temp" = {
-      folders = {
+        path = "${vars.storage_syncthing}/bob_temp";
-        "dotfiles" = {
+        devices = [
-          path = "/home/richie/dotfiles";
+          "jeeves"
-          devices = [
+        ];
-            "bob"
+        fsWatcherEnabled = true;
-            "rhapsody-in-green"
+      };
-          ];
+      "notes" = {
-          fsWatcherEnabled = true;
+        id = "l62ul-lpweo"; # cspell:disable-line
-        };
+        path = vars.media_notes;
-        "notes" = {
+        devices = [
-          id = "l62ul-lpweo"; # cspell:disable-line
+          "bob"
-          path = vars.media_notes;
+          "rhapsody-in-green"
-          devices = [
+        ];
-            "rhapsody-in-green"
+        fsWatcherEnabled = true;
-            "davids-server"
+      };
-          ];
+      "important" = {
-          fsWatcherEnabled = true;
+        id = "4ckma-gtshs"; # cspell:disable-line
-        };
+        path = "${vars.storage_syncthing}/important";
-        "important" = {
+        devices = [
-          id = "4ckma-gtshs"; # cspell:disable-line
+          "bob"
-          path = "${vars.storage_syncthing}/important";
+          "rhapsody-in-green"
-          devices = [
+          "phone"
-            "bob"
+        ];
-            "rhapsody-in-green"
+        fsWatcherEnabled = true;
-            "phone"
+      };
-          ];
+      "music" = {
-          fsWatcherEnabled = true;
+        id = "vprc5-3azqc"; # cspell:disable-line
-        };
+        path = "${vars.storage_syncthing}/music";
-        "music" = {
+        devices = [
-          id = "vprc5-3azqc"; # cspell:disable-line
+          "bob"
-          path = "${vars.storage_syncthing}/music";
+          "rhapsody-in-green"
-          devices = [
+          "ipad"
-            "bob"
+          "phone"
-            "rhapsody-in-green"
+        ];
-            "ipad"
+        fsWatcherEnabled = true;
-            "phone"
+      };
-          ];
+      "projects" = {
-          fsWatcherEnabled = true;
+        id = "vyma6-lqqrz"; # cspell:disable-line
-        };
+        path = "${vars.storage_syncthing}/projects";
-        "projects" = {
+        devices = [
-          id = "vyma6-lqqrz"; # cspell:disable-line
+          "bob"
-          path = "${vars.storage_syncthing}/projects";
+          "rhapsody-in-green"
-          devices = [
+        ];
-            "rhapsody-in-green"
+        fsWatcherEnabled = true;
-          ];
+      };
-          fsWatcherEnabled = true;
+      "rhapsody-in-green_temp" = {
-        };
+        path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
-        "rhapsody-in-green_temp" = {
+        devices = [
-          path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
+          "rhapsody-in-green"
-          devices = [
+        ];
-            "rhapsody-in-green"
+        fsWatcherEnabled = true;
-          ];
-          fsWatcherEnabled = true;
-        };
-        "vault" = {
-          path = "/home/richie/vault";
-          devices = [
-            "rhapsody-in-green"
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-        };
-        "backup" = {
-          path = "${vars.storage_syncthing}/backup";
-          devices = [
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-        };
-        #
-        "davids-backup1" = {
-          id = "8229p-8z3tm"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/1";
-          devices = [
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-          type = "receiveencrypted";
-        };
-        "davids-backup2" = {
-          id = "iciw3-dp6ao"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/2";
-          devices = [
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-          type = "receiveencrypted";
-        };
-        "davids-backup3" = {
-          id = "9si6m-bnkjb"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/3";
-          devices = [
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-          type = "receiveencrypted";
-        };
-        "davids-backup4" = {
-          id = "qjyfy-uupj4"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/4";
-          devices = [
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-          type = "receiveencrypted";
-        };
-        "davids-backup5" = {
-          id = "fm4h5-emsu2"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/5";
-          devices = [
-            "davids-server"
-          ];
-          fsWatcherEnabled = true;
-          type = "receiveencrypted";
-        };
       };
     };
   };

systems/jeeves/vars.nix

@@ -11,7 +11,6 @@ in
   media_docker_configs = "${zfs_media}/docker/configs";
   media_mirror = "${zfs_media}/mirror";
   media_share = "${zfs_media}/share";
-  media_services = "${zfs_media}/services";
   media_notes = "${zfs_media}/notes";
   media_plex = "${zfs_media}/plex";
   media_home_assistant = "${zfs_media}/home_assistant";

systems/muninn/default.nix

@@ -0,0 +1,59 @@
+{ inputs, pkgs, ... }:
+{
+  imports = [
+    ../../users/gaming
+    ../../users/richie
+    ../../common/global
+    ../../common/optional/desktop.nix
+    ../../common/optional/steam.nix
+    ../../common/optional/systemd-boot.nix
+    ../../common/optional/update.nix
+    ./hardware.nix
+    inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
+  ];
+
+  environment.systemPackages = with pkgs; [
+    plex-media-player
+  ];
+
+  networking = {
+    hostName = "muninn";
+    hostId = "a43179c5";
+    firewall.enable = true;
+    networkmanager.enable = true;
+  };
+
+  hardware = {
+    pulseaudio.enable = false;
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+    firmware = [ pkgs.sof-firmware ];
+  };
+
+  security.rtkit.enable = true;
+
+  services = {
+    displayManager = {
+      enable = true;
+      autoLogin = {
+        user = "gaming";
+        enable = true;
+      };
+      defaultSession = "steam";
+      # defaultSession = "plasma";
+    };
+
+    openssh.ports = [ 295 ];
+
+    snapshot_manager.enable = true;
+
+    zfs = {
+      trim.enable = true;
+      autoScrub.enable = true;
+    };
+  };
+
+  system.stateVersion = "24.05";
+}

systems/muninn/hardware.nix

@@ -0,0 +1,63 @@
+{ config, lib, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "thunderbolt"
+        "usb_storage"
+        "sd_mod"
+      ];
+      kernelModules = [ ];
+      luks.devices."luks-root-pool-nvme-INTEL_SSDPEKKW256G7_BTPY63820XBH256D-part2" = {
+        device = "/dev/disk/by-id/nvme-INTEL_SSDPEKKW256G7_BTPY63820XBH256D-part2";
+        bypassWorkqueues = true;
+        allowDiscards = true;
+        keyFileSize = 4096;
+        keyFile = "/dev/disk/by-id/usb-SanDisk_Ultra_T_C_4C530001020919102244-0:0";
+      };
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = lib.mkDefault {
+      device = "root_pool/root";
+      fsType = "zfs";
+    };
+
+    "/home" = {
+      device = "root_pool/home";
+      fsType = "zfs";
+    };
+
+    "/nix" = {
+      device = "root_pool/nix";
+      fsType = "zfs";
+    };
+
+    "/var" = {
+      device = "root_pool/var";
+      fsType = "zfs";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/12CE-A600";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+  };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

systems/rhapsody-in-green/default.nix

@@ -13,7 +13,6 @@
     ./hardware.nix
     ./syncthing.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
-    inputs.nixos-cosmic.nixosModules.default
   ];
 
   networking = {
@@ -23,10 +22,26 @@
     networkmanager.enable = true;
   };
 
+  hardware = {
+    pulseaudio.enable = false;
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+  };
+
+  security.rtkit.enable = true;
+
   services = {
+
     openssh.ports = [ 922 ];
 
-    desktopManager.cosmic.enable = true;
+    snapshot_manager.enable = true;
+
+    zfs = {
+      trim.enable = true;
+      autoScrub.enable = true;
+    };
   };
 
   system.stateVersion = "24.05";

systems/rhapsody-in-green/hardware.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 

systems/rhapsody-in-green/syncthing.nix

@@ -1,17 +1,10 @@
-{
+{    
   services.syncthing.settings.folders = {
-    "dotfiles" = {
-      path = "/home/richie/dotfiles";
-      devices = [
-        "jeeves"
-        "bob"
-      ];
-      fsWatcherEnabled = true;
-    };
     "notes" = {
       id = "l62ul-lpweo"; # cspell:disable-line
       path = "/home/richie/notes";
       devices = [
+        "bob"
         "jeeves"
       ];
       fsWatcherEnabled = true;
@@ -41,6 +34,7 @@
       id = "vyma6-lqqrz"; # cspell:disable-line
       path = "/home/richie/projects";
       devices = [
+        "bob"
         "jeeves"
       ];
       fsWatcherEnabled = true;
@@ -56,7 +50,7 @@
     "vault" = {
       path = "/home/richie/vault";
       devices = [
-        "jeeves"
+        "bob"
       ];
       fsWatcherEnabled = true;
     };

systems/router/default.nix

@@ -0,0 +1,32 @@
+{
+  imports = [
+    ../../users/richie
+    ../../common/global
+    ../../common/optional/systemd-boot.nix
+    ../../common/optional/zerotier.nix
+    ./hardware.nix
+  ];
+
+  networking = {
+    hostName = "router";
+    hostId = "c58bbb8b";
+    firewall.enable = true;
+    networkmanager.enable = true;
+  };
+
+  security.rtkit.enable = true;
+
+  services = {
+
+    openssh.ports = [ 972 ];
+
+    snapshot_manager.enable = true;
+
+    zfs = {
+      trim.enable = true;
+      autoScrub.enable = true;
+    };
+  };
+
+  system.stateVersion = "24.05";
+}

systems/router/hardware.nix

@@ -1,36 +1,29 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{ config, lib, modulesPath, ... }:
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
     initrd = {
-      availableKernelModules = [
+      availableKernelModules = [ 
-        "nvme"
-        "xhci_pci"
         "ahci"
-        "usbhid"
+        "ehci_pci"
-        "usb_storage"
+        "nvme"
         "sd_mod"
+        "usb_storage"
+        "usbhid"
+        "xhci_pci"
       ];
       kernelModules = [ ];
-      luks.devices."luks-root-pool-nvme-Samsung_SSD_990_PRO_with_Heatsink_1TB_S73JNJ0X114418B-part2" = {
+      luks.devices."luks-root-pool-wwn-0x500a0751e6c3c01c-part2"= {
-        device = "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_with_Heatsink_1TB_S73JNJ0X114418B-part2";
+        device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01c-part2";
         bypassWorkqueues = true;
         allowDiscards = true;
+        fallbackToPassword = true;
         keyFileSize = 4096;
-        keyFile = "/dev/disk/by-id/usb-Samsung_Flash_Drive_FIT_0374620080067131-0:0";
+        keyFile = "/dev/disk/by-id/usb-Samsung_Flash_Drive_FIT_0374220080010715-0:0";
       };
     };
-    kernelModules = [ "kvm-amd" ];
+    kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
   };
 
@@ -50,8 +43,13 @@
       fsType = "zfs";
     };
 
+    "/nix" = {
+      device = "root_pool/nix";
+      fsType = "zfs";
+    };
+
     "/boot" = {
-      device = "/dev/disk/by-uuid/609D-FF29";
+      device = "/dev/disk/by-uuid/12CE-A600";
       fsType = "vfat";
       options = [
         "fmask=0077"
@@ -65,5 +63,5 @@
   networking.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

tools/installer.py

@@ -132,10 +132,11 @@ def create_zfs_pool(pool_disks: Sequence[str], mnt_dir: str) -> None:
 def create_zfs_datasets() -> None:
     """Create ZFS datasets."""
 
-    bash_wrapper("zfs create -o canmount=noauto -o reservation=10G root_pool/root")
+    bash_wrapper("zfs create -o canmount=noauto root_pool/root")
     bash_wrapper("zfs create root_pool/home")
-    bash_wrapper("zfs create root_pool/var -o reservation=1G")
+    bash_wrapper("zfs create root_pool/var")
-    bash_wrapper("zfs create -o compression=zstd-9 -o reservation=10G root_pool/nix")
+    bash_wrapper("zfs create -o compression=zstd-9 root_pool/nix")
+
     datasets = bash_wrapper("zfs list -o name")
 
     expected_datasets = {
@@ -266,7 +267,7 @@ def installer(
 
     if encrypt_key:
         pool_disks = [
-            f"/dev/mapper/luks-root-pool-{disk.split('/')[-1]}-part2" for disk in disks
+            f'/dev/mapper/luks-root-pool-{disk.split("/")[-1]}-part2' for disk in disks
         ]
     else:
         pool_disks = [f"{disk}-part2" for disk in disks]
@@ -448,7 +449,7 @@ def draw_device_menu(
     type_padding = calculate_device_menu_padding(devices, "type", padding)
     mountpoints_padding = calculate_device_menu_padding(devices, "mountpoints", padding)
 
-    device_header = f"{'Name':{name_padding}}{'Size':{size_padding}}{'Type':{type_padding}}{'Mountpoints':{mountpoints_padding}}"
+    device_header = f"{"Name":{name_padding}}{"Size":{size_padding}}{"Type":{type_padding}}{"Mountpoints":{mountpoints_padding}}"
 
     menu_width = range(menu_start_x, len(device_header) + menu_start_x)
 

treefmt.toml

@@ -1,14 +0,0 @@
-# One CLI to format the code tree - https://github.com/numtide/treefmt
-
-[global]
-# Glob patterns of files to exclude
-excludes = [".git/"]
-
-
-[formatter.nixfmt]
-# Formatter to run
-command = "nixfmt"
-# Command-line arguments for the command
-#options = []
-# Glob pattern of files to include
-includes = ["*.nix"]

users/brendan/default.nix

@@ -1,49 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-let
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in
-{
-
-  sops.secrets.brendan_password = {
-    sopsFile = ../secrets.yaml;
-    neededForUsers = true;
-  };
-
-  users = {
-    users.brendan = {
-      isNormalUser = true;
-
-      hashedPasswordFile = "${config.sops.secrets.brendan_password.path}";
-
-      shell = pkgs.zsh;
-      group = "brendan";
-      extraGroups =
-        [
-          "audio"
-          "video"
-          "wheel"
-          "users"
-        ]
-        ++ ifTheyExist [
-          "dialout"
-          "docker"
-          "hass"
-          "libvirtd"
-          "networkmanager"
-          "plugdev"
-          "scanner"
-          "uaccess"
-          "wireshark"
-        ];
-      uid = 1001;
-    };
-
-    groups.brendan.gid = 1001;
-  };
-
-  home-manager.users.brendan = import ./systems/${config.networking.hostName}.nix;
-}

users/brendan/home/cli/default.nix

@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./direnv.nix
-    ./git.nix
-    ./zsh.nix
-  ];
-
-  programs.starship.enable = true;
-}

users/brendan/home/cli/direnv.nix

@@ -1,8 +0,0 @@
-{
-
-  programs.direnv = {
-    enable = true;
-    enableZshIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

users/brendan/home/cli/git.nix

@@ -1,12 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    userEmail = "XXXXXXXXXXXXXXXXX";
-    userName = "XXXXXXXXXXXXXXXXX";
-    extraConfig = {
-      pull.rebase = true;
-      color.ui = true;
-    };
-    lfs.enable = true;
-  };
-}

users/brendan/home/cli/zsh.nix

@@ -1,29 +0,0 @@
-{
-  programs.zsh = {
-    enable = true;
-    syntaxHighlighting.enable = true;
-    history.size = 10000;
-    oh-my-zsh = {
-      enable = true;
-      plugins = [
-        "git"
-        "docker"
-        "docker-compose"
-        "colored-man-pages"
-        "rust"
-        "systemd"
-        "tmux"
-        "ufw"
-        "z"
-      ];
-    };
-    shellAliases = {
-      "lrt" = "eza --icons -lsnew";
-      "ls" = "eza";
-      "ll" = "eza --long --group";
-      "la" = "eza --all";
-
-      "rebuild" = "sudo nixos-rebuild switch --flake /home/brendan/dotfiles#$HOST";
-    };
-  };
-}

users/brendan/home/global.nix

@@ -1,21 +0,0 @@
-{ config, ... }:
-{
-  imports = [
-    ./cli
-    ./programs.nix
-  ];
-
-  programs = {
-    home-manager.enable = true;
-    git.enable = true;
-  };
-
-  home = {
-    username = "brendan";
-    homeDirectory = "/home/${config.home.username}";
-    stateVersion = "24.05";
-    sessionVariables = {
-      FLAKE = "$HOME/dotfiles";
-    };
-  };
-}

users/brendan/home/gui/default.nix

@@ -1,28 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./firefox
-    ./vscode
-  ];
-
-  home.packages = with pkgs; [
-    candy-icons
-    chromium
-    discord-canary
-    gimp
-    gparted
-    mediainfo
-    nemo
-    nemo-fileroller
-    obs-studio
-    obsidian
-    prismlauncher
-    proxychains
-    prusa-slicer
-    signal-desktop
-    sweet-nova
-    util-linux
-    vlc
-    zoom-us
-  ];
-}

users/brendan/home/gui/firefox/default.nix

@@ -1,255 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [ ./search_engines.nix ];
-
-  programs.firefox = {
-    enable = true;
-    profiles.richie = {
-      extensions = with inputs.firefox-addons.packages.x86_64-linux; [
-        bitwarden
-        darkreader
-        dearrow
-        fastforwardteam
-        return-youtube-dislikes
-        sponsorblock
-        ublock-origin
-      ];
-      search = {
-        force = true;
-        default = "kagi";
-        order = [
-          "kagi"
-          "DuckDuckGo"
-          "Google"
-        ];
-      };
-      settings = {
-        # SECTION: FASTFOX
-        # GENERAL
-        "content.notify.interval" = 100000;
-
-        # GFX
-        "gfx.canvas.accelerated.cache-items" = 4096;
-        "gfx.canvas.accelerated.cache-size" = 512;
-        "gfx.content.skia-font-cache-size" = 20;
-
-        # DISK CACHE
-        "browser.cache.jsbc_compression_level" = 3;
-
-        # MEDIA CACHE
-        "media.memory_cache_max_size" = 65536;
-        "media.cache_readahead_limit" = 7200;
-        "media.cache_resume_threshold" = 3600;
-
-        # IMAGE CACHE
-        "image.mem.decode_bytes_at_a_time" = 32768;
-
-        # NETWORK
-        "network.buffer.cache.size" = 262144;
-        "network.buffer.cache.count" = 128;
-        "network.http.max-connections" = 1800;
-        "network.http.max-persistent-connections-per-server" = 10;
-        "network.http.max-urgent-start-excessive-connections-per-host" = 5;
-        "network.http.pacing.requests.enabled" = false;
-        "network.dnsCacheExpiration" = 3600;
-        "network.dns.max_high_priority_threads" = 8;
-        "network.ssl_tokens_cache_capacity" = 10240;
-
-        # SPECULATIVE LOADING
-        "network.dns.disablePrefetch" = true;
-        "network.prefetch-next" = false;
-        "network.predictor.enabled" = false;
-
-        # EXPERIMENTAL
-        "layout.css.grid-template-masonry-value.enabled" = true;
-        "dom.enable_web_task_scheduling" = true;
-        "layout.css.has-selector.enabled" = true;
-        "dom.security.sanitizer.enabled" = true;
-
-        # SECTION: SECUREFOX
-        # TRACKING PROTECTION
-        "browser.contentblocking.category" = "strict";
-        "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
-        "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
-        "network.cookie.sameSite.noneRequiresSecure" = true;
-        "browser.download.start_downloads_in_tmp_dir" = true;
-        "browser.helperApps.deleteTempFileOnExit" = true;
-        "browser.uitour.enabled" = false;
-        "privacy.globalprivacycontrol.enabled" = true;
-
-        # OCSP & CERTS / HPKP
-        "security.OCSP.enabled" = 0;
-        "security.remote_settings.crlite_filters.enabled" = true;
-        "security.pki.crlite_mode" = 2;
-
-        # SSL / TLS
-        "security.ssl.treat_unsafe_negotiation_as_broken" = true;
-        "browser.xul.error_pages.expert_bad_cert" = true;
-        "security.tls.enable_0rtt_data" = false;
-
-        # DISK AVOIDANCE
-        "browser.privatebrowsing.forceMediaMemoryCache" = true;
-        "browser.sessionstore.interval" = 60000;
-
-        # SHUTDOWN & SANITIZING
-        "privacy.history.custom" = true;
-
-        # SEARCH / URL BAR
-        "browser.search.separatePrivateDefault.ui.enabled" = true;
-        "browser.urlbar.update2.engineAliasRefresh" = true;
-        # PREF: restore search engine suggestions
-        "browser.search.suggest.enabled" = true;
-        "browser.urlbar.suggest.quicksuggest.sponsored" = false;
-        "browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
-        "browser.formfill.enable" = false;
-        "security.insecure_connection_text.enabled" = true;
-        "security.insecure_connection_text.pbmode.enabled" = true;
-        "network.IDN_show_punycode" = true;
-
-        # HTTPS-FIRST POLICY
-        "dom.security.https_first" = true;
-        "dom.security.https_first_schemeless" = true;
-
-        # PASSWORDS
-        "signon.formlessCapture.enabled" = false;
-        "signon.rememberSignons" = false;
-        "signon.privateBrowsingCapture.enabled" = false;
-        "network.auth.subresource-http-auth-allow" = 1;
-        "editor.truncate_user_pastes" = false;
-
-        # MIXED CONTENT + CROSS-SITE
-        "security.mixed_content.block_display_content" = true;
-        "security.mixed_content.upgrade_display_content" = true;
-        "security.mixed_content.upgrade_display_content.image" = true;
-        "pdfjs.enableScripting" = false;
-        "extensions.postDownloadThirdPartyPrompt" = false;
-
-        # HEADERS / REFERERS
-        "network.http.referer.XOriginTrimmingPolicy" = 2;
-
-        # CONTAINERS
-        "privacy.userContext.ui.enabled" = true;
-
-        # WEBRTC
-        "media.peerconnection.ice.proxy_only_if_behind_proxy" = true;
-        "media.peerconnection.ice.default_address_only" = true;
-
-        # SAFE BROWSING
-        "browser.safebrowsing.downloads.remote.enabled" = false;
-
-        # MOZILLA
-        # PREF: allow websites to ask you to receive site notifications
-        "permissions.default.desktop-notification" = 0; # allow websites to ask
-        # PREF: allow websites to ask you for your location
-        "permissions.default.geo" = 0;
-        "geo.provider.network.url" =
-          "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
-        "permissions.manager.defaultsUrl" = "";
-        "webchannel.allowObject.urlWhitelist" = "";
-
-        # TELEMETRY
-        "datareporting.policy.dataSubmissionEnabled" = false;
-        "datareporting.healthreport.uploadEnabled" = false;
-        "toolkit.telemetry.unified" = false;
-        "toolkit.telemetry.enabled" = false;
-        "toolkit.telemetry.server" = "data:,";
-        "toolkit.telemetry.archive.enabled" = false;
-        "toolkit.telemetry.newProfilePing.enabled" = false;
-        "toolkit.telemetry.shutdownPingSender.enabled" = false;
-        "toolkit.telemetry.updatePing.enabled" = false;
-        "toolkit.telemetry.bhrPing.enabled" = false;
-        "toolkit.telemetry.firstShutdownPing.enabled" = false;
-        "toolkit.telemetry.coverage.opt-out" = true;
-        "toolkit.coverage.opt-out" = true;
-        "toolkit.coverage.endpoint.base" = "";
-        "browser.ping-centre.telemetry" = false;
-        "browser.newtabpage.activity-stream.feeds.telemetry" = false;
-        "browser.newtabpage.activity-stream.telemetry" = false;
-
-        # EXPERIMENTS
-        "app.shield.optoutstudies.enabled" = false;
-        "app.normandy.enabled" = false;
-        "app.normandy.api_url" = "";
-
-        # CRASH REPORTS
-        "breakpad.reportURL" = "";
-        "browser.tabs.crashReporting.sendReport" = false;
-        "browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
-
-        # DETECTION
-        "captivedetect.canonicalURL" = "";
-        "network.captive-portal-service.enabled" = false;
-        "network.connectivity-service.enabled" = false;
-
-        # SECTION: PESKYFOX
-        # MOZILLA UI
-        "browser.privatebrowsing.vpnpromourl" = "";
-        "extensions.getAddons.showPane" = false;
-        "extensions.htmlaboutaddons.recommendations.enabled" = false;
-        "browser.discovery.enabled" = false;
-        "browser.shell.checkDefaultBrowser" = false;
-        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false;
-        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false;
-        "browser.preferences.moreFromMozilla" = false;
-        "browser.tabs.tabmanager.enabled" = false;
-        "browser.aboutConfig.showWarning" = false;
-        "browser.aboutwelcome.enabled" = false;
-
-        # THEME ADJUSTMENTS
-        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-        "browser.compactmode.show" = true;
-        "browser.display.focus_ring_on_anything" = true;
-        "browser.display.focus_ring_style" = 0;
-        "browser.display.focus_ring_width" = 0;
-        "layout.css.prefers-color-scheme.content-override" = 2;
-
-        # COOKIE BANNER HANDLING
-        "cookiebanners.service.mode" = 1;
-        "cookiebanners.service.mode.privateBrowsing" = 1;
-
-        # FULLSCREEN NOTICE
-        "full-screen-api.transition-duration.enter" = "0 0";
-        "full-screen-api.transition-duration.leave" = "0 0";
-        "full-screen-api.warning.delay" = -1;
-        "full-screen-api.warning.timeout" = 0;
-
-        # URL BAR
-        "browser.urlbar.suggest.calculator" = true;
-        "browser.urlbar.unitConversion.enabled" = true;
-        "browser.urlbar.trending.featureGate" = false;
-
-        # NEW TAB PAGE
-        "browser.newtabpage.activity-stream.feeds.topsites" = false;
-        "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-
-        # POCKET
-        "extensions.pocket.enabled" = false;
-
-        # DOWNLOADS
-        "browser.download.always_ask_before_handling_new_types" = true;
-        "browser.download.manager.addToRecentDocs" = false;
-
-        # PDF
-        "browser.download.open_pdf_attachments_inline" = true;
-
-        # TAB BEHAVIOR
-        "browser.bookmarks.openInTabClosesMenu" = false;
-        "browser.menu.showViewImageInfo" = true;
-        "findbar.highlightAll" = true;
-        "layout.word_select.eat_space_to_next_word" = false;
-
-        # SECTION: MY OVERRIDES
-        "browser.startup.homepage" = "https://google.com";
-        "identity.fxaccounts.enabled" = false;
-
-        # SECTION SMOOTHFOX
-        # OPTION: SHARPEN SCROLLING                                                           *
-        "apz.overscroll.enabled" = true; # DEFAULT NON-LINUX
-        "mousewheel.min_line_scroll_amount" = 10; # 10-40; adjust this number to your liking; default=5
-        "general.smoothScroll.mouseWheel.durationMinMS" = 80; # default=50
-        "general.smoothScroll.currentVelocityWeighting" = "0.15"; # default=.25
-        "general.smoothScroll.stopDecelerationWeighting" = "0.6"; # default=.4
-      };
-    };
-  };
-}

users/brendan/home/gui/firefox/github.svg

@@ -1,3 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16 0C7.16 0 0 7.16 0 16C0 23.08 4.58 29.06 10.94 31.18C11.74 31.32 12.04 30.84 12.04 30.42C12.04 30.04 12.02 28.78 12.02 27.44C8 28.18 6.96 26.46 6.64 25.56C6.46 25.1 5.68 23.68 5 23.3C4.44 23 3.64 22.26 4.98 22.24C6.24 22.22 7.14 23.4 7.44 23.88C8.88 26.3 11.18 25.62 12.1 25.2C12.24 24.16 12.66 23.46 13.12 23.06C9.56 22.66 5.84 21.28 5.84 15.16C5.84 13.42 6.46 11.98 7.48 10.86C7.32 10.46 6.76 8.82 7.64 6.62C7.64 6.62 8.98 6.2 12.04 8.26C13.32 7.9 14.68 7.72 16.04 7.72C17.4 7.72 18.76 7.9 20.04 8.26C23.1 6.18 24.44 6.62 24.44 6.62C25.32 8.82 24.76 10.46 24.6 10.86C25.62 11.98 26.24 13.4 26.24 15.16C26.24 21.3 22.5 22.66 18.94 23.06C19.52 23.56 20.02 24.52 20.02 26.02C20.02 28.16 20 29.88 20 30.42C20 30.84 20.3 31.34 21.1 31.18C27.42 29.06 32 23.06 32 16C32 7.16 24.84 0 16 0V0Z" fill="white"/>
-</svg>

users/brendan/home/gui/firefox/search_engines.nix

@@ -1,84 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.firefox.profiles.richie.search.engines = {
-    "Nix Options" = {
-      urls = [
-        {
-          template = "https://search.nixos.org/options";
-          params = [
-            {
-              name = "type";
-              value = "packages";
-            }
-            {
-              name = "channel";
-              value = "unstable";
-            }
-            {
-              name = "query";
-              value = "{searchTerms}";
-            }
-          ];
-        }
-      ];
-      icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-      definedAliases = [ "@o" ];
-    };
-    "Nix Packages" = {
-      urls = [
-        {
-          template = "https://search.nixos.org/packages";
-          params = [
-            {
-              name = "type";
-              value = "packages";
-            }
-            {
-              name = "channel";
-              value = "unstable";
-            }
-            {
-              name = "query";
-              value = "{searchTerms}";
-            }
-          ];
-        }
-      ];
-      icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-      definedAliases = [ "@n" ];
-    };
-    "kagi" = {
-      urls = [
-        {
-          template = "https://kagi.com/search?";
-          params = [
-            {
-              name = "q";
-              value = "{searchTerms}";
-            }
-          ];
-        }
-      ];
-      icon = ./kagi.png;
-    };
-    github = {
-      urls = [
-        {
-          template = "https://github.com/search?";
-          params = [
-            {
-              name = "q";
-              value = "{searchTerms}";
-            }
-            {
-              name = "type";
-              value = "code";
-            }
-          ];
-        }
-      ];
-      icon = ./github.svg;
-      definedAliases = [ "@g" ];
-    };
-  };
-}

users/brendan/home/gui/vscode/default.nix

@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-let
-  vscode_dir = "/home/richie/projects/nix-dotfiles/users/richie/home/gui/vscode";
-in
-{
-  # mutable symlinks to key binds and settings
-  xdg.configFile."Code/User/settings.json".source =
-    config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/settings.json";
-  xdg.configFile."Code/User/keybindings.json".source =
-    config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/keybindings.json";
-
-  home.packages = with pkgs; [ nil ];
-
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscode;
-    mutableExtensionsDir = true;
-  };
-}

users/brendan/home/gui/vscode/extension_manager.py

@@ -1,68 +0,0 @@
-from subprocess import run
-
-
-def get_installed_extensions():
-    process = run("code --list-extensions".split(), check=True, capture_output=True)
-    return set(process.stdout.decode("utf-8").strip().split("\n"))
-
-
-def main():
-    print("starting vscode extension manager")
-
-    extensions = {
-        # vscode
-        "ms-azuretools.vscode-docker",
-        "ms-vscode-remote.remote-containers",
-        "ms-vscode-remote.remote-ssh-edit",
-        "ms-vscode-remote.remote-ssh",
-        "ms-vscode.hexeditor",
-        "ms-vscode.remote-explorer",
-        "ms-vsliveshare.vsliveshare",
-        "oderwat.indent-rainbow",
-        "usernamehw.errorlens",
-        # git
-        "codezombiech.gitignore",
-        "eamodio.gitlens",
-        "gitHub.vscode-github-actions",
-        # python
-        "charliermarsh.ruff",
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "ms-python.debugpy",
-        # rust
-        "rust-lang.rust-analyzer",
-        # MD
-        "davidanson.vscode-markdownlint",
-        "yzhang.markdown-all-in-one",
-        # configs
-        "redhat.vscode-yaml",
-        "tamasfe.even-better-toml",
-        # shell
-        "timonwong.shellcheck",
-        "foxundermoon.shell-format",
-        # nix
-        "jnoortheen.nix-ide",
-        # database
-        "mtxr.sqltools-driver-pg",
-        "mtxr.sqltools",
-        # other
-        "esbenp.prettier-vscode",
-        "mechatroner.rainbow-csv",
-        "streetsidesoftware.code-spell-checker",
-        "supermaven.supermaven",
-    }
-
-    installed_extensions = get_installed_extensions()
-
-    missing_extensions = extensions.difference(installed_extensions)
-    for extension in missing_extensions:
-        run(f"code --install-extension {extension} --force".split(), check=True)
-
-    if extra_extensions := installed_extensions.difference(extensions):
-        print(f"Extra extensions installed: {extra_extensions}")
-
-    print("vscode extension manager finished")
-
-
-if __name__ == "__main__":
-    main()

users/brendan/home/gui/vscode/keybindings.json

@@ -1,20 +0,0 @@
-[
-  {
-    "key": "shift+alt+f",
-    "command": "editor.action.formatDocument",
-    "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor"
-  },
-  {
-    "key": "alt+a d",
-    "command": "cSpell.addWordToWorkspaceSettings"
-  },
-  {
-    "key": "ctrl+shift+`",
-    "command": "workbench.action.createTerminalEditor"
-  },
-  {
-    "key": "ctrl+shift+`",
-    "command": "-workbench.action.terminal.new",
-    "when": "terminalProcessSupported || terminalWebExtensionContributedProfile"
-  }
-]

users/brendan/home/gui/vscode/settings.json

@@ -1,71 +0,0 @@
-{
-  // vscode settings
-  "diffEditor.ignoreTrimWhitespace": false,
-  "editor.formatOnSave": true,
-  "editor.minimap.renderCharacters": false,
-  "editor.minimap.showSlider": "always",
-  "explorer.confirmDelete": false,
-  "explorer.confirmDragAndDrop": false,
-  "explorer.confirmPasteNative": false,
-  "files.autoSave": "afterDelay",
-  "git.autofetch": true,
-  "git.confirmSync": false,
-  "git.fetchOnPull": true,
-  "git.pruneOnFetch": true,
-  "terminal.integrated.scrollback": 10000,
-  "update.mode": "none",
-  "workbench.colorTheme": "Default Dark+",
-
-  // turns off all sounds and announcements
-  "accessibility.signals.terminalCommandFailed": {
-    "sound": "off",
-    "announcement": "off"
-  },
-  "accessibility.signals.terminalQuickFix": {
-    "sound": "off",
-    "announcement": "off"
-  },
-  "accessibility.signals.terminalBell": {
-    "sound": "off",
-    "announcement": "off"
-  },
-
-  // database settings
-  "sqltools.connections": [
-    {
-      "previewLimit": 50,
-      "server": "192.168.90.40",
-      "port": 5432,
-      "askForPassword": true,
-      "driver": "PostgreSQL",
-      "name": "main",
-      "database": "postgres",
-      "username": "richie"
-    }
-  ],
-
-  // formatters
-  "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
-  "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
-  "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
-  "[nix]": { "editor.defaultFormatter": "jnoortheen.nix-ide" },
-  "[python]": { "editor.defaultFormatter": "charliermarsh.ruff" },
-  "[yaml]": { "editor.defaultFormatter": "redhat.vscode-yaml" },
-
-  // spell check
-  "cSpell.enabled": true,
-  "cSpell.language": "en,en-US",
-  "cSpell.enableFiletypes": ["bat", "csv", "nix", "toml"],
-  "cSpell.userWords": ["Cahill", "syncthing"],
-
-  // nix
-  "nix.enableLanguageServer": true,
-  "nix.serverPath": "nil",
-
-  // force the use of rust-analyzer from dev shell
-  "rust-analyzer.server.path": "rust-analyzer",
-  "redhat.telemetry.enabled": true,
-  "gitlens.plusFeatures.enabled": false,
-  // new
-  "hediet.vscode-drawio.resizeImages": null
-}

users/brendan/home/programs.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    # python
-    poetry
-    python313
-    ruff
-    # nix
-    nix-init
-    nix-output-monitor
-    nix-prefetch
-    nix-tree
-    nixfmt-rfc-style
-    treefmt
-  ];
-}

users/brendan/home/ssh_config.nix

@@ -1,41 +0,0 @@
-{
-  programs.ssh = {
-    enable = true;
-
-    matchBlocks = {
-      jeeves = {
-        hostname = "192.168.90.40";
-        user = "richie";
-        identityFile = "~/.ssh/id_ed25519";
-        port = 629;
-        dynamicForwards = [ { port = 9050; } ];
-      };
-      unlock-jeeves = {
-        hostname = "192.168.95.14";
-        user = "root";
-        identityFile = "~/.ssh/id_ed25519";
-        port = 2222;
-      };
-      jeevesjr = {
-        hostname = "192.168.90.35";
-        user = "richie";
-        identityFile = "~/.ssh/id_ed25519";
-        port = 352;
-        dynamicForwards = [ { port = 9050; } ];
-      };
-      bob = {
-        hostname = "192.168.90.25";
-        user = "richie";
-        identityFile = "~/.ssh/id_ed25519";
-        port = 262;
-        dynamicForwards = [ { port = 9050; } ];
-      };
-      rhapsody-in-green = {
-        hostname = "192.168.90.221";
-        user = "richie";
-        identityFile = "~/.ssh/id_ed25519";
-        port = 922;
-      };
-    };
-  };
-}

users/gaming/default.nix

@@ -2,7 +2,7 @@
   pkgs,
   config,
   ...
-}:
+}: 
 {
   sops.secrets.gaming_password = {
     sopsFile = ../secrets.yaml;
@@ -16,7 +16,8 @@
 
       shell = pkgs.zsh;
       group = "gaming";
-      extraGroups = [
+      extraGroups =
+      [
         "audio"
         "video"
         "users"
@@ -26,5 +27,5 @@
 
     groups.gaming.gid = 1100;
   };
-  home-manager.users.gaming = import ./systems/${config.networking.hostName}.nix;
+  home-manager.users.gaming = import ./systems/${config.networking.hostName}.nix; 
 }

users/gaming/home/firefox.nix

@@ -18,6 +18,8 @@
         order = [ "Google" ];
       };
       settings = {
+        # Makes Firefox use the PlayStation 5 user agent
+        "general.useragent.override" = "Mozilla/5.0 (PlayStation; PlayStation 5/10.01) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15,gzip(gfe),gzip(gfe)";
 
         # SECTION: FASTFOX
         # GENERAL
@@ -137,8 +139,7 @@
         "permissions.default.desktop-notification" = 0; # allow websites to ask
         # PREF: allow websites to ask you for your location
         "permissions.default.geo" = 0;
-        "geo.provider.network.url" =
+        "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
-          "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
         "permissions.manager.defaultsUrl" = "";
         "webchannel.allowObject.urlWhitelist" = "";
 

users/gaming/home/global.nix

@@ -13,5 +13,8 @@
     username = "gaming";
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "24.05";
+    sessionVariables = {
+      FLAKE = "$HOME/Projects/dotfiles";
+    };
   };
 }

users/gaming/home/programs.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    chromium
+    wget
   ];
 }

users/richie/default.nix

@@ -2,51 +2,50 @@
   pkgs,
   config,
   ...
-}:
+}: let
-let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in
+in {
-{
 
   sops.secrets.richie_password = {
     sopsFile = ../secrets.yaml;
     neededForUsers = true;
   };
 
-  users = {
+  users.users.richie = {
-    users.richie = {
+    isNormalUser = true;
-      isNormalUser = true;
 
-      hashedPasswordFile = "${config.sops.secrets.richie_password.path}";
+    hashedPasswordFile = "${config.sops.secrets.richie_password.path}";
 
-      shell = pkgs.zsh;
+    shell = pkgs.zsh;
-      group = "richie";
+    group = "richie";
-      openssh.authorizedKeys.keys = [
+    openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYZFsc9CSH03ZUP7y81AHwSyjLwFmcshVFCyxDcYhBT rhapsody-in-green" # cspell:disable-line
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPtuYhiJHRTYhNaDmTcJOqJASk7D8mIn6u3F1IN5AFJ bob" # cspell:disable-line
-      ];
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYZFsc9CSH03ZUP7y81AHwSyjLwFmcshVFCyxDcYhBT rhapsody-in-green" # cspell:disable-line
-      extraGroups =
+    ];
-        [
+    extraGroups =
-          "audio"
+    [
-          "video"
+      "audio"
-          "wheel"
+      "video"
-          "users"
+      "wheel"
-        ]
+      "users"
-        ++ ifTheyExist [
+    ]
-          "dialout"
+    ++ ifTheyExist [
-          "docker"
+      "dialout"
-          "hass"
+      "docker"
-          "libvirtd"
+      "hass"
-          "networkmanager"
+      "libvirtd"
-          "plugdev"
+      "networkmanager"
-          "scanner"
+      "plugdev"
-          "uaccess"
+      "scanner"
-          "wireshark"
+      "uaccess"
-        ];
+      "wireshark"
-      uid = 1000;
+    ];
-    };
+    uid = 1000;
-
-    groups.richie.gid = 1000;
   };
 
-  home-manager.users.richie = import ./systems/${config.networking.hostName}.nix;
+  users.groups.richie = {
+    gid = 1000;
+  };
+
+  home-manager.users.richie = import ./systems/${config.networking.hostName}.nix; 
 }

users/richie/home/cli/git.nix

@@ -3,10 +3,5 @@
     enable = true;
     userEmail = "Richie@tmmworkshop.com";
     userName = "Richie Cahill";
-    extraConfig = {
-      pull.rebase = true;
-      color.ui = true;
-    };
-    lfs.enable = true;
   };
 }

users/richie/home/cli/zsh.nix

@@ -18,14 +18,17 @@
       ];
     };
     shellAliases = {
+      "sgc" = "sudo git -C /root/dotfiles";
+
+      ## Utilities
       "lrt" = "eza --icons -lsnew";
       "ls" = "eza";
       "ll" = "eza --long --group";
       "la" = "eza --all";
 
       "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'";
-      "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST";
+      "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/projects/dotfiles#$HOST";
-      "nix-test" = "nixos-rebuild test --flake /home/richie/dotfiles";
+      "nix-test" = "nixos-rebuild test --flake /home/richie/projects/dotfiles";
     };
   };
 }

users/richie/home/global.nix

@@ -16,7 +16,7 @@
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "24.05";
     sessionVariables = {
-      FLAKE = "$HOME/dotfiles";
+      FLAKE = "$HOME/Projects/dotfiles";
     };
   };
 }

users/richie/home/gui/default.nix

@@ -8,7 +8,6 @@
 
   home.packages = with pkgs; [
     candy-icons
-    chromium
     discord-canary
     gimp
     gparted

users/richie/home/gui/firefox/default.nix

@@ -17,11 +17,7 @@
       search = {
         force = true;
         default = "kagi";
-        order = [
+        order = [ "kagi" "DuckDuckGo" "Google" ];
-          "kagi"
-          "DuckDuckGo"
-          "Google"
-        ];
       };
       settings = {
         # SECTION: FASTFOX
@@ -142,8 +138,7 @@
         "permissions.default.desktop-notification" = 0; # allow websites to ask
         # PREF: allow websites to ask you for your location
         "permissions.default.geo" = 0;
-        "geo.provider.network.url" =
+        "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
-          "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
         "permissions.manager.defaultsUrl" = "";
         "webchannel.allowObject.urlWhitelist" = "";
 

users/richie/home/gui/kitty.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.kitty = {
     enable = true;
     font.name = "IntoneMono Nerd Font";

users/richie/home/gui/vscode/default.nix

@@ -4,10 +4,8 @@ let
 in
 {
   # mutable symlinks to key binds and settings
-  xdg.configFile."Code/User/settings.json".source =
+  xdg.configFile."Code/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/settings.json";
-    config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/settings.json";
+  xdg.configFile."Code/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/keybindings.json";
-  xdg.configFile."Code/User/keybindings.json".source =
-    config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/keybindings.json";
 
   home.packages = with pkgs; [ nil ];
 

users/richie/home/gui/vscode/settings.json

@@ -30,20 +30,6 @@
     "announcement": "off"
   },
 
-  // database settings
-  "sqltools.connections": [
-    {
-      "previewLimit": 50,
-      "server": "192.168.90.40",
-      "port": 5432,
-      "askForPassword": true,
-      "driver": "PostgreSQL",
-      "name": "main",
-      "database": "postgres",
-      "username": "richie"
-    }
-  ],
-
   // formatters
   "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
   "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },