fixed brendans-system host name

boot strapping
2026-04-21 06:39:09 -04:00 · 2025-02-11 21:46:19 -05:00 · 2025-02-11 21:43:01 -05:00
70 changed files with 1463 additions and 405 deletions
--- a/.github/workflows/build_systems.yml
+++ b/.github/workflows/build_systems.yml
@@ -4,8 +4,6 @@ on:
  pull_request:
  push:
    branches: [main]
-  schedule:
-    - cron: "0 22 * * *"

 jobs:
  build:
@@ -17,10 +15,10 @@ jobs:
          - "bob"
          - "jeeves"
          - "rhapsody-in-green"
+          - "brendans-system"
    steps:
      - uses: actions/checkout@v4
      - name: Build default package
        run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
      - name: copy to nix-cache
        run: nix copy --to ssh://jeeves .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel
-
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,10 +1,10 @@
 keys:
-  - &admin_richie age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c # cspell:disable-line
+  - &admin_richie age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c

-  - &system_bob age1q47vup0tjhulkg7d6xwmdsgrw64h4ax3la3evzqpxyy4adsmk9fs56qz3y # cspell:disable-line
-  - &system_jeeves age13lmqgc3jvkyah5e3vcwmj4s5wsc2akctcga0lpc0x8v8du3fxprqp4ldkv # cspell:disable-line
-  - &system_router age1xzxryqq63x65yuza9lmmkud7crjjxpnkdew070yhx6xn7xe4tdws5twxsv # cspell:disable-line
-  - &system_rhapsody age1ufnewppysaq2wwcl4ugngjz8pfzc5a35yg7luq0qmuqvctajcycs5lf6k4 # cspell:disable-line
+  - &system_bob age1q47vup0tjhulkg7d6xwmdsgrw64h4ax3la3evzqpxyy4adsmk9fs56qz3y
+  - &system_jeeves age13lmqgc3jvkyah5e3vcwmj4s5wsc2akctcga0lpc0x8v8du3fxprqp4ldkv
+  - &system_router age1xzxryqq63x65yuza9lmmkud7crjjxpnkdew070yhx6xn7xe4tdws5twxsv
+  - &system_rhapsody age1ufnewppysaq2wwcl4ugngjz8pfzc5a35yg7luq0qmuqvctajcycs5lf6k4

 creation_rules:
  - path_regex: users/secrets\.yaml$
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,7 +26,6 @@
    "azuretools",
    "bantime",
    "bazarr",
-    "bgwriter",
    "binhex",
    "bitwarden",
    "blkdiscard",
@@ -37,9 +36,7 @@
    "captivedetect",
    "cgroupdriver",
    "charliermarsh",
-    "Checkpointing",
    "cloudflared",
-    "codellama",
    "codezombiech",
    "compactmode",
    "Compat",
@@ -49,15 +46,12 @@
    "createrole",
    "crlite",
    "cryptsetup",
-    "cuda",
    "darkreader",
-    "datagrip",
    "datareporting",
    "davidanson",
    "dconf",
    "dearrow",
    "debugpy",
-    "deepseek",
    "dialout",
    "diffie",
    "direnv",
@@ -65,16 +59,12 @@
    "dnodesize",
    "dotfiles",
    "drawio",
-    "duckdns",
    "eamodio",
-    "ehci",
-    "emerg",
    "endlessh",
    "errorlens",
    "esbenp",
    "esphome",
    "extest",
-    "fadvise",
    "fastforwardteam",
    "FASTFOX",
    "ffmpegthumbnailer",
@@ -86,7 +76,6 @@
    "fmask",
    "fontconfig",
    "formfill",
-    "forwardfor",
    "foxundermoon",
    "FULLSCREEN",
    "fwupd",
@@ -111,7 +100,6 @@
    "HPKP",
    "hplip",
    "htmlaboutaddons",
-    "httpchk",
    "hurlenko",
    "hwloc",
    "INITDB",
@@ -124,7 +112,6 @@
    "jsbc",
    "kagi",
    "kuma",
-    "lazer",
    "levelname",
    "libglvnd",
    "libmysqlclient",
@@ -139,13 +126,10 @@
    "lynis",
    "mangohud",
    "markdownlint",
-    "maxconn",
-    "maxpages",
    "maxretry",
    "maxtime",
    "mechatroner",
    "mediainfo",
-    "mixtral",
    "mklabel",
    "mkpart",
    "modesetting",
@@ -167,24 +151,18 @@
    "nixpkgs",
    "nmap",
    "noauto",
-    "nodev",
    "noecho",
    "nonsponsored",
    "Noto",
-    "nprt",
    "nvme",
    "OCSP",
    "oderwat",
-    "ollama",
-    "ondemand",
    "oneshot",
-    "openwakeword",
    "optimise",
    "optoutstudies",
    "overalljails",
    "overscroll",
    "overseerr",
-    "partitionwise",
    "pbmode",
    "pciutils",
    "pcscd",
@@ -197,12 +175,10 @@
    "plugdev",
    "poppler",
    "posixacl",
-    "powertop",
    "primarycache",
    "prismlauncher",
    "privatebrowsing",
    "PRIVOXY",
-    "protontricks",
    "prowlarr",
    "proxychains",
    "prusa",
@@ -222,14 +198,12 @@
    "radarr",
    "readahead",
    "receiveencrypted",
-    "recordsize",
    "Redistributable",
    "referer",
    "REFERERS",
    "relatime",
    "Rhosts",
    "ripgrep",
-    "roboto",
    "rokuecp",
    "routable",
    "rspace",
@@ -263,11 +237,11 @@
    "TCPIP",
    "tiktok",
    "timonwong",
-    "titlebar",
    "tmmworkshop",
    "Tmpfs",
    "topsites",
    "topstories",
+    "torrenting",
    "treefmt",
    "twimg",
    "uaccess",
@@ -276,7 +250,6 @@
    "uitour",
    "unrar",
    "unsubmitted",
-    "uptimekuma",
    "urlbar",
    "urlclassifier",
    "usbhid",
@@ -288,11 +261,9 @@
    "virt",
    "virtualisation",
    "vpnpromourl",
-    "wakeonlan",
    "webchannel",
    "WEBRTC",
    "WEBUI",
-    "wireplumber",
    "wireshark",
    "Workqueues",
    "xattr",
--- a/common/global/default.nix
+++ b/common/global/default.nix
@@ -52,8 +52,6 @@
    };
  };

-  powerManagement.powertop.enable = lib.mkDefault true;
-
  programs.zsh.enable = true;

  security.auditd.enable = lib.mkDefault true;
--- a/common/optional/desktop.nix
+++ b/common/optional/desktop.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
  boot = {
-    kernelPackages = pkgs.linuxPackages_6_13;
+    kernelPackages = pkgs.linuxPackages_6_12;
    zfs.package = pkgs.zfs_2_3;
  };

--- a/common/optional/syncthing_base.nix
+++ b/common/optional/syncthing_base.nix
@@ -1,14 +1,13 @@
-{ lib, ... }:
 {
  services.syncthing = {
    enable = true;
    user = "richie";
    overrideDevices = true;
-    overrideFolders = lib.mkDefault true;
+    overrideFolders = true;
    dataDir = "/home/richie/Syncthing";
    configDir = "/home/richie/.config/syncthing";
    settings.devices = {
-      phone.id = "TBRULKD-7DZPGGZ-F6LLB7J-MSO54AY-7KLPBIN-QOFK6PX-W2HBEWI-PHM2CQI"; # cspell:disable-line
+      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
      bob.id = "CJIAPEJ-VO74RR4-F75VU6M-QNZAMYG-FYUJG7Y-6AT62HJ-355PRPL-PJFETAZ"; # cspell:disable-line
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1743119709,
-        "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
+        "lastModified": 1738382607,
+        "narHash": "sha256-ppR81tMrcQk/wHm8MmKtp3mrtYmMTgF2lxLLXYwRsOM=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
+        "rev": "dc86c8feffa328d9050e039a1286e175af6d76d8",
        "type": "gitlab"
      },
      "original": {
@@ -23,6 +23,22 @@
        "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,
@@ -63,11 +79,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1743267068,
-        "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=",
+        "lastModified": 1738415006,
+        "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0",
+        "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2",
        "type": "github"
      },
      "original": {
@@ -98,13 +114,35 @@
        "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": 1743167577,
-        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
+        "lastModified": 1738391520,
+        "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
+        "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773",
        "type": "github"
      },
      "original": {
@@ -116,11 +154,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1743095683,
-        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
+        "lastModified": 1738142207,
+        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
+        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
        "type": "github"
      },
      "original": {
@@ -132,11 +170,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1743293199,
-        "narHash": "sha256-UTEKMh3sbRHVr6ZYIoM7NWQjfrjIGTVOoV2Q4LkLvSk=",
+        "lastModified": 1738422722,
+        "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a2cd41ef5ba904d58f230740f06567ff9506e368",
+        "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1",
        "type": "github"
      },
      "original": {
@@ -147,6 +185,22 @@
      }
    },
    "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=",
@@ -194,10 +248,11 @@
      "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",
+        "nixpkgs-stable": "nixpkgs-stable_2",
        "sops-nix": "sops-nix",
        "system_tools": "system_tools",
        "systems": "systems_3"
@@ -210,11 +265,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742700801,
-        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
+        "lastModified": 1738291974,
+        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
+        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
        "type": "github"
      },
      "original": {
@@ -232,11 +287,11 @@
        "poetry2nix": "poetry2nix"
      },
      "locked": {
-        "lastModified": 1741571944,
-        "narHash": "sha256-PM7dz99nb6dDiw/3naRGB/dUl5U7dJVspR9uevhW3xo=",
+        "lastModified": 1738431375,
+        "narHash": "sha256-jk6JrgqNe0dEPxV2xX/pBVsrPDfWaa033LKcyERkHJw=",
        "owner": "RichieCahill",
        "repo": "system_tools",
-        "rev": "c9979e045bca52ec85a0dc560b238f3e5ae2f01c",
+        "rev": "36764189680c9be26192ee94da1a3f33f890ff0d",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,10 @@
      "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
    ];
    extra-trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # cspell:disable-line
-      "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" # cspell:disable-line
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # cspell:disable-line
-      "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU=" # cspell:disable-line
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU="
    ];
  };

@@ -38,6 +38,11 @@
      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";
@@ -50,6 +55,7 @@
      nixpkgs,
      home-manager,
      systems,
+      nixos-cosmic,
      sops-nix,
      ...
    }@inputs:
@@ -91,6 +97,12 @@
          ];
          specialArgs = { inherit inputs outputs; };
        };
+        brendans-system = lib.nixosSystem {
+          modules = [
+            ./systems/brendans-system
+          ];
+          specialArgs = { inherit inputs outputs; };
+        };
      };
    };
 }
--- a/systems/bob/default.nix
+++ b/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,8 +37,6 @@
    };

    openssh.ports = [ 262 ];
-
-    snapshot_manager.path = ./snapshot_config.toml;
  };

  system.stateVersion = "24.05";
--- a/systems/bob/hardware.nix
+++ b/systems/bob/hardware.nix
@@ -28,7 +28,6 @@
        allowDiscards = true;
        keyFileSize = 4096;
        keyFile = "/dev/disk/by-id/usb-Samsung_Flash_Drive_FIT_0374620080067131-0:0";
-        fallbackToPassword = true;
      };
    };
    kernelModules = [ "kvm-amd" ];
@@ -51,11 +50,6 @@
      fsType = "zfs";
    };

-    "/zfs/models" = {
-      device = "root_pool/models";
-      fsType = "zfs";
-    };
-
    "/boot" = {
      device = "/dev/disk/by-uuid/609D-FF29";
      fsType = "vfat";
--- a/systems/bob/llms.nix
+++ b/systems/bob/llms.nix
@@ -1,28 +1,24 @@
 {
  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 = {
-    #   enable = true;
-    #   openFirewall = true;
-    #   host = "0.0.0.0";
-    # };
+    open-webui = {
+      enable = true;
+      openFirewall = true;
+      host = "192.168.90.25";
+    };
  };
 }
--- a/common/optional/nvidia.nix
+++ b/common/optional/nvidia.nix
@@ -1,7 +1,5 @@
 { config, ... }:
 {
-  nixpkgs.config.cudaSupport = true;
-
  services.xserver.videoDrivers = [ "nvidia" ];
  hardware = {
    nvidia = {
--- a/systems/bob/snapshot_config.toml
+++ b/systems/bob/snapshot_config.toml
@@ -1,29 +0,0 @@
-["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
--- a/systems/brendans-system/default.nix
+++ b/systems/brendans-system/default.nix
@@ -0,0 +1,37 @@
+{
+  imports = [
+    ../../users/brendan
+    ../../common/global
+    ../../common/optional/desktop.nix
+    ../../common/optional/docker.nix
+    ../../common/optional/steam.nix
+    ../../common/optional/systemd-boot.nix
+    ../../common/optional/update.nix
+    ../../common/optional/zerotier.nix
+    ./hardware.nix
+    ./nvidia.nix
+    ./programs.nix
+  ];
+
+  networking = {
+    hostName = "brendans-system";
+    hostId = "7c678a41";
+    firewall.enable = true;
+    networkmanager.enable = true;
+  };
+
+  services = {
+    displayManager = {
+      enable = true;
+      autoLogin = {
+        user = "gaming";
+        enable = true;
+      };
+      defaultSession = "plasma";
+    };
+
+    openssh.ports = [ 262 ];
+  };
+
+  system.stateVersion = "24.05";
+}
--- a/systems/brendans-system/hardware.nix
+++ b/systems/brendans-system/hardware.nix
@@ -0,0 +1,69 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
+      ];
+      kernelModules = [ ];
+      luks.devices."luks-root-pool-nvme-Samsung_SSD_990_PRO_with_Heatsink_1TB_S73JNJ0X114418B-part2" = {
+        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" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = lib.mkDefault {
+      device = "root_pool/root";
+      fsType = "zfs";
+    };
+
+    "/home" = {
+      device = "root_pool/home";
+      fsType = "zfs";
+    };
+
+    "/var" = {
+      device = "root_pool/var";
+      fsType = "zfs";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/609D-FF29";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+  };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/systems/brendans-system/nvidia.nix
+++ b/systems/brendans-system/nvidia.nix
@@ -1,7 +1,5 @@
 { config, ... }:
 {
-  nixpkgs.config.cudaSupport = true;
-
  services.xserver.videoDrivers = [ "nvidia" ];
  hardware = {
    nvidia = {
@@ -9,7 +7,7 @@
      powerManagement.enable = true;
      package = config.boot.kernelPackages.nvidiaPackages.beta;
      nvidiaSettings = true;
-      open = false;
+      open = true;
    };
    nvidia-container-toolkit.enable = true;
  };
--- a/systems/brendans-system/programs.nix
+++ b/systems/brendans-system/programs.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    jellyfin-media-player
+  ];
+}
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -10,12 +10,17 @@
    ./services
    ./hardware.nix
    ./networking.nix
-    ./nvidia.nix
    ./programs.nix
    ./runners
    ./syncthing.nix
  ];

+  boot.zfs.extraPools = [
+    "media"
+    "storage"
+    "torrenting"
+  ];
+
  services = {
    openssh.ports = [ 629 ];

--- a/systems/jeeves/docker/qbit.nix
+++ b/systems/jeeves/docker/qbit.nix
@@ -0,0 +1,36 @@
+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;
+  };
+}
--- a/systems/jeeves/docker/qbitvpn.nix
+++ b/systems/jeeves/docker/qbitvpn.nix
@@ -21,9 +21,8 @@ in
      "8118:8118"
    ];
    volumes = [
-      "${vars.docker_configs}/qbitvpn:/config"
-      "${vars.qbitvpn}:/data"
-      "${vars.qbitvpn_scratch}:/data/incomplete"
+      "${vars.media_docker_configs}/qbitvpn:/config"
+      "${vars.torrenting_qbitvpn}:/data"
      "/etc/localtime:/etc/localtime:ro"
    ];
    environment = {
@@ -41,7 +40,7 @@ in
      DELUGE_DAEMON_LOG_LEVEL = "debug";
      DELUGE_WEB_LOG_LEVEL = "debug";
    };
-    environmentFiles = [ "${vars.secrets}/docker/qbitvpn" ];
+    environmentFiles = [ "${vars.storage_secrets}/docker/qbitvpn" ];
    autoStart = true;
  };
 }
--- a/systems/jeeves/docker/share.nix
+++ b/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.share}:/data"
+      "${vars.media_share}:/data"
    ];
    extraOptions = [ "--network=web" ];
    autoStart = true;
--- a/systems/jeeves/docker/uptime_kuma.nix
+++ b/systems/jeeves/docker/uptime_kuma.nix
@@ -0,0 +1,17 @@
+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;
+    };
+  };
+}
--- a/systems/jeeves/hardware.nix
+++ b/systems/jeeves/hardware.nix
@@ -4,21 +4,6 @@
  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") ];

@@ -56,51 +41,87 @@ in
      luks.devices = {
        # cspell:disable
        # Root pool
-        "luks-root-pool-wwn-0x55cd2e4150f01519-part2" =
-          makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2";
-        "luks-root-pool-wwn-0x55cd2e4150f01556-part2" =
-          makeLuksSSD "/dev/disk/by-id/wwn-0x55cd2e4150f01556-part2";
-
+        "luks-root-pool-wwn-0x55cd2e4150f01519-part2" = {
+          device = "/dev/disk/by-id/wwn-0x55cd2e4150f01519-part2";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "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" =
-          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1";
-        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1" =
-          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1";
-        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1" =
-          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1";
-        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1" =
-          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000U1P2HGN-part1";
-
-        # Scratch pool
-        "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01C-part1" =
-          makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01C-part1";
-        "luks-scratch-pool-ata-CT480BX500SSD1_2314E6C3C01E-part1" =
-          makeLuksSSD "/dev/disk/by-id/ata-CT480BX500SSD1_2314E6C3C01E-part1";
-
+        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1" = {
+          device = "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120V2J118B-part1";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "luks-media_pool-nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1" = {
+          device = "/dev/disk/by-id/nvme-INTEL_SSDPEK1A118GA_BTOC14120WAG118B-part1";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "luks-media_pool-nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1" = {
+          device = "/dev/disk/by-id/nvme-INTEL_SSDPE2ME012T4_CVMD5130000G1P2HGN-part1";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "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" =
-          makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834822N-part1";
-        "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1" =
-          makeLuksSSD "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1";
-        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1" =
-          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1";
-        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1" =
-          makeLuksSSD "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828105A8016D-part1";
-        "luks-storage_pool-wwn-0x5000cca23bc438dd-part1" =
-          makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bc438dd-part1";
-        "luks-storage_pool-wwn-0x5000cca23bd035f5-part1" =
-          makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd035f5-part1";
-        "luks-storage_pool-wwn-0x5000cca23bd00ad6-part1" =
-          makeLuksDevice "/dev/disk/by-id/wwn-0x5000cca23bd00ad6-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";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "luks-storage_pool-nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1" = {
+          device = "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_2TB_S6S2NS0T834817F-part1";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "luks-storage_pool-nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1" = {
+          device = "/dev/disk/by-id/nvme-INTEL_MEMPEK1W016GA_PHBT828104DF016D-part1";
+          bypassWorkqueues = true;
+          allowDiscards = true;
+        };
+        "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 = [ ];
  };
--- a/systems/jeeves/runners/nix_builder.nix
+++ b/systems/jeeves/runners/nix_builder.nix
@@ -28,8 +28,8 @@ in
          mountPoint = "/zfs/media/github-runners/${name}";
          isReadOnly = false;
        };
-        "/secrets".mountPoint = "${vars.secrets}/services/github-runners/${name}";
-        "ssh-keys".mountPoint = "${vars.secrets}/services/github-runners/id_ed25519_github-runners";
+        "/secrets".mountPoint = "${vars.storage_secrets}/services/github-runners/${name}";
+        "ssh-keys".mountPoint = "${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners";
      };
      config =
        {
@@ -65,7 +65,7 @@ in
              Port 629
              User github-runners
              HostName 192.168.95.14
-              IdentityFile ${vars.secrets}/services/github-runners/id_ed25519_github-runners
+              IdentityFile ${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners
              StrictHostKeyChecking no
              UserKnownHostsFile /dev/null
          '';
@@ -75,7 +75,7 @@ in
            workDir = "/zfs/media/github-runners/${name}";
            url = "https://github.com/RichieCahill/dotfiles";
            extraLabels = [ "nixos" ];
-            tokenFile = "${vars.secrets}/services/github-runners/${name}";
+            tokenFile = "${vars.storage_secrets}/services/github-runners/${name}";
            user = "github-runners";
            group = "github-runners";
            extraPackages = with pkgs; [
--- a/systems/jeeves/scripts/zfs.sh
+++ b/systems/jeeves/scripts/zfs.sh
@@ -11,11 +11,13 @@ 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

-# scratch
-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
+# torrenting
+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 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
@@ -24,10 +26,6 @@ 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
@@ -35,6 +33,7 @@ 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
-sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/transmission
-sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/library
+
+# torrenting datasets
+sudo zfs create -o recordsize=16K -o exec=off -o sync=disabled torrenting/qbit
+sudo zfs create -o recordsize=16K -o exec=off -o sync=disabled torrenting/qbitvpn
--- a/systems/jeeves/services/acme.nix
+++ b/systems/jeeves/services/acme.nix
@@ -1,22 +0,0 @@
-{ config, ... }:
-let
-  vars = import ../vars.nix;
-in
-{
-  security.acme = {
-    acceptTerms = true;
-    defaults = {
-      email = "themadmaker2@protonmail.com";
-      dnsResolver = "1.1.1.1:53";
-      extraLegoFlags = [
-        "--dns-timeout=300"
-      ];
-    };
-    certs."tmmworkshop.com" = {
-      dnsProvider = "cloudflare";
-      environmentFile = "${vars.secrets}/services/acme/cloudflare.txt";
-      email = "themadmaker2@protonmail.com";
-      group = config.services.haproxy.group;
-    };
-  };
-}
--- a/systems/jeeves/services/audiobookshelf.nix
+++ b/systems/jeeves/services/audiobookshelf.nix
@@ -3,8 +3,12 @@ let
  vars = import ../vars.nix;
 in
 {
-  services.audiobookshelf.enable = true;
+  services.audiobookshelf = {
+    enable = true;
+    openFirewall = true;
+    host = "192.168.90.40";
+  };
  systemd.services.audiobookshelf.serviceConfig.WorkingDirectory =
-    lib.mkForce "${vars.docker_configs}/audiobookshelf";
-  users.users.audiobookshelf.home = lib.mkForce "${vars.docker_configs}/audiobookshelf";
+    lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
+  users.users.audiobookshelf.home = lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
 }
--- a/systems/jeeves/services/cloud_flare_tunnel.nix
+++ b/systems/jeeves/services/cloud_flare_tunnel.nix
@@ -9,7 +9,7 @@ in
    wantedBy = [ "multi-user.target" ];
    serviceConfig = {
      Type = "simple";
-      EnvironmentFile = "${vars.secrets}/docker/cloud_flare_tunnel";
+      EnvironmentFile = "${vars.storage_secrets}/docker/cloud_flare_tunnel";
      ExecStart = "${pkgs.cloudflared}/bin/cloudflared --no-autoupdate tunnel run";
      Restart = "on-failure";
    };
--- a/systems/jeeves/services/duckdns.nix
+++ b/systems/jeeves/services/duckdns.nix
@@ -0,0 +1,10 @@
+let
+  vars = import ../vars.nix;
+in
+{
+  services.duckdns = {
+    enable = true;
+    tokenFile = "${vars.storage_secrets}/services/duckdns/token";
+    domainsFile = "${vars.storage_secrets}/services/duckdns/domains";
+  };
+}
--- a/systems/jeeves/services/filebrowser.nix
+++ b/systems/jeeves/services/filebrowser.nix
@@ -6,6 +6,8 @@ let
  vars = import ../vars.nix;
 in
 {
+  networking.firewall.allowedTCPPorts = [ 8080 ];
+
  systemd.services.filebrowser = {
    description = "filebrowser";
    after = [ "network.target" ];
@@ -14,7 +16,7 @@ in
      Type = "simple";
      User = "richie";
      Group = "users";
-      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.docker_configs}/filebrowser/filebrowser.db";
+      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.media_docker_configs}/filebrowser/filebrowser.db";
      Restart = "on-failure";
    };
  };
--- a/systems/jeeves/services/haproxy.cfg
+++ b/systems/jeeves/services/haproxy.cfg
@@ -21,54 +21,53 @@ defaults

 #Application Setup
 frontend ContentSwitching
-  bind *:80 v4v6
-  bind *:443 v4v6 ssl crt /var/lib/acme/tmmworkshop.com/full.pem
+  bind *:80
+  bind *:443 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
  mode  http
  # tmmworkshop.com
-  acl host_tmmworkshop  hdr(host) -i tmmworkshop.com
-  acl host_tmmworkshop  hdr(host) -i www.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_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

-  use_backend tmmworkshop_nodes if host_tmmworkshop
  use_backend audiobookshelf_nodes if host_audiobookshelf
  use_backend cache_nodes  if host_cache
  use_backend filebrowser_nodes  if host_filebrowser
  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

 backend audiobookshelf_nodes
  mode http
-  server server 127.0.0.1:8000
+  server server 192.168.90.40:8000

 backend cache_nodes
  mode http
-  server server 127.0.0.1:5000
+  server server 192.168.90.40:5000

 backend filebrowser_nodes
  mode http
-  server server 127.0.0.1:8080
+  server server 192.168.90.40:8080

 backend homeassistant_nodes
  mode http
-  server server 127.0.0.1:8123
+  server server 192.168.95.14:8123

 backend jellyfin
    option httpchk
    option forwardfor
    http-check send meth GET uri /health
    http-check expect string Healthy
-    server jellyfin 127.0.0.1:8096
+    server jellyfin 192.168.95.14:8096

 backend share_nodes
  mode http
-  server server 127.0.0.1:8091
+  server server 192.168.95.14:8091

-backend tmmworkshop_nodes
+backend uptime_kuma_nodes
  mode http
-  server server 127.0.0.1:8080
+  server server 192.168.95.14:3001
--- a/systems/jeeves/services/home_assistant.nix
+++ b/systems/jeeves/services/home_assistant.nix
@@ -2,41 +2,26 @@ let
  vars = import ../vars.nix;
 in
 {
-  users = {
-    users.hass = {
-      isSystemUser = true;
-      group = "hass";
-    };
-    groups.hass = { };
-  };
-
  services = {
    home-assistant = {
      enable = true;
      openFirewall = true;
-      configDir = vars.home_assistant;
+      configDir = vars.media_home_assistant;
      config = {
        http = {
          server_port = 8123;
          server_host = [
            "192.168.95.14"
            "192.168.90.40"
-            "127.0.0.1"
          ];
          use_x_forwarded_for = true;
-          trusted_proxies = "127.0.0.1";
+          trusted_proxies = "192.168.95.0/24";
        };
        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 = { };
@@ -72,7 +57,6 @@ in
          rokuecp
          uiprotect
          wakeonlan
-          wyoming
        ];
      extraComponents = [ "isal" ];
    };
@@ -81,23 +65,5 @@ in
      openFirewall = true;
      address = "192.168.90.40";
    };
-    wyoming = {
-      faster-whisper.servers.main = {
-        enable = true;
-        uri = "tcp://0.0.0.0:10300";
-        model = "medium.en";
-        language = "en";
-        device = "cuda";
-      };
-      piper.servers.main = {
-        enable = true;
-        uri = "tcp://0.0.0.0:10200";
-        voice = "en_GB-alba-medium";
-      };
-      openwakeword = {
-        enable = true;
-        uri = "tcp://0.0.0.0:10400";
-      };
-    };
  };
 }
--- a/systems/jeeves/services/jellyfin.nix
+++ b/systems/jeeves/services/jellyfin.nix
@@ -5,6 +5,6 @@ in
  services.jellyfin = {
    enable = true;
    openFirewall = true;
-    dataDir = "${vars.services}/jellyfin";
+    dataDir = "${vars.media_services}/jellyfin";
  };
 }
--- a/systems/jeeves/services/nix_serve.nix
+++ b/systems/jeeves/services/nix_serve.nix
@@ -4,7 +4,7 @@ in
 {
  services.nix-serve = {
    enable = true;
-    secretKeyFile = "${vars.secrets}/services/nix-cache/cache-priv-key.pem";
+    secretKeyFile = "${vars.storage_secrets}/services/nix-cache/cache-priv-key.pem";
    openFirewall = true;
  };
 }
--- a/systems/jeeves/services/postgress.nix
+++ b/systems/jeeves/services/postgress.nix
@@ -10,31 +10,19 @@ in
    package = pkgs.postgresql_17_jit;
    enableTCPIP = true;
    enableJIT = true;
-    dataDir = "${vars.database}/postgres";
+    dataDir = "${vars.media_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.95.1/24 trust
-
-
      #type database DBuser origin-address auth-method
-      local hass     hass      trust
+      local all       all     trust

      # ipv4
-      host  hass     hass       192.168.90.1/24 trust
-      host  hass     hass       127.0.0.1/32 trust
+      host  all      all     127.0.0.1/32    trust
+      host  all      all     192.168.90.1/24 trust

      # ipv6
-      host hass      hass     ::1/128         trust
+      host all       all     ::1/128         trust
    '';

    identMap = ''
@@ -43,7 +31,6 @@ in
        superuser_map      postgres  postgres
        # Let other names login as themselves
        superuser_map      richie    postgres
-        superuser_map      hass      hass
    '';
    ensureUsers = [
      {
@@ -58,7 +45,6 @@ in
      }
      {
        name = "richie";
-        ensureDBOwnership = true;
        ensureClauses = {
          superuser = true;
          login = true;
@@ -67,22 +53,6 @@ in
          replication = true;
        };
      }
-      {
-        name = "hass";
-        ensureDBOwnership = true;
-        ensureClauses = {
-          login = true;
-          createrole = true;
-          createdb = true;
-          replication = true;
-        };
-      }
-    ];
-    ensureDatabases = [
-      "hass"
-      "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
--- a/systems/jeeves/services/systemd.nix
+++ b/systems/jeeves/services/systemd.nix
@@ -23,7 +23,7 @@ in
        description = "validates startup";
        path = [ pkgs.zfs ];
        serviceConfig = {
-          EnvironmentFile = "${vars.secrets}/services/server-validation";
+          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}'";
        };
--- a/systems/jeeves/services/transmission.nix
+++ b/systems/jeeves/services/transmission.nix
@@ -1,32 +0,0 @@
-{ 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.95.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;
-    };
-  };
-}
--- a/systems/jeeves/services/validate_system.toml
+++ b/systems/jeeves/services/validate_system.toml
@@ -1,9 +1,11 @@
-zpool = ["root_pool", "storage", "media"]
+zpool = ["root_pool", "storage", "torrenting", "media"]
 services = [
    "audiobookshelf",
    "cloud_flare_tunnel",
    "haproxy",
+    "docker-qbit",
    "docker-qbitvpn",
+    "docker-uptime_kuma",
    "docker",
    "filebrowser",
    "home-assistant",
--- a/systems/jeeves/syncthing.nix
+++ b/systems/jeeves/syncthing.nix
@@ -5,7 +5,6 @@ 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
@@ -20,7 +19,7 @@ in
        };
        "notes" = {
          id = "l62ul-lpweo"; # cspell:disable-line
-          path = vars.notes;
+          path = vars.media_notes;
          devices = [
            "rhapsody-in-green"
            "davids-server"
@@ -29,7 +28,7 @@ in
        };
        "important" = {
          id = "4ckma-gtshs"; # cspell:disable-line
-          path = "${vars.syncthing}/important";
+          path = "${vars.storage_syncthing}/important";
          devices = [
            "bob"
            "rhapsody-in-green"
@@ -39,7 +38,7 @@ in
        };
        "music" = {
          id = "vprc5-3azqc"; # cspell:disable-line
-          path = "${vars.syncthing}/music";
+          path = "${vars.storage_syncthing}/music";
          devices = [
            "bob"
            "rhapsody-in-green"
@@ -50,14 +49,14 @@ in
        };
        "projects" = {
          id = "vyma6-lqqrz"; # cspell:disable-line
-          path = "${vars.syncthing}/projects";
+          path = "${vars.storage_syncthing}/projects";
          devices = [
            "rhapsody-in-green"
          ];
          fsWatcherEnabled = true;
        };
        "rhapsody-in-green_temp" = {
-          path = "${vars.syncthing}/rhapsody-in-green_temp";
+          path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
          devices = [
            "rhapsody-in-green"
          ];
@@ -72,7 +71,7 @@ in
          fsWatcherEnabled = true;
        };
        "backup" = {
-          path = "${vars.syncthing}/backup";
+          path = "${vars.storage_syncthing}/backup";
          devices = [
            "davids-server"
          ];
@@ -81,7 +80,7 @@ in
        #
        "davids-backup1" = {
          id = "8229p-8z3tm"; # cspell:disable-line
-          path = "${vars.syncthing}/davids_backups/1";
+          path = "${vars.storage_syncthing}/davids_backups/1";
          devices = [
            "davids-server"
          ];
@@ -90,7 +89,7 @@ in
        };
        "davids-backup2" = {
          id = "iciw3-dp6ao"; # cspell:disable-line
-          path = "${vars.syncthing}/davids_backups/2";
+          path = "${vars.storage_syncthing}/davids_backups/2";
          devices = [
            "davids-server"
          ];
@@ -99,7 +98,7 @@ in
        };
        "davids-backup3" = {
          id = "9si6m-bnkjb"; # cspell:disable-line
-          path = "${vars.syncthing}/davids_backups/3";
+          path = "${vars.storage_syncthing}/davids_backups/3";
          devices = [
            "davids-server"
          ];
@@ -108,7 +107,7 @@ in
        };
        "davids-backup4" = {
          id = "qjyfy-uupj4"; # cspell:disable-line
-          path = "${vars.syncthing}/davids_backups/4";
+          path = "${vars.storage_syncthing}/davids_backups/4";
          devices = [
            "davids-server"
          ];
@@ -117,7 +116,7 @@ in
        };
        "davids-backup5" = {
          id = "fm4h5-emsu2"; # cspell:disable-line
-          path = "${vars.syncthing}/davids_backups/5";
+          path = "${vars.storage_syncthing}/davids_backups/5";
          devices = [
            "davids-server"
          ];
--- a/systems/jeeves/vars.nix
+++ b/systems/jeeves/vars.nix
@@ -1,21 +1,28 @@
 let
  zfs_media = "/zfs/media";
  zfs_storage = "/zfs/storage";
-  zfs_scratch = "/zfs/scratch";
+  zfs_torrenting = "/zfs/torrenting";
 in
 {
-  inherit zfs_media zfs_storage zfs_scratch;
-  database = "${zfs_media}/database";
-  docker = "${zfs_media}/docker";
-  docker_configs = "${zfs_media}/docker/configs";
-  home_assistant = "${zfs_media}/home_assistant";
-  notes = "${zfs_media}/notes";
-  qbitvpn = "${zfs_storage}/qbitvpn";
-  qbitvpn_scratch = "${zfs_scratch}/qbitvpn";
-  secrets = "${zfs_storage}/secrets";
-  services = "${zfs_media}/services";
-  share = "${zfs_media}/share";
-  syncthing = "${zfs_storage}/syncthing";
-  transmission = "${zfs_storage}/transmission";
-  transmission_scratch = "${zfs_scratch}/transmission";
+  inherit zfs_media zfs_storage zfs_torrenting;
+  # media
+  media_database = "${zfs_media}/database";
+  media_docker = "${zfs_media}/docker";
+  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";
+  # storage
+  storage_main = "${zfs_storage}/main";
+  storage_photos = "${zfs_storage}/photos";
+  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";
 }
--- a/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -13,6 +13,7 @@
    ./hardware.nix
    ./syncthing.nix
    inputs.nixos-hardware.nixosModules.framework-13-7040-amd
+    inputs.nixos-cosmic.nixosModules.default
  ];

  networking = {
@@ -24,6 +25,8 @@

  services = {
    openssh.ports = [ 922 ];
+
+    desktopManager.cosmic.enable = true;
  };

  system.stateVersion = "24.05";
--- a/users/brendan/default.nix
+++ b/users/brendan/default.nix
@@ -0,0 +1,49 @@
+{
+  pkgs,
+  config,
+  ...
+}:
+let
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in
+{
+
+  sops.secrets.brendan_password = {
+    sopsFile = ../secrets.yaml;
+    neededForUsers = true;
+  };
+
+  users = {
+    users.brendan = {
+      isNormalUser = true;
+
+      hashedPasswordFile = "${config.sops.secrets.brendan_password.path}";
+
+      shell = pkgs.zsh;
+      group = "brendan";
+      extraGroups =
+        [
+          "audio"
+          "video"
+          "wheel"
+          "users"
+        ]
+        ++ ifTheyExist [
+          "dialout"
+          "docker"
+          "hass"
+          "libvirtd"
+          "networkmanager"
+          "plugdev"
+          "scanner"
+          "uaccess"
+          "wireshark"
+        ];
+      uid = 1001;
+    };
+
+    groups.brendan.gid = 1001;
+  };
+
+  home-manager.users.brendan = import ./systems/${config.networking.hostName}.nix;
+}
--- a/users/brendan/home/cli/default.nix
+++ b/users/brendan/home/cli/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./direnv.nix
+    ./git.nix
+    ./zsh.nix
+  ];
+
+  programs.starship.enable = true;
+}
--- a/users/brendan/home/cli/direnv.nix
+++ b/users/brendan/home/cli/direnv.nix
@@ -0,0 +1,8 @@
+{
+
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
+  };
+}
--- a/users/brendan/home/cli/git.nix
+++ b/users/brendan/home/cli/git.nix
@@ -0,0 +1,12 @@
+{
+  programs.git = {
+    enable = true;
+    userEmail = "XXXXXXXXXXXXXXXXX";
+    userName = "XXXXXXXXXXXXXXXXX";
+    extraConfig = {
+      pull.rebase = true;
+      color.ui = true;
+    };
+    lfs.enable = true;
+  };
+}
--- a/users/brendan/home/cli/zsh.nix
+++ b/users/brendan/home/cli/zsh.nix
@@ -0,0 +1,29 @@
+{
+  programs.zsh = {
+    enable = true;
+    syntaxHighlighting.enable = true;
+    history.size = 10000;
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        "git"
+        "docker"
+        "docker-compose"
+        "colored-man-pages"
+        "rust"
+        "systemd"
+        "tmux"
+        "ufw"
+        "z"
+      ];
+    };
+    shellAliases = {
+      "lrt" = "eza --icons -lsnew";
+      "ls" = "eza";
+      "ll" = "eza --long --group";
+      "la" = "eza --all";
+
+      "rebuild" = "sudo nixos-rebuild switch --flake /home/brendan/dotfiles#$HOST";
+    };
+  };
+}
--- a/users/brendan/home/global.nix
+++ b/users/brendan/home/global.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+{
+  imports = [
+    ./cli
+    ./programs.nix
+  ];
+
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+
+  home = {
+    username = "brendan";
+    homeDirectory = "/home/${config.home.username}";
+    stateVersion = "24.05";
+    sessionVariables = {
+      FLAKE = "$HOME/dotfiles";
+    };
+  };
+}
--- a/users/brendan/home/gui/default.nix
+++ b/users/brendan/home/gui/default.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./firefox
+    ./vscode
+  ];
+
+  home.packages = with pkgs; [
+    candy-icons
+    chromium
+    discord-canary
+    gimp
+    gparted
+    mediainfo
+    nemo
+    nemo-fileroller
+    obs-studio
+    obsidian
+    prismlauncher
+    proxychains
+    prusa-slicer
+    signal-desktop
+    sweet-nova
+    util-linux
+    vlc
+    zoom-us
+  ];
+}
--- a/users/brendan/home/gui/firefox/default.nix
+++ b/users/brendan/home/gui/firefox/default.nix
@@ -0,0 +1,255 @@
+{ inputs, ... }:
+{
+  imports = [ ./search_engines.nix ];
+
+  programs.firefox = {
+    enable = true;
+    profiles.richie = {
+      extensions = with inputs.firefox-addons.packages.x86_64-linux; [
+        bitwarden
+        darkreader
+        dearrow
+        fastforwardteam
+        return-youtube-dislikes
+        sponsorblock
+        ublock-origin
+      ];
+      search = {
+        force = true;
+        default = "kagi";
+        order = [
+          "kagi"
+          "DuckDuckGo"
+          "Google"
+        ];
+      };
+      settings = {
+        # SECTION: FASTFOX
+        # GENERAL
+        "content.notify.interval" = 100000;
+
+        # GFX
+        "gfx.canvas.accelerated.cache-items" = 4096;
+        "gfx.canvas.accelerated.cache-size" = 512;
+        "gfx.content.skia-font-cache-size" = 20;
+
+        # DISK CACHE
+        "browser.cache.jsbc_compression_level" = 3;
+
+        # MEDIA CACHE
+        "media.memory_cache_max_size" = 65536;
+        "media.cache_readahead_limit" = 7200;
+        "media.cache_resume_threshold" = 3600;
+
+        # IMAGE CACHE
+        "image.mem.decode_bytes_at_a_time" = 32768;
+
+        # NETWORK
+        "network.buffer.cache.size" = 262144;
+        "network.buffer.cache.count" = 128;
+        "network.http.max-connections" = 1800;
+        "network.http.max-persistent-connections-per-server" = 10;
+        "network.http.max-urgent-start-excessive-connections-per-host" = 5;
+        "network.http.pacing.requests.enabled" = false;
+        "network.dnsCacheExpiration" = 3600;
+        "network.dns.max_high_priority_threads" = 8;
+        "network.ssl_tokens_cache_capacity" = 10240;
+
+        # SPECULATIVE LOADING
+        "network.dns.disablePrefetch" = true;
+        "network.prefetch-next" = false;
+        "network.predictor.enabled" = false;
+
+        # EXPERIMENTAL
+        "layout.css.grid-template-masonry-value.enabled" = true;
+        "dom.enable_web_task_scheduling" = true;
+        "layout.css.has-selector.enabled" = true;
+        "dom.security.sanitizer.enabled" = true;
+
+        # SECTION: SECUREFOX
+        # TRACKING PROTECTION
+        "browser.contentblocking.category" = "strict";
+        "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
+        "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
+        "network.cookie.sameSite.noneRequiresSecure" = true;
+        "browser.download.start_downloads_in_tmp_dir" = true;
+        "browser.helperApps.deleteTempFileOnExit" = true;
+        "browser.uitour.enabled" = false;
+        "privacy.globalprivacycontrol.enabled" = true;
+
+        # OCSP & CERTS / HPKP
+        "security.OCSP.enabled" = 0;
+        "security.remote_settings.crlite_filters.enabled" = true;
+        "security.pki.crlite_mode" = 2;
+
+        # SSL / TLS
+        "security.ssl.treat_unsafe_negotiation_as_broken" = true;
+        "browser.xul.error_pages.expert_bad_cert" = true;
+        "security.tls.enable_0rtt_data" = false;
+
+        # DISK AVOIDANCE
+        "browser.privatebrowsing.forceMediaMemoryCache" = true;
+        "browser.sessionstore.interval" = 60000;
+
+        # SHUTDOWN & SANITIZING
+        "privacy.history.custom" = true;
+
+        # SEARCH / URL BAR
+        "browser.search.separatePrivateDefault.ui.enabled" = true;
+        "browser.urlbar.update2.engineAliasRefresh" = true;
+        # PREF: restore search engine suggestions
+        "browser.search.suggest.enabled" = true;
+        "browser.urlbar.suggest.quicksuggest.sponsored" = false;
+        "browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
+        "browser.formfill.enable" = false;
+        "security.insecure_connection_text.enabled" = true;
+        "security.insecure_connection_text.pbmode.enabled" = true;
+        "network.IDN_show_punycode" = true;
+
+        # HTTPS-FIRST POLICY
+        "dom.security.https_first" = true;
+        "dom.security.https_first_schemeless" = true;
+
+        # PASSWORDS
+        "signon.formlessCapture.enabled" = false;
+        "signon.rememberSignons" = false;
+        "signon.privateBrowsingCapture.enabled" = false;
+        "network.auth.subresource-http-auth-allow" = 1;
+        "editor.truncate_user_pastes" = false;
+
+        # MIXED CONTENT + CROSS-SITE
+        "security.mixed_content.block_display_content" = true;
+        "security.mixed_content.upgrade_display_content" = true;
+        "security.mixed_content.upgrade_display_content.image" = true;
+        "pdfjs.enableScripting" = false;
+        "extensions.postDownloadThirdPartyPrompt" = false;
+
+        # HEADERS / REFERERS
+        "network.http.referer.XOriginTrimmingPolicy" = 2;
+
+        # CONTAINERS
+        "privacy.userContext.ui.enabled" = true;
+
+        # WEBRTC
+        "media.peerconnection.ice.proxy_only_if_behind_proxy" = true;
+        "media.peerconnection.ice.default_address_only" = true;
+
+        # SAFE BROWSING
+        "browser.safebrowsing.downloads.remote.enabled" = false;
+
+        # MOZILLA
+        # PREF: allow websites to ask you to receive site notifications
+        "permissions.default.desktop-notification" = 0; # allow websites to ask
+        # PREF: allow websites to ask you for your location
+        "permissions.default.geo" = 0;
+        "geo.provider.network.url" =
+          "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
+        "permissions.manager.defaultsUrl" = "";
+        "webchannel.allowObject.urlWhitelist" = "";
+
+        # TELEMETRY
+        "datareporting.policy.dataSubmissionEnabled" = false;
+        "datareporting.healthreport.uploadEnabled" = false;
+        "toolkit.telemetry.unified" = false;
+        "toolkit.telemetry.enabled" = false;
+        "toolkit.telemetry.server" = "data:,";
+        "toolkit.telemetry.archive.enabled" = false;
+        "toolkit.telemetry.newProfilePing.enabled" = false;
+        "toolkit.telemetry.shutdownPingSender.enabled" = false;
+        "toolkit.telemetry.updatePing.enabled" = false;
+        "toolkit.telemetry.bhrPing.enabled" = false;
+        "toolkit.telemetry.firstShutdownPing.enabled" = false;
+        "toolkit.telemetry.coverage.opt-out" = true;
+        "toolkit.coverage.opt-out" = true;
+        "toolkit.coverage.endpoint.base" = "";
+        "browser.ping-centre.telemetry" = false;
+        "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+        "browser.newtabpage.activity-stream.telemetry" = false;
+
+        # EXPERIMENTS
+        "app.shield.optoutstudies.enabled" = false;
+        "app.normandy.enabled" = false;
+        "app.normandy.api_url" = "";
+
+        # CRASH REPORTS
+        "breakpad.reportURL" = "";
+        "browser.tabs.crashReporting.sendReport" = false;
+        "browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
+
+        # DETECTION
+        "captivedetect.canonicalURL" = "";
+        "network.captive-portal-service.enabled" = false;
+        "network.connectivity-service.enabled" = false;
+
+        # SECTION: PESKYFOX
+        # MOZILLA UI
+        "browser.privatebrowsing.vpnpromourl" = "";
+        "extensions.getAddons.showPane" = false;
+        "extensions.htmlaboutaddons.recommendations.enabled" = false;
+        "browser.discovery.enabled" = false;
+        "browser.shell.checkDefaultBrowser" = false;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false;
+        "browser.preferences.moreFromMozilla" = false;
+        "browser.tabs.tabmanager.enabled" = false;
+        "browser.aboutConfig.showWarning" = false;
+        "browser.aboutwelcome.enabled" = false;
+
+        # THEME ADJUSTMENTS
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+        "browser.compactmode.show" = true;
+        "browser.display.focus_ring_on_anything" = true;
+        "browser.display.focus_ring_style" = 0;
+        "browser.display.focus_ring_width" = 0;
+        "layout.css.prefers-color-scheme.content-override" = 2;
+
+        # COOKIE BANNER HANDLING
+        "cookiebanners.service.mode" = 1;
+        "cookiebanners.service.mode.privateBrowsing" = 1;
+
+        # FULLSCREEN NOTICE
+        "full-screen-api.transition-duration.enter" = "0 0";
+        "full-screen-api.transition-duration.leave" = "0 0";
+        "full-screen-api.warning.delay" = -1;
+        "full-screen-api.warning.timeout" = 0;
+
+        # URL BAR
+        "browser.urlbar.suggest.calculator" = true;
+        "browser.urlbar.unitConversion.enabled" = true;
+        "browser.urlbar.trending.featureGate" = false;
+
+        # NEW TAB PAGE
+        "browser.newtabpage.activity-stream.feeds.topsites" = false;
+        "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+
+        # POCKET
+        "extensions.pocket.enabled" = false;
+
+        # DOWNLOADS
+        "browser.download.always_ask_before_handling_new_types" = true;
+        "browser.download.manager.addToRecentDocs" = false;
+
+        # PDF
+        "browser.download.open_pdf_attachments_inline" = true;
+
+        # TAB BEHAVIOR
+        "browser.bookmarks.openInTabClosesMenu" = false;
+        "browser.menu.showViewImageInfo" = true;
+        "findbar.highlightAll" = true;
+        "layout.word_select.eat_space_to_next_word" = false;
+
+        # SECTION: MY OVERRIDES
+        "browser.startup.homepage" = "https://google.com";
+        "identity.fxaccounts.enabled" = false;
+
+        # SECTION SMOOTHFOX
+        # OPTION: SHARPEN SCROLLING                                                           *
+        "apz.overscroll.enabled" = true; # DEFAULT NON-LINUX
+        "mousewheel.min_line_scroll_amount" = 10; # 10-40; adjust this number to your liking; default=5
+        "general.smoothScroll.mouseWheel.durationMinMS" = 80; # default=50
+        "general.smoothScroll.currentVelocityWeighting" = "0.15"; # default=.25
+        "general.smoothScroll.stopDecelerationWeighting" = "0.6"; # default=.4
+      };
+    };
+  };
+}
--- a/users/brendan/home/gui/firefox/github.svg
+++ b/users/brendan/home/gui/firefox/github.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 0C7.16 0 0 7.16 0 16C0 23.08 4.58 29.06 10.94 31.18C11.74 31.32 12.04 30.84 12.04 30.42C12.04 30.04 12.02 28.78 12.02 27.44C8 28.18 6.96 26.46 6.64 25.56C6.46 25.1 5.68 23.68 5 23.3C4.44 23 3.64 22.26 4.98 22.24C6.24 22.22 7.14 23.4 7.44 23.88C8.88 26.3 11.18 25.62 12.1 25.2C12.24 24.16 12.66 23.46 13.12 23.06C9.56 22.66 5.84 21.28 5.84 15.16C5.84 13.42 6.46 11.98 7.48 10.86C7.32 10.46 6.76 8.82 7.64 6.62C7.64 6.62 8.98 6.2 12.04 8.26C13.32 7.9 14.68 7.72 16.04 7.72C17.4 7.72 18.76 7.9 20.04 8.26C23.1 6.18 24.44 6.62 24.44 6.62C25.32 8.82 24.76 10.46 24.6 10.86C25.62 11.98 26.24 13.4 26.24 15.16C26.24 21.3 22.5 22.66 18.94 23.06C19.52 23.56 20.02 24.52 20.02 26.02C20.02 28.16 20 29.88 20 30.42C20 30.84 20.3 31.34 21.1 31.18C27.42 29.06 32 23.06 32 16C32 7.16 24.84 0 16 0V0Z" fill="white"/>
+</svg>
--- a/users/brendan/home/gui/firefox/kagi.png
+++ b/users/brendan/home/gui/firefox/kagi.png
--- a/users/brendan/home/gui/firefox/search_engines.nix
+++ b/users/brendan/home/gui/firefox/search_engines.nix
@@ -0,0 +1,84 @@
+{ pkgs, ... }:
+{
+  programs.firefox.profiles.richie.search.engines = {
+    "Nix Options" = {
+      urls = [
+        {
+          template = "https://search.nixos.org/options";
+          params = [
+            {
+              name = "type";
+              value = "packages";
+            }
+            {
+              name = "channel";
+              value = "unstable";
+            }
+            {
+              name = "query";
+              value = "{searchTerms}";
+            }
+          ];
+        }
+      ];
+      icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+      definedAliases = [ "@o" ];
+    };
+    "Nix Packages" = {
+      urls = [
+        {
+          template = "https://search.nixos.org/packages";
+          params = [
+            {
+              name = "type";
+              value = "packages";
+            }
+            {
+              name = "channel";
+              value = "unstable";
+            }
+            {
+              name = "query";
+              value = "{searchTerms}";
+            }
+          ];
+        }
+      ];
+      icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+      definedAliases = [ "@n" ];
+    };
+    "kagi" = {
+      urls = [
+        {
+          template = "https://kagi.com/search?";
+          params = [
+            {
+              name = "q";
+              value = "{searchTerms}";
+            }
+          ];
+        }
+      ];
+      icon = ./kagi.png;
+    };
+    github = {
+      urls = [
+        {
+          template = "https://github.com/search?";
+          params = [
+            {
+              name = "q";
+              value = "{searchTerms}";
+            }
+            {
+              name = "type";
+              value = "code";
+            }
+          ];
+        }
+      ];
+      icon = ./github.svg;
+      definedAliases = [ "@g" ];
+    };
+  };
+}
--- a/users/brendan/home/gui/vscode/default.nix
+++ b/users/brendan/home/gui/vscode/default.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+let
+  vscode_dir = "/home/richie/projects/nix-dotfiles/users/richie/home/gui/vscode";
+in
+{
+  # mutable symlinks to key binds and settings
+  xdg.configFile."Code/User/settings.json".source =
+    config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/settings.json";
+  xdg.configFile."Code/User/keybindings.json".source =
+    config.lib.file.mkOutOfStoreSymlink "${vscode_dir}/keybindings.json";
+
+  home.packages = with pkgs; [ nil ];
+
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscode;
+    mutableExtensionsDir = true;
+  };
+}
--- a/users/brendan/home/gui/vscode/extension_manager.py
+++ b/users/brendan/home/gui/vscode/extension_manager.py
@@ -0,0 +1,68 @@
+from subprocess import run
+
+
+def get_installed_extensions():
+    process = run("code --list-extensions".split(), check=True, capture_output=True)
+    return set(process.stdout.decode("utf-8").strip().split("\n"))
+
+
+def main():
+    print("starting vscode extension manager")
+
+    extensions = {
+        # vscode
+        "ms-azuretools.vscode-docker",
+        "ms-vscode-remote.remote-containers",
+        "ms-vscode-remote.remote-ssh-edit",
+        "ms-vscode-remote.remote-ssh",
+        "ms-vscode.hexeditor",
+        "ms-vscode.remote-explorer",
+        "ms-vsliveshare.vsliveshare",
+        "oderwat.indent-rainbow",
+        "usernamehw.errorlens",
+        # git
+        "codezombiech.gitignore",
+        "eamodio.gitlens",
+        "gitHub.vscode-github-actions",
+        # python
+        "charliermarsh.ruff",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "ms-python.debugpy",
+        # rust
+        "rust-lang.rust-analyzer",
+        # MD
+        "davidanson.vscode-markdownlint",
+        "yzhang.markdown-all-in-one",
+        # configs
+        "redhat.vscode-yaml",
+        "tamasfe.even-better-toml",
+        # shell
+        "timonwong.shellcheck",
+        "foxundermoon.shell-format",
+        # nix
+        "jnoortheen.nix-ide",
+        # database
+        "mtxr.sqltools-driver-pg",
+        "mtxr.sqltools",
+        # other
+        "esbenp.prettier-vscode",
+        "mechatroner.rainbow-csv",
+        "streetsidesoftware.code-spell-checker",
+        "supermaven.supermaven",
+    }
+
+    installed_extensions = get_installed_extensions()
+
+    missing_extensions = extensions.difference(installed_extensions)
+    for extension in missing_extensions:
+        run(f"code --install-extension {extension} --force".split(), check=True)
+
+    if extra_extensions := installed_extensions.difference(extensions):
+        print(f"Extra extensions installed: {extra_extensions}")
+
+    print("vscode extension manager finished")
+
+
+if __name__ == "__main__":
+    main()
--- a/users/brendan/home/gui/vscode/keybindings.json
+++ b/users/brendan/home/gui/vscode/keybindings.json
@@ -0,0 +1,20 @@
+[
+  {
+    "key": "shift+alt+f",
+    "command": "editor.action.formatDocument",
+    "when": "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor"
+  },
+  {
+    "key": "alt+a d",
+    "command": "cSpell.addWordToWorkspaceSettings"
+  },
+  {
+    "key": "ctrl+shift+`",
+    "command": "workbench.action.createTerminalEditor"
+  },
+  {
+    "key": "ctrl+shift+`",
+    "command": "-workbench.action.terminal.new",
+    "when": "terminalProcessSupported || terminalWebExtensionContributedProfile"
+  }
+]
--- a/users/brendan/home/gui/vscode/settings.json
+++ b/users/brendan/home/gui/vscode/settings.json
@@ -0,0 +1,71 @@
+{
+  // vscode settings
+  "diffEditor.ignoreTrimWhitespace": false,
+  "editor.formatOnSave": true,
+  "editor.minimap.renderCharacters": false,
+  "editor.minimap.showSlider": "always",
+  "explorer.confirmDelete": false,
+  "explorer.confirmDragAndDrop": false,
+  "explorer.confirmPasteNative": false,
+  "files.autoSave": "afterDelay",
+  "git.autofetch": true,
+  "git.confirmSync": false,
+  "git.fetchOnPull": true,
+  "git.pruneOnFetch": true,
+  "terminal.integrated.scrollback": 10000,
+  "update.mode": "none",
+  "workbench.colorTheme": "Default Dark+",
+
+  // turns off all sounds and announcements
+  "accessibility.signals.terminalCommandFailed": {
+    "sound": "off",
+    "announcement": "off"
+  },
+  "accessibility.signals.terminalQuickFix": {
+    "sound": "off",
+    "announcement": "off"
+  },
+  "accessibility.signals.terminalBell": {
+    "sound": "off",
+    "announcement": "off"
+  },
+
+  // database settings
+  "sqltools.connections": [
+    {
+      "previewLimit": 50,
+      "server": "192.168.90.40",
+      "port": 5432,
+      "askForPassword": true,
+      "driver": "PostgreSQL",
+      "name": "main",
+      "database": "postgres",
+      "username": "richie"
+    }
+  ],
+
+  // formatters
+  "[html]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
+  "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
+  "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
+  "[nix]": { "editor.defaultFormatter": "jnoortheen.nix-ide" },
+  "[python]": { "editor.defaultFormatter": "charliermarsh.ruff" },
+  "[yaml]": { "editor.defaultFormatter": "redhat.vscode-yaml" },
+
+  // spell check
+  "cSpell.enabled": true,
+  "cSpell.language": "en,en-US",
+  "cSpell.enableFiletypes": ["bat", "csv", "nix", "toml"],
+  "cSpell.userWords": ["Cahill", "syncthing"],
+
+  // nix
+  "nix.enableLanguageServer": true,
+  "nix.serverPath": "nil",
+
+  // force the use of rust-analyzer from dev shell
+  "rust-analyzer.server.path": "rust-analyzer",
+  "redhat.telemetry.enabled": true,
+  "gitlens.plusFeatures.enabled": false,
+  // new
+  "hediet.vscode-drawio.resizeImages": null
+}
--- a/users/brendan/home/programs.nix
+++ b/users/brendan/home/programs.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # python
+    poetry
+    python313
+    ruff
+    # nix
+    nix-init
+    nix-output-monitor
+    nix-prefetch
+    nix-tree
+    nixfmt-rfc-style
+    treefmt
+  ];
+}
--- a/users/brendan/home/ssh_config.nix
+++ b/users/brendan/home/ssh_config.nix
@@ -0,0 +1,41 @@
+{
+  programs.ssh = {
+    enable = true;
+
+    matchBlocks = {
+      jeeves = {
+        hostname = "192.168.90.40";
+        user = "richie";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 629;
+        dynamicForwards = [ { port = 9050; } ];
+      };
+      unlock-jeeves = {
+        hostname = "192.168.95.14";
+        user = "root";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 2222;
+      };
+      jeevesjr = {
+        hostname = "192.168.90.35";
+        user = "richie";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 352;
+        dynamicForwards = [ { port = 9050; } ];
+      };
+      bob = {
+        hostname = "192.168.90.25";
+        user = "richie";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 262;
+        dynamicForwards = [ { port = 9050; } ];
+      };
+      rhapsody-in-green = {
+        hostname = "192.168.90.221";
+        user = "richie";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 922;
+      };
+    };
+  };
+}
--- a/users/brendan/systems/brendans-system.nix
+++ b/users/brendan/systems/brendans-system.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../home/global.nix
+    ../home/gui
+  ];
+}
--- a/users/gaming/home/firefox.nix
+++ b/users/gaming/home/firefox.nix
@@ -0,0 +1,250 @@
+{ 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
+      };
+    };
+  };
+}
--- a/users/gaming/home/programs.nix
+++ b/users/gaming/home/programs.nix
@@ -2,7 +2,5 @@
 {
  home.packages = with pkgs; [
    chromium
-    vscode
-    firefox
  ];
 }
--- a/users/gaming/systems/bob.nix
+++ b/users/gaming/systems/bob.nix
@@ -1,5 +1,6 @@
 {
  imports = [
    ../home/global.nix
+    ../home/firefox.nix
  ];
 }
--- a/users/richie/default.nix
+++ b/users/richie/default.nix
@@ -39,7 +39,6 @@ in
          "networkmanager"
          "plugdev"
          "scanner"
-          "transmission"
          "uaccess"
          "wireshark"
        ];
--- a/users/richie/home/gui/default.nix
+++ b/users/richie/home/gui/default.nix
@@ -12,8 +12,6 @@
    discord-canary
    gimp
    gparted
-    jetbrains.datagrip
-    ladybird
    mediainfo
    nemo
    nemo-fileroller
--- a/users/richie/home/gui/firefox/default.nix
+++ b/users/richie/home/gui/firefox/default.nix
@@ -5,7 +5,7 @@
  programs.firefox = {
    enable = true;
    profiles.richie = {
-      extensions.packages = with inputs.firefox-addons.packages.x86_64-linux; [
+      extensions = with inputs.firefox-addons.packages.x86_64-linux; [
        bitwarden
        darkreader
        dearrow
@@ -19,8 +19,8 @@
        default = "kagi";
        order = [
          "kagi"
-          "ddg"
-          "google"
+          "DuckDuckGo"
+          "Google"
        ];
      };
      settings = {
--- a/users/richie/home/gui/firefox/search_engines.nix
+++ b/users/richie/home/gui/firefox/search_engines.nix
@@ -47,21 +47,6 @@
      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 = [
        {
--- a/users/richie/home/gui/vscode/default.nix
+++ b/users/richie/home/gui/vscode/default.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  vscode_dir = "/home/richie/dotfiles/users/richie/home/gui/vscode";
+  vscode_dir = "/home/richie/projects/nix-dotfiles/users/richie/home/gui/vscode";
 in
 {
  # mutable symlinks to key binds and settings
--- a/users/richie/home/gui/vscode/settings.json
+++ b/users/richie/home/gui/vscode/settings.json
@@ -15,7 +15,6 @@
  "terminal.integrated.scrollback": 10000,
  "update.mode": "none",
  "workbench.colorTheme": "Default Dark+",
-  "workbench.secondarySideBar.showLabels": false,

  // turns off all sounds and announcements
  "accessibility.signals.terminalCommandFailed": {
@@ -48,7 +47,6 @@
  // 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" },
@@ -64,9 +62,6 @@
  "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,
--- a/users/richie/home/ssh_config.nix
+++ b/users/richie/home/ssh_config.nix
@@ -16,6 +16,13 @@
        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";
--- a/users/secrets.yaml
+++ b/users/secrets.yaml
@@ -1,3 +1,4 @@
+brendan_password: ENC[AES256_GCM,data:KGDUpvtRBCdJpT/YyaXGy1v/ijuDrphZ+bceMDonVU7/PGhOt3zv4b9v4lcaA/E+RsTPvp7tOJX99LggSyjNxABkZy9MeOcjJA==,iv:23H9vY5LQXMtrKQCduQ8OMTPsNy52z5KG6bFHvZ95ms=,tag:B3cHKPUCtbib6ew+YtZw6A==,type:str]
 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]
 sops:
@@ -51,8 +52,8 @@ sops:
            UzQzWEFtSDJwR201cmZoeXh5T0RmSk0KWLOpw5cWbtnfVP/ISa7n1vZchoD+nxmn
            7yr7igpEIro0Sd238KinOQYswVaT0NHB9p1dSW/mN+aGQliSNLzkDQ==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-01-07T20:13:43Z"
-    mac: ENC[AES256_GCM,data:Q5fmv+MRVYGUQ4j+28CcGWHmgT1178N+haVS9xa0c99OKuPZdfSndAG0QVDhh/jYq+7zXs6zzLtBjB+egkoDfxJXfJOmg3E46UMO3vDHaEcIZD16ZbWJaz4Z/+yabqhDURKtgfGiu4xPv3OtGbwcP5kud17WcHNfY/LT+Y+LSD8=,iv:y3K3kCroIh+RTplUe4tM8B9rbLgIHCbE6FJawngam8Q=,tag:2VTIWlLp4cOwm18BfIlz5g==,type:str]
+    lastmodified: "2025-02-12T02:37:13Z"
+    mac: ENC[AES256_GCM,data:TJsVuu7sevYmskFKj1V872A5NWZYQm5Ta6Ln6kdRYgJbn23EiGK2qRgI8OrM5RSA8MNXI8ggy5/Z3RiclszsLWMq6qO5rmiCR3ZKkThmeBwImw6kAEfSmwMTmVGAGO4KQcDV3eAyT/Q/kcVByEx72Dp8PsCIpd+Vmn33HCiRsYM=,iv:ndw86ofFW/GIBXe2f3HTRNWE5rD+5CJHsTKvfUkmPEY=,tag:rN76/5TCj90vsp/o4ju0pQ==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.9.2
+    version: 3.9.4
Author	SHA1	Message	Date
Richie Cahill	78611ab864	fixed brendans-system host name	2025-02-11 21:46:19 -05:00
Richie Cahill	ff0f7eba26	boot strapping	2025-02-11 21:43:01 -05:00