update desktop.nix kernelPackages to linuxPackages_6_14

Flake lock file updates:

• Updated input 'firefox-addons':
    'gitlab:rycee/nur-expressions/fe13e6abfe72b39ad8381595c3c404849330c3cb?dir=pkgs/firefox-addons&narHash=sha256-bN4tccrmczfR4PUuepHpxNNmWG3cLZTFIt4BaD8YyvA%3D' (2025-06-09)
  → 'gitlab:rycee/nur-expressions/a00ce73b626ed274fbfe9f51627861e140b08f6d?dir=pkgs/firefox-addons&narHash=sha256-b3y7V7db0VwLGtpcLRmT1Aa9dpAKoHQdem55UhgB/fw%3D' (2025-06-18)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1df816c407d3a5090c8496c9b00170af7891f021?narHash=sha256-V1BgwiX8NjbRreU6LC2EzmuqFSQAHhoSeNlYJyZ40NE%3D' (2025-06-09)
  → 'github:nix-community/home-manager/0f355844e54e4c70906b1ef5cc35a0047d666c04?narHash=sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0%3D' (2025-06-18)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/4602f7e1d3f197b3cb540d5accf5669121629628?narHash=sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM%3D' (2025-06-06)
  → 'github:nixos/nixos-hardware/61837d2a33ccc1582c5fabb7bf9130d39fee59ad?narHash=sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4%3D' (2025-06-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f?narHash=sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU%3D' (2025-06-07)
  → 'github:nixos/nixpkgs/9e83b64f727c88a7711a2c463a7b16eedb69a84c?narHash=sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI%3D' (2025-06-17)
• Updated input 'nixpkgs-master':
    'github:nixos/nixpkgs/8b64795ee08f70b73d4eeac16af0869f92b18284?narHash=sha256-G3nP/Eaymj55jV9p/xjeRmMTUICICGTNFpJaXDAoNtQ%3D' (2025-06-09)
  → 'github:nixos/nixpkgs/ba92ab5dc0759a8740003ca34b5c1b888f4766d4?narHash=sha256-JW40%2BzIiDS%2BrZavb9IYdIN40/GmErO2%2B0%2BA66rM6/b8%3D' (2025-06-19)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/8d215e1c981be3aa37e47aeabd4e61bb069548fd?narHash=sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD%2B9H%2BWc8o%3D' (2025-05-18)
  → 'github:Mic92/sops-nix/77c423a03b9b2b79709ea2cb63336312e78b72e2?narHash=sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M%3D' (2025-06-17)

.github/workflows/build_systems.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
   push:
     branches: [main]
+  schedule:
+    - cron: "0 22 * * *"
 
 jobs:
   build:
@@ -20,6 +22,5 @@ jobs:
       - 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/treefmt.yml

@@ -0,0 +1,15 @@
+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"

.sops.yaml

@@ -1,10 +1,10 @@
 keys:
-  - &admin_richie age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c
+  - &admin_richie age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c # cspell:disable-line
 
-  - &system_bob age1q47vup0tjhulkg7d6xwmdsgrw64h4ax3la3evzqpxyy4adsmk9fs56qz3y
+  - &system_bob age1q47vup0tjhulkg7d6xwmdsgrw64h4ax3la3evzqpxyy4adsmk9fs56qz3y # cspell:disable-line
-  - &system_jeeves age13lmqgc3jvkyah5e3vcwmj4s5wsc2akctcga0lpc0x8v8du3fxprqp4ldkv
+  - &system_jeeves age13lmqgc3jvkyah5e3vcwmj4s5wsc2akctcga0lpc0x8v8du3fxprqp4ldkv # cspell:disable-line
-  - &system_router age1xzxryqq63x65yuza9lmmkud7crjjxpnkdew070yhx6xn7xe4tdws5twxsv
+  - &system_router age1xzxryqq63x65yuza9lmmkud7crjjxpnkdew070yhx6xn7xe4tdws5twxsv # cspell:disable-line
-  - &system_rhapsody age1ufnewppysaq2wwcl4ugngjz8pfzc5a35yg7luq0qmuqvctajcycs5lf6k4
+  - &system_rhapsody age1ufnewppysaq2wwcl4ugngjz8pfzc5a35yg7luq0qmuqvctajcycs5lf6k4 # cspell:disable-line
 
 creation_rules:
   - path_regex: users/secrets\.yaml$

.vscode/settings.json

@@ -26,6 +26,7 @@
     "azuretools",
     "bantime",
     "bazarr",
+    "bgwriter",
     "binhex",
     "bitwarden",
     "blkdiscard",
@@ -36,20 +37,27 @@
     "captivedetect",
     "cgroupdriver",
     "charliermarsh",
+    "Checkpointing",
     "cloudflared",
+    "codellama",
     "codezombiech",
     "compactmode",
     "Compat",
     "contentblocking",
     "cookiebanners",
+    "createdb",
+    "createrole",
     "crlite",
     "cryptsetup",
+    "cuda",
     "darkreader",
+    "datagrip",
     "datareporting",
     "davidanson",
     "dconf",
     "dearrow",
     "debugpy",
+    "deepseek",
     "dialout",
     "diffie",
     "direnv",
@@ -57,12 +65,16 @@
     "dnodesize",
     "dotfiles",
     "drawio",
+    "duckdns",
     "eamodio",
+    "ehci",
+    "emerg",
     "endlessh",
     "errorlens",
     "esbenp",
     "esphome",
     "extest",
+    "fadvise",
     "fastforwardteam",
     "FASTFOX",
     "ffmpegthumbnailer",
@@ -74,6 +86,7 @@
     "fmask",
     "fontconfig",
     "formfill",
+    "forwardfor",
     "foxundermoon",
     "FULLSCREEN",
     "fwupd",
@@ -98,6 +111,7 @@
     "HPKP",
     "hplip",
     "htmlaboutaddons",
+    "httpchk",
     "hurlenko",
     "hwloc",
     "INITDB",
@@ -110,6 +124,7 @@
     "jsbc",
     "kagi",
     "kuma",
+    "lazer",
     "levelname",
     "libglvnd",
     "libmysqlclient",
@@ -124,10 +139,13 @@
     "lynis",
     "mangohud",
     "markdownlint",
+    "maxconn",
+    "maxpages",
     "maxretry",
     "maxtime",
     "mechatroner",
     "mediainfo",
+    "mixtral",
     "mklabel",
     "mkpart",
     "modesetting",
@@ -144,22 +162,29 @@
     "Networkd",
     "networkmanager",
     "newtabpage",
+    "nixfmt",
     "nixos",
     "nixpkgs",
     "nmap",
     "noauto",
+    "nodev",
     "noecho",
     "nonsponsored",
     "Noto",
+    "nprt",
     "nvme",
     "OCSP",
     "oderwat",
+    "ollama",
+    "ondemand",
     "oneshot",
+    "openwakeword",
     "optimise",
     "optoutstudies",
     "overalljails",
     "overscroll",
     "overseerr",
+    "partitionwise",
     "pbmode",
     "pciutils",
     "pcscd",
@@ -172,10 +197,12 @@
     "plugdev",
     "poppler",
     "posixacl",
+    "powertop",
     "primarycache",
     "prismlauncher",
     "privatebrowsing",
     "PRIVOXY",
+    "protontricks",
     "prowlarr",
     "proxychains",
     "prusa",
@@ -195,12 +222,14 @@
     "radarr",
     "readahead",
     "receiveencrypted",
+    "recordsize",
     "Redistributable",
     "referer",
     "REFERERS",
     "relatime",
     "Rhosts",
     "ripgrep",
+    "roboto",
     "rokuecp",
     "routable",
     "rspace",
@@ -231,13 +260,15 @@
     "sysstat",
     "tabmanager",
     "tamasfe",
+    "TCPIP",
     "tiktok",
     "timonwong",
+    "titlebar",
     "tmmworkshop",
     "Tmpfs",
     "topsites",
     "topstories",
-    "torrenting",
+    "treefmt",
     "twimg",
     "uaccess",
     "ublock",
@@ -245,6 +276,7 @@
     "uitour",
     "unrar",
     "unsubmitted",
+    "uptimekuma",
     "urlbar",
     "urlclassifier",
     "usbhid",
@@ -256,9 +288,11 @@
     "virt",
     "virtualisation",
     "vpnpromourl",
+    "wakeonlan",
     "webchannel",
     "WEBRTC",
     "WEBUI",
+    "wireplumber",
     "wireshark",
     "Workqueues",
     "xattr",

common/global/default.nix

@@ -52,9 +52,18 @@
     };
   };
 
+  powerManagement.powertop.enable = lib.mkDefault true;
+
   programs.zsh.enable = true;
 
-  security.auditd.enable = lib.mkDefault true;
+  security = {
+    auditd.enable = lib.mkDefault true;
+    sudo-rs = {
+      enable = true;
+      execWheelOnly = true;
+    };
+    sudo.enable = false;
+  };
 
   users.mutableUsers = lib.mkDefault false;
 

common/global/locale.nix

@@ -4,8 +4,7 @@
   console.keyMap = lib.mkDefault "us";
 
   i18n = {
-    defaultLocale = lib.mkDefault "en_US.utf8";
+    defaultLocale = lib.mkDefault "en_US.UTF-8";
-    supportedLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ];
     extraLocaleSettings = lib.mkDefault {
       LC_ADDRESS = "en_US.UTF-8";
       LC_IDENTIFICATION = "en_US.UTF-8";

common/global/nix.nix

@@ -2,9 +2,11 @@
   inputs,
   lib,
   ...
-}: let
+}:
+let
   flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-in {
+in
+{
   nix = {
     settings = {
       trusted-users = [
@@ -13,17 +15,14 @@ in {
       ];
       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="
       ];
       auto-optimise-store = lib.mkDefault true;

common/global/snapshot_manager.nix

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

common/optional/desktop.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_12;
+    kernelPackages = pkgs.linuxPackages_6_14;
     zfs.package = pkgs.zfs_2_3;
   };
 

common/optional/nvidia.nix

@@ -1,5 +1,7 @@
 { config, ... }:
 {
+  nixpkgs.config.cudaSupport = true;
+
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware = {
     nvidia = {

common/optional/printing.nix

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

common/optional/steam.nix

@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; [mangohud steam-run];
+  environment.systemPackages = with pkgs; [
+    mangohud
+    steam-run
+  ];
   hardware.steam-hardware.enable = true;
 
   programs = {

common/optional/syncthing_base.nix

@@ -1,13 +1,14 @@
+{ lib, ... }:
 {
   services.syncthing = {
     enable = true;
     user = "richie";
     overrideDevices = true;
-    overrideFolders = true;
+    overrideFolders = lib.mkDefault true;
     dataDir = "/home/richie/Syncthing";
     configDir = "/home/richie/.config/syncthing";
     settings.devices = {
-      phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
+      phone.id = "TBRULKD-7DZPGGZ-F6LLB7J-MSO54AY-7KLPBIN-QOFK6PX-W2HBEWI-PHM2CQI"; # 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
       bob.id = "CJIAPEJ-VO74RR4-F75VU6M-QNZAMYG-FYUJG7Y-6AT62HJ-355PRPL-PJFETAZ"; # cspell:disable-line

common/optional/tmmworkshop_cache.nix

@@ -0,0 +1,7 @@
+{
+  nix.settings = {
+    trusted-substituters = [ "http://cache.tmmworkshop.com" ];
+    substituters = [ "http://cache.tmmworkshop.com/?priority=1&want-mass-query=true" ];
+    trusted-public-keys = [ "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" ];
+  };
+}

flake.lock

@@ -2,18 +2,17 @@
   "nodes": {
     "firefox-addons": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1738382607,
+        "lastModified": 1750219402,
-        "narHash": "sha256-ppR81tMrcQk/wHm8MmKtp3mrtYmMTgF2lxLLXYwRsOM=",
+        "narHash": "sha256-b3y7V7db0VwLGtpcLRmT1Aa9dpAKoHQdem55UhgB/fw=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "dc86c8feffa328d9050e039a1286e175af6d76d8",
+        "rev": "a00ce73b626ed274fbfe9f51627861e140b08f6d",
         "type": "gitlab"
       },
       "original": {
@@ -23,55 +22,6 @@
         "type": "gitlab"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1629284811,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -79,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738415006,
+        "lastModified": 1750275572,
-        "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=",
+        "narHash": "sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2",
+        "rev": "0f355844e54e4c70906b1ef5cc35a0047d666c04",
         "type": "github"
       },
       "original": {
@@ -92,57 +42,13 @@
         "type": "github"
       }
     },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "system_tools",
-          "poetry2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729742964,
-        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
-    "nixos-cosmic": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1738343111,
-        "narHash": "sha256-y9st4Y0p5ry+6QdlIGeqxAA6rbEIOO1uXdAc5jxV2Bc=",
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "rev": "51b9cce097da369550f45ac07879274dc8be81e4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lilyinstarlight",
-        "repo": "nixos-cosmic",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1738391520,
+        "lastModified": 1750083401,
-        "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=",
+        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773",
+        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
         "type": "github"
       },
       "original": {
@@ -154,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1750134718,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
         "type": "github"
       },
       "original": {
@@ -170,11 +76,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1738422722,
+        "lastModified": 1750291913,
-        "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=",
+        "narHash": "sha256-JW40+zIiDS+rZavb9IYdIN40/GmErO2+0+A66rM6/b8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1",
+        "rev": "ba92ab5dc0759a8740003ca34b5c1b888f4766d4",
         "type": "github"
       },
       "original": {
@@ -185,22 +91,6 @@
       }
     },
     "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1738163270,
-        "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1735563628,
         "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
@@ -216,31 +106,53 @@
         "type": "github"
       }
     },
-    "poetry2nix": {
+    "pyproject-build-systems": {
       "inputs": {
-        "flake-utils": [
-          "system_tools",
-          "flake-utils"
-        ],
-        "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
           "system_tools",
           "nixpkgs"
         ],
-        "systems": "systems_2",
+        "pyproject-nix": [
-        "treefmt-nix": "treefmt-nix"
+          "system_tools",
+          "pyproject-nix"
+        ],
+        "uv2nix": [
+          "system_tools",
+          "uv2nix"
+        ]
       },
       "locked": {
-        "lastModified": 1736884309,
+        "lastModified": 1744599653,
-        "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=",
+        "narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=",
-        "owner": "nix-community",
+        "owner": "pyproject-nix",
-        "repo": "poetry2nix",
+        "repo": "build-system-pkgs",
-        "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b",
+        "rev": "7dba6dbc73120e15b558754c26024f6c93015dd7",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "pyproject-nix",
-        "repo": "poetry2nix",
+        "repo": "build-system-pkgs",
+        "type": "github"
+      }
+    },
+    "pyproject-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "system_tools",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746540146,
+        "narHash": "sha256-QxdHGNpbicIrw5t6U3x+ZxeY/7IEJ6lYbvsjXmcxFIM=",
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "rev": "e09c10c24ebb955125fda449939bfba664c467fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
         "type": "github"
       }
     },
@@ -248,14 +160,13 @@
       "inputs": {
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
-        "nixos-cosmic": "nixos-cosmic",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-stable": "nixpkgs-stable_2",
+        "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix",
         "system_tools": "system_tools",
-        "systems": "systems_3"
+        "systems": "systems"
       }
     },
     "sops-nix": {
@@ -265,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
+        "lastModified": 1750119275,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
         "type": "github"
       },
       "original": {
@@ -280,18 +191,19 @@
     },
     "system_tools": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "poetry2nix": "poetry2nix"
+        "pyproject-build-systems": "pyproject-build-systems",
+        "pyproject-nix": "pyproject-nix",
+        "uv2nix": "uv2nix"
       },
       "locked": {
-        "lastModified": 1738431375,
+        "lastModified": 1747501237,
-        "narHash": "sha256-jk6JrgqNe0dEPxV2xX/pBVsrPDfWaa033LKcyERkHJw=",
+        "narHash": "sha256-woyaUwmZurfNTXBEFM6M7ueSd/Udixs+4DUInhL835c=",
         "owner": "RichieCahill",
         "repo": "system_tools",
-        "rev": "36764189680c9be26192ee94da1a3f33f890ff0d",
+        "rev": "68ab5d1c17ac3fe2487f73dbbb4848bd2291139e",
         "type": "github"
       },
       "original": {
@@ -301,36 +213,6 @@
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -345,25 +227,28 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
+    "uv2nix": {
       "inputs": {
         "nixpkgs": [
           "system_tools",
-          "poetry2nix",
           "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "system_tools",
+          "pyproject-nix"
         ]
       },
       "locked": {
-        "lastModified": 1730120726,
+        "lastModified": 1747441483,
-        "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
+        "narHash": "sha256-W8BFXk5R0TuJcjIhcGoMpSOaIufGXpizK0pm+uTqynA=",
-        "owner": "numtide",
+        "owner": "pyproject-nix",
-        "repo": "treefmt-nix",
+        "repo": "uv2nix",
-        "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
+        "rev": "582024dc64663e9f88d467c2f7f7b20d278349de",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "pyproject-nix",
-        "repo": "treefmt-nix",
+        "repo": "uv2nix",
         "type": "github"
       }
     }

flake.nix

@@ -4,14 +4,12 @@
   nixConfig = {
     extra-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"
     ];
     extra-trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # cspell:disable-line
-      "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # cspell:disable-line
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU=" # cspell:disable-line
-      "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU="
     ];
   };
 
@@ -38,26 +36,22 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixos-cosmic = {
-      url = "github:lilyinstarlight/nixos-cosmic";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = {
+  outputs =
+    {
       self,
       nixpkgs,
       home-manager,
       systems,
-    nixos-cosmic,
       sops-nix,
       ...
-  } @ inputs: let
+    }@inputs:
+    let
       inherit (self) outputs;
       lib = nixpkgs.lib // home-manager.lib;
       forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
@@ -68,12 +62,13 @@
           config.allowUnfree = true;
         }
       );
-  in {
+    in
+    {
       inherit lib;
       overlays = import ./overlays { inherit inputs outputs; };
 
       devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
-    formatter = forEachSystem (pkgs: pkgs.alejandra);
+      formatter = forEachSystem (pkgs: pkgs.treefmt);
 
       nixosConfigurations = {
         bob = lib.nixosSystem {

overlays/default.nix

@@ -1,4 +1,5 @@
-{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,4 +1,8 @@
-{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

@@ -12,8 +12,8 @@
     ../../common/optional/update.nix
     ../../common/optional/yubikey.nix
     ../../common/optional/zerotier.nix
+    ../../common/optional/nvidia.nix
     ./hardware.nix
-    ./nvidia.nix
     ./syncthing.nix
     ./games.nix
     ./llms.nix
@@ -37,6 +37,8 @@
     };
 
     openssh.ports = [ 262 ];
+
+    snapshot_manager.path = ./snapshot_config.toml;
   };
 
   system.stateVersion = "24.05";

systems/bob/hardware.nix

@@ -28,6 +28,7 @@
         allowDiscards = true;
         keyFileSize = 4096;
         keyFile = "/dev/disk/by-id/usb-Samsung_Flash_Drive_FIT_0374620080067131-0:0";
+        fallbackToPassword = true;
       };
     };
     kernelModules = [ "kvm-amd" ];
@@ -50,6 +51,11 @@
       fsType = "zfs";
     };
 
+    "/zfs/models" = {
+      device = "root_pool/models";
+      fsType = "zfs";
+    };
+
     "/boot" = {
       device = "/dev/disk/by-uuid/609D-FF29";
       fsType = "vfat";

systems/bob/llms.nix

@@ -1,24 +1,28 @@
 {
   services = {
     ollama = {
+      user = "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"
+        "llama2-uncensored:7b"
         "mistral-nemo:12b"
+        "dolphin-mixtral:8x7b"
+        "qwq:32b"
+        "Qihoo360-Light-R1-32B"
       ];
+      models = "/zfs/models";
       acceleration = "cuda";
       openFirewall = true;
     };
-    open-webui = {
+    # open-webui = {
-      enable = true;
+    #   enable = true;
-      openFirewall = true;
+    #   openFirewall = true;
-      host = "192.168.90.25";
+    #   host = "0.0.0.0";
-    }; 
+    # };
   };
 }

systems/bob/snapshot_config.toml

@@ -0,0 +1,29 @@
+["default"]
+15_min = 8
+hourly = 24
+daily = 0
+monthly = 0
+
+["root_pool/home"]
+15_min = 8
+hourly = 12
+daily = 1
+monthly = 0
+
+["root_pool/root"]
+15_min = 8
+hourly = 24
+daily = 0
+monthly = 0
+
+["root_pool/nix"]
+15_min = 4
+hourly = 0
+daily = 0
+monthly = 0
+
+["root_pool/models"]
+15_min = 4
+hourly = 24
+daily = 0
+monthly = 0

systems/jeeves/default.nix

@@ -10,17 +10,12 @@
     ./services
     ./hardware.nix
     ./networking.nix
+    ./nvidia.nix
     ./programs.nix
     ./runners
     ./syncthing.nix
   ];
 
-  boot.zfs.extraPools = [
-    "media"
-    "storage"
-    "torrenting"
-  ];
-
   services = {
     openssh.ports = [ 629 ];
 

systems/jeeves/docker/great_cloud_of_witnesses.nix

@@ -0,0 +1,61 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  vars = import ../vars.nix;
+in
+{
+
+  # environment.systemPackages = with pkgs; [ php.withExtensions ({ all, ... }: [ all.pdo_pgsql ]) ];
+
+  services.httpd = {
+    enable = true;
+    adminAddr = "webmaster@localhost";
+
+    enablePHP = true;
+    phpPackage = pkgs.php.withExtensions (
+      { enabled, all }:
+      enabled
+      ++ [
+        all.pdo
+        all.pdo_pgsql
+      ]
+    );
+    extraModules = [ "rewrite" ];
+    virtualHosts.great_cloud_of_witnesses = {
+      hostName = "localhost";
+      listen = [
+        {
+          ip = "*";
+          port = 8092;
+        }
+
+      ];
+      documentRoot = "${vars.services}/great_cloud_of_witnesses";
+      extraConfig = ''
+        <Directory "${vars.services}/great_cloud_of_witnesses">
+          AllowOverride All
+          Require all granted
+        </Directory>
+      '';
+    };
+  };
+
+  sops.secrets.gcw_password = {
+    sopsFile = ../../../users/secrets.yaml;
+    neededForUsers = true;
+  };
+
+  users = {
+    users.gcw = {
+      isSystemUser = true;
+      hashedPasswordFile = config.sops.secrets.gcw_password.path;
+      group = "gcw";
+    };
+    groups.gcw = { };
+  };
+}

systems/jeeves/docker/qbit.nix

@@ -1,29 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  networking.firewall = {
-    allowedTCPPorts = [ 6881 8082 29432 ]; 
-    allowedUDPPorts = [ 6881 29432 ];
-  };
-  virtualisation.oci-containers.containers.qbit = {
-    image = "ghcr.io/linuxserver/qbittorrent:5.0.2";
-    ports = [
-      "6881:6881"
-      "6881:6881/udp"
-      "8082:8082"
-      "29432:29432"
-    ];
-    volumes = [
-      "${vars.media_docker_configs}/qbit:/config"
-      "${vars.torrenting_qbit}:/data"
-    ];
-    environment = {
-      PUID = "600";
-      PGID = "100";
-      TZ = "America/New_York";
-      WEBUI_PORT = "8082";
-    };
-    autoStart = true;
-  };
-}

systems/jeeves/docker/qbitvpn.nix

@@ -3,7 +3,11 @@ let
 in
 {
   networking.firewall = {
-    allowedTCPPorts = [ 6882 8081 8118 ];
+    allowedTCPPorts = [
+      6882
+      8081
+      8118
+    ];
     allowedUDPPorts = [ 6882 ];
   };
   virtualisation.oci-containers.containers.qbitvpn = {
@@ -17,8 +21,9 @@ in
       "8118:8118"
     ];
     volumes = [
-      "${vars.media_docker_configs}/qbitvpn:/config"
+      "${vars.docker_configs}/qbitvpn:/config"
-      "${vars.torrenting_qbitvpn}:/data"
+      "${vars.qbitvpn}:/data"
+      "${vars.qbitvpn_scratch}:/data/incomplete"
       "/etc/localtime:/etc/localtime:ro"
     ];
     environment = {
@@ -36,7 +41,7 @@ in
       DELUGE_DAEMON_LOG_LEVEL = "debug";
       DELUGE_WEB_LOG_LEVEL = "debug";
     };
-    environmentFiles = ["${vars.storage_secrets}/docker/qbitvpn"];
+    environmentFiles = [ "${vars.secrets}/docker/qbitvpn" ];
     autoStart = true;
   };
 }

systems/jeeves/docker/share.nix

@@ -7,7 +7,7 @@ in
     ports = [ "8091:80" ];
     volumes = [
       "${../../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
-      "${vars.media_share}:/data"
+      "${vars.share}:/data"
     ];
     extraOptions = [ "--network=web" ];
     autoStart = true;

systems/jeeves/docker/uptime_kuma.nix

@@ -1,17 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  virtualisation.oci-containers.containers = {
-    uptime_kuma = {
-      ports = [ "3001:3001" ];
-      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"
-      ];
-      extraOptions = [ "--network=web" ];
-      autoStart = true;
-    };
-  };
-}

systems/jeeves/hardware.nix

@@ -1,4 +1,24 @@
-{ config, lib, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+let
+  makeLuksDevice = device: {
+    inherit device;
+    keyFileSize = 4096;
+    keyFile = "/dev/disk/by-id/usb-XIAO_USB_Drive_24587CE29074-0:0";
+    fallbackToPassword = true;
+  };
+  makeLuksSSD =
+    device:
+    (makeLuksDevice device)
+    // {
+      bypassWorkqueues = true;
+      allowDiscards = true;
+    };
+in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -36,77 +56,51 @@
       luks.devices = {
         # cspell:disable
         # Root pool
-        "luks-root-pool-wwn-0x55cd2e4150f01519-part2" = {
+        "luks-root-pool-wwn-0x55cd2e4150f01519-part2" =
-          device = "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2";
+          makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2";
-          bypassWorkqueues = true;
+        "luks-root-pool-wwn-0x55cd2e4150f01556-part2" =
-          allowDiscards = true;
+          makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part2";
-        };
+
-        "luks-root-pool-wwn-0x55cd2e4150f01556-part2" = {
-          device = "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part2";
-          bypassWorkqueues = true;
-          allowDiscards = true;
-        };
         # Media pool
-        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1" = {
+        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1" =
-          device = "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1";
+          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1";
-          bypassWorkqueues = true;
+        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1" =
-          allowDiscards = true;
+          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1";
-        };
+        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1" =
-        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1" = {
+          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1";
-          device = "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1";
+        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1" =
-          bypassWorkqueues = true;
+          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1";
-          allowDiscards = true;
+
-        };
+        # Scratch pool
-        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1" = {
+        "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01C-part1" =
-          device = "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1";
+          makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01C-part1";
-          bypassWorkqueues = true;
+        "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01E-part1" =
-          allowDiscards = true;
+          makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01E-part1";
-        };
+
-        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1" = {
-          device = "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1";
-          bypassWorkqueues = true;
-          allowDiscards = true;
-        };
         # Storage pool
-        "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1" = {
+        "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1" =
-          device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1";
+          makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1";
-          bypassWorkqueues = true;
+        "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1" =
-          allowDiscards = true;
+          makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1";
-        };
+        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1" =
-        "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1" = {
+          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1";
-          device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1";
+        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1" =
-          bypassWorkqueues = true;
+          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1";
-          allowDiscards = true;
+        "luks-storage_pool-wwn-0x5000cca23bc438dd-part1" =
-        };
+          makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bc438dd-part1";
-        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1" = {
+        "luks-storage_pool-wwn-0x5000cca23bd035f5-part1" =
-          device = "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1";
+          makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd035f5-part1";
-          bypassWorkqueues = true;
+        "luks-storage_pool-wwn-0x5000cca23bd00ad6-part1" =
-          allowDiscards = true;
+          makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-part1";
-        };
-        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1" = {
-          device = "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1";
-          bypassWorkqueues = true;
-          allowDiscards = true;
-        };
-        "luks-storage_pool-wwn-0x5000cca23bc438dd-part1".device = "/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-0x5000cca23bd00ad6-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-part1";
-        "luks-storage_pool-wwn-0x5000cca23bcf313e-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bcf313e-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 = "/dev/disk/by-id/wwn-0x5000cca264f080a3-part1";
-        "luks-torrenting_pool-wwn-0x5000cca298c33ae5-part1".device = "/dev/disk/by-id/wwn-0x5000cca298c33ae5-part1";
-        # cspell:enable
       };
     };
+
+    zfs.extraPools = [
+      "media"
+      "scratch"
+      "storage"
+    ];
+
     kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
   };
@@ -122,8 +116,8 @@
       fsType = "zfs";
     };
 
-    "/nix" =
+    "/nix" = {
-    { device = "root_pool/nix";
+      device = "root_pool/nix";
       fsType = "zfs";
     };
 

systems/jeeves/networking.nix

@@ -11,8 +11,8 @@
     networks = {
       "10-1GB_Primary" = {
         matchConfig.Name = "enp98s0f0";
-        address = [ "192.168.95.14/24" ];
+        address = [ "192.168.99.14/24" ];
-        routes = [{ Gateway = "192.168.95.1"; }];
+        routes = [ { Gateway = "192.168.99.1"; } ];
         linkConfig.RequiredForOnline = "routable";
       };
       "10-1GB_Secondary" = {

systems/jeeves/nvidia.nix

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

systems/jeeves/runners/default.nix

@@ -15,7 +15,6 @@
     groups.github-runners.gid = 601;
   };
 
-
   services.nix_builder.containers = {
     nix-builder-0.enable = true;
     nix-builder-1.enable = true;

systems/jeeves/runners/nix_builder.nix

@@ -7,14 +7,20 @@ let
 in
 {
   options.services.nix_builder.containers = mkOption {
-    type = types.attrsOf (types.submodule ({ name, ... }: {
+    type = types.attrsOf (
+      types.submodule (
+        { name, ... }:
+        {
           options.enable = mkEnableOption "GitHub runner container";
-    }));
+        }
+      )
+    );
     default = { };
     description = "GitHub runner container configurations";
   };
 
-  config.containers = mapAttrs (name: cfg:
+  config.containers = mapAttrs (
+    name: cfg:
     mkIf cfg.enable {
       autoStart = true;
       bindMounts = {
@@ -22,10 +28,17 @@ in
           mountPoint = "/zfs/media/github-runners/${name}";
           isReadOnly = false;
         };
-        "/secrets".mountPoint = "${vars.storage_secrets}/services/github-runners/${name}";
+        "/secrets".mountPoint = "${vars.secrets}/services/github-runners/${name}";
-        "ssh-keys".mountPoint = "${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners";
+        "ssh-keys".mountPoint = "${vars.secrets}/services/github-runners/id_ed25519_github-runners";
       };
-      config = { config, pkgs, lib, ... }: {
+      config =
+        {
+          config,
+          pkgs,
+          lib,
+          ...
+        }:
+        {
           nix.settings = {
             trusted-substituters = [
               "https://cache.nixos.org"
@@ -51,8 +64,8 @@ in
             Host jeeves
               Port 629
               User github-runners
-              HostName 192.168.95.14
+              HostName 192.168.99.14
-              IdentityFile ${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners
+              IdentityFile ${vars.secrets}/services/github-runners/id_ed25519_github-runners
               StrictHostKeyChecking no
               UserKnownHostsFile /dev/null
           '';
@@ -62,10 +75,15 @@ in
             workDir = "/zfs/media/github-runners/${name}";
             url = "https://github.com/RichieCahill/dotfiles";
             extraLabels = [ "nixos" ];
-            tokenFile = "${vars.storage_secrets}/services/github-runners/${name}";
+            tokenFile = "${vars.secrets}/services/github-runners/${name}";
             user = "github-runners";
             group = "github-runners";
-            extraPackages = with pkgs; [ nixos-rebuild openssh ];
+            extraPackages = with pkgs; [
+              nixfmt-rfc-style
+              nixos-rebuild
+              openssh
+              treefmt
+            ];
           };
           users = {
             users.github-runners = {

systems/jeeves/scripts/zfs.sh

@@ -11,13 +11,11 @@ sudo zpool create -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=aut
 sudo zpool add storage -o ashift=12 special mirror
 sudo zpool add storage -o ashift=12 logs mirror
 
-# torrenting
+# scratch
-sudo zpool create -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=auto -O xattr=sa -O compression=zstd -m /zfs/torrenting torrenting
+sudo zpool create -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=auto -O xattr=sa -O compression=zstd -m /zfs/scratch scratch
-sudo zpool add torrenting -o ashift=12 special
 
 # media datasets
 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 compression=zstd-9 media/plex
@@ -26,6 +24,10 @@ 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
 
+# scratch datasets
+sudo zfs create -o recordsize=16k -o sync=disabled scratch/qbitvpn
+sudo zfs create -o recordsize=16k -o sync=disabled scratch/transmission
+
 # storage datasets
 sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/archive
 sudo zfs create -o compression=zstd-19 storage/main
@@ -33,7 +35,6 @@ sudo zfs create -o recordsize=16K -o compression=zstd-19 -o copies=2 storage/pho
 sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/plex
 sudo zfs create -o compression=zstd-19 -o copies=3 storage/secrets
 sudo zfs create -o compression=zstd-19 storage/syncthing
-
+sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/qbitvpn
-# torrenting datasets
+sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/transmission
-sudo zfs create -o recordsize=16K -o exec=off -o sync=disabled torrenting/qbit
+sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/library
-sudo zfs create -o recordsize=16K -o exec=off -o sync=disabled torrenting/qbitvpn

systems/jeeves/services/audiobookshelf.nix

@@ -3,11 +3,8 @@ let
   vars = import ../vars.nix;
 in
 {
-  services.audiobookshelf = {
+  services.audiobookshelf.enable = true;
-    enable = true;
+  systemd.services.audiobookshelf.serviceConfig.WorkingDirectory =
-    openFirewall = true;
+    lib.mkForce "${vars.docker_configs}/audiobookshelf";
-    host = "192.168.90.40";
+  users.users.audiobookshelf.home = lib.mkForce "${vars.docker_configs}/audiobookshelf";
-  };
-  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

@@ -9,10 +9,9 @@ in
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       Type = "simple";
-      EnvironmentFile = "${vars.storage_secrets}/docker/cloud_flare_tunnel";
+      EnvironmentFile = "${vars.secrets}/docker/cloud_flare_tunnel";
       ExecStart = "${pkgs.cloudflared}/bin/cloudflared --no-autoupdate tunnel run";
       Restart = "on-failure";
     };
   };
 }
-

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

@@ -6,8 +6,6 @@ let
   vars = import ../vars.nix;
 in
 {
-  networking.firewall.allowedTCPPorts = [ 8080 ];
-
   systemd.services.filebrowser = {
     description = "filebrowser";
     after = [ "network.target" ];
@@ -16,7 +14,7 @@ in
       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";
+      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.docker_configs}/filebrowser/filebrowser.db";
       Restart = "on-failure";
     };
   };

systems/jeeves/services/haproxy.cfg

@@ -21,8 +21,8 @@ defaults
 
 #Application Setup
 frontend ContentSwitching
-  bind *:80
+  bind *:80 v4v6
-  bind *:443 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
+  bind *:443 v4v6 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
   mode  http
   # tmmworkshop.com
   acl host_audiobookshelf  hdr(host) -i audiobookshelf.tmmworkshop.com
@@ -31,7 +31,7 @@ frontend ContentSwitching
   acl host_homeassistant  hdr(host) -i homeassistant.tmmworkshop.com
   acl host_jellyfin  hdr(host) -i jellyfin.tmmworkshop.com
   acl host_share  hdr(host) -i share.tmmworkshop.com
-  acl host_uptime_kuma  hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
+  acl host_gcw  hdr(host) -i gcw.tmmworkshop.com
 
   use_backend audiobookshelf_nodes if host_audiobookshelf
   use_backend cache_nodes  if host_cache
@@ -39,35 +39,35 @@ frontend ContentSwitching
   use_backend homeassistant_nodes  if host_homeassistant
   use_backend jellyfin if host_jellyfin
   use_backend share_nodes  if host_share
-  use_backend uptime_kuma_nodes  if host_uptime_kuma
+  use_backend gcw_nodes  if host_gcw
 
 backend audiobookshelf_nodes
   mode http
-  server server 192.168.90.40:8000
+  server server 127.0.0.1:8000
 
 backend cache_nodes
   mode http
-  server server 192.168.90.40:5000
+  server server 127.0.0.1:5000
 
 backend filebrowser_nodes
   mode http
-  server server 192.168.90.40:8080
+  server server 127.0.0.1:8080
 
 backend homeassistant_nodes
   mode http
-  server server 192.168.95.14:8123
+  server server 127.0.0.1:8123
 
 backend jellyfin
     option httpchk
     option forwardfor
     http-check send meth GET uri /health
     http-check expect string Healthy
-    server jellyfin 192.168.95.14:8096
+    server jellyfin 127.0.0.1:8096
 
 backend share_nodes
   mode http
-  server server 192.168.95.14:8091
+  server server 127.0.0.1:8091
 
-backend uptime_kuma_nodes
+backend gcw_nodes
   mode http
-  server server 192.168.95.14:3001
+  server server 127.0.0.1:8092

systems/jeeves/services/haproxy.nix

@@ -1,5 +1,8 @@
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
 
   services.haproxy = {
     enable = true;

systems/jeeves/services/home_assistant.nix

@@ -2,27 +2,41 @@ let
   vars = import ../vars.nix;
 in
 {
+  users = {
+    users.hass = {
+      isSystemUser = true;
+      group = "hass";
+    };
+    groups.hass = { };
+  };
+
   services = {
     home-assistant = {
       enable = true;
       openFirewall = true;
-      configDir = vars.media_home_assistant;
+      configDir = vars.home_assistant;
       config = {
         http = {
           server_port = 8123;
           server_host = [
-            "192.168.95.14"
+            "192.168.99.14"
             "192.168.90.40"
-            "192.168.98.4"
+            "127.0.0.1"
           ];
           use_x_forwarded_for = true;
-          trusted_proxies = "192.168.95.0/24";
+          trusted_proxies = "127.0.0.1";
         };
         homeassistant = {
           time_zone = "America/New_York";
           unit_system = "us_customary";
           temperature_unit = "F";
         };
+        recorder = {
+          db_url = "postgresql://@/hass";
+          auto_purge = true;
+          purge_keep_days = 3650;
+          db_retry_wait = 15;
+        };
         assist_pipeline = { };
         backup = { };
         bluetooth = { };

systems/jeeves/services/jellyfin.nix

@@ -5,6 +5,6 @@ in
   services.jellyfin = {
     enable = true;
     openFirewall = true;
-    dataDir = "${vars.media_services}/jellyfin";
+    dataDir = "${vars.services}/jellyfin";
   };
 }

systems/jeeves/services/nix_serve.nix

@@ -4,7 +4,7 @@ in
 {
   services.nix-serve = {
     enable = true;
-    secretKeyFile = "${vars.storage_secrets}/services/nix-cache/cache-priv-key.pem";
+    secretKeyFile = "${vars.secrets}/services/nix-cache/cache-priv-key.pem";
     openFirewall = true;
   };
 }

systems/jeeves/services/postgress.nix

@@ -0,0 +1,192 @@
+{ 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.database}/postgres";
+
+    authentication = pkgs.lib.mkOverride 10 ''
+
+      # admins
+      local all  postgres   trust
+      host  all  postgres   127.0.0.1/32    trust
+      host  all  postgres   ::1/128         trust 
+
+      local all  richie   trust
+      host  all  richie   127.0.0.1/32    trust
+      host  all  richie   ::1/128         trust
+      host  all  richie   192.168.90.1/24 trust
+      host  all  richie   192.168.99.1/24 trust
+
+
+      #type database DBuser origin-address auth-method
+      local hass     hass     trust
+
+      # ipv4
+      host  hass     hass     192.168.90.1/24 trust
+      host  hass     hass     127.0.0.1/32 trust
+
+      # ipv6
+      host hass      hass     ::1/128         trust
+
+      # megan
+      host  megan    megan    192.168.90.1/24 trust
+      host  megan    megan    127.0.0.1/32 trust
+
+      host  gcw      megan    192.168.90.1/24 trust
+      host  gcw      megan    127.0.0.1/32 trust
+
+      # gcw
+      local gcw      gcw      trust
+      host  gcw      gcw      192.168.90.1/24 trust
+      host  gcw      gcw      127.0.0.1/32 trust
+
+    '';
+
+    identMap = ''
+      # ArbitraryMapName systemUser DBUser
+        superuser_map      root      postgres
+        superuser_map      postgres  postgres
+        # Let other names login as themselves
+        superuser_map      richie    postgres
+        superuser_map      hass      hass
+    '';
+    ensureUsers = [
+      {
+        name = "postgres";
+        ensureClauses = {
+          superuser = true;
+          login = true;
+          createrole = true;
+          createdb = true;
+          replication = true;
+        };
+      }
+      {
+        name = "richie";
+        ensureDBOwnership = true;
+        ensureClauses = {
+          superuser = true;
+          login = true;
+          createrole = true;
+          createdb = true;
+          replication = true;
+        };
+      }
+      {
+        name = "hass";
+        ensureDBOwnership = true;
+        ensureClauses = {
+          login = true;
+          createrole = true;
+          createdb = true;
+          replication = true;
+        };
+      }
+      {
+        name = "megan";
+        ensureDBOwnership = true;
+        ensureClauses = {
+          login = true;
+          createrole = true;
+          createdb = true;
+          replication = true;
+        };
+      }
+      {
+        name = "gcw";
+        ensureDBOwnership = true;
+        ensureClauses = {
+          login = true;
+          createrole = true;
+          createdb = true;
+          replication = true;
+        };
+      }
+    ];
+    ensureDatabases = [
+      "gcw"
+      "hass"
+      "megan"
+      "mxr_dev"
+      "mxr_prod"
+      "richie"
+    ];
+    # 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/systemd.nix

@@ -23,7 +23,7 @@ in
         description = "validates startup";
         path = [ pkgs.zfs ];
         serviceConfig = {
-          EnvironmentFile = "${vars.storage_secrets}/services/server-validation";
+          EnvironmentFile = "${vars.secrets}/services/server-validation";
           Type = "oneshot";
           ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_system --config-file='${./validate_system.toml}'";
         };

systems/jeeves/services/transmission.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+let
+  vars = import ../vars.nix;
+in
+{
+  services.transmission = {
+    enable = true;
+    package = pkgs.transmission_4;
+    webHome = pkgs.flood-for-transmission;
+    home = "${vars.services}/transmission";
+    openPeerPorts = true;
+    openRPCPort = true;
+    downloadDirPermissions = "770";
+    settings = {
+      bind-address-ipv4 = "192.168.99.14";
+      cache-size-mb = 0;
+      download-dir = "${vars.transmission}/complete";
+      download-queue-enabled = false;
+      incomplete-dir = "${vars.transmission_scratch}/incomplete";
+      incomplete-dir-enabled = true;
+      message-level = 3;
+      peer-port = 51413;
+      rpc-bind-address = "0.0.0.0";
+      rpc-host-whitelist = "127.0.0.1,192.168.90.40";
+      rpc-host-whitelist-enabled = true;
+      rpc-port = 9091;
+      rpc-whitelist-enabled = true;
+      rpc-whitelist = "127.0.0.1,192.168.90.49";
+      seed-queue-enabled = false;
+    };
+  };
+}

systems/jeeves/services/validate_system.toml

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

systems/jeeves/syncthing.nix

@@ -5,6 +5,7 @@ in
   networking.firewall.allowedTCPPorts = [ 8384 ];
 
   services.syncthing = {
+    overrideFolders = false;
     guiAddress = "192.168.90.40:8384";
     settings = {
       devices.davids-server.id = "7GXTDGR-AOXFW2O-K6J7NM3-XYZNRRW-AKHAFWM-GBOWUPQ-OA6JIWD-ER7RDQL"; # cspell:disable-line
@@ -19,7 +20,7 @@ in
         };
         "notes" = {
           id = "l62ul-lpweo"; # cspell:disable-line
-          path = vars.media_notes;
+          path = vars.notes;
           devices = [
             "rhapsody-in-green"
             "davids-server"
@@ -28,7 +29,7 @@ in
         };
         "important" = {
           id = "4ckma-gtshs"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/important";
+          path = "${vars.syncthing}/important";
           devices = [
             "bob"
             "rhapsody-in-green"
@@ -38,7 +39,7 @@ in
         };
         "music" = {
           id = "vprc5-3azqc"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/music";
+          path = "${vars.syncthing}/music";
           devices = [
             "bob"
             "rhapsody-in-green"
@@ -49,14 +50,14 @@ in
         };
         "projects" = {
           id = "vyma6-lqqrz"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/projects";
+          path = "${vars.syncthing}/projects";
           devices = [
             "rhapsody-in-green"
           ];
           fsWatcherEnabled = true;
         };
         "rhapsody-in-green_temp" = {
-          path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
+          path = "${vars.syncthing}/rhapsody-in-green_temp";
           devices = [
             "rhapsody-in-green"
           ];
@@ -71,7 +72,7 @@ in
           fsWatcherEnabled = true;
         };
         "backup" = {
-          path = "${vars.storage_syncthing}/backup";
+          path = "${vars.syncthing}/backup";
           devices = [
             "davids-server"
           ];
@@ -80,7 +81,7 @@ in
         #
         "davids-backup1" = {
           id = "8229p-8z3tm"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/1";
+          path = "${vars.syncthing}/davids_backups/1";
           devices = [
             "davids-server"
           ];
@@ -89,7 +90,7 @@ in
         };
         "davids-backup2" = {
           id = "iciw3-dp6ao"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/2";
+          path = "${vars.syncthing}/davids_backups/2";
           devices = [
             "davids-server"
           ];
@@ -98,7 +99,7 @@ in
         };
         "davids-backup3" = {
           id = "9si6m-bnkjb"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/3";
+          path = "${vars.syncthing}/davids_backups/3";
           devices = [
             "davids-server"
           ];
@@ -107,7 +108,7 @@ in
         };
         "davids-backup4" = {
           id = "qjyfy-uupj4"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/4";
+          path = "${vars.syncthing}/davids_backups/4";
           devices = [
             "davids-server"
           ];
@@ -116,7 +117,7 @@ in
         };
         "davids-backup5" = {
           id = "fm4h5-emsu2"; # cspell:disable-line
-          path = "${vars.storage_syncthing}/davids_backups/5";
+          path = "${vars.syncthing}/davids_backups/5";
           devices = [
             "davids-server"
           ];

systems/jeeves/vars.nix

@@ -1,28 +1,21 @@
 let
   zfs_media = "/zfs/media";
   zfs_storage = "/zfs/storage";
-  zfs_torrenting = "/zfs/torrenting";
+  zfs_scratch = "/zfs/scratch";
 in
 {
-  inherit zfs_media zfs_storage zfs_torrenting;
+  inherit zfs_media zfs_storage zfs_scratch;
-  # media
+  database = "${zfs_media}/database";
-  media_database = "${zfs_media}/database";
+  docker = "${zfs_media}/docker";
-  media_docker = "${zfs_media}/docker";
+  docker_configs = "${zfs_media}/docker/configs";
-  media_docker_configs = "${zfs_media}/docker/configs";
+  home_assistant = "${zfs_media}/home_assistant";
-  media_mirror = "${zfs_media}/mirror";
+  notes = "${zfs_media}/notes";
-  media_share = "${zfs_media}/share";
+  qbitvpn = "${zfs_storage}/qbitvpn";
-  media_services = "${zfs_media}/services";  
+  qbitvpn_scratch = "${zfs_scratch}/qbitvpn";
-  media_notes = "${zfs_media}/notes";
+  secrets = "${zfs_storage}/secrets";
-  media_plex = "${zfs_media}/plex";
+  services = "${zfs_media}/services";
-  media_home_assistant = "${zfs_media}/home_assistant";
+  share = "${zfs_media}/share";
-  # storage
+  syncthing = "${zfs_storage}/syncthing";
-  storage_main = "${zfs_storage}/main";
+  transmission = "${zfs_storage}/transmission";
-  storage_photos = "${zfs_storage}/photos";
+  transmission_scratch = "${zfs_scratch}/transmission";
-  storage_plex = "${zfs_storage}/plex";
-  storage_secrets = "${zfs_storage}/secrets";
-  storage_syncthing = "${zfs_storage}/syncthing";
-  storage_library = "${zfs_storage}/library";
-  # torrenting
-  torrenting_qbit = "${zfs_torrenting}/qbit";
-  torrenting_qbitvpn = "${zfs_torrenting}/qbitvpn";
 }

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 = {
@@ -25,8 +24,6 @@
 
   services = {
     openssh.ports = [ 922 ];
-
-    desktopManager.cosmic.enable = true;  
   };
 
   system.stateVersion = "24.05";

systems/rhapsody-in-green/hardware.nix

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

tools/installer.py

@@ -266,7 +266,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 +448,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

@@ -0,0 +1,14 @@
+# 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/gaming/default.nix

@@ -16,8 +16,7 @@
 
       shell = pkgs.zsh;
       group = "gaming";
-      extraGroups =
+      extraGroups = [
-      [
         "audio"
         "video"
         "users"

users/gaming/home/firefox.nix

@@ -1,249 +0,0 @@
-{ inputs, ... }:
-{
-  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 = "Google";
-        order = [ "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/gaming/home/programs.nix

@@ -2,5 +2,7 @@
 {
   home.packages = with pkgs; [
     chromium
+    vscode
+    firefox
   ];
 }

users/gaming/systems/bob.nix

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

users/megan/default.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  config,
+  ...
+}:
+{
+  sops.secrets.megan_password = {
+    sopsFile = ../secrets.yaml;
+    neededForUsers = true;
+  };
+
+  users = {
+    users.megan = {
+      isNormalUser = true;
+      hashedPasswordFile = "${config.sops.secrets.megan_password.path}";
+
+      shell = pkgs.zsh;
+      group = "megan";
+      extraGroups = [
+        "audio"
+        "video"
+        "users"
+      ];
+      uid = 1101;
+    };
+
+    groups.megan.gid = 1101;
+  };
+  home-manager.users.megan = import ./systems/${config.networking.hostName}.nix;
+}

users/megan/home/cli/default.nix

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

users/megan/home/cli/direnv.nix

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

users/megan/home/cli/git.nix

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

users/megan/home/cli/zsh.nix

@@ -0,0 +1,31 @@
+{
+  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";
+
+      "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'";
+      "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST";
+      "nix-test" = "nixos-rebuild test --flake /home/richie/dotfiles";
+    };
+  };
+}

users/megan/home/global.nix

@@ -0,0 +1,18 @@
+{ config, ... }:
+{
+  imports = [
+    ./cli
+    ./programs.nix
+  ];
+
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+
+  home = {
+    username = "megan";
+    homeDirectory = "/home/${config.home.username}";
+    stateVersion = "24.05";
+  };
+}

users/megan/home/programs.nix

@@ -0,0 +1,42 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # cli
+    bat
+    btop
+    eza
+    fd
+    ffmpegthumbnailer
+    fzf
+    git
+    gnupg
+    imagemagick
+    jq
+    ncdu
+    neofetch
+    ouch
+    p7zip
+    poppler
+    rar
+    ripgrep
+    starship
+    tmux
+    unzip
+    yazi
+    zoxide
+    # system info
+    hwloc
+    lynis
+    pciutils
+    smartmontools
+    usbutils
+    # networking
+    iperf3
+    nmap
+    wget
+    # python
+    poetry
+    python313
+    ruff
+  ];
+}

users/megan/systems/jeeves.nix

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

users/richie/default.nix

@@ -2,9 +2,11 @@
   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;
@@ -37,6 +39,7 @@ in {
           "networkmanager"
           "plugdev"
           "scanner"
+          "transmission"
           "uaccess"
           "wireshark"
         ];

users/richie/home/cli/zsh.nix

@@ -23,9 +23,9 @@
       "ll" = "eza --long --group";
       "la" = "eza --all";
 
-      "rspace" = "'for f in *\ *; do mv \"$f\" \"\${f// /_}\"; done'";
+      "rebuild" = "sudo nixos-rebuild switch --flake $HOME/dotfiles#$HOST";
-      "rebuild" = "sudo nixos-rebuild switch --flake /home/richie/dotfiles#$HOST";
+      "rebuild_backup" =
-      "nix-test" = "nixos-rebuild test --flake /home/richie/dotfiles";
+        "sudo nixos-rebuild switch --flake $HOME/dotfiles#$HOST --option substituters 'https://nix-community.cachix.org' --option trusted-public-keys 'cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY='";
     };
   };
 }

users/richie/home/gui/default.nix

@@ -12,6 +12,8 @@
     discord-canary
     gimp
     gparted
+    jetbrains.datagrip
+    ladybird
     mediainfo
     nemo
     nemo-fileroller

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

@@ -5,7 +5,7 @@
   programs.firefox = {
     enable = true;
     profiles.richie = {
-      extensions = with inputs.firefox-addons.packages.x86_64-linux; [
+      extensions.packages = with inputs.firefox-addons.packages.x86_64-linux; [
         bitwarden
         darkreader
         dearrow
@@ -17,7 +17,11 @@
       search = {
         force = true;
         default = "kagi";
-        order = [ "kagi" "DuckDuckGo" "Google" ];
+        order = [
+          "kagi"
+          "ddg"
+          "google"
+        ];
       };
       settings = {
         # SECTION: FASTFOX
@@ -138,7 +142,8 @@
         "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%";
+        "geo.provider.network.url" =
+          "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
         "permissions.manager.defaultsUrl" = "";
         "webchannel.allowObject.urlWhitelist" = "";
 

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

@@ -47,6 +47,21 @@
       icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
       definedAliases = [ "@n" ];
     };
+    "Nix Packages pr-tracker" = {
+      urls = [
+        {
+          template = "https://nixpk.gs/pr-tracker.html?";
+          params = [
+            {
+              name = "pr";
+              value = "{searchTerms}";
+            }
+          ];
+        }
+      ];
+      icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+      definedAliases = [ "@nprt" ];
+    };
     "kagi" = {
       urls = [
         {

users/richie/home/gui/kitty.nix

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

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

@@ -1,11 +1,13 @@
 { config, pkgs, ... }:
 let
-  vscode_dir = "/home/richie/projects/nix-dotfiles/users/richie/home/gui/vscode";
+  vscode_dir = "/home/richie/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/settings.json".source =
-  xdg.configFile."Code/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/keybindings.json";
+    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 ];
 

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

@@ -15,6 +15,7 @@
   "terminal.integrated.scrollback": 10000,
   "update.mode": "none",
   "workbench.colorTheme": "Default Dark+",
+  "workbench.secondarySideBar.showLabels": false,
 
   // turns off all sounds and announcements
   "accessibility.signals.terminalCommandFailed": {
@@ -30,9 +31,24 @@
     "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" },
+  "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
   "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
   "[nix]": { "editor.defaultFormatter": "jnoortheen.nix-ide" },
   "[python]": { "editor.defaultFormatter": "charliermarsh.ruff" },
@@ -48,6 +64,9 @@
   "nix.enableLanguageServer": true,
   "nix.serverPath": "nil",
 
+  // python tools
+  "mypy.runUsingActiveInterpreter": true,
+
   // force the use of rust-analyzer from dev shell
   "rust-analyzer.server.path": "rust-analyzer",
   "redhat.telemetry.enabled": true,

users/richie/home/programs.nix

@@ -50,7 +50,8 @@
     nix-output-monitor
     nix-prefetch
     nix-tree
-    nixpkgs-fmt
+    nixfmt-rfc-style
+    treefmt
     inputs.system_tools.packages.x86_64-linux.default
   ];
 }

users/richie/home/ssh_config.nix

@@ -11,18 +11,11 @@
         dynamicForwards = [ { port = 9050; } ];
       };
       unlock-jeeves = {
-        hostname = "192.168.95.14";
+        hostname = "192.168.99.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";

users/secrets.yaml

@@ -1,10 +1,8 @@
 richie_password: ENC[AES256_GCM,data:DMi3M8aqrQ60APIofr8wJMh+VZ14hLRxz6jWZgzswr0pV/QVSX53ShBFr90ruO3mucOLYv0l+bI31covfqMAhXWBJp9wUgtC2Q==,iv:qgtn30hZfIL4dBnQSLkjbo7zPJA4m9TR0f52sTFc0v4=,tag:ydLbcGyXjv0fE+4b5ECX5w==,type:str]
 gaming_password: ENC[AES256_GCM,data:i692UsQaCOjE4V1y9d8yYDlK+TRMIprCHJkhl1UBZRMqe9a2LTUtmbbn/xlCYQd2tADJvn+dkx1jLfV4CqaqWOj5YSUFfpgsEw==,iv:3Y7hXQcmpzNN7hF+BDvO52uFB4o5D0dHvxemJ0ZoSIM=,tag:zzLGNDVAMCs2GPMqXp2BtQ==,type:str]
+megan_password: ENC[AES256_GCM,data:Udrs9OWFI2TDM1yxRwfy7uiONh1G3Mr9HabwpmRykp1Xw9KK+q245nxN7QQbR0AiTCyyyivhn6GB2+DvBBY/6UrN5iGs+LaXgg==,iv:n02HzE8jvWM5xDfaPB9BHxtfoAZQ/Tk80XuySY2NyoU=,tag:L9wPVy7zt6mp09qWhzdLpg==,type:str]
+gcw_password: ENC[AES256_GCM,data:T5CliWyyw4igunGRokOW7dNTOQ7DbOhM4gLa8YN4gbVLEVU7n3jxAVF9Uy9zM7LBBqdLvyXnqGzC1HBSBmE+pKBV7YIN3aQkng==,iv:SLq4aeLHdwfq0+A4N6UO4Dz7oBoC0ZDKBr74hheHQFw=,tag:4a71PZcyzoWjOmYEPx07ag==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c
           enc: |
@@ -51,8 +49,7 @@ sops:
             UzQzWEFtSDJwR201cmZoeXh5T0RmSk0KWLOpw5cWbtnfVP/ISa7n1vZchoD+nxmn
             7yr7igpEIro0Sd238KinOQYswVaT0NHB9p1dSW/mN+aGQliSNLzkDQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-01-07T20:13:43Z"
+    lastmodified: "2025-06-05T00:52:15Z"
-    mac: ENC[AES256_GCM,data:Q5fmv+MRVYGUQ4j+28CcGWHmgT1178N+haVS9xa0c99OKuPZdfSndAG0QVDhh/jYq+7zXs6zzLtBjB+egkoDfxJXfJOmg3E46UMO3vDHaEcIZD16ZbWJaz4Z/+yabqhDURKtgfGiu4xPv3OtGbwcP5kud17WcHNfY/LT+Y+LSD8=,iv:y3K3kCroIh+RTplUe4tM8B9rbLgIHCbE6FJawngam8Q=,tag:2VTIWlLp4cOwm18BfIlz5g==,type:str]
+    mac: ENC[AES256_GCM,data:FVj9SmI6uq5ujIX3NwFSLcappRIX0K1U/GXks4Wj0gJH//Tqo5Ur07+WdE5JNmHdS1gXW34RhzFmEbQ9KR2OoP8cfTG+a7qCftzEQbV5aBBEMxstsl48TLtRTwRuSrEnVOHh/0EfFOkXTUO/rVS4jDmd57eAB6OBJQePQk+P+0Q=,iv:P1aeFC+6xG4Koph0Dynwek/861OsH1asui3qtpu1JUI=,tag:1RYayU758c+yAULOgQuWgw==,type:str]
-    pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.2
+    version: 3.10.2