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,12 +14,10 @@ jobs:
         system:
           - "bob"
           - "jeeves"
+          - "muninn"
           - "rhapsody-in-green"
+          - "router"
     steps:
       - uses: actions/checkout@v4
       - name: Build default package
         run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
-      - name: copy to nix-cache
-        env:
-          NIX_SSHOPTS: "-vvvv"
-        run: nix copy --to ssh://jeeves .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel

.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",
@@ -105,7 +101,6 @@
     "ioit",
     "iperf",
     "isal",
-    "jellyfin",
     "jnoortheen",
     "jsbc",
     "kagi",
@@ -116,7 +111,6 @@
     "libsodium",
     "libssh",
     "libvirtd",
-    "llms",
     "localtime",
     "louislam",
     "lsnew",
@@ -128,7 +122,6 @@
     "maxtime",
     "mechatroner",
     "mediainfo",
-    "microvm",
     "mklabel",
     "mkpart",
     "modesetting",
@@ -136,6 +129,7 @@
     "mountpoints",
     "mousewheel",
     "mtxr",
+    "muninn",
     "ncdu",
     "nemo",
     "neofetch",
@@ -168,6 +162,7 @@
     "peerconnection",
     "PESKYFOX",
     "PGID",
+    "photoprism",
     "pipewire",
     "pkgs",
     "plugdev",
@@ -184,10 +179,8 @@
     "PUID",
     "pulseaudio",
     "punycode",
-    "pychromecast",
     "pylance",
     "pymetno",
-    "pyownet",
     "qbit",
     "qbittorrent",
     "qbittorrentvpn",
@@ -195,14 +188,12 @@
     "quicksuggest",
     "radarr",
     "readahead",
-    "receiveencrypted",
     "Redistributable",
     "referer",
     "REFERERS",
     "relatime",
     "Rhosts",
     "ripgrep",
-    "rokuecp",
     "routable",
     "rspace",
     "rtkit",
@@ -224,7 +215,6 @@
     "sponsorblock",
     "sqltools",
     "ssdp",
-    "SSHOPTS",
     "stdenv",
     "subresource",
     "substituters",
@@ -242,7 +232,6 @@
     "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;
@@ -32,26 +32,17 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     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/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/syncthing_base.nix

@@ -6,7 +6,8 @@
     overrideFolders = true;
     dataDir = "/home/richie/Syncthing";
     configDir = "/home/richie/.config/syncthing";
-    settings.devices = {
+    settings = {
+      devices = {
         phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
         jeeves.id = "ICRHXZW-ECYJCUZ-I4CZ64R-3XRK7CG-LL2HAAK-FGOHD22-BQA4AI6-5OAL6AG"; # cspell:disable-line
         ipad.id = "KI76T3X-SFUGV2L-VSNYTKR-TSIUV5L-SHWD3HE-GQRGRCN-GY4UFMD-CW6Z6AX"; # cspell:disable-line
@@ -14,4 +15,5 @@
         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

@@ -33,8 +33,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    microvm = {
+    system_tools = {
-      url = "github:astro/microvm.nix";
+      url = "github:RichieCahill/system_tools";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -47,10 +47,6 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    system_tools = {
-      url = "github:RichieCahill/system_tools";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
@@ -60,7 +56,6 @@
     systems,
     nixos-cosmic,
     sops-nix,
-    microvm,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -76,35 +71,10 @@
   in {
     inherit lib;
     overlays = import ./overlays {inherit inputs outputs;};
+
     devShells = forEachSystem (pkgs: import ./shell.nix {inherit pkgs;});
     formatter = forEachSystem (pkgs: pkgs.alejandra);
 
-    emulated-dev = nixpkgs.lib.nixosSystem {
-      # host system
-      system = "x86_64-linux";
-      modules = let
-        guestSystem = "aarch64-unknown-linux-gnu";
-        # you can use packages in the guest machine with cross system configuration
-        pkgs = import nixpkgs {
-          system = "x86_64-linux";
-          crossSystem.config = guestSystem;
-        };
-      in [
-        {nixpkgs.crossSystem.config = guestSystem;}
-        microvm.nixosModules.microvm
-        {
-          microvm = {
-            # you can choose what CPU will be emulated by qemu
-            cpu = "cortex-a53";
-            hypervisor = "qemu";
-          };
-          environment.systemPackages = with pkgs; [ cowsay htop ];
-          services.getty.autologinUser = "root";
-          system.stateVersion = "23.11";
-        }
-      ];
-    };
-
     nixosConfigurations = {
       bob = lib.nixosSystem {
         modules = [
@@ -124,6 +94,16 @@
         ];
         specialArgs = {inherit inputs outputs;};
       };
+      muninn = lib.nixosSystem {
+        modules = [
+          ./systems/muninn
+        ];
+        specialArgs = {inherit inputs outputs;};
+      };
+      router = lib.nixosSystem {
+        modules = [./systems/router];
+        specialArgs = {inherit inputs outputs;};
+      };
     };
   };
 }

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;
-      enable = true;
+    bluetooth = {
-      autoLogin = {
-        user = "gaming";
       enable = true;
+      powerOnBoot = 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" ];

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/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/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/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"; }];
+        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,29 +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,86 +0,0 @@
-{ config, inputs, lib, ... }:
-
-with lib;
-
-let
-  vars = import ../vars.nix;
-in
-{
-  imports = [ inputs.microvm.nixosModules.microvm ];
-
-  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; [ nixos-rebuild openssh ];
-          };
-          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,13 +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,18 +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,8 +0,0 @@
-{
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-  services.haproxy = {
-    enable = true;
-    config = builtins.readFile ./haproxy.cfg;
-  };
-}

systems/jeeves/services/home_assistant.nix

@@ -1,70 +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"
-            "192.168.98.4"
-          ];
-          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/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,18 +2,13 @@ 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" = {
-          path = "/home/richie/dotfiles";
         devices = [
-            "bob"
+          "jeeves"
-            "rhapsody-in-green"
         ];
         fsWatcherEnabled = true;
       };
@@ -21,8 +16,8 @@ in
         id = "l62ul-lpweo"; # cspell:disable-line
         path = vars.media_notes;
         devices = [
+          "bob"
           "rhapsody-in-green"
-            "davids-server"
         ];
         fsWatcherEnabled = true;
       };
@@ -51,6 +46,7 @@ in
         id = "vyma6-lqqrz"; # cspell:disable-line
         path = "${vars.storage_syncthing}/projects";
         devices = [
+          "bob"
           "rhapsody-in-green"
         ];
         fsWatcherEnabled = true;
@@ -62,68 +58,6 @@ in
         ];
         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/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

@@ -0,0 +1,67 @@
+{ config, lib, modulesPath, ... }:
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ 
+        "ahci"
+        "ehci_pci"
+        "nvme"
+        "sd_mod"
+        "usb_storage"
+        "usbhid"
+        "xhci_pci"
+      ];
+      kernelModules = [ ];
+      luks.devices."luks-root-pool-wwn-0x500a0751e6c3c01c-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_0374220080010715-0:0";
+      };
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = lib.mkDefault {
+      device = "root_pool/root";
+      fsType = "zfs";
+    };
+
+    "/home" = {
+      device = "root_pool/home";
+      fsType = "zfs";
+    };
+
+    "/var" = {
+      device = "root_pool/var";
+      fsType = "zfs";
+    };
+
+    "/nix" = {
+      device = "root_pool/nix";
+      fsType = "zfs";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/12CE-A600";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+  };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  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 = {

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

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

@@ -11,8 +11,7 @@ in {
     neededForUsers = true;
   };
 
-  users = {
+  users.users.richie = {
-    users.richie = {
     isNormalUser = true;
 
     hashedPasswordFile = "${config.sops.secrets.richie_password.path}";
@@ -20,6 +19,7 @@ in {
     shell = pkgs.zsh;
     group = "richie";
     openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPtuYhiJHRTYhNaDmTcJOqJASk7D8mIn6u3F1IN5AFJ bob" # cspell:disable-line
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYZFsc9CSH03ZUP7y81AHwSyjLwFmcshVFCyxDcYhBT rhapsody-in-green" # cspell:disable-line
     ];
     extraGroups =
@@ -43,7 +43,8 @@ in {
     uid = 1000;
   };
 
-    groups.richie.gid = 1000;
+  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/ssh_config.nix

@@ -36,6 +36,12 @@
         identityFile = "~/.ssh/id_ed25519";
         port = 922;
       };
+      muninn = {
+        hostname = "192.168.98.52";
+        user = "richie";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 295;
+      };      
     };
   };
 }

users/richie/systems/muninn.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../home/global.nix
+    ../home/gui
+  ];
+}

users/richie/systems/router.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../home/global.nix
+  ];
+}