asahi update

Reviewed-on: #1
Co-authored-by: Evan Reichard <evan@reichard.io>
Co-committed-by: Evan Reichard <evan@reichard.io>

.sops.yaml

@@ -3,6 +3,8 @@ keys:
   - &admin_reichard age1sac93wpnjcv62s7583jv6a4yspndh6k0r25g3qx3k7gq748uvafst6nz4w
   # lin-va-mbp-personal@evanreichard - SSH Derived
   - &user_lin-va-mbp-personal age17ayje4uv2mhwehhp9jr3u9l0ds07396kt7ef40sufx89vm7cgfjq6d5d4y
+  # mac-va-mbp-personal@evanreichard - SSH Derived
+  - &user_mac-va-mbp-personal age1dccte7xtwswgef089nd80dutp96xnezx5lrqnneh9cusegsnda8sj3dj6c
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
@@ -13,3 +15,8 @@ creation_rules:
       - age:
           - *admin_reichard
           - *user_lin-va-mbp-personal
+  - path_regex: secrets/mac-va-mbp-personal/evanreichard/[^/]+\.(yaml|json|env|ini)$
+    key_groups:
+      - age:
+          - *admin_reichard
+          - *user_mac-va-mbp-personal

README.md

@@ -2,65 +2,79 @@
 
 This repository contains the configuration for multiple machines, as well as my home / IDE config (home-manager).
 
-### NixOS
+```bash
+# Install NixOS
+./bootstrap.sh install --name lin-va-nix-builder
+
+# Remote Image Build (NixOS Builder)
+./bootstrap.sh image --name lin-va-rke2 --remote
+
+# Home Manager Install
+home-manager switch --flake .#evanreichard@mac-va-mbp-personal
+
+# Update Flake
+nix flake update
+```
+
+## Manual
 
 ```bash
+# Install NixOS
 sudo nixos-rebuild switch --flake .#lin-va-mbp-personal
+
+# Install NixOS (Remote)
+nix run github:nix-community/nixos-anywhere -- --flake .#lin-cloud-kube1 --target-host \<USER\>@\<IP\>
+
+# Build Image
+nix build .#vmwareConfigurations.lin-va-rke2
 ```
 
-### NixOS Generators
+## Nix Darwin
 
 ```bash
-nix build .#vmwareConfigurations.rke2-node
+# Install Nix Without Determinate
+curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+
+# Switch Nix Darwin
+sudo nix run nix-darwin#darwin-rebuild -- switch --flake .#mac-va-mbp-personal
+sudo darwin-rebuild switch --flake .#mac-va-mbp-personal
 ```
 
-### Home Manager
+## Clean Garbage
+
+NOTE: This will remove previous generations
 
 ```bash
-home-manager switch --flake .#evanreichard@MBP-Personal
+sudo nix-collect-garbage --delete-old
+nix-collect-garbage --delete-old
 ```
 
-### NixOS Hosts
+## Home Manager
-
-#### Copy Config
 
 ```bash
-rsync -av --exclude='.git' . root@HOST:/etc/nixos
+# Update System Channels
+sudo nix-channel --add https://nixos.org/channels/nixpkgs-25.05-darwin nixpkgs
+sudo nix-channel --update
+
+# Update Home Manager
+nix-channel --add https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz home-manager
+nix-channel --update
+
+# Link Repo
+ln -s /Users/evanreichard/Development/git/personal/nix/home-manager ~/.config/home-manager
+
+# Build Home Manager
+home-manager switch
 ```
 
-#### Partition Drives
+### OS Update
+
+`/etc/bashrc` may get overridden. To properly load Nix, prepend the following:
 
 ```bash
-# Validate Disk
+# Nix
-ls -l /dev/disk/by-id
+if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
-
+  . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
-# Partition Disk
+fi
-# WARNING: This will destroy all data on the disk(s)
+# End Nix
-sudo nix \
-    --experimental-features "nix-command flakes" \
-    run github:nix-community/disko -- \
-    --mode disko \
-    --flake /etc/nixos#HOST_CONFIG
-```
-
-#### Install NixOS
-
-```bash
-# Install
-sudo nixos-install --flake /etc/nixos#HOST_CONFIG
-
-# Reboot
-sudo reboot
-```
-
-#### Copy Config Back to Host
-
-```bash
-rsync -av --exclude='.git' . root@HOST:/etc/nixos
-```
-
-#### Rebuild NixOS
-
-```bash
-sudo nixos-rebuild switch
 ```

bootstrap.sh

@@ -31,13 +31,13 @@ function cmd_image() {
 
     # Validate Config Exists
     if ! nix eval --json --impure \
-        ".#qcowConfigurations" \
+        ".#vmwareConfigurations" \
         --apply "s: builtins.hasAttr \"$name\" s" 2>/dev/null | grep -q "true"; then
         echo "Error: NixOS Generator Config '$name' not found"
         exit 1
     fi
 
-    build_args=(".#qcowConfigurations.$name")
+    build_args=(".#vmwareConfigurations.$name")
     if [ "$remote" = true ]; then
         build_args+=("-j0")
     fi
@@ -51,8 +51,9 @@ function cmd_image() {
 }
 
 function cmd_install() {
-    local usage="Usage: $0 install --name <system-name>"
+    local usage="Usage: $0 install --name <system-name> [--remote <user@remote-host>]"
     local name=""
+    local remote=""
 
     while [[ $# -gt 0 ]]; do
         case "$1" in
@@ -60,6 +61,10 @@ function cmd_install() {
                 name="$2"
                 shift 2
                 ;;
+            --remote)
+                remote="$2"
+                shift 2
+                ;;
             *)
                 echo "$usage"
                 exit 1
@@ -87,6 +92,18 @@ function cmd_install() {
         exit 1
     fi
 
+    # Remote or Local
+    if [ -n "$remote" ]; then
+	cmd_install_remote "$name" "$remote"
+    else
+	cmd_install_local "$name" "$disk_id"
+    fi
+}
+
+function cmd_install_local(){
+    local name="$1"
+    local disk_id="$2"
+
     # Validate Disk Exists
     if [ ! -e "$disk_id" ]; then
         echo "Error: Disk $disk_id not found on system"
@@ -133,6 +150,27 @@ function cmd_install() {
     sudo reboot
 }
 
+function cmd_install_remote(){
+    local name="$1"
+    local remote="$2"
+
+    # Prompt Install
+    read -p "This will completely wipe and install NixOS on $remote with configuration $name. Continue? (y/n) " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        echo "Operation Cancelled"
+        exit 1
+    fi
+
+    # Install NixOS
+    echo "Installing $name to remote host: $remote"
+    if ! nix run github:nix-community/nixos-anywhere -- --flake ".#$name" --target-host "$remote"; then
+        echo "Error: Remote NixOS installation failed"
+        exit 1
+    fi
+    echo "Successfully installed $name to remote host: $remote"
+}
+
 case "$1" in
     image)
         shift

flake.lock

@@ -6,33 +6,54 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay"
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1738646032,
+        "lastModified": 1755115705,
-        "narHash": "sha256-57BdBE9anNpIpf48EiTVLGxg4mOQ04XjHCEP0gLTsFA=",
+        "narHash": "sha256-CjWlI6c1pWu+X5Qz8B6K1httNpA4eDNxf/Ozfm6Mvlw=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "e77031211944723a38bebc043e48847c36e43668",
+        "rev": "78b5825968dc784dae2fe71b1c76f364efe107ae",
         "type": "github"
       },
       "original": {
         "owner": "tpwrules",
-        "ref": "releasep2-2024-12-25",
+        "ref": "release-25.05",
         "repo": "nixos-apple-silicon",
         "type": "github"
       }
     },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749744770,
+        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
+        "owner": "nix-darwin",
+        "repo": "nix-darwin",
+        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-darwin",
+        "ref": "nix-darwin-25.05",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1743598667,
+        "lastModified": 1756733629,
-        "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
+        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
         "type": "github"
       },
       "original": {
@@ -43,18 +64,17 @@
     },
     "firefox-addons": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1743861198,
+        "lastModified": 1756699417,
-        "narHash": "sha256-PzbPHoSI5U1juWd01Spf3ST7ylR9mQ84v5p7NksBplY=",
+        "narHash": "sha256-rpRy5ae5ijEGaK+Cr66NqCQJ6ZeUE5Zi8gUWgKhesto=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "7408ed5bbc9009741094f4dd4cc1abec79e79e7e",
+        "rev": "007b803d1eff595d25e7886e83054dbd038bf029",
         "type": "gitlab"
       },
       "original": {
@@ -96,40 +116,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1629284811,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils-plus": {
-      "inputs": {
-        "flake-utils": "flake-utils_2"
-      },
-      "locked": {
-        "lastModified": 1715533576,
-        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -147,6 +133,25 @@
         "type": "github"
       }
     },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": "flake-utils"
+      },
+      "locked": {
+        "lastModified": 1715533576,
+        "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -154,16 +159,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1743808813,
+        "lastModified": 1756679287,
-        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -191,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742568034,
+        "lastModified": 1751903740,
-        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
+        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
+        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
         "type": "github"
       },
       "original": {
@@ -206,11 +211,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743259260,
+        "lastModified": 1752596105,
-        "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=",
+        "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f",
+        "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
         "type": "github"
       },
       "original": {
@@ -222,11 +227,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1744098102,
+        "lastModified": 1756542300,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
         "type": "github"
       },
       "original": {
@@ -238,16 +243,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743813633,
+        "lastModified": 1756617294,
-        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
+        "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
+        "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -255,6 +260,7 @@
     "root": {
       "inputs": {
         "apple-silicon": "apple-silicon",
+        "darwin": "darwin",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
@@ -265,22 +271,6 @@
         "sops-nix": "sops-nix"
       }
     },
-    "rust-overlay": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1686795910,
-        "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "snowfall-lib": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -310,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743910657,
+        "lastModified": 1754988908,
-        "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=",
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "523f58a4faff6c67f5f685bed33a7721e984c304",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -337,6 +327,27 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "apple-silicon",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760945191,
+        "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,7 +2,7 @@
   description = "NixOS Hosts";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     disko.url = "github:nix-community/disko";
     snowfall-lib = {
@@ -10,11 +10,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-silicon = {
-      url = "github:tpwrules/nixos-apple-silicon/releasep2-2024-12-25";
+      url = "github:tpwrules/nixos-apple-silicon/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-generators = {
@@ -29,6 +29,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    darwin = {
+      url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs:
@@ -51,6 +55,12 @@
         ];
       };
 
+      outputs-builder = channels: {
+        devShells = {
+          default = import ./shells/default/default.nix { pkgs = channels.nixpkgs; };
+        };
+      };
+
       homes.modules = with inputs; [
         sops-nix.homeManagerModules.sops
       ];
@@ -60,6 +70,10 @@
           disko.nixosModules.disko
           sops-nix.nixosModules.sops
         ];
+        darwin = with inputs; [
+          home-manager.darwinModules.home-manager
+          sops-nix.darwinModules.sops
+        ];
       };
     };
 }

homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix

@@ -1,9 +1,9 @@
-{ lib, config, namespace, ... }:
+{ lib, pkgs, config, namespace, ... }:
 let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "24.11";
+  home.stateVersion = "25.05";
 
   reichard = {
     user = {
@@ -49,6 +49,8 @@ in
   #   tldr
   # ];
 
+  home.packages = with pkgs; [ fastfetch ];
+
   # SQLite Configuration
   home.file.".sqliterc".text = ''
     .headers on

homes/aarch64-darwin/evanreichard@mac-va-mbp-work/default.nix

@@ -3,7 +3,7 @@ let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "24.11";
+  home.stateVersion = "25.05";
 
   reichard = {
     user = {
@@ -43,7 +43,7 @@ in
     android-tools
     imagemagick
     mosh
-    python311
+    python312
     texliveSmall # Pandoc PDF Dep
     google-cloud-sdk
     tldr

homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix

@@ -3,7 +3,7 @@ let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "24.11";
+  home.stateVersion = "25.05";
 
   reichard = {
     user = {

homes/x86_64-linux/evanreichard@lin-va-terminal/default.nix

@@ -0,0 +1,36 @@
+{ lib, config, namespace, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+in
+{
+  home.stateVersion = "25.05";
+
+  reichard = {
+    user = {
+      enable = true;
+      inherit (config.snowfallorg.user) name;
+    };
+
+    services = {
+      ssh-agent = enabled;
+    };
+
+    programs = {
+      terminal = {
+        bash = enabled;
+        tmux = enabled;
+        btop = enabled;
+        direnv = enabled;
+        git = enabled;
+        k9s = enabled;
+        nvim = enabled;
+      };
+    };
+  };
+
+  # SQLite Configuration
+  home.file.".sqliterc".text = ''
+    .headers on
+    .mode column
+  '';
+}

homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix

@@ -3,7 +3,7 @@ let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "24.11";
+  home.stateVersion = "25.05";
 
   reichard = {
     user = {
@@ -15,6 +15,7 @@ in
       ssh-agent = enabled;
       fusuma = enabled;
       swww = enabled;
+      poweralertd = enabled;
       sops = {
         enable = true;
         defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
@@ -26,7 +27,10 @@ in
       graphical = {
         wms.hyprland = enabled;
         ghostty = enabled;
+        gimp = enabled;
+        wireshark = enabled;
         ghidra = enabled;
+        remmina = enabled;
         browsers.firefox = {
           enable = true;
           gpuAcceleration = true;
@@ -44,9 +48,9 @@ in
     };
   };
 
-  # home.packages = with pkgs; [
+  home.packages = with pkgs; [
-  #   catppuccin-gtk
+    jellyfin-media-player
-  # ];
+  ];
 
   dconf = {
     settings = {

modules/darwin/default.nix

@@ -0,0 +1,8 @@
+{
+  config = {
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+    };
+  };
+}

modules/darwin/nix/default.nix

@@ -0,0 +1,102 @@
+{ config, lib, pkgs, inputs, namespace, host, ... }:
+let
+  inherit (lib) types mkIf;
+  inherit (lib.${namespace}) mkBoolOpt mkOpt;
+
+  cfg = config.${namespace}.nix;
+in
+{
+  options.${namespace}.nix = {
+    enable = mkBoolOpt true "Whether or not to manage nix configuration.";
+    package = mkOpt types.package pkgs.nixVersions.latest "Which nix package to use.";
+  };
+
+  config = mkIf cfg.enable {
+    nix =
+      let
+        mappedRegistry = lib.pipe inputs [
+          (lib.filterAttrs (_: lib.isType "flake"))
+          (lib.mapAttrs (_: flake: { inherit flake; }))
+          (x: x // {
+            nixpkgs.flake = if pkgs.stdenv.hostPlatform.isLinux then inputs.nixpkgs else inputs.nixpkgs-unstable;
+          })
+          (x: if pkgs.stdenv.hostPlatform.isDarwin then lib.removeAttrs x [ "nixpkgs-unstable" ] else x)
+        ];
+        users = [
+          "root"
+          "@wheel"
+          "nix-builder"
+          "evanreichard"
+        ];
+      in
+      {
+        inherit (cfg) package;
+
+        buildMachines = lib.optional (config.${namespace}.security.sops.enable && host != "nixos-builder") {
+          hostName = "10.0.50.130";
+          systems = [ "x86_64-linux" ];
+          sshUser = "evanreichard";
+          protocol = "ssh";
+          sshKey = config.sops.secrets.builder_ssh_key.path;
+          supportedFeatures = [
+            "benchmark"
+            "big-parallel"
+            "nixos-test"
+            "kvm"
+          ];
+        };
+
+        checkConfig = true;
+        distributedBuilds = true;
+        optimise.automatic = true;
+        registry = lib.mkForce mappedRegistry;
+
+        gc = {
+          automatic = true;
+          options = "--delete-older-than 7d";
+        };
+
+        settings = {
+          connect-timeout = 5;
+          allowed-users = users;
+          max-jobs = "auto";
+          auto-optimise-store = pkgs.stdenv.hostPlatform.isLinux;
+          builders-use-substitutes = true;
+          experimental-features = [
+            "nix-command"
+            "flakes "
+          ];
+          flake-registry = "/etc/nix/registry.json";
+          http-connections = 50;
+          keep-derivations = true;
+          keep-going = true;
+          keep-outputs = true;
+          log-lines = 50;
+          sandbox = true;
+          trusted-users = users;
+          warn-dirty = false;
+          use-xdg-base-directories = true;
+
+          substituters = [
+            "https://anyrun.cachix.org"
+            "https://cache.nixos.org"
+            "https://hyprland.cachix.org"
+            "https://nix-community.cachix.org"
+            "https://nixpkgs-unfree.cachix.org"
+            "https://nixpkgs-wayland.cachix.org"
+            "https://numtide.cachix.org"
+          ];
+
+          trusted-public-keys = [
+            "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
+            "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+            "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+            "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+            "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
+            "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+            "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
+          ];
+        };
+      };
+  };
+}

modules/darwin/security/sops/default.nix

@@ -0,0 +1,31 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib.${namespace}) mkOpt;
+
+  cfg = config.${namespace}.security.sops;
+in
+{
+  options.${namespace}.security.sops = {
+    enable = lib.mkEnableOption "sops";
+    defaultSopsFile = mkOpt lib.types.path null "Default sops file.";
+    sshKeyPaths = mkOpt (with lib.types; listOf path) [
+      "/etc/ssh/ssh_host_ed25519_key"
+    ] "SSH Key paths to use.";
+  };
+
+  config = lib.mkIf cfg.enable {
+    sops = {
+      inherit (cfg) defaultSopsFile;
+
+      age = {
+        inherit (cfg) sshKeyPaths;
+
+        keyFile = "${config.users.users.${config.${namespace}.user.name}.home}/.config/sops/age/keys.txt";
+      };
+    };
+
+    sops.secrets.builder_ssh_key = {
+      sopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
+    };
+  };
+}

modules/darwin/services/openssh/default.nix

@@ -0,0 +1,20 @@
+{ config, namespace, lib, ... }:
+let
+  inherit (lib.${namespace}) mkOpt;
+
+  cfg = config.${namespace}.security.sops;
+in
+{
+  options.${namespace}.services.openssh = with lib.types; {
+    enable = lib.mkEnableOption "OpenSSH support";
+    authorizedKeys = mkOpt (listOf str) [ ] "The public keys to apply.";
+    extraConfig = mkOpt str "" "Extra configuration to apply.";
+    port = mkOpt port 2222 "The port to listen on (in addition to 22).";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.openssh = {
+      enable = true;
+    };
+  };
+}

modules/darwin/user/default.nix

@@ -0,0 +1,23 @@
+{ config, lib, namespace, pkgs, ... }:
+let
+  inherit (lib) types mkIf;
+  inherit (lib.${namespace}) mkOpt;
+
+  cfg = config.${namespace}.user;
+in
+{
+  options.${namespace}.user = with types; {
+    name = mkOpt str "evanreichard" "The name to use for the user account.";
+    email = mkOpt str "evan@reichard.io" "The email of the user.";
+    fullName = mkOpt str "Evan Reichard" "The full name of the user.";
+    uid = mkOpt (types.nullOr types.int) 501 "The uid for the user account.";
+  };
+
+  config = {
+    users.users.${cfg.name} = {
+      uid = mkIf (cfg.uid != null) cfg.uid;
+      shell = pkgs.bashInteractive;
+      home = "/Users/${cfg.name}";
+    };
+  };
+}

modules/home/programs/graphical/browsers/firefox/default.nix

@@ -53,7 +53,7 @@ in
 
     settings = mkOpt attrs { } "Settings to apply to the profile.";
 
-    extensions = mkOpt (with lib.types; listOf package)
+    extensions.packages = mkOpt (with lib.types; listOf package)
       (with pkgs.firefox-addons; [
         bitwarden
         darkreader

modules/home/programs/graphical/ghostty/default.nix

@@ -10,62 +10,14 @@ in
   };
 
   config = mkIf cfg.enable {
-    programs.bash = {
+    # Enable Bash
-      enable = true;
+    ${namespace}.programs.terminal.bash.enable = true;
-      shellAliases = {
-        grep = "grep --color";
-        ssh = "TERM=xterm-256color ssh";
-        flush_dns = "sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder";
-      };
-      profileExtra = ''
-        SHELL="$BASH"
-        PATH=~/.bin:$PATH
-        bind "set show-mode-in-prompt on"
 
-        set -o vi || true
+    # Pending Darwin @ https://github.com/NixOS/nixpkgs/pull/369788
-        VISUAL=vim
+    home.packages = with pkgs; optionals isLinux [
-        EDITOR="$VISUAL"
-
-        fastfetch
-        eval "$(thefuck --alias)"
-      '';
-    };
-
-    programs.powerline-go = {
-      enable = true;
-      settings = {
-        git-mode = "compact";
-        theme = "gruvbox";
-      };
-      modules = [
-        "host"
-        "cwd"
-        "git"
-        "docker"
-        "venv"
-      ];
-    };
-
-    programs.readline = {
-      enable = true;
-      extraConfig = ''
-        # Approximate VIM Dracula Colors
-        set vi-ins-mode-string \1\e[01;38;5;23;48;5;231m\2 I \1\e[38;5;231;48;5;238m\2\1\e[0m\2
-        set vi-cmd-mode-string \1\e[01;38;5;22;48;5;148m\2 C \1\e[38;5;148;48;5;238m\2\1\e[0m\2
-      '';
-    };
-
-    home.packages = with pkgs; [
-      thefuck
-      fastfetch
-      bashInteractive
-      (nerdfonts.override { fonts = [ "Meslo" ]; })
-    ] ++ optionals isLinux [
-      # Pending Darwin @ https://github.com/NixOS/nixpkgs/pull/369788
       ghostty
     ];
 
-    home.file.".config/fastfetch/config.jsonc".text = builtins.readFile ./config/fastfetch.jsonc;
     home.file.".config/ghostty/config".text =
       let
         bashPath = "${pkgs.bashInteractive}/bin/bash";

modules/home/programs/graphical/gimp/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.programs.graphical.gimp;
+in
+{
+  options.${namespace}.programs.graphical.gimp = {
+    enable = mkEnableOption "GIMP";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      gimp-with-plugins
+    ];
+  };
+}

modules/home/programs/graphical/remmina/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.programs.graphical.remmina;
+in
+{
+  options.${namespace}.programs.graphical.remmina = {
+    enable = mkEnableOption "Remmina";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      remmina
+    ];
+  };
+}

modules/home/programs/graphical/wireshark/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.programs.graphical.wireshark;
+in
+{
+  options.${namespace}.programs.graphical.wireshark = {
+    enable = mkEnableOption "Wireshark";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      wireshark
+    ];
+  };
+}

modules/home/programs/graphical/wms/hyprland/default.nix

@@ -39,8 +39,8 @@ in
           "$mainMod, Q, killactive"
           "$mainMod, M, exit"
           "$mainMod, V, togglefloating"
-          "$mainMod, P, pseudo" # dwindle
+          "$mainMod, P, pin"
-          "$mainMod, J, togglesplit" # dwindle
+          "$mainMod, J, togglesplit"
           "$mainMod, S, togglespecialworkspace, magic"
           "$mainMod SHIFT, S, movetoworkspace, special:magic"
 

modules/home/programs/terminal/aws/default.nix

@@ -10,8 +10,9 @@ in
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      cw
+      aws-sso-util
       awscli2
+      cw
       ssm-session-manager-plugin
     ];
   };

modules/home/programs/terminal/bash/config/.gitignore

@@ -0,0 +1,3 @@
+_scratch
+.direnv
+.envrc

modules/home/programs/terminal/bash/default.nix

@@ -0,0 +1,66 @@
+{ pkgs, lib, config, namespace, ... }:
+let
+  inherit (lib) mkIf;
+  cfg = config.${namespace}.programs.terminal.bash;
+in
+{
+  options.${namespace}.programs.terminal.bash = {
+    enable = lib.mkEnableOption "bash";
+  };
+
+  config = mkIf cfg.enable {
+    programs.bash = {
+      enable = true;
+      shellAliases = {
+        grep = "grep --color";
+        ssh = "TERM=xterm-256color ssh";
+      };
+      profileExtra = ''
+        export COLORTERM=truecolor
+        SHELL="$BASH"
+        PATH=~/.bin:$PATH
+        bind "set show-mode-in-prompt on"
+
+        set -o vi || true
+        VISUAL=vim
+        EDITOR="$VISUAL"
+
+        fastfetch
+        eval "$(thefuck --alias)"
+      '';
+    };
+
+    programs.powerline-go = {
+      enable = true;
+      settings = {
+        git-mode = "compact";
+        theme = "gruvbox";
+      };
+      modules = [
+        "host"
+        "cwd"
+        "git"
+        "docker"
+        "venv"
+      ];
+    };
+
+    programs.readline = {
+      enable = true;
+      extraConfig = ''
+        # Approximate VIM Dracula Colors
+        set vi-ins-mode-string \1\e[01;38;5;23;48;5;231m\2 I \1\e[38;5;231;48;5;238m\2\1\e[0m\2
+        set vi-cmd-mode-string \1\e[01;38;5;22;48;5;148m\2 C \1\e[38;5;148;48;5;238m\2\1\e[0m\2
+      '';
+    };
+
+    home.packages = with pkgs; [
+      thefuck
+      fastfetch
+      bashInteractive
+      nerd-fonts.meslo-lg
+    ];
+
+    home.file.".config/fastfetch/config.jsonc".text = builtins.readFile ./config/fastfetch.jsonc;
+  };
+}

modules/home/programs/terminal/nvim/config/lua/avante-config.lua

@@ -0,0 +1 @@
+require("avante").setup()

modules/home/programs/terminal/nvim/config/lua/base.lua

@@ -5,6 +5,12 @@
 -- vim.cmd('colorscheme melange')
 vim.cmd("colorscheme catppuccin-mocha")
 
+-- Set User Shell
+local nix_bash = vim.fn.expand("~/.nix-profile/bin/bash")
+if vim.fn.executable(nix_bash) == 1 then
+	vim.o.shell = nix_bash
+end
+
 -- Set Leader
 vim.keymap.set("n", "<Space>", "<Nop>", { silent = true })
 vim.g.mapleader = " "
@@ -20,7 +26,7 @@ vim.g.loaded_netrwPlugin = 1
 vim.opt.termguicolors = true
 
 -- Synchronize with system clipboard
-vim.opt.clipboard = "unnamed"
+vim.opt.clipboard:append("unnamedplus")
 
 -- Always show the signcolumn
 vim.opt.signcolumn = "yes"

modules/home/programs/terminal/nvim/config/lua/git-ref.lua

@@ -1,4 +1,4 @@
-function get_git_info()
+local function get_git_info()
 	local abs_path = vim.fn.expand("%:p")
 	local git_root = vim.fn.systemlist(
 		"git -C " .. vim.fn.escape(vim.fn.fnamemodify(abs_path, ":h"), " ") .. " rev-parse --show-toplevel"

modules/home/programs/terminal/nvim/config/lua/git-signs.lua

@@ -1,16 +1,18 @@
-require('gitsigns').setup {
+require("gitsigns").setup({
-    on_attach = function(bufnr)
+	current_line_blame = true,
-        local gitsigns = require('gitsigns')
+	current_line_blame_opts = { delay = 0 },
+	on_attach = function(bufnr)
+		local gitsigns = require("gitsigns")
 
-        local function map(mode, l, r, opts)
+		local function map(mode, l, r, opts)
-            opts = opts or {}
+			opts = opts or {}
-            opts.buffer = bufnr
+			opts.buffer = bufnr
-            vim.keymap.set(mode, l, r, opts)
+			vim.keymap.set(mode, l, r, opts)
-        end
+		end
 
-        map('n', '<leader>gb', gitsigns.toggle_current_line_blame)
+		map("n", "<leader>gb", gitsigns.toggle_current_line_blame)
-        map('n', '<leader>gB', function()
+		map("n", "<leader>gB", function()
-            gitsigns.blame_line {full = true}
+			gitsigns.blame_line({ full = true })
-        end)
+		end)
-    end
+	end,
-}
+})

modules/home/programs/terminal/nvim/config/lua/init.lua

@@ -1,23 +1,25 @@
 require("base")
 require("aerial-config")
 require("autopairs-config")
+require("avante-config")
 require("cmp-config")
 require("comment-config")
 require("dap-config")
 require("diffview-config")
 require("git-ref")
 require("git-signs")
-require("llm")
 require("leap-config")
+require("llm")
 require("lsp-config")
 require("lsp-lines-config")
 require("lualine-config")
 require("neotree-config")
 require("noice-config")
 require("numb-config")
+require("octo-config")
 require("silicon-config")
 require("telescope-config")
 require("toggleterm-config")
 require("ts-config")
-require("which-key-config")
 require("weird-chars")
+require("which-key-config")

modules/home/programs/terminal/nvim/config/lua/llm.lua

@@ -1,6 +1,6 @@
 -- Configure LLama LLM
 vim.g.llama_config = {
-	endpoint = "http://10.0.50.120:8080/infill",
+	endpoint = "http://10.0.50.120:8012/infill",
 	api_key = "",
 	n_prefix = 256,
 	n_suffix = 64,

modules/home/programs/terminal/nvim/config/lua/lsp-config.lua

@@ -23,7 +23,7 @@ local nvim_lsp = require("lspconfig")
 local on_attach = function(client, bufnr)
 	local bufopts = { noremap = true, silent = true, buffer = bufnr }
 
-	if client.supports_method("textDocument/formatting") then
+	if client:supports_method("textDocument/formatting") then
 		vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
 		vim.api.nvim_create_autocmd("BufWritePre", {
 			group = augroup,
@@ -80,6 +80,7 @@ nvim_lsp.pyright.setup({
 	on_attach = on_attach,
 	flags = lsp_flags,
 	capabilities = capabilities,
+	filetypes = { "starlark", "python" },
 })
 
 -- HTML LSP Configuration
@@ -122,6 +123,16 @@ nvim_lsp.svelte.setup({
 	cmd = { nix_vars.sveltels, "--stdio" },
 })
 
+-- C LSP Configuration
+nvim_lsp.clangd.setup({
+	-- Explicitly exclude proto files
+	filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
+	on_attach = on_attach,
+	flags = lsp_flags,
+	capabilities = capabilities,
+	cmd = { nix_vars.clangd },
+})
+
 -- Lua LSP Configuration
 nvim_lsp.lua_ls.setup({
 	on_attach = on_attach_no_formatting,
@@ -183,9 +194,9 @@ nvim_lsp.golangci_lint_ls.setup({
 })
 
 ------------------------------------------------------
---------------------- Null-LS LSP --------------------
+--------------------- None-LS LSP --------------------
 ------------------------------------------------------
-local null_ls = require("null-ls")
+local none_ls = require("null-ls")
 
 local eslintFiles = {
 	".eslintrc",
@@ -202,29 +213,33 @@ local eslintFiles = {
 	"eslint.config.cts",
 }
 
-has_eslint_in_parents = function(fname)
+local has_eslint_in_parents = function(fname)
-	root_file = nvim_lsp.util.insert_package_json(eslintFiles, "eslintConfig", fname)
+	local root_file = nvim_lsp.util.insert_package_json(eslintFiles, "eslintConfig", fname)
 	return nvim_lsp.util.root_pattern(unpack(root_file))(fname)
 end
 
-null_ls.setup({
+none_ls.setup({
 	sources = {
 		-- Prettier Formatting
-		null_ls.builtins.formatting.prettier,
+		none_ls.builtins.formatting.prettier,
-		null_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
+		none_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
 		require("none-ls.diagnostics.eslint_d").with({
 			condition = function(utils)
 				return has_eslint_in_parents(vim.fn.getcwd())
 			end,
 		}),
-		null_ls.builtins.completion.spell,
+		none_ls.builtins.completion.spell,
-		null_ls.builtins.formatting.nixpkgs_fmt,
+		none_ls.builtins.formatting.nixpkgs_fmt,
-		null_ls.builtins.formatting.stylua,
+		none_ls.builtins.formatting.stylua,
-		null_ls.builtins.diagnostics.sqlfluff,
+		none_ls.builtins.diagnostics.sqlfluff,
-		null_ls.builtins.formatting.sqlfluff,
+		none_ls.builtins.formatting.sqlfluff,
+		require("none-ls.formatting.autopep8").with({
+			filetypes = { "starlark", "python" },
+			extra_args = { "--max-line-length", "100" },
+		}),
 	},
 	on_attach = function(client, bufnr)
-		if client.supports_method("textDocument/formatting") then
+		if client:supports_method("textDocument/formatting") then
 			vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
 			vim.api.nvim_create_autocmd("BufWritePre", {
 				group = augroup,

modules/home/programs/terminal/nvim/config/lua/lsp-lines-config.lua

@@ -1,2 +1,5 @@
 require("lsp_lines").setup()
-vim.diagnostic.config({virtual_text = false})
+vim.diagnostic.config({
+	virtual_text = false,
+	virtual_lines = true,
+})

modules/home/programs/terminal/nvim/config/lua/lualine-config.lua

@@ -3,23 +3,28 @@ local cached_pr_status = ""
 
 -- Read process output
 local function read_output(err, data)
-    if err then return end
+	if err then
-    if not data then return end
+		return
-    cached_pr_status = data
+	end
+	if not data then
+		return
+	end
+	cached_pr_status = data
 end
 
 -- Spawn process
 local function execute_command()
-    local stdout = vim.loop.new_pipe(false)
+	local stdout = vim.loop.new_pipe(false)
 
-    local spawn_opts = {
+	local spawn_opts = {
-        detached = true,
+		detached = true,
-        stdio = {nil, stdout, nil},
+		stdio = { nil, stdout, nil },
-        args = {"-c", "gh pr checks | awk -F'\t' '{ print $2 }'"}
+		args = { "-c", "gh pr checks | awk -F'\t' '{ print $2 }'" },
-    }
+	}
 
-    vim.loop.spawn("bash", spawn_opts,
+	vim.loop.spawn("bash", spawn_opts, function()
-                   function() stdout:read_start(read_output) end)
+		stdout:read_start(read_output)
+	end)
 end
 
 -- Spawn & schedule process
@@ -28,22 +33,26 @@ vim.fn.timer_start(300000, execute_command)
 
 -- Return status from cache
 function pr_status()
-    --   
+	--   
-    --    
+	--    
-    --
+	--
-    -- PENDING COLOR - #d29922
+	-- PENDING COLOR - #d29922
-    -- PASS COLOR - #3fb950
+	-- PASS COLOR - #3fb950
-    -- FAIL COLOR - #f85149
+	-- FAIL COLOR - #f85149
-    return cached_pr_status:gsub("\n", ""):gsub("fail", " "):gsub("pass",
+	return cached_pr_status
-                                                                     " ")
+		:gsub("\n", "")
-               :gsub("pending", " "):gsub("skipping", " "):sub(1, -2)
+		:gsub("fail", " ")
+		:gsub("pass", " ")
+		:gsub("pending", " ")
+		:gsub("skipping", " ")
+		:sub(1, -2)
 end
 
-require('lualine').setup({
+require("lualine").setup({
-    options = {
+	options = {
-        theme = "gruvbox_dark"
+		theme = "catppuccin",
-        -- theme = "nord"
+		-- theme = "nord"
-        -- theme = "OceanicNext",
+		-- theme = "OceanicNext",
-    },
+	},
-    sections = {lualine_c = {{pr_status}}}
+	sections = { lualine_c = { { pr_status } } },
 })

modules/home/programs/terminal/nvim/config/lua/octo-config.lua

@@ -0,0 +1,30 @@
+require("octo").setup()
+
+vim.keymap.set("n", "<leader>rs", "<cmd>Octo review start<cr>")
+vim.keymap.set("n", "<leader>rd", "<cmd>Octo review discard<cr>")
+vim.keymap.set("n", "<leader>rr", "<cmd>Octo review resume<cr>")
+vim.keymap.set("n", "<leader>re", "<cmd>Octo review submit<cr>")
+vim.keymap.set("n", "<leader>rca", "<cmd>Octo review comments<cr>")
+vim.keymap.set("n", "<leader>rcs", "<cmd>Octo comment suggest<cr>")
+vim.keymap.set("n", "<leader>rcc", "<cmd>Octo comment add<cr>")
+vim.keymap.set("n", "<leader>rcr", "<cmd>Octo comment reply<cr>")
+
+vim.keymap.set("n", "<leader>pd", "<cmd>Octo pr diff<cr>")
+vim.keymap.set("n", "<leader>pc", "<cmd>Octo pr changes<cr>")
+
+-- vim.api.nvim_create_autocmd("FileType", {
+-- 	pattern = "octo",
+-- 	callback = function()
+-- 		vim.keymap.set("n", "<leader>rs", "<cmd>Octo review start<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rd", "<cmd>Octo review discard<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rr", "<cmd>Octo review resume<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>re", "<cmd>Octo review submit<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rca", "<cmd>Octo review comments<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rcs", "<cmd>Octo comment suggest<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rcc", "<cmd>Octo comment add<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rcr", "<cmd>Octo comment reply<cr>", { buffer = true })
+--
+-- 		vim.keymap.set("n", "<leader>pd", "<cmd>Octo pr diff<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>pc", "<cmd>Octo pr changes<cr>", { buffer = true })
+-- 	end,
+-- })

modules/home/programs/terminal/nvim/config/lua/telescope-config.lua

@@ -1,20 +1,23 @@
-require('telescope').setup {
+require("telescope").setup({
-    extensions = {
+	extensions = {
-        fzf = {
+		fzf = {
-            fuzzy = true,
+			fuzzy = true,
-            override_generic_sorter = true,
+			override_generic_sorter = true,
-            override_file_sorter = true,
+			override_file_sorter = true,
-            case_mode = "smart_case"
+			case_mode = "smart_case",
-        }
+		},
-    }
+	},
-}
+})
 
-require('telescope').load_extension('fzf')
+require("telescope").load_extension("fzf")
 require("telescope").load_extension("ui-select")
+require("telescope").load_extension("undo")
 
-local builtin = require('telescope.builtin')
+local builtin = require("telescope.builtin")
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set("n", "<leader>ff", builtin.find_files)
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+vim.keymap.set("n", "<leader>fg", builtin.live_grep)
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set("n", "<leader>fb", builtin.buffers)
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+vim.keymap.set("n", "<leader>fh", builtin.help_tags)
-vim.keymap.set('n', '<leader>fj', builtin.jumplist, {})
+vim.keymap.set("n", "<leader>fj", builtin.jumplist)
+vim.keymap.set("n", "<leader>fu", "<cmd>Telescope undo<cr>")
+vim.keymap.set("n", "<leader>fp", "<cmd>Octo pr list<cr>")

modules/home/programs/terminal/nvim/config/lua/ts-config.lua

@@ -1,3 +1,4 @@
-require'nvim-treesitter.configs'.setup {
+require("nvim-treesitter.configs").setup({
-    highlight = {enable = true, additional_vim_regex_highlighting = false}
+	highlight = { enable = true, additional_vim_regex_highlighting = false },
-}
+})
+vim.treesitter.language.register("markdown", "octo")

modules/home/programs/terminal/nvim/config/lua/which-key-config.lua

@@ -16,6 +16,7 @@ wk.add({
 	{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Live Grep" },
 	{ "<leader>fh", "<cmd>Telescope help_tags<cr>", desc = "Help Tags" },
 	{ "<leader>fj", "<cmd>Telescope jumplist<cr>", desc = "Jump List" },
+	{ "<leader>fp", "<cmd>Octo pr list<cr>", desc = "PR List" },
 	{ "<leader>g", group = "DiffView" },
 	{ "<leader>gB", desc = "Git Blame Full" },
 	{ "<leader>gH", "<cmd>DiffviewFileHistory --range=origin..HEAD<cr>", desc = "Diff History - Main" },

modules/home/programs/terminal/nvim/default.nix

@@ -34,6 +34,7 @@ in
         # -------------------
         # ----- Helpers -----
         # -------------------
+        avante-nvim # Avante
         aerial-nvim # Code Outline
         comment-nvim # Code Comments
         diffview-nvim # Diff View
@@ -47,9 +48,11 @@ in
         telescope-fzf-native-nvim # Faster Telescope
         telescope-nvim # Fuzzy Finder
         telescope-ui-select-nvim # UI
+        telescope-undo-nvim # Undo Tree
         toggleterm-nvim # Terminal Helper
         vim-nix # Nix Helpers
         which-key-nvim # Shortcut Helper
+        octo-nvim # Git Octo
 
         # ------------------
         # --- Theme / UI ---
@@ -81,13 +84,14 @@ in
         (
           pkgs.vimUtils.buildVimPlugin {
             pname = "none-ls-extras.nvim";
-            version = "2024-06-11";
+            version = "2025-06-18";
             src = pkgs.fetchFromGitHub {
               owner = "nvimtools";
               repo = "none-ls-extras.nvim";
-              rev = "336e84b9e43c0effb735b08798ffac382920053b";
+              rev = "924fe88a9983c7d90dbb31fc4e3129a583ea0a90";
-              sha256 = "sha256-UtU4oWSRTKdEoMz3w8Pk95sROuo3LEwxSDAm169wxwk=";
+              sha256 = "sha256-OJHg2+h3zvlK7LJ8kY6f7et0w6emnxfcDbjD1YyWRTw=";
             };
+            doCheck = false;
             meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/";
           }
         )
@@ -105,6 +109,7 @@ in
               rev = "5ca462bee0a39b058786bc7fbeb5d16ea49f3a23";
               sha256 = "0vlp645d5mmii513v72jca931miyrhkvhwb9bfzhix1199zx7vi2";
             };
+            doCheck = false;
             meta.homepage = "https://github.com/mhanberg/silicon.lua/";
           }
         )
@@ -142,7 +147,6 @@ in
             meta.homepage = "https://github.com/ggml-org/llama.vim/";
           }
         )
-
       ];
 
       extraPackages = with pkgs; [
@@ -165,6 +169,7 @@ in
         nodePackages.vscode-langservers-extracted
         pyright
         eslint_d
+        python312Packages.autopep8
 
         # Formatters
         luaformatter
@@ -196,6 +201,7 @@ in
           tsls = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server",
           golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver",
           vscls = "${pkgs.nodePackages.vscode-langservers-extracted}",
+          clangd = "${pkgs.clang-tools}/bin/clangd",
         }
         return nix_vars
       '';

modules/home/programs/terminal/tmux/default.nix

@@ -0,0 +1,62 @@
+{ lib, pkgs, config, namespace, ... }:
+let
+  inherit (lib) mkIf;
+  cfg = config.${namespace}.programs.terminal.tmux;
+in
+{
+  options.${namespace}.programs.terminal.tmux = {
+    enable = lib.mkEnableOption "tmux";
+  };
+
+  config = mkIf cfg.enable {
+    programs.tmux = {
+      enable = true;
+      clock24 = true;
+
+      plugins = with pkgs.tmuxPlugins; [
+        {
+          plugin = catppuccin;
+          extraConfig = ''
+            set -g @catppuccin_flavor "mocha"
+            set -g @catppuccin_status_background "none"
+
+            # Style & Separators
+            set -g @catppuccin_window_status_style "basic"
+            set -g @catppuccin_status_left_separator "█"
+            set -g @catppuccin_status_middle_separator ""
+            set -g @catppuccin_status_right_separator "█"
+
+            # Window Titles
+            set -g @catppuccin_window_text " #W"
+            set -g @catppuccin_window_current_text " #W"
+          '';
+        }
+        cpu
+        yank
+      ];
+
+      extraConfig = ''
+        # Misc Settings
+        set -g status-position top
+        set -g mouse on
+        setw -g mode-keys vi
+        set -ag terminal-overrides ",xterm-256color:Tc:Ms=\\E]52;c%p1%.0s;%p2%s\\7"
+
+        # Start Index 1
+        set -g base-index 1
+        setw -g pane-base-index 1
+        set -g renumber-windows on
+
+        # Maintain Directory
+        bind '"' split-window -c "#{pane_current_path}"
+        bind % split-window -h -c "#{pane_current_path}"
+        bind c new-window -c "#{pane_current_path}"
+
+        # Theme
+        set -g status-left ""
+        set -g status-right ""
+        set -ag status-right "#{E:@catppuccin_status_host}"
+      '';
+    };
+  };
+}

modules/home/services/poweralertd/default.nix

@@ -0,0 +1,17 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf;
+
+  cfg = config.${namespace}.services.poweralertd;
+in
+{
+  options.${namespace}.services.poweralertd = {
+    enable = lib.mkEnableOption "poweralertd";
+  };
+
+  config = mkIf cfg.enable {
+    services.poweralertd = {
+      enable = true;
+    };
+  };
+}

modules/home/services/sops/default.nix

@@ -28,14 +28,6 @@ in
         keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
         sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ] ++ cfg.sshKeyPaths;
       };
-
-      # TODO
-      # secrets = {
-      #   nix = {
-      #     sopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
-      #     path = "${config.home.homeDirectory}/.config/nix/nix.conf";
-      #   };
-      # };
     };
   };
 }

modules/nixos/hardware/battery/upower/default.nix

@@ -0,0 +1,15 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf;
+
+  cfg = config.${namespace}.hardware.battery.upower;
+in
+{
+  options.${namespace}.hardware.battery.upower = {
+    enable = lib.mkEnableOption "enable upower";
+  };
+
+  config = mkIf cfg.enable {
+    services.upower.enable = true;
+  };
+}

modules/nixos/hardware/opengl/default.nix

@@ -14,6 +14,8 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.xserver.videoDrivers = mkIf cfg.enableNvidia [ "nvidia" ];
+
     environment.systemPackages = with pkgs; [
       libva-utils
       vdpauinfo
@@ -23,6 +25,15 @@ in
       intel-gpu-tools
     ];
 
+    # Enable Nvidia Hardware
+    hardware.nvidia = mkIf cfg.enableNvidia {
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      open = false;
+      nvidiaSettings = true;
+    };
+
     # Add Intel Arc / Nvidia Drivers
     hardware.enableRedistributableFirmware = mkIf cfg.enableIntel (mkForce true);
     hardware.graphics = {

modules/nixos/programs/graphical/wms/hyprland/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, namespace, ... }:
+{ config, pkgs, lib, namespace, ... }:
 let
   inherit (lib) mkIf;
 
@@ -17,6 +17,10 @@ in
       };
     };
 
+    environment.systemPackages = with pkgs; [
+      wl-clipboard
+    ];
+
     reichard = {
       display-managers = {
         sddm = {

modules/nixos/services/headscale/default.nix

@@ -0,0 +1,51 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.${namespace}.services.headscale;
+  inherit (lib.${namespace}) mkBoolOpt;
+in
+{
+  options.${namespace}.services.headscale = {
+    enable = mkEnableOption "enable headscale service";
+    openFirewall = mkBoolOpt false "Open firewall";
+  };
+
+  options.services.headscale.settings.dns.nameservers.split = lib.mkOption {
+    type = lib.types.attrsOf (lib.types.listOf lib.types.str);
+    default = { };
+    description = ''
+      Split DNS configuration mapping domains to specific nameservers.
+      Each key is a domain suffix, and the value is a list of nameservers
+      to use for that domain.
+    '';
+    example = {
+      "internal.company.com" = [ "10.0.0.1" "10.0.0.2" ];
+      "dev.local" = [ "192.168.1.1" ];
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.headscale = {
+      enable = true;
+      address = "0.0.0.0";
+      settings = {
+        server_url = "https://headscale.reichard.io";
+        dns = {
+          base_domain = "reichard.dev";
+          nameservers = {
+            global = [
+              "9.9.9.9"
+            ];
+            split = {
+              "va.reichard.io" = [ "10.0.20.20" ];
+            };
+          };
+        };
+      };
+    };
+
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ 8080 ];
+    };
+  };
+}

modules/nixos/services/llama-cpp/default.nix

@@ -0,0 +1,108 @@
+{ config, pkgs, lib, namespace, ... }:
+let
+  inherit (lib) types mkIf mkEnableOption;
+  inherit (lib.${namespace}) mkOpt;
+  cfg = config.${namespace}.services.llama-cpp;
+
+  modelDir = "/models";
+  availableModels = {
+    "qwen2.5-coder-7b-q8_0.gguf" = {
+      url = "https://huggingface.co/ggml-org/Qwen2.5-Coder-7B-Q8_0-GGUF/resolve/main/qwen2.5-coder-7b-q8_0.gguf?download=true";
+      flag = "--fim-qwen-7b-default";
+    };
+    "qwen2.5-coder-3b-q8_0.gguf" = {
+      url = "https://huggingface.co/ggml-org/Qwen2.5-Coder-3B-Q8_0-GGUF/resolve/main/qwen2.5-coder-3b-q8_0.gguf?download=true";
+      flag = "--fim-qwen-3b-default";
+    };
+  };
+in
+{
+  options.${namespace}.services.llama-cpp = with types; {
+    enable = mkEnableOption "llama-cpp support";
+    modelName = mkOpt str "qwen2.5-coder-3b-q8_0.gguf" "model to use";
+  };
+
+  config =
+    let
+      modelPath = "${modelDir}/${cfg.modelName}";
+    in
+    mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = availableModels ? ${cfg.modelName};
+          message = "Invalid model '${cfg.modelName}'. Available models: ${lib.concatStringsSep ", " (lib.attrNames availableModels)}";
+        }
+      ];
+
+      systemd.services = {
+        # LLama Download Model
+        download-model = {
+          description = "Download Model";
+          wantedBy = [ "multi-user.target" ];
+          before = [ "llama-cpp.service" ];
+          path = [ pkgs.curl pkgs.coreutils ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            User = "root";
+            Group = "root";
+          };
+          script =
+            let
+              modelURL = availableModels.${cfg.modelName}.url;
+            in
+            ''
+              set -euo pipefail
+
+              if [ ! -f "${modelPath}" ]; then
+                mkdir -p "${modelDir}"
+                # Add -f flag to follow redirects and -L for location
+                # Add --fail flag to exit with error on HTTP errors
+                # Add -C - to resume interrupted downloads
+                curl -f -L -C - \
+                  -H "Accept: application/octet-stream" \
+                  --retry 3 \
+                  --retry-delay 5 \
+                  --max-time 1800 \
+                  "${modelURL}" \
+                  -o "${modelPath}.tmp" && \
+                mv "${modelPath}.tmp" "${modelPath}"
+              fi
+            '';
+        };
+
+        # Setup LLama API Service
+        llama-cpp = {
+          after = [ "download-model.service" ];
+          requires = [ "download-model.service" ];
+        };
+      };
+
+      services.llama-cpp = {
+        enable = true;
+        host = "0.0.0.0";
+        port = 8012;
+        openFirewall = true;
+        model = "${modelPath}";
+
+        package = (pkgs.llama-cpp.override {
+          cudaSupport = true;
+        }).overrideAttrs (oldAttrs: {
+          cmakeFlags = oldAttrs.cmakeFlags ++ [
+            "-DGGML_CUDA_ENABLE_UNIFIED_MEMORY=1"
+            "-DCMAKE_CUDA_ARCHITECTURES=61" # GTX-1070
+
+            # Disable CPU Instructions - Intel(R) Core(TM) i5-3570K CPU @ 3.40GHz
+            "-DLLAMA_FMA=OFF"
+            "-DLLAMA_AVX2=OFF"
+            "-DLLAMA_AVX512=OFF"
+            "-DGGML_FMA=OFF"
+            "-DGGML_AVX2=OFF"
+            "-DGGML_AVX512=OFF"
+          ];
+        });
+
+        extraFlags = [ availableModels.${cfg.modelName}.flag ];
+      };
+    };
+}

modules/nixos/services/mosh/default.nix

@@ -0,0 +1,18 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf;
+
+  cfg = config.${namespace}.services.mosh;
+in
+{
+  options.${namespace}.services.mosh = {
+    enable = lib.mkEnableOption "mosh support";
+  };
+
+  config = mkIf cfg.enable {
+    programs.mosh = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+}

modules/nixos/services/openssh/default.nix

@@ -12,8 +12,14 @@ let
   authorizedKeys = [
     # evanreichard@lin-va-mbp-personal
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+    # evanreichard@mac-va-mbp-personal
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
     # evanreichard@lin-va-thinkpad
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
+    # evanreichard@mobile
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARTNbl4lgQsp7SJEng7vprL0+ChC9e6iR7o/PiC4Jme"
+    # evanreichard@lin-va-terminal
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM5e6Cty+7rX5BjIEHBTU6GnzfOxPJiHpSqin/BnsypO"
   ];
 in
 {

modules/nixos/services/rke2/default.nix

@@ -9,7 +9,7 @@ in
   options.${namespace}.services.rke2 = with types; {
     enable = lib.mkEnableOption "Enable RKE2";
     disable = mkOpt (listOf str) [ ] "Disable services";
-    openFirewall = mkBoolOpt true "Open firewall";
+    openFirewall = mkBoolOpt false "Open firewall";
   };
 
   config = mkIf cfg.enable {
@@ -18,6 +18,10 @@ in
       disable = cfg.disable;
     };
 
+    # NOTE: Tailscale & K8s Calico conflict due to FWMask. You need to update the DaemonSet Env with:
+    #   - name: FELIX_IPTABLESMARKMASK
+    #     value: "0xff00ff00"
+
     networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [
       # RKE2 Ports - https://docs.rke2.io/install/requirements#networking
       6443 # Kubernetes API
@@ -32,8 +36,6 @@ in
       7946 # memberlist
     ];
 
-    environment.systemPackages = with pkgs; [ nfs-utils ];
-
     networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [
       # RKE2 Ports - https://docs.rke2.io/install/requirements#networking
       8472 # Canal CNI with VXLAN
@@ -49,5 +51,11 @@ in
       after = [ "cloud-final.service" ];
       requires = [ "cloud-final.service" ];
     };
+
+    environment.systemPackages = with pkgs; [
+      k9s
+      kubectl
+      nfs-utils
+    ];
   };
 }

modules/nixos/services/rtl-tcp/default.nix

@@ -0,0 +1,32 @@
+{ config, pkgs, lib, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) mkBoolOpt;
+  cfg = config.${namespace}.services.rtl-tcp;
+in
+{
+  options.${namespace}.services.rtl-tcp = {
+    enable = mkEnableOption "RTL-TCP support";
+    openFirewall = mkBoolOpt true "Open firewall";
+  };
+
+  config = mkIf cfg.enable {
+    hardware.rtl-sdr.enable = true;
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 1234 ];
+
+    # RTL-SDR TCP Server Service
+    systemd.services.rtl-tcp = {
+      description = "RTL-SDR TCP Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.rtl-sdr}/bin/rtl_tcp -a 0.0.0.0 -f 1090000000 -s 2400000";
+        Restart = "on-failure";
+        RestartSec = "10s";
+        User = "root";
+        Group = "root";
+      };
+    };
+  };
+}

modules/nixos/services/sunshine/default.nix

@@ -0,0 +1,20 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.services.sunshine;
+in
+{
+  options.${namespace}.services.sunshine = {
+    enable = mkEnableOption "enable sunshine service";
+    openFirewall = mkBoolOpt true "open firewall";
+  };
+
+  config = mkIf cfg.enable {
+    services.sunshine = {
+      enable = true;
+      openFirewall = cfg.openFirewall;
+    };
+  };
+}

modules/nixos/services/tailscale/default.nix

@@ -0,0 +1,27 @@
+{ config, lib, namespace, ... }:
+let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.${namespace}.services.tailscale;
+in
+{
+  options.${namespace}.services.tailscale = {
+    enable = mkEnableOption "enable tailscale service";
+    enableRouting = mkEnableOption "enable tailscale routing";
+  };
+
+  config = mkIf cfg.enable {
+    services.tailscale = {
+      enable = true;
+      useRoutingFeatures = if cfg.enableRouting then "server" else "client";
+    };
+
+    boot.kernel.sysctl = mkIf cfg.enableRouting {
+      "net.ipv4.ip_forward" = 1;
+      "net.ipv6.conf.all.forwarding" = 1;
+    };
+
+    # NOTE: Tailscale & K8s Calico conflict due to FWMask. You need to update the DaemonSet Env with:
+    #   - name: FELIX_IPTABLESMARKMASK
+    #     value: "0xff00ff00"
+  };
+}

modules/nixos/system/boot/default.nix

@@ -1,18 +1,29 @@
 { config, lib, namespace, ... }:
 let
   inherit (lib) mkIf mkDefault;
+  inherit (lib.${namespace}) mkBoolOpt;
 
   cfg = config.${namespace}.system.boot;
 in
 {
   options.${namespace}.system.boot = {
     enable = lib.mkEnableOption "Enable Boot";
-    xenGuest = lib.mkEnableOption "Enable Xen Guest";
+    enableGrub = mkBoolOpt true "Enable GRUB";
+    enableSystemd = mkBoolOpt false "Enable systemd";
+
+    xenGuest = lib.mkEnableOption "Xen guest support";
     showNotch = lib.mkEnableOption "Show macOS Notch";
     silentBoot = lib.mkEnableOption "Silent Boot";
   };
 
   config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = !(cfg.enableGrub && cfg.enableSystemd);
+        message = "Cannot enable both GRUB and systemd-boot";
+      }
+    ];
+
     services.xe-guest-utilities.enable = mkIf cfg.xenGuest true;
 
     boot = {
@@ -33,12 +44,18 @@ in
           canTouchEfiVariables = false;
         };
 
-        systemd-boot = {
+        systemd-boot = mkIf cfg.enableSystemd {
           enable = true;
           configurationLimit = 20;
           editor = false;
         };
 
+        grub = mkIf cfg.enableGrub {
+          enable = true;
+          efiSupport = true;
+          efiInstallAsRemovable = true;
+        };
+
         timeout = mkDefault 1;
       };
 

modules/nixos/system/disk/default.nix

@@ -20,22 +20,19 @@ in
           content = {
             type = "gpt";
             partitions = {
+              bios-boot = {
+                name = "bios-boot";
+                size = "1M";
+                type = "EF02";
+              };
               boot = {
-                size = "512M";
+                name = "boot";
+                size = "500M";
                 type = "EF00";
                 content = {
                   type = "filesystem";
                   format = "vfat";
                   mountpoint = "/boot";
-                  mountOptions = [ "umask=0077" ];
-                };
-              };
-              root = {
-                size = "100%";
-                content = {
-                  type = "filesystem";
-                  format = "ext4";
-                  mountpoint = "/";
                 };
               };
               swap = {
@@ -46,6 +43,33 @@ in
                   resumeDevice = true;
                 };
               };
+              root = {
+                name = "root";
+                size = "100%";
+                content = {
+                  type = "lvm_pv";
+                  vg = "pool";
+                };
+              };
+            };
+          };
+        };
+      };
+
+      lvm_vg = {
+        pool = {
+          type = "lvm_vg";
+          lvs = {
+            root = {
+              size = "100%FREE";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+                mountOptions = [
+                  "defaults"
+                ];
+              };
             };
           };
         };

modules/nixos/virtualisation/libvirtd/default.nix

@@ -0,0 +1,59 @@
+{ config, lib, pkgs, namespace, ... }:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkBoolOpt;
+
+  cfg = config.${namespace}.virtualisation.libvirtd;
+in
+{
+  options.${namespace}.virtualisation.libvirtd = {
+    enable = lib.mkEnableOption "enable libvirtd";
+    withVirtManager = mkBoolOpt false "add virt-manager";
+    enableIntelIOMMU = mkBoolOpt false "enable Intel IOMMU for better device passthrough";
+    enableAMDIOMMU = mkBoolOpt false "enable AMD IOMMU for better device passthrough";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      win-virtio
+      virtiofsd
+      libvirt
+      qemu_kvm
+    ] ++ lib.optionals cfg.withVirtManager [
+      virt-manager
+      virt-viewer
+      spice-gtk
+    ];
+
+    reichard = {
+      user = {
+        extraGroups = [
+          "libvirtd"
+        ];
+      };
+    };
+
+    virtualisation = {
+      libvirtd = {
+        enable = true;
+        qemu = {
+          package = pkgs.qemu_kvm;
+          runAsRoot = false;
+          swtpm.enable = true;
+          ovmf = {
+            enable = true;
+            packages = [ pkgs.OVMFFull.fd ];
+          };
+        };
+      };
+
+      spiceUSBRedirection.enable = true;
+    };
+
+    boot.kernelParams = lib.optionals cfg.enableIntelIOMMU [
+      "intel_iommu=on"
+    ] ++ lib.optionals cfg.enableAMDIOMMU [
+      "amd_iommu=on"
+    ];
+  };
+}

secrets/mac-va-mbp-personal/evanreichard/default.yaml

@@ -0,0 +1,26 @@
+builder_ssh_key: ENC[AES256_GCM,data:1cYuaFJke/8GyqxPKp2zH/uARvW6Bqx6AsB16U8f3WkDpnxO6kym19MpDyQUBEjJ9Bj3RiBkSSL96jBv4YZfq+1cN8D6E14faKoYF5FZy5o1C+aTl+4L9zbrQIl/QDFh42qcJ6cYsOSjbEJv8kvZQBV7l+LNo8ZX07f76Kld3boouJJMMZWa9oaZgEifTxN4yDOPXTXNjCO3blGnsm+V3FPkba+EUASL9WH6+XLU2oW1Bc/sydOTiKGRJcs5eyqYvKi3evtxUUyqgdPVtUHNTsh6/B5kDLWFavfEfchPHT0LHIuqGJwGBglTp/NJThAoo5vNFAFIAUw9QWlY4alHhsi2L5g49r3s6i+3fGeyGCTP61uffY9HgF7nOdkTVMsRXacKh9fwgdsZAepcU+kJ3LJSdOaa4hUtCsZpFHUe4jA0kTHI1/V+7ak+iw92gNZTLKsCjIOzWFvEBVSXLctPdxQ8ezvF9ekvw5mkAwO7QYonlrQ3MUY/8b1DDOdjmfSwEyrLruew2KajFhm8/NM/2BOwcO/y+DbX2MSe5x0sx4HN79E=,iv:V25Tc7bOxc4wl5lf6gZOstN1InaCb3sfpCHMl65iwn8=,tag:mBFZcX2G3vpAOMw7V12d6w==,type:str]
+rke2_kubeconfig: ENC[AES256_GCM,data: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,iv:mC5XSWReVzjwheF1IzCzp34JRvL/vJipyaKhptkH+cU=,tag:SDoNiaWaPKzruj+HPv5jbw==,type:str]
+sops:
+    age:
+        - recipient: age1sac93wpnjcv62s7583jv6a4yspndh6k0r25g3qx3k7gq748uvafst6nz4w
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuVWFObG51K2lTYlZidXBU
+            aW55RnpkVDExbVBkNDl4NkV3MFNkNThjbWdZCklhWkVSaWpPSE1VY09iWGlPVE9Q
+            bW1SY05jK3BwcDIwSHdMZjJHdWQyQkkKLS0tIHZYS2c2U2xtQ1QxajlKeWpmNXZW
+            bmdpcTl2NjRWM3F3Q2RHbk1rTEFvZEkKWag1nmqFZMRjwFtIo6oqs+9UI/Mer5bK
+            Ax7P7uwoZdiMN2g84W1pNTjj6GktFn3jrBaE+MxY6NUBr02apkRYZw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1dccte7xtwswgef089nd80dutp96xnezx5lrqnneh9cusegsnda8sj3dj6c
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5cURST1FTbVk4RGZTaitF
+            MEt3Z2U0a004Zmo0VG1BN29DUnBLNGxPMEJFCkcyL1JrMkZsSTM5WCtZSldSeGZw
+            SmdpV3AxRDJyVW1WMXBuclhBSDkvTXcKLS0tIDZsU2pBbEFHNkdqWW1CZW1hdVN3
+            eW9OdlJmS21IVDNVNk9OMjZBT21PUTAK+lpsdEp2uvg8nFWu/hPtK0+Ahi5J//5d
+            NB6JJ7lwRWKy2NppFf9sy20Y1Z0Z5Ui40nbnURRzYgtsqbKBveUDcA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2025-07-29T23:30:28Z"
+    mac: ENC[AES256_GCM,data:x3dnanNbIX0fippbbFqOSR9ptZGdAwWuyn7hf3z6i43rk8Nk9p9EVqmE4/Guz2QY2tG/cph/5/nwX4UCO4ixAdB7pAWZa6lI1JdFzMBfW1IGeXOLyprDt6xdFnCVXjy64HgNWiVOPUS4+olxNZ0LPmCof7odqn+Axj+icFK3N34=,iv:OyFac4TxnKXwJ0l7LcJTqVyl11gIpw8fvEAEQTrEBc0=,tag:zMOGwIwAZmel+4EIqy9/tQ==,type:str]
+    unencrypted_suffix: _unencrypted
+    version: 3.10.2

shells/default/default.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+let
+  sync-repo = pkgs.writeShellScriptBin "sync-repo" ''
+    if [ -z "$1" ]; then
+      echo "Usage: sync-repo <ip-address>"
+      echo "Example: sync-repo 23.29.118.42"
+      exit 1
+    fi
+
+    rsync -av \
+      --exclude='.git' \
+      --exclude='.direnv' \
+      --exclude='_scratch' \
+      . evanreichard@$1:/etc/nixos
+  '';
+in
+pkgs.mkShell {
+  name = "reichard-dev";
+
+  buildInputs = with pkgs; [
+    rsync
+    sync-repo
+  ];
+
+  shellHook = ''
+    echo "Use: sync-repo <ip-address> to sync repository"
+  '';
+}

systems/aarch64-darwin/mac-va-mbp-personal/default.nix

@@ -0,0 +1,20 @@
+{ namespace, lib, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+in
+{
+  system.stateVersion = 6;
+
+  # System Config
+  reichard = {
+    nix = enabled;
+
+    security = {
+      sops = {
+        enable = true;
+        sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/mac-va-mbp-personal/default.yaml";
+      };
+    };
+  };
+}

systems/aarch64-linux/lin-o1-headscale/default.nix

@@ -0,0 +1,62 @@
+{ namespace, config, pkgs, lib, modulesPath, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+
+  cfg = config.${namespace}.user;
+in
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  system.stateVersion = "25.05";
+  time.timeZone = "UTC";
+
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+
+  reichard = {
+    nix = enabled;
+
+    system = {
+      disk = {
+        enable = true;
+        diskPath = "/dev/sda";
+      };
+      networking = enabled;
+    };
+
+    services = {
+      openssh = enabled;
+      headscale = {
+        enable = true;
+        openFirewall = true;
+      };
+      tailscale = {
+        enable = true;
+        enableRouting = true;
+      };
+    };
+  };
+
+  users.users.${cfg.name} = {
+    openssh = {
+      authorizedKeys.keys = [
+        # evanreichard@lin-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+        # evanreichard@mac-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
+        # evanreichard@lin-va-thinkpad
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
+      ];
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    btop
+    tmux
+    vim
+  ];
+}

systems/aarch64-linux/lin-o1-node/default.nix

@@ -0,0 +1,60 @@
+{ namespace, config, pkgs, lib, modulesPath, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+
+  cfg = config.${namespace}.user;
+in
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  system.stateVersion = "25.05";
+  time.timeZone = "UTC";
+
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+
+  reichard = {
+    nix = enabled;
+
+    system = {
+      disk = {
+        enable = true;
+        diskPath = "/dev/sda";
+      };
+      networking = {
+        enable = true;
+      };
+    };
+
+    services = {
+      openssh = enabled;
+      tailscale = {
+        enable = true;
+        enableRouting = true;
+      };
+    };
+  };
+
+  users.users.${cfg.name} = {
+    openssh = {
+      authorizedKeys.keys = [
+        # evanreichard@lin-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+        # evanreichard@mac-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
+        # evanreichard@lin-va-thinkpad
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
+      ];
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    btop
+    tmux
+    vim
+  ];
+}

systems/aarch64-linux/lin-va-mbp-personal/default.nix

@@ -7,7 +7,7 @@ in
     ./hardware-configuration.nix
   ];
 
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
   time.timeZone = "America/New_York";
 
   # System Config

systems/x86_64-linux/lin-o1-x86-node/default.nix

@@ -0,0 +1,60 @@
+{ namespace, config, pkgs, lib, modulesPath, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+
+  cfg = config.${namespace}.user;
+in
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  system.stateVersion = "25.05";
+  time.timeZone = "UTC";
+
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+
+  reichard = {
+    nix = enabled;
+
+    system = {
+      disk = {
+        enable = true;
+        diskPath = "/dev/sda";
+      };
+      networking = {
+        enable = true;
+      };
+    };
+
+    services = {
+      openssh = enabled;
+      tailscale = {
+        enable = true;
+        enableRouting = true;
+      };
+    };
+  };
+
+  users.users.${cfg.name} = {
+    openssh = {
+      authorizedKeys.keys = [
+        # evanreichard@lin-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+        # evanreichard@mac-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
+        # evanreichard@lin-va-thinkpad
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
+      ];
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    btop
+    tmux
+    vim
+  ];
+}

systems/x86_64-linux/lin-ovh-kube1/default.nix

@@ -0,0 +1,65 @@
+{ namespace, config, pkgs, lib, modulesPath, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+
+  cfg = config.${namespace}.user;
+in
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  system.stateVersion = "25.05";
+  time.timeZone = "UTC";
+
+  networking.firewall.allowedTCPPorts = [ 443 ];
+
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+
+  reichard = {
+    nix = enabled;
+
+    system = {
+      disk = {
+        enable = true;
+        diskPath = "/dev/sda";
+      };
+      networking = enabled;
+    };
+
+    services = {
+      openssh = enabled;
+      tailscale = {
+        enable = true;
+        enableRouting = true;
+      };
+      rke2 = {
+        enable = true;
+        openFirewall = false;
+        disable = [ "rke2-ingress-nginx" ];
+      };
+    };
+  };
+
+  users.users.${cfg.name} = {
+    openssh = {
+      authorizedKeys.keys = [
+        # evanreichard@lin-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+        # evanreichard@mac-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
+        # evanreichard@lin-va-thinkpad
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
+      ];
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    btop
+    tmux
+    vim
+  ];
+}

systems/x86_64-linux/lin-ssd-kube1/default.nix

@@ -0,0 +1,73 @@
+{ namespace, config, pkgs, lib, modulesPath, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+
+  cfg = config.${namespace}.user;
+in
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  system.stateVersion = "25.05";
+  time.timeZone = "UTC";
+
+  networking.firewall.allowedTCPPorts = [ 443 ];
+
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+
+  reichard = {
+    nix = enabled;
+
+    system = {
+      disk = {
+        enable = true;
+        diskPath = "/dev/sda";
+      };
+      networking = {
+        enable = true;
+        useStatic = {
+          interface = "enp3s0";
+          address = "23.29.118.42";
+          defaultGateway = "23.29.118.1";
+          nameservers = [ "1.1.1.1" ];
+        };
+      };
+    };
+
+    services = {
+      openssh = enabled;
+      tailscale = {
+        enable = true;
+        enableRouting = true;
+      };
+      rke2 = {
+        enable = true;
+        openFirewall = false;
+        disable = [ "rke2-ingress-nginx" ];
+      };
+    };
+  };
+
+  # users.users.${cfg.name} = {
+  #   openssh = {
+  #     authorizedKeys.keys = [
+  #       # evanreichard@lin-va-mbp-personal
+  #       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+  #       # evanreichard@mac-va-mbp-personal
+  #       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
+  #       # evanreichard@lin-va-thinkpad
+  #       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
+  #     ];
+  #   };
+  # };
+
+  environment.systemPackages = with pkgs; [
+    btop
+    tmux
+    vim
+  ];
+}

systems/x86_64-linux/lin-va-nix-builder/default.nix

@@ -4,7 +4,7 @@ let
 in
 {
   time.timeZone = "America/New_York";
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
 
   reichard = {
     system = {
@@ -33,6 +33,8 @@ in
         authorizedKeys = [
           # evanreichard@lin-va-mbp-personal
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+          # evanreichard@mac-va-mbp-personal
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
           # evanreichard@lin-va-thinkpad
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
           # NixOS Builder
@@ -47,6 +49,8 @@ in
       authorizedKeys.keys = [
         # evanreichard@lin-va-mbp-personal
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+        # evanreichard@mac-va-mbp-personal
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
         # evanreichard@lin-va-thinkpad
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
         # NixOS Builder

systems/x86_64-linux/lin-va-office/default.nix

@@ -1,175 +1,70 @@
-{ config, pkgs, ... }:
+{ namespace, pkgs, config, lib, ... }:
-
 let
-  cuda-llama = (pkgs.llama-cpp.override {
+  inherit (lib.${namespace}) enabled;
-    cudaSupport = true;
+  cfg = config.${namespace}.user;
-  }).overrideAttrs (oldAttrs: {
-    cmakeFlags = oldAttrs.cmakeFlags ++ [
-      "-DGGML_CUDA_ENABLE_UNIFIED_MEMORY=1"
-
-      # Disable CPU Instructions - Intel(R) Core(TM) i5-3570K CPU @ 3.40GHz
-      "-DLLAMA_FMA=OFF"
-      "-DLLAMA_AVX2=OFF"
-      "-DLLAMA_AVX512=OFF"
-      "-DGGML_FMA=OFF"
-      "-DGGML_AVX2=OFF"
-      "-DGGML_AVX512=OFF"
-    ];
-  });
-
-  # Define Model Vars
-  modelDir = "/models";
-
-  # 7B
-  # modelName = "qwen2.5-coder-7b-q8_0.gguf";
-  # modelUrl = "https://huggingface.co/ggml-org/Qwen2.5-Coder-7B-Q8_0-GGUF/resolve/main/${modelName}?download=true";
-
-  # 3B
-  modelName = "qwen2.5-coder-3b-q8_0.gguf";
-  modelUrl = "https://huggingface.co/ggml-org/Qwen2.5-Coder-3B-Q8_0-GGUF/resolve/main/${modelName}?download=true";
-
-  modelPath = "${modelDir}/${modelName}";
 in
-
 {
-  # Allow Nvidia & CUDA
+  system.stateVersion = "25.05";
+  time.timeZone = "America/New_York";
+
   nixpkgs.config.allowUnfree = true;
 
-  # Enable Graphics
+  # System Config
-  hardware.graphics = {
+  reichard = {
-    enable = true;
+    nix = enabled;
-    enable32Bit = true;
-    extraPackages = [ pkgs.cudatoolkit ];
-  };
 
-  # Load Nvidia Driver Module
+    system = {
-  services.xserver.videoDrivers = [ "nvidia" ];
+      boot = {
-
+        enable = true;
-  # Nvidia Package Configuration
+        silentBoot = true;
-  hardware.nvidia = {
+      };
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+      disk = {
-    modesetting.enable = true;
+        enable = true;
-    powerManagement.enable = true;
+        diskPath = "/dev/sda";
-    open = false;
+      };
-    nvidiaSettings = true;
+      networking = {
-  };
+        enable = true;
-
+        useStatic = {
-  # Networking Configuration
+          interface = "enp5s0";
-  networking.firewall = {
+          address = "10.0.50.120";
-    enable = true;
+          defaultGateway = "10.0.50.254";
-    allowedTCPPorts = [
+          nameservers = [ "10.0.20.20" ];
-      1234 # RTL-TCP
+        };
-      8080 # LLama API
-    ];
-  };
-
-  # RTL-SDR
-  hardware.rtl-sdr.enable = true;
-
-  systemd.services = {
-    # LLama Download Model
-    download-model = {
-      description = "Download Model";
-      wantedBy = [ "multi-user.target" ];
-      before = [ "llama-cpp.service" ];
-      path = [ pkgs.curl pkgs.coreutils ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        User = "root";
-        Group = "root";
       };
-      script = ''
-        set -euo pipefail
-
-        if [ ! -f "${modelPath}" ]; then
-          mkdir -p "${modelDir}"
-          # Add -f flag to follow redirects and -L for location
-          # Add --fail flag to exit with error on HTTP errors
-          # Add -C - to resume interrupted downloads
-          curl -f -L -C - \
-            -H "Accept: application/octet-stream" \
-            --retry 3 \
-            --retry-delay 5 \
-            --max-time 1800 \
-            "${modelUrl}" \
-            -o "${modelPath}.tmp" && \
-          mv "${modelPath}.tmp" "${modelPath}"
-        fi
-      '';
     };
 
-    # RTL-SDR TCP Server Service
+    hardware = {
-    rtl-tcp = {
+      opengl = {
-      description = "RTL-SDR TCP Server";
+        enable = true;
-      after = [ "network.target" ];
+        enableNvidia = true;
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        ExecStart = "${pkgs.rtl-sdr}/bin/rtl_tcp -a 0.0.0.0 -f 1090000000 -s 2400000";
-        Restart = "on-failure";
-        RestartSec = "10s";
-        User = "root";
-        Group = "root";
       };
     };
+
+    services = {
+      openssh = enabled;
+      llama-cpp = enabled;
+      rtl-tcp = enabled;
+    };
   };
 
-  # Setup LLama API Service
+  users.users.${cfg.name} = {
-  systemd.services.llama-cpp = {
+    openssh = {
-    after = [ "download-model.service" ];
+      authorizedKeys.keys = [
-    requires = [ "download-model.service" ];
+        # evanreichard@lin-va-mbp-personal
-  };
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
-
+        # evanreichard@mac-va-mbp-personal
-  # Enable LLama API
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV"
-  services.llama-cpp = {
+        # evanreichard@lin-va-thinkpad
-    enable = true;
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
-    host = "0.0.0.0";
+      ];
-    package = cuda-llama;
+    };
-    model = modelPath;
-    port = 8080;
-    openFirewall = true;
-
-    # 7B
-    # extraFlags = [
-    #   "-ngl"
-    #   "99"
-    #   "-fa"
-    #   "-ub"
-    #   "512"
-    #   "-b"
-    #   "512"
-    #   "-dt"
-    #   "0.1"
-    #   "--ctx-size"
-    #   "4096"
-    #   "--cache-reuse"
-    #   "256"
-    # ];
-
-    # 3B
-    extraFlags = [
-      "-ngl"
-      "99"
-      "-fa"
-      "-ub"
-      "1024"
-      "-b"
-      "1024"
-      "--ctx-size"
-      "0"
-      "--cache-reuse"
-      "256"
-    ];
   };
 
   # System Packages
   environment.systemPackages = with pkgs; [
-    htop
+    btop
-    nvtopPackages.full
+    git
-    rtl-sdr
     tmux
     vim
-    wget
   ];
 }

systems/x86_64-linux/lin-va-terminal/default.nix

@@ -0,0 +1,47 @@
+{ namespace, lib, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+in
+{
+  system.stateVersion = "25.05";
+  time.timeZone = "America/New_York";
+
+  reichard = {
+    nix = enabled;
+
+    system = {
+      boot = {
+        enable = true;
+        enableGrub = false;
+        enableSystemd = true;
+        xenGuest = true;
+      };
+
+      disk = {
+        enable = true;
+        diskPath = "/dev/xvda";
+      };
+
+      networking = {
+        enable = true;
+        useStatic = {
+          interface = "enX0";
+          address = "10.0.50.30";
+          defaultGateway = "10.0.50.254";
+          nameservers = [ "10.0.20.20" ];
+        };
+      };
+    };
+
+    services = {
+      avahi = enabled;
+      mosh = enabled;
+      openssh = enabled;
+      tailscale = enabled;
+    };
+
+    virtualisation = {
+      podman = enabled;
+    };
+  };
+}

systems/x86_64-linux/lin-va-thinkpad/default.nix

@@ -1,11 +1,14 @@
-{ namespace, lib, ... }:
+{ namespace, pkgs, lib, ... }:
 let
   inherit (lib.${namespace}) enabled;
 in
 {
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
   time.timeZone = "America/New_York";
   hardware.enableRedistributableFirmware = true;
+  hardware.bluetooth.enable = true;
+  hardware.amdgpu.initrd.enable = lib.mkDefault true;
+  services.xserver.videoDrivers = [ "modesetting" ];
 
   # System Config
   reichard = {
@@ -14,6 +17,8 @@ in
     system = {
       boot = {
         enable = true;
+        enableGrub = false;
+        enableSystemd = true;
         silentBoot = true;
       };
       disk = {
@@ -28,15 +33,24 @@ in
 
     hardware = {
       opengl = enabled;
+      battery = {
+        upower = enabled;
+      };
     };
 
     services = {
+      tailscale = enabled;
       avahi = enabled;
       ydotool = enabled;
     };
 
     virtualisation = {
       podman = enabled;
+      libvirtd = {
+        enable = true;
+        withVirtManager = true;
+        enableAMDIOMMU = true;
+      };
     };
 
     programs = {
@@ -52,4 +66,9 @@ in
       };
     };
   };
+
+  # Additional System Packages
+  environment.systemPackages = with pkgs; [
+    mosh
+  ];
 }

systems/x86_64-vmware/lin-va-rke2/default.nix

@@ -9,7 +9,7 @@ in
 
   config = {
     # Basic System
-    system.stateVersion = "24.11";
+    system.stateVersion = "25.05";
     time.timeZone = "UTC";
 
     reichard = {
@@ -33,6 +33,7 @@ in
         cloud-init = enabled;
         rke2 = {
           enable = true;
+          openFirewall = true;
           disable = [ "rke2-ingress-nginx" ];
         };
         openiscsi = {