stuff

.github/workflows/build_systems.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
   push:
     branches: [main]
+  schedule:
+    - cron: "0 22 * * *"
 
 jobs:
   build:
@@ -21,3 +23,4 @@ jobs:
         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
+

.sops.yaml

@@ -1,10 +1,10 @@
 keys:
-  - &admin_richie age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c
+  - &admin_richie age1u8zj599elqqvcmhxn8zuwrufsz8w8w366d3ayrljjejljt2q45kq8mxw9c # cspell:disable-line
 
-  - &system_bob age1q47vup0tjhulkg7d6xwmdsgrw64h4ax3la3evzqpxyy4adsmk9fs56qz3y
-  - &system_jeeves age13lmqgc3jvkyah5e3vcwmj4s5wsc2akctcga0lpc0x8v8du3fxprqp4ldkv
-  - &system_router age1xzxryqq63x65yuza9lmmkud7crjjxpnkdew070yhx6xn7xe4tdws5twxsv
-  - &system_rhapsody age1ufnewppysaq2wwcl4ugngjz8pfzc5a35yg7luq0qmuqvctajcycs5lf6k4
+  - &system_bob age1q47vup0tjhulkg7d6xwmdsgrw64h4ax3la3evzqpxyy4adsmk9fs56qz3y # cspell:disable-line
+  - &system_jeeves age13lmqgc3jvkyah5e3vcwmj4s5wsc2akctcga0lpc0x8v8du3fxprqp4ldkv # cspell:disable-line
+  - &system_router age1xzxryqq63x65yuza9lmmkud7crjjxpnkdew070yhx6xn7xe4tdws5twxsv # cspell:disable-line
+  - &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,7 +37,9 @@
     "captivedetect",
     "cgroupdriver",
     "charliermarsh",
+    "Checkpointing",
     "cloudflared",
+    "codellama",
     "codezombiech",
     "compactmode",
     "Compat",
@@ -46,12 +49,14 @@
     "createrole",
     "crlite",
     "cryptsetup",
+    "cuda",
     "darkreader",
     "datareporting",
     "davidanson",
     "dconf",
     "dearrow",
     "debugpy",
+    "deepseek",
     "dialout",
     "diffie",
     "direnv",
@@ -59,12 +64,16 @@
     "dnodesize",
     "dotfiles",
     "drawio",
+    "duckdns",
     "eamodio",
+    "ehci",
+    "emerg",
     "endlessh",
     "errorlens",
     "esbenp",
     "esphome",
     "extest",
+    "fadvise",
     "fastforwardteam",
     "FASTFOX",
     "ffmpegthumbnailer",
@@ -76,6 +85,7 @@
     "fmask",
     "fontconfig",
     "formfill",
+    "forwardfor",
     "foxundermoon",
     "FULLSCREEN",
     "fwupd",
@@ -100,6 +110,7 @@
     "HPKP",
     "hplip",
     "htmlaboutaddons",
+    "httpchk",
     "hurlenko",
     "hwloc",
     "INITDB",
@@ -112,6 +123,7 @@
     "jsbc",
     "kagi",
     "kuma",
+    "lazer",
     "levelname",
     "libglvnd",
     "libmysqlclient",
@@ -126,6 +138,8 @@
     "lynis",
     "mangohud",
     "markdownlint",
+    "maxconn",
+    "maxpages",
     "maxretry",
     "maxtime",
     "mechatroner",
@@ -151,18 +165,22 @@
     "nixpkgs",
     "nmap",
     "noauto",
+    "nodev",
     "noecho",
     "nonsponsored",
     "Noto",
+    "nprt",
     "nvme",
     "OCSP",
     "oderwat",
+    "ollama",
     "oneshot",
     "optimise",
     "optoutstudies",
     "overalljails",
     "overscroll",
     "overseerr",
+    "partitionwise",
     "pbmode",
     "pciutils",
     "pcscd",
@@ -179,6 +197,7 @@
     "prismlauncher",
     "privatebrowsing",
     "PRIVOXY",
+    "protontricks",
     "prowlarr",
     "proxychains",
     "prusa",
@@ -198,12 +217,14 @@
     "radarr",
     "readahead",
     "receiveencrypted",
+    "recordsize",
     "Redistributable",
     "referer",
     "REFERERS",
     "relatime",
     "Rhosts",
     "ripgrep",
+    "roboto",
     "rokuecp",
     "routable",
     "rspace",
@@ -237,6 +258,7 @@
     "TCPIP",
     "tiktok",
     "timonwong",
+    "titlebar",
     "tmmworkshop",
     "Tmpfs",
     "topsites",
@@ -250,6 +272,7 @@
     "uitour",
     "unrar",
     "unsubmitted",
+    "uptimekuma",
     "urlbar",
     "urlclassifier",
     "usbhid",
@@ -261,9 +284,11 @@
     "virt",
     "virtualisation",
     "vpnpromourl",
+    "wakeonlan",
     "webchannel",
     "WEBRTC",
     "WEBUI",
+    "wireplumber",
     "wireshark",
     "Workqueues",
     "xattr",

flake.lock

@@ -9,11 +9,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1738382607,
-        "narHash": "sha256-ppR81tMrcQk/wHm8MmKtp3mrtYmMTgF2lxLLXYwRsOM=",
+        "lastModified": 1739396257,
+        "narHash": "sha256-E+xGh25fyBLNo2FYxP4uHkTh4yh1C0AIyYpcVdW3CL0=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "dc86c8feffa328d9050e039a1286e175af6d76d8",
+        "rev": "f61927ae7c2b28ee9d426114a06f185f4dea4301",
         "type": "gitlab"
       },
       "original": {
@@ -23,22 +23,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,
@@ -79,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738415006,
-        "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=",
+        "lastModified": 1739381933,
+        "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2",
+        "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba",
         "type": "github"
       },
       "original": {
@@ -114,35 +98,13 @@
         "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,
-        "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=",
+        "lastModified": 1738816619,
+        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773",
+        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
         "type": "github"
       },
       "original": {
@@ -154,11 +116,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738142207,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "lastModified": 1739214665,
+        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
         "type": "github"
       },
       "original": {
@@ -170,11 +132,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1738422722,
-        "narHash": "sha256-Q4vhtbLYWBUnjWD4iQb003Lt+N5PuURDad1BngGKdUs=",
+        "lastModified": 1739399097,
+        "narHash": "sha256-5U1YLh8bENPGtC6j6493qs3lK0PrzZw4omMvJUFOhEI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "102a39bfee444533e6b4e8611d7e92aa39b7bec1",
+        "rev": "154a2c1abcea99a98f8b9344dfaba019a28162bd",
         "type": "github"
       },
       "original": {
@@ -185,22 +147,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=",
@@ -248,11 +194,10 @@
       "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"
@@ -265,11 +210,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738291974,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
+        "lastModified": 1739262228,
+        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
+        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
         "type": "github"
       },
       "original": {
@@ -287,11 +232,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1738431375,
-        "narHash": "sha256-jk6JrgqNe0dEPxV2xX/pBVsrPDfWaa033LKcyERkHJw=",
+        "lastModified": 1738434563,
+        "narHash": "sha256-RE+6AgQ/Q/yFBYDPlN+jSrhEKtZLBF8xlIsz2T78K68=",
         "owner": "RichieCahill",
         "repo": "system_tools",
-        "rev": "36764189680c9be26192ee94da1a3f33f890ff0d",
+        "rev": "7cff86220ce86a1083466e2fc8b947551ab577a3",
         "type": "github"
       },
       "original": {

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="
-      "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU="
+      "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
     ];
   };
 
@@ -38,11 +38,6 @@
       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";
@@ -55,7 +50,6 @@
       nixpkgs,
       home-manager,
       systems,
-      nixos-cosmic,
       sops-nix,
       ...
     }@inputs:

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

systems/jeeves/mxr/default.nix

@@ -0,0 +1,49 @@
+{
+  containers.mxr = {
+    autoStart = true;
+    ephemeral = true;
+    config =
+      {
+        config,
+        pkgs,
+        lib,
+        ...
+      }:
+      {
+        nix.settings = {
+          trusted-substituters = [
+            "https://cache.nixos.org"
+            "https://cache.tmmworkshop.com"
+            "https://nix-community.cachix.org"
+          ];
+          substituters = [
+            "https://cache.nixos.org/?priority=2&want-mass-query=true"
+            "https://cache.tmmworkshop.com/?priority=2&want-mass-query=true"
+            "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
+          ];
+          trusted-public-keys = [
+            "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+            "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA="
+            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+          ];
+          experimental-features = [
+            "flakes"
+            "nix-command"
+          ];
+        };
+        systemd.services.mxr = {
+          description = "mxr";
+          after = [ "network.target" ];
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig = {
+            Type = "simple";
+            User = "mxr";
+            Group = "mxr";
+            ExecStart = "curl -s https://raw.githubusercontent.com/RichieCahill/mxr/refs/heads/main/tools/installer.py | ${pkgs.python313}/bin/python";
+            Restart = "on-failure";
+          };
+        };
+        system.stateVersion = "24.11";
+      };
+  };
+}

systems/jeeves/services/audiobookshelf.nix

@@ -3,11 +3,7 @@ let
   vars = import ../vars.nix;
 in
 {
-  services.audiobookshelf = {
-    enable = true;
-    openFirewall = true;
-    host = "192.168.90.40";
-  };
+  services.audiobookshelf.enable = true;
   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/filebrowser.nix

@@ -6,8 +6,6 @@ let
   vars = import ../vars.nix;
 in
 {
-  networking.firewall.allowedTCPPorts = [ 8080 ];
-
   systemd.services.filebrowser = {
     description = "filebrowser";
     after = [ "network.target" ];

systems/jeeves/services/haproxy.cfg

@@ -21,8 +21,8 @@ defaults
 
 #Application Setup
 frontend ContentSwitching
-  bind *:80
-  bind *:443 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
+  bind *:80 v4v6
+  bind *:443 v4v6 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
   mode  http
   # tmmworkshop.com
   acl host_audiobookshelf  hdr(host) -i audiobookshelf.tmmworkshop.com
@@ -30,6 +30,7 @@ frontend ContentSwitching
   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_mxr  hdr(host) -i mxr.tmmworkshop.com
   acl host_share  hdr(host) -i share.tmmworkshop.com
   acl host_uptime_kuma  hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
 
@@ -38,36 +39,41 @@ frontend ContentSwitching
   use_backend filebrowser_nodes  if host_filebrowser
   use_backend homeassistant_nodes  if host_homeassistant
   use_backend jellyfin if host_jellyfin
+  use_backend mxr_nodes  if host_mxr
   use_backend share_nodes  if host_share
   use_backend uptime_kuma_nodes  if host_uptime_kuma
 
 backend audiobookshelf_nodes
   mode http
-  server server 192.168.90.40:8000
+  server server 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 mxr_nodes
+  mode http
+  server server 127.0.0.1:3000
 
 backend share_nodes
   mode http
-  server server 192.168.95.14:8091
+  server server 127.0.0.1:8091
 
 backend uptime_kuma_nodes
   mode http
-  server server 192.168.95.14:3001
+  server server 127.0.0.1:3001

systems/jeeves/services/home_assistant.nix

@@ -13,9 +13,10 @@ in
           server_host = [
             "192.168.95.14"
             "192.168.90.40"
+            "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";

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

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/ssh_config.nix

@@ -16,13 +16,6 @@
         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";