cloud init migration

.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -2,4 +2,3 @@
 _scratch
 result
 ._*
-.direnv

.sops.yaml

@@ -1,31 +1,15 @@
 keys:
-  # Global Admin
+  # Admin - Age Native
   - &admin_reichard age1sac93wpnjcv62s7583jv6a4yspndh6k0r25g3qx3k7gq748uvafst6nz4w
-
+  # lin-va-mbp-personal@evanreichard - SSH Derived
-  # User SSH Derived
   - &user_lin-va-mbp-personal age17ayje4uv2mhwehhp9jr3u9l0ds07396kt7ef40sufx89vm7cgfjq6d5d4y
-  - &user_mac-va-mbp-personal age1dccte7xtwswgef089nd80dutp96xnezx5lrqnneh9cusegsnda8sj3dj6c
-  - &user_lin-va-thinkpad age1avlhszrryt4gf4ya536jhzm7qwt9xfttm8x4sns6h9w2tahzqp8sspz9y5
-  - &user_lin-va-desktop age15hdlen5dgjvdfgg2j0uzvchs5vs3xuptkhsw9xeuatcuk6uwrvcsz7hcsg
-
-  # System SSH Derived
-  - &system_lin-va-desktop age1mxjrvjxkn69kfn2np3wpd73g44fuhsgykw7l5ss9rx30em5jfp2scnrq32
-  - &system_lin-va-thinkpad age13gymlygyac9z2slecl53jp8spq7e8n4zkan86n0gmnm3nrj4muxqa5ullm
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
       - age:
           - *admin_reichard
-  - path_regex: secrets/common/systems.yaml
+  - path_regex: secrets/lin-va-mbp-personal/evanreichard/[^/]+\.(yaml|json|env|ini)$
-    key_groups:
-      - age:
-          - *admin_reichard
-          - *system_lin-va-desktop
-          - *system_lin-va-thinkpad
-  - path_regex: secrets/common/evanreichard.yaml
     key_groups:
       - age:
           - *admin_reichard
           - *user_lin-va-mbp-personal
-          - *user_lin-va-thinkpad
-          - *user_mac-va-mbp-personal

README.md

@@ -2,103 +2,65 @@
 
 This repository contains the configuration for multiple machines, as well as my home / IDE config (home-manager).
 
-```bash
+### NixOS
-# 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
 ```
 
-## Nix Darwin
+### NixOS Generators
 
 ```bash
-# Install Nix Without Determinate
+nix build .#vmwareConfigurations.rke2-node
-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
 ```
 
-## Clean Garbage
+### Home Manager
-
-NOTE: This will remove previous generations
 
 ```bash
-sudo nix-collect-garbage --delete-old
+home-manager switch --flake .#evanreichard@MBP-Personal
-nix-collect-garbage --delete-old
 ```
 
-## Home Manager
+### NixOS Hosts
+
+#### Copy Config
 
 ```bash
-# Update System Channels
+rsync -av --exclude='.git' . root@HOST:/etc/nixos
-sudo nix-channel --add https://nixos.org/channels/nixpkgs-25.11-darwin nixpkgs
-sudo nix-channel --update
-
-# Update Home Manager
-nix-channel --add https://github.com/nix-community/home-manager/archive/release-25.11.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
 ```
 
-### OS Update
+#### Partition Drives
-
-`/etc/bashrc` may get overridden. To properly load Nix, prepend the following:
 
 ```bash
-# Nix
+# Validate Disk
-if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
+ls -l /dev/disk/by-id
-  . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
+
-fi
+# Partition Disk
-# End Nix
+# WARNING: This will destroy all data on the disk(s)
+sudo nix \
+    --experimental-features "nix-command flakes" \
+    run github:nix-community/disko -- \
+    --mode disko \
+    --flake /etc/nixos#HOST_CONFIG
 ```
 
-#### SOPS
+#### Install NixOS
-
-1. Convert your SSH key to an age key
-2. Get age public key
-3. Update `.sops.yaml` with rules
-4. Edit file
 
 ```bash
-# Ensure Config
+# Install
-mkdir -p ~/.config/sops/age
+sudo nixos-install --flake /etc/nixos#HOST_CONFIG
 
-# Convert SSH to Age
+# Reboot
-ssh-to-age -private-key -i $HOME/.ssh/id_ed25519 -o ~/.config/sops/age/keys.txt
+sudo reboot
-
+```
-# Get Public Key
+
-age-keygen -y ~/.config/sops/age/keys.txt
+#### Copy Config Back to Host
-ssh-to-age -private-key -i ~/.ssh/id_ed25519 | age-keygen -y
+
-SOPS_AGE_KEY_FILE=<ADMIN_KEY> sops -d --extract '["lin-va-desktop"]["host"]' ./secrets/keys.yaml | ssh-to-age -private-key | age-keygen -y
+```bash
-
+rsync -av --exclude='.git' . root@HOST:/etc/nixos
-# Edit File
+```
-# NOTE: You can specify key with - `SOPS_AGE_KEY_FILE=~/.config/sops/age/other.txt`
+
-sops secrets/lin-va-thinkpad/evanreichard/default.yaml
+#### Rebuild NixOS
+
+```bash
+sudo nixos-rebuild switch
 ```

TODO.md

@@ -0,0 +1,8 @@
+- Nix Builder
+
+  - Keys
+  - User
+  - Etc
+
+- SSH
+  - Known Hosts

bootstrap.sh

@@ -3,7 +3,7 @@
 export NIX_CONFIG="experimental-features = nix-command flakes"
 
 function cmd_image() {
-    local usage="Usage: $0 image --name <image-name> [--remote]"
+    local usage="Usage: $0 image --name <image-name>"
     local name=""
     local remote=false
 
@@ -51,9 +51,8 @@ function cmd_image() {
 }
 
 function cmd_install() {
-    local usage="Usage: $0 install --name <system-name> [--remote <user@remote-host>]"
+    local usage="Usage: $0 install --name <system-name>"
     local name=""
-    local remote=""
 
     while [[ $# -gt 0 ]]; do
         case "$1" in
@@ -61,10 +60,6 @@ function cmd_install() {
                 name="$2"
                 shift 2
                 ;;
-            --remote)
-                remote="$2"
-                shift 2
-                ;;
             *)
                 echo "$usage"
                 exit 1
@@ -85,25 +80,15 @@ function cmd_install() {
         exit 1
     fi
 
+    #$ TODO
+    #
     # Validate mainDiskID Exists
     if ! disk_id=$(nix eval --raw --impure \
-	".#nixosConfigurations.$name.config.disko.devices.disk.main.device" 2>/dev/null); then
+	".#nixosConfigurations.$name.config.mainDiskID" 2>/dev/null); then
         echo "Error: mainDiskID not defined for configuration '$name'"
         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"
@@ -150,27 +135,6 @@ function cmd_install_local(){
     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

@@ -5,53 +5,34 @@
         "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1768564560,
+        "lastModified": 1738646032,
-        "narHash": "sha256-YyIzhZoFVE4C5P9e0wZGjx4P9IT/OTUMFF3r6iKd3UY=",
+        "narHash": "sha256-57BdBE9anNpIpf48EiTVLGxg4mOQ04XjHCEP0gLTsFA=",
-        "owner": "nix-community",
+        "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "83a2bb509972148aa6d3f75c65103b6bfb7898af",
+        "rev": "e77031211944723a38bebc043e48847c36e43668",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "tpwrules",
+        "ref": "releasep2-2024-12-25",
         "repo": "nixos-apple-silicon",
         "type": "github"
       }
     },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767634391,
-        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
-        "owner": "nix-darwin",
-        "repo": "nix-darwin",
-        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-darwin",
-        "ref": "nix-darwin-25.11",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1766150702,
+        "lastModified": 1743598667,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
         "type": "github"
       },
       "original": {
@@ -62,17 +43,18 @@
     },
     "firefox-addons": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1768622624,
+        "lastModified": 1743861198,
-        "narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
+        "narHash": "sha256-PzbPHoSI5U1juWd01Spf3ST7ylR9mQ84v5p7NksBplY=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
+        "rev": "7408ed5bbc9009741094f4dd4cc1abec79e79e7e",
         "type": "gitlab"
       },
       "original": {
@@ -84,11 +66,11 @@
     },
     "flake-compat": {
       "locked": {
-        "lastModified": 1761640442,
+        "lastModified": 1688025799,
-        "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=",
+        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
         "owner": "nix-community",
         "repo": "flake-compat",
-        "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884",
+        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
         "type": "github"
       },
       "original": {
@@ -114,6 +96,40 @@
       }
     },
     "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"
       },
@@ -131,25 +147,6 @@
         "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": [
@@ -157,16 +154,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1768603898,
+        "lastModified": 1743808813,
-        "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=",
+        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c",
+        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -194,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764234087,
+        "lastModified": 1742568034,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
         "type": "github"
       },
       "original": {
@@ -209,11 +206,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763618868,
+        "lastModified": 1743259260,
-        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
+        "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
+        "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f",
         "type": "github"
       },
       "original": {
@@ -223,34 +220,18 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1768564909,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768323494,
+        "lastModified": 1743813633,
-        "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=",
+        "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a",
+        "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -258,17 +239,31 @@
     "root": {
       "inputs": {
         "apple-silicon": "apple-silicon",
-        "darwin": "darwin",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "snowfall-lib": "snowfall-lib",
         "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",
@@ -278,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765361626,
+        "lastModified": 1736130495,
-        "narHash": "sha256-kX0Dp/kYSRbQ+yd9e3lmmUWdNbipufvKfL2IzbrSpnY=",
+        "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
         "owner": "snowfallorg",
         "repo": "lib",
-        "rev": "c566ad8b7352c30ec3763435de7c8f1c46ebb357",
+        "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
         "type": "github"
       },
       "original": {
@@ -298,11 +293,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768481291,
+        "lastModified": 1743910657,
-        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
+        "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
+        "rev": "523f58a4faff6c67f5f685bed33a7721e984c304",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,19 +2,18 @@
   description = "NixOS Hosts";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     disko.url = "github:nix-community/disko";
     snowfall-lib = {
       url = "github:snowfallorg/lib";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-silicon = {
-      url = "github:nix-community/nixos-apple-silicon";
+      url = "github:tpwrules/nixos-apple-silicon/releasep2-2024-12-25";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-generators = {
@@ -29,14 +28,9 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    darwin = {
-      url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs =
+  outputs = inputs:
-    inputs:
     inputs.snowfall-lib.mkFlake {
       inherit inputs;
       src = ./.;
@@ -56,12 +50,6 @@
         ];
       };
 
-      outputs-builder = channels: {
-        devShells = {
-          default = import ./shells/default/default.nix { pkgs = channels.nixpkgs; };
-        };
-      };
-
       homes.modules = with inputs; [
         sops-nix.homeManagerModules.sops
       ];
@@ -70,11 +58,6 @@
         nixos = with inputs; [
           disko.nixosModules.disko
           sops-nix.nixosModules.sops
-          ./modules/nixos/common
-        ];
-        darwin = with inputs; [
-          home-manager.darwinModules.home-manager
-          sops-nix.darwinModules.sops
         ];
       };
     };

homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/README.md

@@ -0,0 +1,40 @@
+# Nix Home Manager Configuration
+
+## Upgrade
+
+```bash
+# Update System Channels
+sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.11-darwin nixpkgs
+sudo nix-channel --update
+
+# Update Home Manager
+nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.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
+```
+
+## Clean Garbage
+
+NOTE: This will remove previous generations
+
+```bash
+sudo nix-collect-garbage --delete-old
+nix-collect-garbage --delete-old
+```
+
+## OS Update
+
+`/etc/bashrc` may get overridden. To properly load Nix, prepend the following:
+
+```bash
+# Nix
+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'
+fi
+# End Nix
+```

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

@@ -1,13 +1,9 @@
-{ lib
+{ lib, config, namespace, ... }:
-, config
-, namespace
-, ...
-}:
 let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "25.11";
+  home.stateVersion = "24.11";
 
   reichard = {
     user = {
@@ -15,6 +11,15 @@ in
       inherit (config.snowfallorg.user) name;
     };
 
+    services = {
+      # TODO
+      # sops = {
+      #   enable = true;
+      #   defaultSopsFile = lib.snowfall.fs.get-file "secrets/mac-va-mbp-personal/evanreichard/default.yaml";
+      #   sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
+      # };
+    };
+
     programs = {
       graphical = {
         ghostty = enabled;
@@ -27,12 +32,26 @@ in
         git = enabled;
         k9s = enabled;
         nvim = enabled;
-        opencode = enabled;
+      };
     };
   };
 
-    security = {
+  # Global Packages
-      sops = enabled;
+  # programs.jq = enabled;
-    };
+  # programs.pandoc = enabled;
-  };
+  # home.packages = with pkgs; [
+  #   android-tools
+  #   imagemagick
+  #   mosh
+  #   python311
+  #   texliveSmall # Pandoc PDF Dep
+  #   google-cloud-sdk
+  #   tldr
+  # ];
+
+  # SQLite Configuration
+  home.file.".sqliterc".text = ''
+    .headers on
+    .mode column
+  '';
 }

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

@@ -1,14 +1,9 @@
-{ pkgs
+{ pkgs, lib, config, namespace, ... }:
-, lib
-, config
-, namespace
-, ...
-}:
 let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "25.11";
+  home.stateVersion = "24.11";
 
   reichard = {
     user = {
@@ -16,20 +11,27 @@ in
       inherit (config.snowfallorg.user) name;
     };
 
+    services = {
+      # TODO
+      # sops = {
+      #   enable = true;
+      #   defaultSopsFile = lib.snowfall.fs.get-file "secrets/mac-va-mbp-work/evanreichard/default.yaml";
+      #   sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
+      # };
+    };
+
     programs = {
       graphical = {
         ghostty = enabled;
       };
 
       terminal = {
-        aws = enabled;
         btop = enabled;
-        claude-code = enabled;
         direnv = enabled;
         git = enabled;
         k9s = enabled;
         nvim = enabled;
-        opencode = enabled;
+        aws = enabled;
       };
     };
   };
@@ -38,9 +40,18 @@ in
   programs.jq = enabled;
   programs.pandoc = enabled;
   home.packages = with pkgs; [
-    colima
+    android-tools
-    docker
+    imagemagick
-    reichard.qwen-code
+    mosh
-    codex
+    python311
+    texliveSmall # Pandoc PDF Dep
+    google-cloud-sdk
+    tldr
   ];
+
+  # SQLite Configuration
+  home.file.".sqliterc".text = ''
+    .headers on
+    .mode column
+  '';
 }

homes/aarch64-linux/evanreichard@lin-va-mbp-personal/README.md

@@ -0,0 +1,40 @@
+# Nix Home Manager Configuration
+
+## Upgrade
+
+```bash
+# Update System Channels
+sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.11-darwin nixpkgs
+sudo nix-channel --update
+
+# Update Home Manager
+nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.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
+```
+
+## Clean Garbage
+
+NOTE: This will remove previous generations
+
+```bash
+sudo nix-collect-garbage --delete-old
+nix-collect-garbage --delete-old
+```
+
+## OS Update
+
+`/etc/bashrc` may get overridden. To properly load Nix, prepend the following:
+
+```bash
+# Nix
+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'
+fi
+# End Nix
+```

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

@@ -1,15 +1,9 @@
-{ pkgs
+{ pkgs, lib, config, namespace, osConfig, ... }:
-, lib
-, config
-, namespace
-, osConfig
-, ...
-}:
 let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "25.11";
+  home.stateVersion = "24.11";
 
   reichard = {
     user = {
@@ -20,23 +14,18 @@ in
     services = {
       ssh-agent = enabled;
       fusuma = enabled;
-      swww = enabled;
+      sops = {
+        enable = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
+        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
       };
-
-    security = {
-      sops = enabled;
     };
 
     programs = {
       graphical = {
-        wms.hyprland = {
+        wms.hyprland = enabled;
-          enable = true;
-          mainMod = "ALT";
-          monitors = [ ",highres,auto,2" ]; # Alternatively - 1.68
-        };
         ghostty = enabled;
         ghidra = enabled;
-        gimp = enabled;
         browsers.firefox = {
           enable = true;
           gpuAcceleration = true;
@@ -50,7 +39,6 @@ in
         git = enabled;
         k9s = enabled;
         nvim = enabled;
-        opencode = enabled;
       };
     };
   };
@@ -58,18 +46,17 @@ in
   dconf = {
     settings = {
       "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
         cursor-theme = "catppuccin-macchiato-mauve-cursors";
-        cursor-size = 24;
       };
     };
   };
 
   home.pointerCursor = {
+    x11.enable = true;
     gtk.enable = true;
-    name = "catppuccin-macchiato-mauve-cursors";
     package = pkgs.catppuccin-cursors.macchiatoMauve;
-    size = 24;
+    name = "catppuccin-macchiato-mauve-cursors";
+    size = 64;
   };
 
   # Kubernetes Secrets
@@ -78,4 +65,23 @@ in
       path = "${config.home.homeDirectory}/.kube/rke2";
     };
   };
+
+  # Global Packages
+  # programs.jq = enabled;
+  # programs.pandoc = enabled;
+  # home.packages = with pkgs; [
+  #   android-tools
+  #   imagemagick
+  #   mosh
+  #   python311
+  #   texliveSmall # Pandoc PDF Dep
+  #   google-cloud-sdk
+  #   tldr
+  # ];
+
+  # SQLite Configuration
+  home.file.".sqliterc".text = ''
+    .headers on
+    .mode column
+  '';
 }

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

@@ -1,31 +0,0 @@
-{ lib
-, config
-, namespace
-, ...
-}:
-let
-  inherit (lib.${namespace}) enabled;
-in
-{
-  home.stateVersion = "25.11";
-
-  reichard = {
-    user = {
-      enable = true;
-      inherit (config.snowfallorg.user) name;
-    };
-
-    services = {
-      ssh-agent = enabled;
-    };
-
-    programs = {
-      terminal = {
-        bash = enabled;
-        btop = enabled;
-        direnv = enabled;
-        tmux = enabled;
-      };
-    };
-  };
-}

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

@@ -1,36 +0,0 @@
-{ lib
-, config
-, namespace
-, ...
-}:
-let
-  inherit (lib.${namespace}) enabled;
-in
-{
-  home.stateVersion = "25.11";
-
-  reichard = {
-    user = {
-      enable = true;
-      inherit (config.snowfallorg.user) name;
-    };
-
-    services = {
-      ssh-agent = enabled;
-    };
-
-    programs = {
-      terminal = {
-        bash = enabled;
-        btop = enabled;
-        claude-code = enabled;
-        direnv = enabled;
-        git = enabled;
-        k9s = enabled;
-        nvim = enabled;
-        opencode = enabled;
-        tmux = enabled;
-      };
-    };
-  };
-}

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

@@ -1,81 +0,0 @@
-{ pkgs
-, lib
-, config
-, namespace
-, osConfig
-, ...
-}:
-let
-  inherit (lib.${namespace}) enabled;
-in
-{
-  home.stateVersion = "25.11";
-
-  reichard = {
-    user = {
-      enable = true;
-      inherit (config.snowfallorg.user) name;
-    };
-
-    services = {
-      ssh-agent = enabled;
-      fusuma = enabled;
-      swww = enabled;
-      poweralertd = enabled;
-    };
-
-    security = {
-      sops = enabled;
-    };
-
-    programs = {
-      graphical = {
-        wms.hyprland = enabled;
-        ghostty = enabled;
-        strawberry = enabled;
-        gimp = enabled;
-        wireshark = enabled;
-        ghidra = enabled;
-        remmina = enabled;
-        browsers.firefox = {
-          enable = true;
-          gpuAcceleration = true;
-          hardwareDecoding = true;
-        };
-      };
-
-      terminal = {
-        btop = enabled;
-        direnv = enabled;
-        git = enabled;
-        k9s = enabled;
-        nvim = enabled;
-        opencode = enabled;
-      };
-    };
-  };
-
-  dconf = {
-    settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-        cursor-theme = "catppuccin-macchiato-mauve-cursors";
-        cursor-size = 24;
-      };
-    };
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    name = "catppuccin-macchiato-mauve-cursors";
-    package = pkgs.catppuccin-cursors.macchiatoMauve;
-    size = 24;
-  };
-
-  # Kubernetes Secrets
-  sops.secrets = lib.mkIf osConfig.${namespace}.security.sops.enable {
-    rke2_kubeconfig = {
-      path = "${config.home.homeDirectory}/.kube/rke2";
-    };
-  };
-}

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

@@ -1,79 +0,0 @@
-{ pkgs
-, lib
-, config
-, namespace
-, osConfig
-, ...
-}:
-let
-  inherit (lib.${namespace}) enabled;
-in
-{
-  home.stateVersion = "24.11";
-
-  reichard = {
-    user = {
-      enable = true;
-      inherit (config.snowfallorg.user) name;
-    };
-
-    services = {
-      ssh-agent = enabled;
-      fusuma = enabled;
-      swww = enabled;
-    };
-
-    security = {
-      sops = enabled;
-    };
-
-    programs = {
-      graphical = {
-        wms.hyprland = enabled;
-        ghostty = enabled;
-        ghidra = enabled;
-        browsers.firefox = {
-          enable = true;
-          gpuAcceleration = true;
-          hardwareDecoding = true;
-        };
-      };
-
-      terminal = {
-        btop = enabled;
-        direnv = enabled;
-        git = enabled;
-        k9s = enabled;
-        nvim = enabled;
-      };
-    };
-  };
-
-  dconf = {
-    settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-        cursor-theme = "catppuccin-macchiato-mauve-cursors";
-        cursor-size = 24;
-        # enable-hot-corners = false;
-        # font-name = osConfig.${namespace}.system.fonts.default;
-        # gtk-theme = cfg.theme.name;
-        # icon-theme = cfg.icon.name;
-      };
-    };
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    name = "catppuccin-macchiato-mauve-cursors";
-    package = pkgs.catppuccin-cursors.macchiatoMauve;
-    size = 24;
-  };
-
-  # Kubernetes Secrets
-  sops.secrets = lib.mkIf osConfig.${namespace}.security.sops.enable {
-    rke2_kubeconfig = {
-      path = "${config.home.homeDirectory}/.kube/rke2";
-    };
-  };
-}

modules/darwin/default.nix

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

modules/darwin/nix/default.nix

@@ -1,103 +0,0 @@
-{ 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.";
-    usingDeterminate = mkBoolOpt false "Whether we're using determinate nix";
-    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 = !cfg.usingDeterminate;
-        registry = lib.mkForce mappedRegistry;
-
-        gc = {
-          automatic = !cfg.usingDeterminate;
-          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

@@ -1,35 +0,0 @@
-{ config
-, lib
-, namespace
-, ...
-}:
-let
-  inherit (lib) mkIf mkEnableOption types;
-  inherit (lib.${namespace}) mkOpt;
-  getFile = lib.snowfall.fs.get-file;
-
-  user = config.users.users.${config.${namespace}.user.name};
-  cfg = config.${namespace}.security.sops;
-in
-{
-  options.${namespace}.security.sops = with types; {
-    enable = mkEnableOption "Enable sops";
-    defaultSopsFile = mkOpt str "secrets/systems/${config.system.name}.yaml" "Default sops file.";
-    sshKeyPaths = mkOpt (listOf path) [ ] "Additional SSH key paths to use.";
-  };
-
-  config = mkIf cfg.enable {
-    sops = {
-      defaultSopsFile = getFile cfg.defaultSopsFile;
-
-      age = {
-        keyFile = "${user.home}/.config/sops/age/keys.txt";
-        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ] ++ cfg.sshKeyPaths;
-      };
-    };
-
-    sops.secrets.builder_ssh_key = {
-      sopsFile = getFile "secrets/common/systems.yaml";
-    };
-  };
-}

modules/darwin/services/openssh/default.nix

@@ -1,20 +0,0 @@
-{ 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

@@ -1,23 +0,0 @@
-{ 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

@@ -38,12 +38,6 @@ in
           ExtensionRecommendations = false;
           SkipOnboarding = true;
         };
-        GenerativeAI = {
-          Chatbot = false;
-          LinkPreviews = false;
-          TabGroups = false;
-          Locked = false;
-        };
         ExtensionSettings = {
           # Block All
           # "*".installation_mode = "blocked";
@@ -53,13 +47,19 @@ in
             install_url = "https://gitflic.ru/project/magnolia1234/bpc_uploads/blob/raw?file=bypass_paywalls_clean-latest.xpi";
             installation_mode = "force_installed";
           };
+
+          # Ctrl+Number Tabs
+          "{84601290-bec9-494a-b11c-1baa897a9683}" = {
+            install_url = "https://addons.mozilla.org/firefox/downloads/latest/ctrl-number-to-switch-tabs/latest.xpi";
+            installation_mode = "force_installed";
+          };
         };
         Preferences = { };
       } "Policies to apply to firefox";
 
     settings = mkOpt attrs { } "Settings to apply to the profile.";
 
-    extensions.packages = mkOpt (with lib.types; listOf package)
+    extensions = mkOpt (with lib.types; listOf package)
       (with pkgs.firefox-addons; [
         bitwarden
         darkreader
@@ -91,11 +91,9 @@ in
               "browser.aboutConfig.showWarning" = false;
               "browser.aboutwelcome.enabled" = false;
               "browser.sessionstore.warnOnQuit" = true;
-              "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
               "browser.shell.checkDefaultBrowser" = false;
               "general.smoothScroll.msdPhysics.enabled" = true;
               "intl.accept_languages" = "en-US,en";
-              "ui.key.accelKey" = "224";
 
               # "devtools.chrome.enabled" = true;
               # "xpinstall.signatures.required" = false;

modules/home/programs/graphical/ghostty/config/ghostty-catppuccin-macchiato.conf

@@ -1,23 +0,0 @@
-# https://github.com/catppuccin/ghostty/blob/main/themes/catppuccin-macchiato.conf
-palette = 0=#494d64
-palette = 1=#ed8796
-palette = 2=#a6da95
-palette = 3=#eed49f
-palette = 4=#8aadf4
-palette = 5=#f5bde6
-palette = 6=#8bd5ca
-palette = 7=#b8c0e0
-palette = 8=#5b6078
-palette = 9=#ed8796
-palette = 10=#a6da95
-palette = 11=#eed49f
-palette = 12=#8aadf4
-palette = 13=#f5bde6
-palette = 14=#8bd5ca
-palette = 15=#a5adcb
-background = 24273a
-foreground = cad3f5
-cursor-color = f4dbd6
-cursor-text = 24273a
-selection-background = 3a3e53
-selection-foreground = cad3f5

modules/home/programs/graphical/ghostty/config/ghostty-catppuccin-mocha.conf

@@ -1,23 +0,0 @@
-# https://github.com/catppuccin/ghostty/blob/main/themes/catppuccin-mocha.conf
-palette = 0=#45475a
-palette = 1=#f38ba8
-palette = 2=#a6e3a1
-palette = 3=#f9e2af
-palette = 4=#89b4fa
-palette = 5=#f5c2e7
-palette = 6=#94e2d5
-palette = 7=#bac2de
-palette = 8=#585b70
-palette = 9=#f38ba8
-palette = 10=#a6e3a1
-palette = 11=#f9e2af
-palette = 12=#89b4fa
-palette = 13=#f5c2e7
-palette = 14=#94e2d5
-palette = 15=#a6adc8
-background = 1e1e2e
-foreground = cdd6f4
-cursor-color = f5e0dc
-cursor-text = 1e1e2e
-selection-background = 353749
-selection-foreground = cdd6f4

modules/home/programs/graphical/ghostty/config/ghostty-melange-dark.conf

@@ -1,21 +0,0 @@
-# Melange Dark - Adapted From: https://github.com/savq/melange-nvim/blob/master/term/kitty/melange_dark.conf
-palette = 0=#34302C
-palette = 1=#BD8183
-palette = 2=#78997A
-palette = 3=#E49B5D
-palette = 4=#7F91B2
-palette = 5=#B380B0
-palette = 6=#7B9695
-palette = 7=#C1A78E
-palette = 8=#867462
-palette = 9=#D47766
-palette = 10=#85B695
-palette = 11=#EBC06D
-palette = 12=#A3A9CE
-palette = 13=#CF9BC2
-palette = 14=#89B3B6
-palette = 15=#ECE1D7
-background = 292522
-foreground = ECE1D7
-selection-background = 403A36
-selection-foreground = ECE1D7

modules/home/programs/graphical/ghostty/config/ghostty.conf

@@ -5,54 +5,49 @@ font-family = "MesloLGM Nerd Font Mono"
 confirm-close-surface = true
 
 # Keybindings - Tabs & Splits
-keybind = cmd+t=new_tab
+keybind = ctrl+t=new_tab
-keybind = cmd+w=close_surface
+keybind = ctrl+w=close_surface
-keybind = cmd+d=new_split:right
+keybind = ctrl+d=new_split:right
-keybind = cmd+shift+d=new_split:down
+keybind = ctrl+shift+d=new_split:down
-keybind = cmd+shift+enter=toggle_split_zoom
+keybind = ctrl+enter=toggle_split_zoom
 
 # Keybindings - Navigation - Splits
-keybind = cmd+left=goto_split:left
+keybind = ctrl+left=goto_split:left
-keybind = cmd+right=goto_split:right
+keybind = ctrl+right=goto_split:right
-keybind = cmd+up=goto_split:up
+keybind = ctrl+up=goto_split:up
-keybind = cmd+down=goto_split:down
+keybind = ctrl+down=goto_split:down
-keybind = cmd+]=goto_split:next
+keybind = ctrl+]=goto_split:next
-keybind = cmd+[=goto_split:previous
+keybind = ctrl+[=goto_split:previous
 
 # Keybindings - Navigation - Tabs
-keybind = cmd+1=goto_tab:1
+keybind = ctrl+1=goto_tab:1
-keybind = cmd+2=goto_tab:2
+keybind = ctrl+2=goto_tab:2
-keybind = cmd+3=goto_tab:3
+keybind = ctrl+3=goto_tab:3
-keybind = cmd+4=goto_tab:4
+keybind = ctrl+4=goto_tab:4
-keybind = cmd+5=goto_tab:5
+keybind = ctrl+5=goto_tab:5
-keybind = cmd+6=goto_tab:6
+keybind = ctrl+6=goto_tab:6
-keybind = cmd+7=goto_tab:7
+keybind = ctrl+7=goto_tab:7
-keybind = cmd+8=goto_tab:8
+keybind = ctrl+8=goto_tab:8
-keybind = cmd+9=goto_tab:9
+keybind = ctrl+9=goto_tab:9
 
-keybind = performable:cmd+c=copy_to_clipboard
+# Melange Dark - Adapted From: https://github.com/savq/melange-nvim/blob/master/term/kitty/melange_dark.conf
-keybind = performable:cmd+v=paste_from_clipboard
+palette = 0=#34302C
-
+palette = 1=#BD8183
-# https://github.com/catppuccin/ghostty/blob/main/themes/catppuccin-mocha.conf
+palette = 2=#78997A
-palette = 0=#45475a
+palette = 3=#E49B5D
-palette = 1=#f38ba8
+palette = 4=#7F91B2
-palette = 2=#a6e3a1
+palette = 5=#B380B0
-palette = 3=#f9e2af
+palette = 6=#7B9695
-palette = 4=#89b4fa
+palette = 7=#C1A78E
-palette = 5=#f5c2e7
+palette = 8=#867462
-palette = 6=#94e2d5
+palette = 9=#D47766
-palette = 7=#bac2de
+palette = 10=#85B695
-palette = 8=#585b70
+palette = 11=#EBC06D
-palette = 9=#f38ba8
+palette = 12=#A3A9CE
-palette = 10=#a6e3a1
+palette = 13=#CF9BC2
-palette = 11=#f9e2af
+palette = 14=#89B3B6
-palette = 12=#89b4fa
+palette = 15=#ECE1D7
-palette = 13=#f5c2e7
+background = 292522
-palette = 14=#94e2d5
+foreground = ECE1D7
-palette = 15=#a6adc8
+selection-background = 403A36
-background = 1e1e2e
+selection-foreground = ECE1D7
-foreground = cdd6f4
-cursor-color = f5e0dc
-cursor-text = 1e1e2e
-selection-background = 353749
-selection-foreground = cdd6f4

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

@@ -10,14 +10,60 @@ in
   };
 
   config = mkIf cfg.enable {
-    # Enable Bash
+    programs.bash = {
-    ${namespace}.programs.terminal.bash.enable = true;
+      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
+        VISUAL=vim
+        EDITOR="$VISUAL"
+        eval "$(thefuck --alias)"
+        set -o vi || true
+        bind "set show-mode-in-prompt on"
+        fastfetch
+      '';
+    };
 
+    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
-    home.packages = with pkgs; optionals isLinux [
       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";
@@ -26,5 +72,6 @@ in
         [ "@BASH_PATH@" ]
         [ bashPath ]
         (builtins.readFile ./config/ghostty.conf);
+
   };
 }

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

@@ -1,24 +0,0 @@
-{ 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; [
-      darktable
-      gimp-with-plugins
-      gthumb
-    ];
-  };
-}

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

@@ -1,17 +0,0 @@
-{ 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/strawberry/default.nix

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

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

@@ -1,17 +0,0 @@
-{ 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/config/hyprland.conf

@@ -1,7 +1,54 @@
+################
+### MONITORS ###
+################
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,highres,auto,1.68 # 2
+debug:disable_scale_checks = true
+
+###################
+### MY PROGRAMS ###
+###################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+
+# Set programs that you use
+$terminal = ghostty
+$fileManager = dolphin
+$menu = wofi --show drun
+
+
+#################
+### AUTOSTART ###
+#################
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
+
+# exec-once = $terminal
+# exec-once = nm-applet &
 exec-once = uwsm app -- waybar
 exec-once = uwsm app -- $terminal
 exec-once = uwsm app -- firefox
 
+
+#############################
+### ENVIRONMENT VARIABLES ###
+#############################
+
+# See https://wiki.hyprland.org/Configuring/Environment-variables/
+
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
+
+
+#####################
+### LOOK AND FEEL ###
+#####################
+
+# Refer to https://wiki.hyprland.org/Configuring/Variables/
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
 general {
     gaps_in = 5
     gaps_out = 12
@@ -44,6 +91,7 @@ decoration {
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#animations
+#https://wiki.hyprland.org/Configuring/Animations/
 animations {
     enabled = yes, please :)
 
@@ -126,14 +174,101 @@ input {
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
-gesture = 4, horizontal, workspace, invert
+gestures {
-
+    workspace_swipe = true
-# Thinkpad Trackpoint
+    workspace_swipe_fingers = 4
-device {
+    workspace_swipe_invert = true
-    name = tpps/2-elan-trackpoint
-    sensitivity = -0.3
 }
 
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+# device {
+#     name = epic-mouse-v1
+#     sensitivity = -0.5
+# }
+
+
+###################
+### KEYBINDINGS ###
+###################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+$mainMod = SUPER # Sets "Windows" key as main modifier
+
+bind = $mainMod_ALT, 1, exec, hyprshot -m output
+bind = $mainMod_ALT, 2, exec, hyprshot -m window
+bind = $mainMod_ALT, 3, exec, hyprshot -m region
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, RETURN, exec, $terminal
+bind = $mainMod, W, killactive,
+bind = $mainMod, M, exit,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, SPACE, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+# Generic Laptop Multimedia Keys for Volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
+
+# macOS Keyboard Brightness
+bindel = ALT, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight s 10%+
+bindel = ALT, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight s 10%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+
 ##############################
 ### WINDOWS AND WORKSPACES ###
 ##############################

modules/home/programs/graphical/wms/hyprland/config/waybar-style.css

@@ -61,6 +61,11 @@
   background-color: @surface0;
 }
 
+#workspaces {
+  padding: 0px;
+  margin-left: 1rem;
+}
+
 #workspaces button {
   color: @lavender;
   border-radius: 1rem;
@@ -113,6 +118,11 @@
   color: @red;
 }
 
+#clock {
+  color: @blue;
+  margin-right: 1rem;
+}
+
 /* Left Border Radius */
 #clock,
 #network,
@@ -134,13 +144,3 @@
   border-top-right-radius: 1rem;
   border-bottom-right-radius: 1rem;
 }
-
-#workspaces {
-  padding: 0px;
-  margin-left: 1rem;
-}
-
-#clock {
-  color: @blue;
-  margin-right: 1rem;
-}

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

@@ -1,119 +1,28 @@
-{ lib
+{ lib, pkgs, config, namespace, ... }:
-, pkgs
-, config
-, namespace
-, ...
-}:
 let
-  inherit (lib) types mkIf;
+  inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkOpt enabled;
+  inherit (lib.${namespace}) enabled;
 
   cfg = config.${namespace}.programs.graphical.wms.hyprland;
 in
 {
   options.${namespace}.programs.graphical.wms.hyprland = {
     enable = lib.mkEnableOption "Hyprland";
-    mainMod = mkOpt types.str "SUPER" "main modifier key";
-    menuMod = mkOpt types.str "SUPER" "menu modifier key (i.e. menuMod + space)";
-    monitors = mkOpt (with types; listOf str) [ ", preferred, auto, 1" ] "monitor configuration";
   };
 
   config = mkIf cfg.enable {
     services.swaync = enabled;
+    services.hyprpaper = enabled;
 
     wayland.windowManager.hyprland = {
       enable = true;
       extraConfig = builtins.readFile ./config/hyprland.conf;
-      settings = {
-        "$mainMod" = cfg.mainMod;
-        "$menuMod" = cfg.menuMod;
-        "$terminal" = "ghostty";
-        "$menu" = "wofi --show drun";
-
-        monitor = cfg.monitors;
-
-        bind = [
-          # Menu Mod Bindings (macOS Transition - Spotlight & Screenshots)
-          "$menuMod, SPACE, exec, $menu"
-          "$menuMod SHIFT, 1, exec, hyprshot -m output"
-          "$menuMod SHIFT, 2, exec, hyprshot -m window"
-          "$menuMod SHIFT, 3, exec, hyprshot -m region"
-
-          # Primary Bindings
-          "$mainMod, RETURN, exec, $terminal"
-          "$mainMod, Q, killactive"
-          "$mainMod, M, exit"
-          "$mainMod, V, togglefloating"
-          "$mainMod, P, pin"
-          "$mainMod, J, togglesplit"
-          "$mainMod, S, togglespecialworkspace, magic"
-          "$mainMod SHIFT, S, movetoworkspace, special:magic"
-
-          # Window Focus
-          "$mainMod, left, movefocus, l"
-          "$mainMod, right, movefocus, r"
-          "$mainMod, up, movefocus, u"
-          "$mainMod, down, movefocus, d"
-
-          # Workspace Switch
-          "$mainMod, 1, workspace, 1"
-          "$mainMod, 2, workspace, 2"
-          "$mainMod, 3, workspace, 3"
-          "$mainMod, 4, workspace, 4"
-          "$mainMod, 5, workspace, 5"
-          "$mainMod, 6, workspace, 6"
-          "$mainMod, 7, workspace, 7"
-          "$mainMod, 8, workspace, 8"
-          "$mainMod, 9, workspace, 9"
-          "$mainMod, 0, workspace, 10"
-
-          # Window Workspace Move
-          "$mainMod SHIFT, 1, movetoworkspace, 1"
-          "$mainMod SHIFT, 2, movetoworkspace, 2"
-          "$mainMod SHIFT, 3, movetoworkspace, 3"
-          "$mainMod SHIFT, 4, movetoworkspace, 4"
-          "$mainMod SHIFT, 5, movetoworkspace, 5"
-          "$mainMod SHIFT, 6, movetoworkspace, 6"
-          "$mainMod SHIFT, 7, movetoworkspace, 7"
-          "$mainMod SHIFT, 8, movetoworkspace, 8"
-          "$mainMod SHIFT, 9, movetoworkspace, 9"
-          "$mainMod SHIFT, 0, movetoworkspace, 10"
-          "$mainMod SHIFT, right, workspace, +1"
-          "$mainMod SHIFT, left, workspace, -1"
-        ];
-        bindm = [
-          # Window Resizing
-          "$mainMod, mouse:272, movewindow"
-          "$mainMod, mouse:273, resizewindow"
-        ];
-        bindel = [
-          # Multimedia & Brightness Keys
-          ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
-          ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-          ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-          ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
-          ",XF86MonBrightnessUp, exec, brightnessctl s 10%+"
-          ",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
-
-          # macOS Keyboard Brightness
-          "$menuMod, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight s 10%+"
-          "$menuMod, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight s 10%-"
-        ];
-        bindl = [
-          # Player Controls
-          ", XF86AudioNext, exec, playerctl next"
-          ", XF86AudioPause, exec, playerctl play-pause"
-          ", XF86AudioPlay, exec, playerctl play-pause"
-          ", XF86AudioPrev, exec, playerctl previous"
-        ];
-      };
     };
 
     programs.waybar = {
       enable = true;
       style = builtins.readFile ./config/waybar-style.css;
-      settings = [
+      settings = [{
-        {
         layer = "top";
         position = "top";
         mod = "dock";
@@ -136,9 +45,7 @@ in
           "battery"
           "clock"
         ];
-          "hyprland/window" = {
+        "hyprland/window" = { format = "{}"; };
-            format = "{}";
-          };
         "wlr/workspaces" = {
           on-scroll-up = "hyprctl dispatch workspace e+1";
           on-scroll-down = "hyprctl dispatch workspace e-1";
@@ -181,6 +88,10 @@ in
           format-alt = "  {used:0.1f}G";
           max-length = 10;
         };
+        # backlight = {
+        #   format = "󰖨  {}%";
+        #   device = "acpi_video0";
+        # };
 
         backlight = {
           format = "{icon}";
@@ -248,11 +159,7 @@ in
             phone = "";
             portable = "";
             car = "";
-              default = [
+            default = [ "" "" "" ];
-                ""
-                ""
-                ""
-              ];
           };
         };
         "pulseaudio#microphone" = {
@@ -265,23 +172,19 @@ in
           on-scroll-down = "pamixer --default-source -d 5";
           scroll-step = 5;
         };
-        }
+      }];
-      ];
     };
 
     home.packages = with pkgs; [
-      brightnessctl
       hyprshot
       wofi
       wofi-emoji
+      brightnessctl
     ];
 
     xdg.configFile = {
       "wofi/config".source = ./config/wofi.conf;
       "wofi/style.css".source = ./config/wofi-style.css;
-      "uwsp/env".text = ''
-        export XCURSOR_SIZE=64
-      '';
     };
   };
 }

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

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

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

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

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

@@ -1,2 +0,0 @@
-.headers on
-.mode column

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

@@ -1,82 +0,0 @@
-{ pkgs
-, lib
-, config
-, namespace
-, ...
-}:
-let
-  inherit (lib) mkIf optionalAttrs;
-  inherit (pkgs.stdenv) isLinux isDarwin;
-  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";
-      }
-      // optionalAttrs isLinux {
-        sync-watch = "watch -d grep -e Dirty: -e Writeback: /proc/meminfo";
-      }
-      // optionalAttrs isDarwin {
-        mosh = "mosh --ssh=\"/usr/bin/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"
-
-        if [ -z "$CLAUDE_CODE_ENTRYPOINT" ]; then
-            fastfetch
-        fi
-
-        [[ -f ~/.bash_custom ]] && . ~/.bash_custom
-      '';
-    };
-
-    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; [
-      bashInteractive
-      fastfetch
-      mosh
-      nerd-fonts.meslo-lg
-    ];
-
-    home.file.".config/fastfetch/config.jsonc".text = builtins.readFile ./config/fastfetch.jsonc;
-    home.file.".sqliterc".text = builtins.readFile ./config/.sqliterc;
-  };
-}

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

@@ -1,9 +1,4 @@
-{ lib
+{ lib, config, namespace, ... }:
-, pkgs
-, config
-, namespace
-, ...
-}:
 let
   inherit (lib) mkIf;
   cfg = config.${namespace}.programs.terminal.btop;
@@ -14,12 +9,10 @@ in
   };
 
   config = mkIf cfg.enable {
-    programs.btop = {
+    programs.btop.enable = true;
-      enable = true;
-      package = pkgs.btop-cuda;
-    };
 
-    home.file.".config/btop/btop.conf".text = builtins.readFile ./config/btop.conf;
+    home.file.".config/btop/btop.conf".text =
+      builtins.readFile ./config/btop.conf;
     home.file.".config/btop/themes/catppuccin_mocha.theme".text =
       builtins.readFile ./config/catppuccin_mocha.theme;
   };

modules/home/programs/terminal/claude-code/default.nix

@@ -1,81 +0,0 @@
-{ lib
-, pkgs
-, config
-, namespace
-, ...
-}:
-let
-  inherit (lib) mkIf;
-  cfg = config.${namespace}.programs.terminal.claude-code;
-in
-{
-  options.${namespace}.programs.terminal.claude-code = {
-    enable = lib.mkEnableOption "enable claude-code";
-  };
-
-  config = mkIf cfg.enable {
-    programs.claude-code = {
-      enable = true;
-      mcpServers = {
-        gopls = {
-          type = "stdio";
-          command = "gopls";
-          args = [ "mcp" ];
-        };
-      };
-    };
-
-    programs.bash = lib.mkIf config.programs.bash.enable {
-      shellAliases = {
-        claude = "default_claude_custom";
-      };
-
-      initExtra =
-        let
-          baseUrl = "https://llm-api.va.reichard.io";
-          authToken = "placeholder";
-        in
-        ''
-          default_claude_custom() {
-            local model_id=""
-            while [[ $# -gt 0 ]]; do
-              case $1 in
-                -m|--model)
-                  model_id="$2"
-                  shift 2
-                  ;;
-                *)
-                  shift
-                  ;;
-              esac
-            done
-
-            if [ -z "$model_id" ]; then
-              echo "Error: Model ID is required. Usage: claude --model <model-id>"
-              return 1
-            fi
-
-            ANTHROPIC_BASE_URL="${baseUrl}" \
-            ANTHROPIC_AUTH_TOKEN="${authToken}" \
-            ANTHROPIC_MODEL="$model_id" \
-            ANTHROPIC_SMALL_FAST_MODEL="$model_id" \
-            ${lib.getExe pkgs.claude-code}
-          }
-
-          # Completion Function
-          _complete_claude_custom() {
-            local cur=''${COMP_WORDS[COMP_CWORD]}
-            local prev=''${COMP_WORDS[COMP_CWORD-1]}
-
-            if [[ "$prev" == "-m" || "$prev" == "--model" ]]; then
-              local models=( $(${pkgs.curl}/bin/curl -s -H "Authorization: Bearer ${authToken}" "${baseUrl}/v1/models" | ${pkgs.jq}/bin/jq -r '.data[].id' 2>/dev/null) )
-              COMPREPLY=( $(compgen -W "''${models[*]}" -- "$cur") )
-            fi
-          }
-
-          # Register Completion
-          complete -F _complete_claude_custom claude
-        '';
-    };
-  };
-}

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

@@ -1,9 +1,4 @@
-{ pkgs
+{ pkgs, lib, config, namespace, ... }:
-, lib
-, config
-, namespace
-, ...
-}:
 let
   inherit (lib) mkIf;
   cfg = config.${namespace}.programs.terminal.git;
@@ -16,12 +11,22 @@ in
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
-      settings = {
+      userName = "Evan Reichard";
       aliases = {
         lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15";
       };
+      includes = [
+        {
+          path = "~/.config/git/work";
+          condition = "gitdir:~/Development/git/work/";
+        }
+        {
+          path = "~/.config/git/personal";
+          condition = "gitdir:~/Development/git/personal/";
+        }
+      ];
+      extraConfig = {
         user = {
-          name = "Evan Reichard";
           email = "evan@reichard.io";
         };
         core = {
@@ -68,16 +73,6 @@ in
           autoSetupRemote = true;
         };
       };
-      includes = [
-        {
-          path = "~/.config/git/work";
-          condition = "gitdir:~/Development/git/work/";
-        }
-        {
-          path = "~/.config/git/personal";
-          condition = "gitdir:~/Development/git/personal/";
-        }
-      ];
     };
 
     programs.gh = {
@@ -87,7 +82,10 @@ in
       };
     };
 
-    home.packages = with pkgs; [ gh ];
+    home.packages = with pkgs; [
+      gitAndTools.gh
+      pre-commit
+    ];
 
     # Copy Configuration
     xdg.configFile = {

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

@@ -0,0 +1,8 @@
+require('aerial').setup({
+    on_attach = function(bufnr)
+        vim.keymap.set('n', '{', '<cmd>AerialPrev<CR>', {buffer = bufnr})
+        vim.keymap.set('n', '}', '<cmd>AerialNext<CR>', {buffer = bufnr})
+    end
+})
+
+vim.keymap.set('n', '<leader>a', '<cmd>AerialToggle!<CR>')

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

@@ -2,11 +2,7 @@
 -- vim.g.nord_borders = true
 -- vim.g.nord_contrast = true
 -- vim.cmd('colorscheme nord')
--- vim.cmd('colorscheme melange')
+vim.cmd('colorscheme melange')
-vim.cmd("colorscheme catppuccin-mocha")
-
--- Set User Shell
-vim.o.shell = require("nix-vars").bash
 
 -- Set Leader
 vim.keymap.set("n", "<Space>", "<Nop>", {silent = true})
@@ -23,7 +19,7 @@ vim.g.loaded_netrwPlugin = 1
 vim.opt.termguicolors = true
 
 -- Synchronize with system clipboard
-vim.opt.clipboard:append("unnamedplus")
+vim.opt.clipboard = "unnamed"
 
 -- Always show the signcolumn
 vim.opt.signcolumn = "yes"
@@ -38,3 +34,33 @@ vim.opt.shiftwidth = 2
 vim.opt.foldmethod = "indent"
 vim.opt.foldnestmax = 10
 vim.opt.foldlevel = 2
+
+-- Diagnostics Mappings
+local diagnostics_active = true
+local toggle_diagnostics = function()
+    diagnostics_active = not diagnostics_active
+    if diagnostics_active then
+        vim.diagnostic.enable()
+    else
+        vim.diagnostic.disable()
+    end
+end
+
+local diagnostics_loclist_active = false
+local toggle_diagnostics_loclist = function()
+    diagnostics_loclist_active = not diagnostics_loclist_active
+    if diagnostics_loclist_active then
+        vim.diagnostic.setloclist()
+    else
+        vim.cmd('lclose')
+    end
+end
+
+local opts = {noremap = true, silent = true}
+vim.keymap.set('n', '<leader>qt', toggle_diagnostics, opts)
+vim.keymap.set('n', '<leader>qN',
+               function() vim.diagnostic.goto_prev({float = false}) end, opts)
+vim.keymap.set('n', '<leader>qn',
+               function() vim.diagnostic.goto_next({float = false}) end, opts)
+vim.keymap.set('n', '<leader>qq', toggle_diagnostics_loclist, opts)
+vim.keymap.set('n', '<leader>qe', vim.diagnostic.open_float, opts)

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

@@ -62,9 +62,9 @@ vim.api.nvim_create_autocmd("FileType", {
     end
 })
 
--- Create KeyMaps
+-- Leader Keys
 local opts = {noremap = true, silent = true}
-vim.keymap.set('n', '<leader>db', dap.toggle_breakpoint, vim.tbl_extend("force", { desc = "Toggle Breakpoint" }, opts))
+vim.keymap.set('n', '<leader>db', dap.toggle_breakpoint, opts)
-vim.keymap.set('n', '<leader>dc', dap.continue, vim.tbl_extend("force", { desc = "Continue" }, opts))
+vim.keymap.set('n', '<leader>du', dapui.toggle, opts)
-vim.keymap.set('n', '<leader>dt', dapgo.debug_test, vim.tbl_extend("force", { desc = "Run Test" }, opts))
+vim.keymap.set('n', '<leader>dc', dap.continue, opts)
-vim.keymap.set('n', '<leader>du', dapui.toggle, vim.tbl_extend("force", { desc = "Toggle UI" }, opts))
+vim.keymap.set('n', '<leader>dt', dapgo.debug_test, opts)

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

@@ -1,35 +0,0 @@
--- Diagnostics Mappings
-local diagnostics_active = true
-local toggle_diagnostics = function()
-	diagnostics_active = not diagnostics_active
-	if diagnostics_active then
-		vim.diagnostic.enable()
-	else
-		vim.diagnostic.disable()
-	end
-end
-
-local diagnostics_loclist_active = false
-local toggle_diagnostics_loclist = function()
-	diagnostics_loclist_active = not diagnostics_loclist_active
-	if diagnostics_loclist_active then
-		vim.diagnostic.setloclist()
-	else
-		vim.cmd("lclose")
-	end
-end
-
--- Create KeyMaps
-local opts = { noremap = true, silent = true }
-vim.keymap.set("n", "<leader>qN", function()
-	vim.diagnostic.goto_prev({ float = false })
-end, vim.tbl_extend("force", { desc = "Previous Diagnostic" }, opts))
-vim.keymap.set("n", "<leader>qe", vim.diagnostic.open_float,
-	vim.tbl_extend("force", { desc = "Open Diagnostics" }, opts))
-vim.keymap.set("n", "<leader>qt", toggle_diagnostics,
-	vim.tbl_extend("force", { desc = "Toggle Inline Diagnostics" }, opts))
-vim.keymap.set("n", "<leader>qn", function()
-	vim.diagnostic.goto_next({ float = false })
-end, vim.tbl_extend("force", { desc = "Next Diagnostic" }, opts))
-vim.keymap.set("n", "<leader>qq", toggle_diagnostics_loclist,
-	vim.tbl_extend("force", { desc = "Toggle Diagnostic List" }, opts))

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

@@ -0,0 +1,6 @@
+vim.keymap.set('n', '<leader>go', '<cmd>DiffviewOpen<CR>')
+vim.keymap.set('n', '<leader>gO', '<cmd>DiffviewOpen origin/main...HEAD<CR>')
+vim.keymap.set('n', '<leader>gh', '<cmd>DiffviewFileHistory<CR>')
+vim.keymap.set('n', '<leader>gH',
+               '<cmd>DiffviewFileHistory --range=origin..HEAD<CR>')
+vim.keymap.set('n', '<leader>gc', '<cmd>DiffviewClose<CR>')

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

@@ -1,69 +0,0 @@
-require("gitsigns").setup({
-	current_line_blame = true,
-	current_line_blame_opts = { delay = 0 },
-	on_attach = function(bufnr)
-		local gitsigns = require("gitsigns")
-
-		local function map(mode, l, r, opts)
-			opts = opts or {}
-			opts.buffer = bufnr
-			vim.keymap.set(mode, l, r, opts)
-		end
-
-		map("n", "<leader>gb", gitsigns.toggle_current_line_blame, { desc = "Git Blame Line" })
-		map("n", "<leader>gB", function()
-			gitsigns.blame_line({ full = true })
-		end, { desc = "Git Blame Full" })
-	end,
-})
-
-
-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"
-	)[1]
-
-	if vim.v.shell_error ~= 0 then
-		return
-	end
-
-	local git_repo = vim.fn.system("git remote get-url origin"):match("([^/:]+/[^/.]+)%.?[^/]*$"):gsub("\n", "")
-	local git_branch = vim.fn.system("git rev-parse --abbrev-ref HEAD"):gsub("\n", "")
-
-	return {
-		file = vim.fn.fnamemodify(abs_path, ":s?" .. git_root .. "/??"),
-		branch = git_branch,
-		repo = git_repo,
-	}
-end
-
-local function copy_git_link()
-	local git_info = get_git_info()
-	if git_info == nil then
-		vim.notify("Failed to get git info", vim.log.levels.ERROR)
-		return
-	end
-
-	local start_line = vim.fn.line("v")
-	local end_line = vim.fn.line(".")
-
-	local message = string.format(
-		"https://github.com/%s/blob/%s/%s#L%d-L%d",
-		git_info.repo,
-		git_info.branch,
-		git_info.file,
-		start_line,
-		end_line
-	)
-	vim.fn.setreg("+", message)
-	vim.notify("Copied:\n\t" .. message, vim.log.levels.INFO)
-end
-
--- Create KeyMaps
-vim.keymap.set("v", "<Leader>gy", function() copy_git_link() end, { desc = "Copy GitHub Link" })
-vim.keymap.set('n', '<leader>go', '<cmd>DiffviewOpen<CR>', { desc = "Open Diff - Current" })
-vim.keymap.set('n', '<leader>gO', '<cmd>DiffviewOpen origin/main...HEAD<CR>', { desc = "Open Diff - Main" })
-vim.keymap.set('n', '<leader>gh', '<cmd>DiffviewFileHistory<CR>', { desc = "Diff History" })
-vim.keymap.set('n', '<leader>gH', '<cmd>DiffviewFileHistory --range=origin..HEAD<CR>', { desc = "Diff History - Main" })
-vim.keymap.set('n', '<leader>gc', '<cmd>DiffviewClose<CR>', { desc = "Close Diff" })

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

@@ -0,0 +1,41 @@
+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"
+	)[1]
+
+	if vim.v.shell_error ~= 0 then
+		return
+	end
+
+	local git_repo = vim.fn.system("git remote get-url origin"):match("([^/:]+/[^/.]+)%.?[^/]*$"):gsub("\n", "")
+	local git_branch = vim.fn.system("git rev-parse --abbrev-ref HEAD"):gsub("\n", "")
+
+	return {
+		file = vim.fn.fnamemodify(abs_path, ":s?" .. git_root .. "/??"),
+		branch = git_branch,
+		repo = git_repo,
+	}
+end
+
+vim.keymap.set("v", "<Leader>gy", function()
+	local git_info = get_git_info()
+	if git_info == nil then
+		vim.notify("Failed to get git info", vim.log.levels.ERROR)
+		return
+	end
+
+	local start_line = vim.fn.line("v")
+	local end_line = vim.fn.line(".")
+
+	local message = string.format(
+		"https://github.com/%s/blob/%s/%s#L%d-L%d",
+		git_info.repo,
+		git_info.branch,
+		git_info.file,
+		start_line,
+		end_line
+	)
+	vim.fn.setreg("+", message)
+	vim.notify("Copied:\n\t" .. message, vim.log.levels.INFO)
+end, { noremap = true, silent = true, desc = "Copy GitHub Link" })

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

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

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

@@ -1,19 +1,23 @@
 require("base")
+require("aerial-config")
 require("autopairs-config")
 require("cmp-config")
 require("comment-config")
 require("dap-config")
-require("diagnostics-config")
+require("diffview-config")
-require("git-config")
+require("git-ref")
+require("git-signs")
+require("llm")
 require("leap-config")
-require("llm-config")
 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("snacks-config")
+require("telescope-config")
 require("toggleterm-config")
 require("ts-config")
-require("weird-chars")
 require("which-key-config")
+require("weird-chars")

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

@@ -1,96 +0,0 @@
-local llm_endpoint = "https://llm-api.va.reichard.io"
-local llm_assistant_model = "qwen3-coder-30b-instruct"
-local llm_infill_model = "qwen3-coder-30b-instruct"
-
--- local llm_assistant_model = "devstral-small-2-instruct"
--- local llm_infill_model = "qwen2.5-coder-3b-instruct"
-
-
-local current_fim = "copilot" -- change this to switch default
-
--- Copilot Configuration
-vim.g.copilot_no_tab_map = true
-vim.g.copilot_filetypes = { ["*"] = true }
-
--- LLama LLM FIM
-vim.g.llama_config = {
-	endpoint = llm_endpoint .. "/infill",
-	model = llm_infill_model,
-	n_predict = 2048,
-	ring_n_chunks = 32,
-	enable_at_startup = (current_fim == "llama"), -- enable based on default
-}
-
--- Toggle function for manual switching
-local function switch_llm_fim_provider(switch_to)
-	if switch_to == "llama" then
-		vim.cmd("Copilot disable")
-		vim.cmd("LlamaEnable")
-		current_fim = "llama"
-		vim.notify("Llama FIM enabled", vim.log.levels.INFO)
-	else
-		vim.cmd("Copilot enable")
-		vim.cmd("LlamaDisable")
-		current_fim = "copilot"
-		vim.notify("Copilot FIM enabled", vim.log.levels.INFO)
-	end
-end
-
--- Configure Code Companion
-require("plugins.codecompanion.fidget-spinner"):init()
-local codecompanion = require("codecompanion")
-codecompanion.setup({
-	display = {
-		chat = {
-			show_token_count = true,
-			window = {
-				layout = "float",
-				width = 0.6,
-			}
-		}
-	},
-	adapters = {
-		http = {
-			opts = { show_defaults = false, },
-			copilot = "copilot",
-			llamaswap = function()
-				return require("codecompanion.adapters").extend("openai_compatible", {
-					formatted_name = "LlamaSwap",
-					name = "llamaswap",
-					schema = { model = { default = llm_assistant_model } },
-					env = { url = llm_endpoint },
-				})
-			end,
-		},
-		acp = {
-			opts = { show_defaults = false },
-			opencode = "opencode",
-		}
-	},
-	strategies = {
-		chat = { adapter = "opencode" },
-		inline = { adapter = "llamaswap" },
-		cmd = { adapter = "llamaswap" },
-	},
-	chat = { dispay = "telescope" },
-	memory = { opts = { chat = { enabled = true } } },
-})
-
--- Create KeyMaps for Code Companion
-vim.keymap.set("n", "<leader>aa", codecompanion.actions, { desc = "Actions" })
-vim.keymap.set("n", "<leader>af", function()
-	if current_fim == "llama" then
-		switch_llm_fim_provider("copilot")
-	else
-		switch_llm_fim_provider("llama")
-	end
-end, { desc = "Toggle FIM (Llama / Copilot)" })
-vim.keymap.set("n", "<leader>ao", function() require("snacks.terminal").toggle("opencode") end,
-	{ desc = "Toggle OpenCode" })
-vim.keymap.set("v", "<leader>ai", ":CodeCompanion<cr>", { desc = "Inline Prompt" })
-vim.keymap.set({ "n", "v" }, "<leader>an", codecompanion.chat, { desc = "New Chat" })
-vim.keymap.set({ "n", "t" }, "<leader>at", codecompanion.toggle, { desc = "Toggle Chat" })
-vim.keymap.set('i', '<C-J>', 'copilot#Accept("\\<CR>")', {
-	expr = true,
-	replace_keycodes = false
-})

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

@@ -0,0 +1,20 @@
+-- Configure LLama LLM
+vim.g.llama_config = {
+	endpoint = "http://10.0.50.120:8080/infill",
+	api_key = "",
+	n_prefix = 256,
+	n_suffix = 64,
+	n_predict = 256,
+	t_max_prompt_ms = 500,
+	t_max_predict_ms = 500,
+	show_info = 2,
+	auto_fim = true,
+	max_line_suffix = 8,
+	max_cache_keys = 256,
+	ring_n_chunks = 8,
+	ring_chunk_size = 32,
+	ring_scope = 512,
+	ring_update_ms = 1000,
+}
+
+-- require("gen").setup({ model = "codegemma" })

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

@@ -8,35 +8,22 @@ vim.api.nvim_create_autocmd("FileType", {
 	end,
 })
 
-require('render-markdown').setup({
+vim.filetype.add({
-	completions = { lsp = { enabled = true } },
+	extension = {
-	file_types = { 'markdown', 'codecompanion' },
+		templ = "templ",
-	html = {
-		-- CodeCompanion Markdown Tweaks
-		tag = {
-			file = { icon = '󰨸 ', highlight = 'Normal' },
-			buf = { icon = '󰂥 ', highlight = 'Normal' },
 	},
-	},
-})
-
-------------------------------------------------------
----------------------- LSP Lines ---------------------
-------------------------------------------------------
-require("lsp_lines").setup()
-vim.diagnostic.config({
-	virtual_text = false,
-	virtual_lines = true,
 })
 
 ------------------------------------------------------
 -------------------- Built-in LSP --------------------
 ------------------------------------------------------
 local nix_vars = require("nix-vars")
+local nvim_lsp = require("lspconfig")
 
-local augroup = vim.api.nvim_create_augroup("LspFormatting", { clear = false })
 local on_attach = function(client, bufnr)
-	if client:supports_method("textDocument/formatting") then
+	local bufopts = { noremap = true, silent = true, buffer = bufnr }
+
+	if client.supports_method("textDocument/formatting") then
 		vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
 		vim.api.nvim_create_autocmd("BufWritePre", {
 			group = augroup,
@@ -47,25 +34,17 @@ local on_attach = function(client, bufnr)
 		})
 	end
 
-	-- Create KeyMaps
+	vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
-	local bufopts = { noremap = true, silent = true, buffer = bufnr }
+	vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, bufopts)
-	vim.keymap.set("n", "K", vim.lsp.buf.hover, vim.tbl_extend("force", { desc = 'Hover documentation' }, bufopts))
+	vim.keymap.set("n", "<leader>lD", vim.lsp.buf.declaration, bufopts)
-	vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help,
+	vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition, bufopts)
-		vim.tbl_extend("force", { desc = "Show signature help" }, bufopts))
+	vim.keymap.set("n", "<leader>li", vim.lsp.buf.implementation, bufopts)
-	vim.keymap.set("n", "<leader>lD", vim.lsp.buf.declaration,
+	vim.keymap.set("n", "<leader>ln", vim.lsp.buf.rename, bufopts)
-		vim.tbl_extend("force", { desc = "Go to declaration" }, bufopts))
+	vim.keymap.set("n", "<leader>lr", vim.lsp.buf.references, bufopts)
-	vim.keymap.set("n", "<leader>ld", vim.lsp.buf.definition,
+	vim.keymap.set("n", "<leader>lt", vim.lsp.buf.type_definition, bufopts)
-		vim.tbl_extend("force", { desc = "Go to definition" }, bufopts))
-	vim.keymap.set("n", "<leader>li", vim.lsp.buf.implementation,
-		vim.tbl_extend("force", { desc = "Go to implementation" }, bufopts))
-	vim.keymap.set("n", "<leader>ln", vim.lsp.buf.rename, vim.tbl_extend("force", { desc = "Rename symbol" }, bufopts))
-	vim.keymap.set("n", "<leader>lr", vim.lsp.buf.references,
-		vim.tbl_extend("force", { desc = "Show references" }, bufopts))
-	vim.keymap.set("n", "<leader>lt", vim.lsp.buf.type_definition,
-		vim.tbl_extend("force", { desc = "Go to type definition" }, bufopts))
 	vim.keymap.set("n", "<leader>lf", function()
 		vim.lsp.buf.format({ async = true, timeout_ms = 2000 })
-	end, vim.tbl_extend("force", { desc = "Format file" }, bufopts))
+	end, bufopts)
 end
 
 local on_attach_no_formatting = function(client, bufnr)
@@ -92,92 +71,81 @@ local organize_go_imports = function()
 	end
 end
 
-local default_config = {
+-- Define LSP Flags & Capabilities
-	flags = { debounce_text_changes = 150 },
+local lsp_flags = { debounce_text_changes = 150 }
-	capabilities = require("cmp_nvim_lsp").default_capabilities(),
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
-	on_attach = on_attach,
-}
-local setup_lsp = function(name, config)
-	local final_config = vim.tbl_deep_extend("force", default_config, config or {})
-
-	vim.lsp.config(name, final_config)
-	vim.lsp.enable(name)
-end
 
 -- Python LSP Configuration
-setup_lsp("pyright", {
+nvim_lsp.pyright.setup({
-	filetypes = { "starlark", "python" },
+	on_attach = on_attach,
+	flags = lsp_flags,
+	capabilities = capabilities,
 })
 
 -- HTML LSP Configuration
-setup_lsp("html", {
+nvim_lsp.html.setup({
 	on_attach = on_attach_no_formatting,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.vscls .. "/bin/vscode-html-language-server", "--stdio" },
-	filetypes = { "htm", "html" },
 })
 
 -- JSON LSP Configuration
-setup_lsp("jsonls", {
+nvim_lsp.jsonls.setup({
 	on_attach = on_attach_no_formatting,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.vscls .. "/bin/vscode-html-language-server", "--stdio" },
-	filetypes = { "json", "jsonc", "jsonl" },
 })
 
 -- CSS LSP Configuration
-setup_lsp("cssls", {
+nvim_lsp.cssls.setup({
 	on_attach = on_attach_no_formatting,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.vscls .. "/bin/vscode-html-language-server", "--stdio" },
-	filetypes = { "css" },
 })
 
 -- Typescript / Javascript LSP Configuration
-setup_lsp("ts_ls", {
+nvim_lsp.ts_ls.setup({
 	on_attach = on_attach_no_formatting,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.tsls, "--stdio" },
-	filetypes = { "typescript", "typescriptreact", "javascript" },
 })
 
--- ESLint LSP
+-- Svelte LSP Configuration
-setup_lsp("eslint", {
+nvim_lsp.svelte.setup({
 	on_attach = on_attach_no_formatting,
-	cmd = { nix_vars.vscls .. "/bin/vscode-eslint-language-server", "--stdio" },
+	flags = lsp_flags,
-})
+	capabilities = capabilities,
-
+	cmd = { nix_vars.sveltels, "--stdio" },
--- C LSP Configuration
-setup_lsp("clangd", {
-	cmd = { nix_vars.clangd },
-	filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
 })
 
 -- Lua LSP Configuration
-setup_lsp("lua_ls", {
+nvim_lsp.lua_ls.setup({
+	on_attach = on_attach_no_formatting,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.luals },
-	filetypes = { "lua" },
 })
 
--- Lua LSP Configuration
+-- Templ LSP Configuration
-setup_lsp("sqls", {
+nvim_lsp.templ.setup({
-	cmd = { nix_vars.sqls },
+	on_attach = on_attach,
+	flags = lsp_flags,
+	capabilities = capabilities,
 })
 
 -- Nix LSP Configuration
-setup_lsp("nil_ls", {
+nvim_lsp.nil_ls.setup({
-	filetypes = { "nix" },
+	on_attach = on_attach,
+	flags = lsp_flags,
+	capabilities = capabilities,
 })
 
--- Omnisharp LSP Configuration
--- NOTE: https://github.com/NixOS/nixpkgs/issues/479348
--- setup_lsp("omnisharp", {
--- 	enable_roslyn_analyzers = true,
--- 	enable_import_completion = true,
--- 	organize_imports_on_format = true,
--- 	enable_decompilation_support = true,
--- 	filetypes = { "cs", "vb", "csproj", "sln", "slnx", "props", "csx", "targets", "tproj", "slngen", "fproj" },
--- 	cmd = { nix_vars.omnisharp, "--languageserver", "--hostPID", tostring(vim.fn.getpid()) },
--- })
-
 -- Go LSP Configuration
-setup_lsp("gopls", {
+nvim_lsp.gopls.setup({
 	on_attach = function(client, bufnr)
 		on_attach(client, bufnr)
 		vim.api.nvim_create_autocmd("BufWritePre", {
@@ -186,8 +154,9 @@ setup_lsp("gopls", {
 			callback = organize_go_imports,
 		})
 	end,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.gopls },
-	filetypes = { "go" },
 	settings = {
 		gopls = {
 			buildFlags = { "-tags=e2e" },
@@ -196,43 +165,64 @@ setup_lsp("gopls", {
 })
 
 -- Go LSP Linting
-setup_lsp("golangci_lint_ls", {
+nvim_lsp.golangci_lint_ls.setup({
 	on_attach = on_attach_no_formatting,
+	flags = lsp_flags,
+	capabilities = capabilities,
 	cmd = { nix_vars.golintls },
-	filetypes = { "go" },
 	init_options = {
 		command = {
 			"golangci-lint",
 			"run",
 			"--output.json.path",
-			"stdout",
-			"--show-stats=false",
 			"--issues-exit-code=1",
 		},
 	},
 })
 
 ------------------------------------------------------
---------------------- None-LS LSP --------------------
+--------------------- Null-LS LSP --------------------
 ------------------------------------------------------
-local none_ls = require("null-ls")
+local null_ls = require("null-ls")
 
-none_ls.setup({
+local eslintFiles = {
+	".eslintrc",
+	".eslintrc.js",
+	".eslintrc.cjs",
+	".eslintrc.yaml",
+	".eslintrc.yml",
+	".eslintrc.json",
+	"eslint.config.js",
+	"eslint.config.mjs",
+	"eslint.config.cjs",
+	"eslint.config.ts",
+	"eslint.config.mts",
+	"eslint.config.cts",
+}
+
+has_eslint_in_parents = function(fname)
+	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({
 	sources = {
-		-- Formatting
+		-- Prettier Formatting
-		none_ls.builtins.formatting.prettier,
+		null_ls.builtins.formatting.prettier,
-		none_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
+		null_ls.builtins.formatting.prettier.with({ filetypes = { "template" } }),
-		none_ls.builtins.formatting.nixpkgs_fmt, -- TODO: nixd native LSP?
+		require("none-ls.diagnostics.eslint_d").with({
-		require("none-ls.formatting.autopep8").with({
+			condition = function(utils)
-			filetypes = { "starlark", "python" },
+				return has_eslint_in_parents(vim.fn.getcwd())
-			extra_args = { "--max-line-length", "100" },
+			end,
 		}),
-
+		null_ls.builtins.completion.spell,
-		-- Completion
+		null_ls.builtins.formatting.nixpkgs_fmt,
-		none_ls.builtins.completion.spell,
+		null_ls.builtins.formatting.stylua,
+		null_ls.builtins.diagnostics.sqlfluff,
+		null_ls.builtins.formatting.sqlfluff,
 	},
 	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

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

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

@@ -3,12 +3,8 @@ local cached_pr_status = ""
 
 -- Read process output
 local function read_output(err, data)
-	if err then
+    if err then return end
-		return
+    if not data then return end
-	end
-	if not data then
-		return
-	end
     cached_pr_status = data
 end
 
@@ -19,12 +15,11 @@ local function execute_command()
     local spawn_opts = {
         detached = true,
         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, function()
+    vim.loop.spawn("bash", spawn_opts,
-		stdout:read_start(read_output)
+                   function() stdout:read_start(read_output) end)
-	end)
 end
 
 -- Spawn & schedule process
@@ -32,26 +27,23 @@ execute_command()
 vim.fn.timer_start(300000, execute_command)
 
 -- Return status from cache
-local function pr_status()
+function pr_status()
     --   
     --    
     --
     -- PENDING COLOR - #d29922
     -- PASS COLOR - #3fb950
     -- FAIL COLOR - #f85149
-	return cached_pr_status
+    return cached_pr_status:gsub("\n", ""):gsub("fail", " "):gsub("pass",
-			:gsub("\n", "")
+                                                                     " ")
-			:gsub("fail", " ")
+               :gsub("pending", " "):gsub("skipping", " "):sub(1, -2)
-			:gsub("pass", " ")
-			:gsub("pending", " ")
-			:gsub("skipping", " ")
-			:sub(1, -2)
 end
 
-require("lualine").setup({
+require('lualine').setup({
-	options = { theme = "catppuccin" },
+    options = {
-	sections = {
+        theme = "gruvbox_dark"
-		lualine_c = { { pr_status } },
+        -- theme = "nord"
-		-- lualine_z = { require("opencode").statusline }
+        -- theme = "OceanicNext",
     },
+    sections = {lualine_c = {{pr_status}}}
 })

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

@@ -0,0 +1,2 @@
+require("neo-tree").setup({ window = { mappings = { ["<space>"] = "none" } } })
+vim.keymap.set("n", "<leader>t", ":Neotree toggle<CR>", { silent = true })

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

@@ -1,14 +1,26 @@
+-- Noice Doc Scrolling
+vim.keymap.set("n", "<c-f>", function()
+    if not require("noice.lsp").scroll(4) then return "<c-f>" end
+end, {silent = true, expr = true})
+
+vim.keymap.set("n", "<c-b>", function()
+    if not require("noice.lsp").scroll(-4) then return "<c-b>" end
+end, {silent = true, expr = true})
+
 -- Noice Setup
 require("noice").setup({
-	-- Ignore (Snacks Priority)
+    lsp = {
-	routes = {
+        override = {
-		{
+            ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-			filter = { event = "ui", kind = "input", },
+            ["vim.lsp.util.stylize_markdown"] = true,
-			opts = { skip = true },
+            ["cmp.entry.get_documentation"] = false
-		},
-		{
-			filter = { event = "ui", kind = "select", },
-			opts = { skip = true },
         },
+        signature = {enabled = false}
     },
+    presets = {
+        command_palette = true, -- position the cmdline and popupmenu together
+        long_message_to_split = true, -- long messages will be sent to a split
+        inc_rename = false, -- enables an input dialog for inc-rename.nvim
+        lsp_doc_border = false -- add a border to hover docs and signature help
+    }
 })

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

@@ -1,13 +0,0 @@
-require("octo").setup()
-
--- Create KeyMaps
-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>")

modules/home/programs/terminal/nvim/config/lua/plugins/codecompanion/fidget-spinner.lua

@@ -1,71 +0,0 @@
-local progress = require("fidget.progress")
-
-local M = {}
-
-function M:init()
-	local group = vim.api.nvim_create_augroup("CodeCompanionFidgetHooks", {})
-
-	vim.api.nvim_create_autocmd({ "User" }, {
-		pattern = "CodeCompanionRequestStarted",
-		group = group,
-		callback = function(request)
-			local handle = M:create_progress_handle(request)
-			M:store_progress_handle(request.data.id, handle)
-		end,
-	})
-
-	vim.api.nvim_create_autocmd({ "User" }, {
-		pattern = "CodeCompanionRequestFinished",
-		group = group,
-		callback = function(request)
-			local handle = M:pop_progress_handle(request.data.id)
-			if handle then
-				M:report_exit_status(handle, request)
-				handle:finish()
-			end
-		end,
-	})
-end
-
-M.handles = {}
-
-function M:store_progress_handle(id, handle)
-	M.handles[id] = handle
-end
-
-function M:pop_progress_handle(id)
-	local handle = M.handles[id]
-	M.handles[id] = nil
-	return handle
-end
-
-function M:create_progress_handle(request)
-	return progress.handle.create({
-		title = " Requesting assistance (" .. request.data.adapter.formatted_name .. ")",
-		message = "In progress...",
-		lsp_client = {
-			name = M:llm_role_title(request.data.adapter),
-		},
-	})
-end
-
-function M:llm_role_title(adapter)
-	local parts = {}
-	table.insert(parts, adapter.formatted_name)
-	if adapter.model and adapter.model ~= "" then
-		table.insert(parts, "(" .. adapter.model .. ")")
-	end
-	return table.concat(parts, " ")
-end
-
-function M:report_exit_status(handle, request)
-	if request.data.status == "success" then
-		handle.message = "Completed"
-	elseif request.data.status == "error" then
-		handle.message = " Error"
-	else
-		handle.message = "󰜺 Cancelled"
-	end
-end
-
-return M

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

@@ -0,0 +1,10 @@
+local silicon = require('silicon')
+silicon.setup({})
+
+vim.keymap.set('v', '<Leader>ss', function() silicon.visualise_api({}) end)
+vim.keymap.set('v', '<Leader>sb',
+               function() silicon.visualise_api({show_buf = true}) end)
+vim.keymap.set('n', '<Leader>sv',
+               function() silicon.visualise_api({visible = true}) end)
+vim.keymap.set('n', '<Leader>sb',
+               function() silicon.visualise_api({show_buf = true}) end)

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

@@ -1,23 +0,0 @@
--- Snacks Setup
-local snacks = require("snacks")
-snacks.setup({
-	input = { enabled = true, style = "popup" },
-	select = { enabled = true, style = "popup" },
-})
-
--- Create KeyMaps
-vim.keymap.set("n", "<leader>fb", snacks.picker.buffers, { desc = "Buffers" })
-vim.keymap.set("n", "<leader>fd", snacks.picker.diagnostics, { desc = "Diagnostics" })
-vim.keymap.set("n", "<leader>ff", snacks.picker.files, { desc = "Find Files" })
-vim.keymap.set("n", "<leader>fg", snacks.picker.grep, { desc = "Grep Files" })
-vim.keymap.set("n", "<leader>fh", snacks.picker.help, { desc = "Help Tags" })
-vim.keymap.set("n", "<leader>fj", snacks.picker.jumps, { desc = "Jump List" })
-vim.keymap.set("n", "<leader>fl", function() snacks.terminal("lazygit") end, { desc = "LazyGit" })
-vim.keymap.set("n", "<leader>fp", snacks.picker.gh_pr, { desc = "GitHub Pull Requests" })
-vim.keymap.set("n", "<leader>fs", snacks.picker.lsp_symbols, { desc = "Symbols" })
-vim.keymap.set("n", "<leader>fu", snacks.picker.undo, { desc = "Undo History" })
-vim.keymap.set("n", "gI", snacks.picker.lsp_implementations, { desc = "LSP Implementations" })
-vim.keymap.set("n", "gi", snacks.picker.lsp_incoming_calls, { desc = "LSP Incoming Calls" })
-vim.keymap.set("n", "go", snacks.picker.lsp_outgoing_calls, { desc = "LSP Outgoing Calls" })
-vim.keymap.set("n", "gr", snacks.picker.lsp_references, { desc = "LSP References" })
-vim.keymap.set("n", [[<c-\>]], function() snacks.terminal() end, { desc = "Toggle Terminal" })

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

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

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

@@ -1,20 +1,20 @@
--- require("toggleterm").setup({open_mapping = [[<c-\>]]})
+require("toggleterm").setup({open_mapping = [[<c-\>]]})
---
+
--- -- Get PR status on terminal load
+-- Get PR status on terminal load
--- -- require("toggleterm").setup({
+-- require("toggleterm").setup({
--- --     open_mapping = [[<c-\>]],
+--     open_mapping = [[<c-\>]],
--- --     on_create = function(term)
+--     on_create = function(term)
--- --         vim.cmd("startinsert")
+--         vim.cmd("startinsert")
--- --         term:send("gh pr checks")
+--         term:send("gh pr checks")
--- --     end
--- -- })
---
--- -- Duplicate C-w & Esc Behavior
--- function _G.set_terminal_keymaps()
---     local opts = {buffer = 0}
---     vim.opt.signcolumn = "no"
---     vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
---     vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
 --     end
---
+-- })
--- vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')
+
+-- Duplicate C-w & Esc Behavior
+function _G.set_terminal_keymaps()
+    local opts = {buffer = 0}
+    vim.opt.signcolumn = "no"
+    vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
+    vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
+end
+
+vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()')

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

@@ -1,4 +1,3 @@
-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

@@ -1,9 +1,47 @@
 local wk = require("which-key")
+
+wk.setup({})
+
 wk.add({
-	{ "<leader>a", group = "LLM" },        -- llm-config.lua
+	{ "<C-k>", desc = "Signature Help" },
-	{ "<leader>f", group = "Find" },       -- snacks-config.lua
+	{ "<leader>a", desc = "Aerial" },
-	{ "<leader>l", group = "LSP" },        -- lsp-config.lua
+	{ "<leader>d", group = "Debug" },
-	{ "<leader>g", group = "Git" },        -- git-config.lua
+	{ "<leader>db", desc = "Toggle Breakpoint" },
-	{ "<leader>q", group = "Diagnostics" }, -- diagnostics-config.lua
+	{ "<leader>dc", desc = "Continue" },
-	{ "<leader>d", group = "Debug" },      -- dap-config.lua
+	{ "<leader>dt", desc = "Run Test" },
+	{ "<leader>du", desc = "Toggle UI" },
+	{ "<leader>f", group = "Find - Telescope" },
+	{ "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Find Buffer" },
+	{ "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find File" },
+	{ "<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>g", group = "DiffView" },
+	{ "<leader>gB", desc = "Git Blame Full" },
+	{ "<leader>gH", "<cmd>DiffviewFileHistory --range=origin..HEAD<cr>", desc = "Diff History - Main" },
+	{ "<leader>gO", "<cmd>DiffviewOpen origin/main...HEAD<cr>", desc = "Open Diff - Main" },
+	{ "<leader>gb", desc = "Git Blame Line" },
+	{ "<leader>gc", "<cmd>DiffviewClose<cr>", desc = "Close Diff" },
+	{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", desc = "Diff History" },
+	{ "<leader>go", "<cmd>DiffviewOpen<cr>", desc = "Open Diff - Current" },
+	{ "<leader>l", group = "LSP" },
+	{ "<leader>lD", desc = "Declaration" },
+	{ "<leader>ld", desc = "Definition" },
+	{ "<leader>lf", desc = "Format" },
+	{ "<leader>li", desc = "Implementation" },
+	{ "<leader>ln", desc = "Rename" },
+	{ "<leader>lr", desc = "References" },
+	{ "<leader>lt", desc = "Type Definition" },
+	{ "<leader>q", group = "Diagnostics" },
+	{ "<leader>qN", desc = "Previous Diagnostic" },
+	{ "<leader>qe", desc = "Open Diagnostic Float" },
+	{ "<leader>qn", desc = "Next Diagnostic" },
+	{ "<leader>qq", desc = "Toggle Diagnostic List" },
+	{ "<leader>qt", desc = "Toggle Inline Diagnostics" },
+	{ "<leader>sv", desc = "Visual Screenshot" },
+	{ "<leader>t", desc = "NeoTree" },
+	{ "K", desc = "Definition Hover" },
+	{ "<leader>ss", desc = "Selected Screenshot", mode = "v" },
+	{ "<leader>s", group = "Screenshot", mode = { "n", "v" } },
+	{ "<leader>sb", desc = "Buffer Screenshot", mode = { "n", "v" } },
 })

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

@@ -1,9 +1,4 @@
-{ pkgs
+{ pkgs, lib, config, namespace, ... }:
-, lib
-, config
-, namespace
-, ...
-}:
 let
   inherit (lib) mkIf;
   cfg = config.${namespace}.programs.terminal.nvim;
@@ -39,29 +34,30 @@ in
         # -------------------
         # ----- Helpers -----
         # -------------------
+        aerial-nvim # Code Outline
         comment-nvim # Code Comments
-        copilot-vim # GitHub Copilot
         diffview-nvim # Diff View
-        fidget-nvim # Notification Helper
         gitsigns-nvim # Git Blame
         leap-nvim # Quick Movement
         markdown-preview-nvim # Markdown Preview
+        neo-tree-nvim # File Explorer
         none-ls-nvim # Formatters
         numb-nvim # Peek / Jump to Lines
         nvim-autopairs # Automatically Close Pairs (),[],{}
-        octo-nvim # Git Octo
+        telescope-fzf-native-nvim # Faster Telescope
-        render-markdown-nvim # Markdown Renderer
-        snacks-nvim # Snacks
         telescope-nvim # Fuzzy Finder
+        telescope-ui-select-nvim # UI
+        toggleterm-nvim # Terminal Helper
         vim-nix # Nix Helpers
         which-key-nvim # Shortcut Helper
 
         # ------------------
         # --- Theme / UI ---
         # ------------------
-        catppuccin-nvim # Theme
         lualine-nvim # Bottom Line
         noice-nvim # UI Tweaks
+        # nord-nvim # Theme
+        melange-nvim # Theme
         nvim-notify # Noice Dependency
         nvim-web-devicons # Dev Icons
 
@@ -78,58 +74,83 @@ in
         nvim-dap-go
         nvim-dap-ui
 
-        # --------------------
-        # -- CODE COMPANION --
-        # --------------------
-        (pkgs.vimUtils.buildVimPlugin {
-          pname = "codecompanion.nvim";
-          version = "2025-12-20";
-          src = pkgs.fetchFromGitHub {
-            owner = "olimorris";
-            repo = "codecompanion.nvim";
-            rev = "a226ca071ebc1d8b5ae1f70800fa9cf4a06a2101";
-            sha256 = "sha256-F1nI7q98SPpDjlwPvGy/qFuHvlT1FrbQPcjWrBwLaHU=";
-          };
-          doCheck = false;
-          meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
-          meta.hydraPlatforms = [ ];
-        })
-
         # --------------------
         # -- NONE-LS EXTRAS --
         # --------------------
-        (pkgs.vimUtils.buildVimPlugin {
+        (
+          pkgs.vimUtils.buildVimPlugin {
             pname = "none-ls-extras.nvim";
-          version = "2025-10-28";
+            version = "2024-06-11";
             src = pkgs.fetchFromGitHub {
               owner = "nvimtools";
               repo = "none-ls-extras.nvim";
-            rev = "402c6b5c29f0ab57fac924b863709f37f55dc298";
+              rev = "336e84b9e43c0effb735b08798ffac382920053b";
-            sha256 = "sha256-4s/xQNWNA4dgb5gZR4Xqn6zDDWrSJNtmHOmmjmYnN/8=";
+              sha256 = "sha256-UtU4oWSRTKdEoMz3w8Pk95sROuo3LEwxSDAm169wxwk=";
             };
-          doCheck = false;
             meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/";
-        })
+          }
+        )
+
+        # -------------------
+        # ----- Silicon -----
+        # -------------------
+        (
+          pkgs.vimUtils.buildVimPlugin {
+            pname = "silicon.lua";
+            version = "2022-12-03";
+            src = pkgs.fetchFromGitHub {
+              owner = "mhanberg";
+              repo = "silicon.lua";
+              rev = "5ca462bee0a39b058786bc7fbeb5d16ea49f3a23";
+              sha256 = "0vlp645d5mmii513v72jca931miyrhkvhwb9bfzhix1199zx7vi2";
+            };
+            meta.homepage = "https://github.com/mhanberg/silicon.lua/";
+          }
+        )
+
+        # -------------------
+        # ------- LLM -------
+        # -------------------
+        (
+          pkgs.vimUtils.buildVimPlugin {
+            pname = "llm.nvim";
+            version = "2024-05-25";
+            src = pkgs.fetchFromGitHub {
+              owner = "David-Kunz";
+              repo = "gen.nvim";
+              rev = "bd19cf584b5b82123de977b44105e855e61e5f39";
+              sha256 = "sha256-0AEB6im8Jz5foYzmL6KEGSAYo48g1bkFpjlCSWT6JeE=";
+            };
+            meta.homepage = "https://github.com/David-Kunz/gen.nvim/";
+          }
+        )
 
         # -------------------
         # ---- LLAMA.VIM ----
         # -------------------
-        (pkgs.vimUtils.buildVimPlugin {
+        (
+          pkgs.vimUtils.buildVimPlugin {
             pname = "llama.vim";
-          version = "2025-10-28";
+            version = "2025-01-23";
             src = pkgs.fetchFromGitHub {
               owner = "ggml-org";
               repo = "llama.vim";
-            rev = "ade8966eff57dcbe4a359dd26fb1ea97378ea03c";
+              rev = "143fe910b8d47a054ed464c38d8b7c17d5354468";
-            sha256 = "sha256-uPqOZLWKVMimhc9eG7yM5OmhJy3mTRgKsiqKhstWs4Y=";
+              sha256 = "sha256-PW0HKzhSxcZiWzpDOuy98rl/X0o2nE7tMjZjwwh0qLE=";
             };
             meta.homepage = "https://github.com/ggml-org/llama.vim/";
-        })
+          }
+        )
+
       ];
 
       extraPackages = with pkgs; [
-        # LSP
+        # Telescope Dependencies
-        eslint_d
+        fd
+        ripgrep
+        tree-sitter
+
+        # LSP Dependencies
         go
         golangci-lint
         golangci-lint-langserver
@@ -142,17 +163,17 @@ in
         nodePackages.typescript-language-server
         nodePackages.vscode-langservers-extracted
         pyright
-        python312Packages.autopep8
+        eslint_d
 
         # Formatters
         luaformatter
         nixpkgs-fmt
         nodePackages.prettier
+        sqlfluff
         stylua
 
-        # Tools
+        # Silicon
-        ripgrep
+        silicon
-        lazygit
       ];
 
       extraConfig = ":luafile ~/.config/nvim/lua/init.lua";
@@ -166,20 +187,14 @@ in
       };
 
       # Generate Nix Vars
-      # NOTE: https://github.com/NixOS/nixpkgs/issues/479348
-      #   omnisharp = "${pkgs.omnisharp-roslyn}/bin/OmniSharp",
-
       "nvim/lua/nix-vars.lua".text = ''
         local nix_vars = {
-          bash = "${pkgs.bashInteractive}/bin/bash",
-          clangd = "${pkgs.clang-tools}/bin/clangd",
-          golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver",
           gopls = "${pkgs.gopls}/bin/gopls",
           luals = "${pkgs.lua-language-server}/bin/lua-language-server",
           sveltels = "${pkgs.nodePackages.svelte-language-server}/bin/svelteserver",
           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}",
-          sqls = "${pkgs.sqls}/bin/sqls",
         }
         return nix_vars
       '';

modules/home/programs/terminal/opencode/config/agents/agent-creator.md

@@ -1,65 +0,0 @@
----
-description: Creates and configures new OpenCode agents based on requirements
-mode: subagent
-temperature: 0.3
-permission:
-  write: allow
----
-
-You help users create custom OpenCode agents. When asked to create an agent:
-
-1. **Understand the need**: Ask clarifying questions about:
-   - What tasks should this agent handle?
-   - Should it be primary or subagent?
-   - What tools does it need access to?
-   - Any special permissions or restrictions?
-   - Should it use a specific model?
-
-2. **Generate the config**: Create a markdown file in the appropriate location:
-   - Global: `~/.config/opencode/agent/`
-   - Project: `.opencode/agent/`
-
-3. **Available config options**:
-   - `description` (required): Brief description of agent purpose
-   - `mode`: "primary", "subagent", or "all" (defaults to "all")
-   - `temperature`: 0.0-1.0 (lower = focused, higher = creative)
-   - `maxSteps`: Limit agentic iterations
-   - `disable`: Set to true to disable agent
-   - `tools`: Control tool access (write, edit, bash, etc.)
-   - `permission`: Set to "ask", "allow", or "deny" for edit/bash/webfetch
-   - Additional provider-specific options pass through to the model
-
-4. **Tools configuration**:
-   - Set individual tools: `write: true`, `bash: false`
-   - Use wildcards: `mymcp_*: false`
-   - Inherits from global config, agent config overrides
-
-5. **Permissions** (for edit, bash, webfetch):
-   - `ask`: Prompt before running
-   - `allow`: Run without approval
-   - `deny`: Disable completely
-   - Can set per-command for bash: `"git push": "ask"`
-
-6. **Keep it simple**: Start minimal, users can extend later.
-
-7. **Explain usage**: Tell them how to invoke with `@agent-name`.
-
-Example structure:
-
-```markdown
----
-description: [one-line purpose]
-mode: subagent
-model: anthropic/claude-sonnet-4-20250514
-temperature: 0.2
-tools:
-  write: false
-  bash: false
-permission:
-  edit: deny
----
-
-[Clear instructions for the agent's behavior]
-```
-
-Be conversational. Ask questions before generating.

modules/home/programs/terminal/opencode/config/agents/developer.md

@@ -1,44 +0,0 @@
----
-description: Implements code from plans and review feedback
-mode: subagent
-temperature: 0.3
-permission:
-  "*": deny
-  bash: allow
-  context7_*: allow
-  edit: allow
-  glob: allow
-  grep: allow
-  list: allow
-  lsp: allow
-  read: allow
-  todoread: allow
-  todowrite: allow
----
-
-You implement code. You're the only agent that modifies files.
-
-**Input:**
-
-- Plan file path from @planner
-- Optional: Review feedback from @reviewer
-
-**Workflow:**
-
-1. Read the plan file
-2. Read the specific files/lines mentioned in context maps
-3. Read incrementally if needed (imports, function definitions, etc.)
-4. Implement changes
-5. Commit:
-   ```bash
-   git add -A
-   git commit -m "type: description"
-   ```
-   Types: `feat`, `fix`, `refactor`, `docs`, `test`, `chore`
-
-**Rules:**
-
-- Trust the plan - don't re-analyze or re-plan
-- Start with context map locations, expand only as needed
-- Fix all critical/regular findings, use judgment on nits
-- Stop reading once you understand the change

modules/home/programs/terminal/opencode/config/agents/orchestrator.md

@@ -1,37 +0,0 @@
----
-description: Orchestrates development by delegating to subagents
-mode: primary
-temperature: 0.2
-maxSteps: 50
-permission:
-  "*": deny
-  task:
-    "*": deny
-    planner: allow
-    developer: allow
-    reviewer: allow
----
-
-You orchestrate development by delegating to subagents. Never code yourself.
-
-**Subagents:**
-
-- **@planner** - Creates implementation plans in `./plans/`
-- **@developer** - Implements from plan files
-- **@reviewer** - Reviews implementations
-
-**Workflow:**
-
-1. **Plan**: Call @planner with requirements
-2. **Review Plan**: Show user the plan path, ask for approval
-3. **Develop**: Call @developer with plan file path
-4. **Review Code**: Call @reviewer with implementation
-5. **Iterate**: If NEEDS_WORK, call @developer with plan + feedback
-6. **Done**: When APPROVED or APPROVED_WITH_NITS
-
-**Rules:**
-
-- Always pass plan file path to @developer (not plan content)
-- Include review feedback on iterations
-- Nits are optional - ask user if they want them fixed
-- Keep user informed of current step

modules/home/programs/terminal/opencode/config/agents/planner.md

@@ -1,100 +0,0 @@
----
-description: Explores codebase and breaks features into ordered implementation tasks. Writes plans to ./plans/
-mode: subagent
-temperature: 0.3
-permission:
-  "*": deny
-  context7_*: allow
-  edit: allow
-  glob: allow
-  grep: allow
-  list: allow
-  lsp: allow
-  read: allow
----
-
-# Code Task Planner Agent
-
-You are a code analysis agent that breaks down feature requests into implementable, independent tasks.
-
-## Your Task
-
-1. **Analyze the codebase** using available tools (grep, lsp, read, etc.)
-2. **Identify dependencies** between components
-3. **Create ordered tasks** where each task can be implemented independently
-4. **Generate context maps** showing exact files and line numbers that need changes
-5. **Write the plan** to `./plans/<PLAN_NAME>.md`
-
-## Task Requirements
-
-- **Independent**: Each task should be implementable without future tasks
-- **Hierarchical**: Dependencies must come before dependents
-- **Specific**: Include exact file paths and line numbers
-- **Contextual**: Explain WHY each file matters (1-2 lines max)
-
-## Output Format
-
-Write to `./plans/<PLAN_NAME>.md` with this structure:
-
-```markdown
-# Plan: <PLAN_NAME>
-
-## Feature Overview
-
-<feature summary>
-
-## Implementation Tasks
-
-### Task 1: <Descriptive Title>
-
-**Context Map:**
-
-- `<file_path>:<line_number>` - <why it's relevant or what changes>
-- `<file_path>:<line_number>` - <why it's relevant or what changes>
-
----
-
-### Task 2: <Descriptive Title>
-
-**Context Map:**
-
-- `<file_path>:<line_number>` - <why it's relevant or what changes>
-
----
-```
-
-## Analysis Strategy
-
-1. **Start with interfaces/contracts** - these are foundational
-2. **Then implementations** - concrete types that satisfy interfaces
-3. **Then handlers/controllers** - code that uses the implementations
-4. **Finally integrations** - wiring everything together
-
-## Context Map Guidelines
-
-- Use exact line numbers from actual code analysis
-- Be specific: "Add AddChat method" not "modify file"
-- Include both new additions AND modifications to existing code
-- If a file doesn't exist yet, use line 0 and note "new file"
-
-## Example
-
-```markdown
-### Task 1: Add Store Interface Methods
-
-**Context Map:**
-
-- `./internal/store/interface.go:15` - Add Conversation struct definition
-- `./internal/store/interface.go:28` - Add AddConversation method to Store interface
-- `./internal/store/interface.go:32` - Add AddMessage method to Store interface
-```
-
-Remember: The context map is what developers see FIRST, so make it count!
-
-## Completion
-
-After writing the plan file, respond with:
-
-**Plan created:** `<PLAN_NAME>`
-**Path:** `./plans/<PLAN_NAME>.md`
-**Tasks:** <number of tasks>

modules/home/programs/terminal/opencode/config/agents/reviewer.md

@@ -1,53 +0,0 @@
----
-description: Reviews implementations and provides structured feedback
-mode: subagent
-temperature: 0.2
-permission:
-  "*": deny
-  bash:
-    "*": deny
-    "git diff *": allow
-    "git log *": allow
-    "git show *": allow
-    "git show": allow
-    "git status *": allow
-    "git status": allow
-  glob: allow
-  grep: allow
-  list: allow
-  lsp: allow
-  read: allow
----
-
-You review code implementations.
-
-**Process:**
-
-1. Check `git status` - if uncommitted changes, stop and tell @developer to commit
-2. Review latest commit with `git show`
-3. Read full files only if needed for context
-
-**Response format:**
-
-VERDICT: [APPROVED | NEEDS_WORK | APPROVED_WITH_NITS]
-
-**Critical:** (security, logic errors, data corruption)
-
-- Finding 1
-- Finding 2
-
-**Regular:** (quality, error handling, performance)
-
-- Finding 1
-
-**Nits:** (style, minor improvements)
-
-- Finding 1
-
-**Verdict rules:**
-
-- NEEDS_WORK: Any critical or regular findings
-- APPROVED_WITH_NITS: Only nits
-- APPROVED: No findings
-
-Be thorough, not pedantic.

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

@@ -1,81 +0,0 @@
-{ lib
-, pkgs
-, config
-, namespace
-, osConfig
-, ...
-}:
-let
-  inherit (lib) mkIf;
-
-  helpers = import ./lib.nix { inherit lib; };
-  llamaSwapConfig = osConfig.${namespace}.services.llama-swap.config or { };
-
-  cfg = config.${namespace}.programs.terminal.opencode;
-in
-{
-  options.${namespace}.programs.terminal.opencode = {
-    enable = lib.mkEnableOption "enable opencode";
-  };
-
-  config = mkIf cfg.enable {
-    # Enable OpenCode
-    programs.opencode = {
-      enable = true;
-      package = pkgs.reichard.opencode;
-      enableMcpIntegration = true;
-      agents = {
-        orchestrator = ./config/agents/orchestrator.md;
-        planner = ./config/agents/planner.md;
-        developer = ./config/agents/developer.md;
-        reviewer = ./config/agents/reviewer.md;
-        agent-creator = ./config/agents/agent-creator.md;
-      };
-    };
-
-    # Define OpenCode Configuration
-    sops = {
-      secrets.context7_apikey = {
-        sopsFile = lib.snowfall.fs.get-file "secrets/common/evanreichard.yaml";
-      };
-      templates."opencode.json" = {
-        path = ".config/opencode/opencode.json";
-        content = builtins.toJSON {
-          "$schema" = "https://opencode.ai/config.json";
-          theme = "catppuccin";
-          provider = {
-            "llama-swap" = {
-              npm = "@ai-sdk/openai-compatible";
-              options = {
-                baseURL = "https://llm-api.va.reichard.io/v1";
-              };
-              models = helpers.toOpencodeModels llamaSwapConfig;
-            };
-          };
-          lsp = {
-            biome = {
-              disabled = true;
-            };
-            starlark = {
-              command = [
-                "${pkgs.pyright}/bin/pyright-langserver"
-                "--stdio"
-              ];
-              extensions = [ ".star" ];
-            };
-          };
-          mcp = {
-            context7 = {
-              type = "remote";
-              url = "https://mcp.context7.com/mcp";
-              headers = {
-                CONTEXT7_API_KEY = "${config.sops.placeholder.context7_apikey}";
-              };
-              enabled = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}

modules/home/programs/terminal/opencode/lib.nix

@@ -1,53 +0,0 @@
-{ lib }:
-let
-  inherit (lib)
-    mapAttrs
-    filterAttrs
-    any
-    flatten
-    listToAttrs
-    nameValuePair
-    ;
-in
-{
-  # Convert llama-swap models to opencode format
-  toOpencodeModels =
-    llamaSwapConfig:
-    let
-      textGenModels = filterAttrs
-        (
-          name: model: any (t: t == "text-generation") (model.metadata.type or [ ])
-        )
-        (llamaSwapConfig.models or { });
-
-      localModels = mapAttrs
-        (
-          name: model:
-            {
-              inherit (model) name;
-            }
-            // (
-              if model.macros.ctx or null != null then
-                {
-                  limit = {
-                    context = lib.toInt model.macros.ctx;
-                    input = lib.toInt model.macros.ctx;
-                    output = lib.toInt model.macros.ctx;
-                  };
-                }
-              else
-                { }
-            )
-        )
-        textGenModels;
-
-      peerModels = listToAttrs (
-        flatten (
-          map (peer: map (modelName: nameValuePair modelName { name = modelName; }) peer.models) (
-            builtins.attrValues (llamaSwapConfig.peers or { })
-          )
-        )
-      );
-    in
-    localModels // peerModels;
-}

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

@@ -1,67 +0,0 @@
-{ 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/security/sops/default.nix

@@ -1,37 +0,0 @@
-{ config
-, lib
-, namespace
-, pkgs
-, ...
-}:
-let
-  inherit (lib) mkIf mkEnableOption types;
-  inherit (lib.${namespace}) mkOpt;
-  getFile = lib.snowfall.fs.get-file;
-
-  cfg = config.${namespace}.security.sops;
-in
-{
-  options.${namespace}.security.sops = with types; {
-    enable = mkEnableOption "Enable sops";
-    defaultSopsFile = mkOpt str "secrets/common/evanreichard.yaml" "Default sops file.";
-    sshKeyPaths = mkOpt (listOf path) [ ] "Additional SSH key paths to use.";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      age
-      sops
-      ssh-to-age
-    ];
-
-    sops = {
-      defaultSopsFile = getFile cfg.defaultSopsFile;
-
-      age = {
-        keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
-        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ] ++ cfg.sshKeyPaths;
-      };
-    };
-  };
-}

modules/home/services/poweralertd/default.nix

@@ -1,17 +0,0 @@
-{ 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

@@ -0,0 +1,41 @@
+{ config, lib, namespace, pkgs, ... }:
+let
+  inherit (lib) mkIf types;
+  inherit (lib.${namespace}) mkOpt;
+
+  cfg = config.${namespace}.services.sops;
+in
+{
+  options.${namespace}.services.sops = with types; {
+    enable = lib.mkEnableOption "sops";
+    defaultSopsFile = mkOpt path null "Default sops file.";
+    sshKeyPaths = mkOpt (listOf path) [ ] "SSH Key paths to use.";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      age
+      sops
+      ssh-to-age
+    ];
+
+    sops = {
+      inherit (cfg) defaultSopsFile;
+      defaultSopsFormat = "yaml";
+
+      age = {
+        generateKey = true;
+        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/home/services/swww/default.nix

@@ -1,78 +0,0 @@
-{ config
-, lib
-, pkgs
-, namespace
-, ...
-}:
-let
-  cfg = config.${namespace}.services.swww;
-in
-{
-  options.${namespace}.services.swww = {
-    enable = lib.mkEnableOption "swww wallpaper service";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      swww
-    ];
-
-    systemd.user = {
-      services = {
-        swww-daemon = {
-          Unit = {
-            Description = "SWWW Wallpaper Daemon";
-            After = [ "graphical-session.target" ];
-          };
-
-          Install = {
-            WantedBy = [ "graphical-session.target" ];
-          };
-
-          Service = {
-            Type = "simple";
-            ExecStart = "${pkgs.swww}/bin/swww-daemon";
-            Restart = "on-failure";
-            RestartSec = 5;
-          };
-        };
-
-        change-wallpaper = {
-          Unit = {
-            Description = "SWWW Wallpaper Changer";
-            After = [ "swww-daemon.service" ];
-            Requires = [ "swww-daemon.service" ];
-          };
-
-          Install = {
-            WantedBy = [ "swww-daemon.service" ];
-          };
-
-          Service = {
-            Type = "oneshot";
-            ExecStart = "${pkgs.writeShellScript "change-wallpaper-script" ''
-              WALLPAPER=$(${pkgs.findutils}/bin/find $HOME/Wallpapers -type f | ${pkgs.coreutils}/bin/shuf -n 1)
-              ${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random
-            ''}";
-          };
-        };
-      };
-
-      timers.swww-schedule = {
-        Unit = {
-          Description = "SWWW Wallpaper Schedule";
-        };
-
-        Install = {
-          WantedBy = [ "timers.target" ];
-        };
-
-        Timer = {
-          OnBootSec = "1min";
-          OnUnitActiveSec = "1h";
-          Unit = "change-wallpaper.service";
-        };
-      };
-    };
-  };
-}

modules/nixos/common/default.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    wget
-  ];
-}

modules/nixos/display-managers/sddm/default.nix

@@ -1,39 +1,33 @@
-{ config
+{ config, lib, pkgs, namespace, ... }:
-, lib
-, pkgs
-, namespace
-, ...
-}:
 let
-  inherit (lib) mkIf types;
+  inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkOpt;
 
   cfg = config.${namespace}.display-managers.sddm;
 in
 {
   options.${namespace}.display-managers.sddm = {
     enable = lib.mkEnableOption "sddm";
-    scale = mkOpt types.str "1.75" "Scale";
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      catppuccin-sddm
+    ];
+
     services = {
       displayManager = {
         sddm = {
           inherit (cfg) enable;
           package = pkgs.kdePackages.sddm;
-          theme = "catppuccin-mocha-mauve";
+          theme = "catppuccin-mocha";
           wayland.enable = true;
         };
       };
     };
 
-    environment.systemPackages = with pkgs; [
-      catppuccin-sddm
-    ];
-
     environment.sessionVariables = {
-      QT_SCREEN_SCALE_FACTORS = cfg.scale;
+      QT_SCREEN_SCALE_FACTORS = "2";
+      QT_FONT_DPI = "192";
     };
   };
 }

modules/nixos/hardware/asahi/default.nix

@@ -1,7 +1,7 @@
 { config, lib, inputs, namespace, ... }:
 let
   inherit (lib) types optionalAttrs;
-  inherit (lib.${namespace}) mkOpt;
+  inherit (lib.${namespace}) mkOpt mkBoolOpt;
 
   cfg = config.${namespace}.hardware.asahi;
 in
@@ -12,6 +12,7 @@ in
 
   options.${namespace}.hardware.asahi = {
     enable = lib.mkEnableOption "support for asahi linux";
+    enableGPU = mkBoolOpt false "enable gpu driver";
     firmwareDirectory = mkOpt types.path null "firmware directory";
   };
 
@@ -20,6 +21,7 @@ in
       enable = cfg.enable;
     } // optionalAttrs cfg.enable {
       peripheralFirmwareDirectory = cfg.firmwareDirectory;
+      useExperimentalGPUDriver = cfg.enableGPU;
     };
   };
 }

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

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

@@ -1,6 +1,6 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) mkIf mkForce;
+  inherit (lib) mkIf;
   inherit (lib.${namespace}) mkBoolOpt;
 
   cfg = config.${namespace}.hardware.opengl;
@@ -14,26 +14,17 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.xserver.videoDrivers = mkIf cfg.enableNvidia [ "nvidia" ];
-
     environment.systemPackages = with pkgs; [
       libva-utils
       vdpauinfo
-    ] ++ lib.optionals (cfg.enableNvidia || cfg.enableIntel) [
+    ] ++ lib.optionals cfg.enableNvidia [
       nvtopPackages.full
+    ] ++ lib.optionals cfg.enableIntel [
+      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.enableRedistributableFirmware = cfg.enableIntel;
     hardware.graphics = {
       enable = true;
       enable32Bit = cfg.enable32Bit;

modules/nixos/home/default.nix

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

modules/nixos/nix/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, namespace, host, ... }:
+{ config, lib, pkgs, namespace, host, ... }:
 let
   inherit (lib) types mkIf;
   inherit (lib.${namespace}) mkBoolOpt mkOpt;
@@ -14,14 +14,6 @@ in
   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"
@@ -48,18 +40,16 @@ in
 
         checkConfig = true;
         distributedBuilds = true;
-        optimise.automatic = true;
-        registry = mappedRegistry;
 
         gc = {
           automatic = true;
           options = "--delete-older-than 7d";
         };
 
+        optimise.automatic = true;
+
         settings = {
-          connect-timeout = 5;
           allowed-users = users;
-          max-jobs = "auto";
           auto-optimise-store = pkgs.stdenv.hostPlatform.isLinux;
           builders-use-substitutes = true;
           experimental-features = [
@@ -76,26 +66,6 @@ in
           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/nixos/programs/graphical/wms/hyprland/default.nix

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

modules/nixos/security/sops/default.nix

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

modules/nixos/services/avahi/default.nix

@@ -23,11 +23,5 @@ in
         workstation = true;
       };
     };
-
-    # Cloud Init
-    systemd.services.avahi-daemon = mkIf config.${namespace}.services.cloud-init.enable {
-      after = [ "cloud-final.service" ];
-      requires = [ "cloud-final.service" ];
-    };
   };
 }

modules/nixos/services/cloud-init/default.nix

@@ -22,6 +22,5 @@ in
         };
       };
     };
-    networking.hostName = lib.mkForce "";
   };
 }

modules/nixos/services/headscale/default.nix

@@ -1,51 +0,0 @@
-{ 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-swap/config.nix

@@ -1,454 +0,0 @@
-{ pkgs }:
-let
-  llama-cpp = pkgs.reichard.llama-cpp;
-  stable-diffusion-cpp = pkgs.reichard.stable-diffusion-cpp.override {
-    cudaSupport = true;
-  };
-in
-{
-  models = {
-    # https://huggingface.co/unsloth/Devstral-Small-2-24B-Instruct-2512-GGUF/tree/main
-    "devstral-small-2-instruct" = {
-      name = "Devstral Small 2 (24B) - Instruct";
-      macros.ctx = "98304";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Devstral/Devstral-Small-2-24B-Instruct-2512-UD-Q4_K_XL.gguf \
-          --chat-template-file /mnt/ssd/Models/Devstral/Devstral-Small-2-24B-Instruct-2512-UD-Q4_K_XL_template.jinja \
-          --temp 0.15 \
-          -c ''${ctx} \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -fit off \
-          -dev CUDA0
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/GLM-4-32B-0414-GGUF/tree/main
-    "glm-4-32b-instruct" = {
-      name = "GLM 4 (32B) - Instruct";
-      macros.ctx = "32768";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/GLM/GLM-4-32B-0414-Q4_K_M.gguf \
-          -c ''${ctx} \
-          --temp 0.6 \
-          --top-k 40 \
-          --top-p 0.95 \
-          --min-p 0.0 \
-          -fit off \
-          -dev CUDA0
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/mradermacher/gpt-oss-20b-heretic-v2-i1-GGUF/tree/main
-    "gpt-oss-20b-thinking" = {
-      name = "GPT OSS (20B) - Thinking";
-      macros.ctx = "131072";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/GPT-OSS/gpt-oss-20b-heretic-v2.i1-MXFP4_MOE.gguf \
-          -c ''${ctx} \
-          --temp 1.0 \
-          --top-p 1.0 \
-          --top-k 40 \
-          -dev CUDA0
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/mradermacher/GPT-OSS-Cybersecurity-20B-Merged-i1-GGUF/tree/main
-    "gpt-oss-csec-20b-thinking" = {
-      name = "GPT OSS CSEC (20B) - Thinking";
-      macros.ctx = "131072";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/GPT-OSS/GPT-OSS-Cybersecurity-20B-Merged.i1-MXFP4_MOE.gguf \
-          -c ''${ctx} \
-          --temp 1.0 \
-          --top-p 1.0 \
-          --top-k 40 \
-          -dev CUDA0
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen3-Next-80B-A3B-Instruct-GGUF/tree/main
-    "qwen3-next-80b-instruct" = {
-      name = "Qwen3 Next (80B) - Instruct";
-      macros.ctx = "262144";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Qwen3/Qwen3-Next-80B-A3B-Instruct-UD-Q2_K_XL.gguf \
-          -c ''${ctx} \
-          --temp 0.7 \
-          --min-p 0.0 \
-          --top-p 0.8 \
-          --top-k 20 \
-          --repeat-penalty 1.05 \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -fit off
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen3-30B-A3B-Instruct-2507-GGUF/tree/main
-    "qwen3-30b-2507-instruct" = {
-      name = "Qwen3 2507 (30B) - Instruct";
-      macros.ctx = "262144";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Qwen3/Qwen3-30B-A3B-Instruct-2507-Q4_K_M.gguf \
-          -c ''${ctx} \
-          --temp 0.7 \
-          --min-p 0.0 \
-          --top-p 0.8 \
-          --top-k 20 \
-          --presence-penalty 1.0 \
-          --repeat-penalty 1.0 \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -ts 70,30 \
-          -fit off
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen3-Coder-30B-A3B-Instruct-GGUF/tree/main
-    "qwen3-coder-30b-instruct" = {
-      name = "Qwen3 Coder (30B) - Instruct";
-      macros.ctx = "131072";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Qwen3/Qwen3-Coder-30B-A3B-Instruct-UD-Q6_K_XL.gguf \
-          -c ''${ctx} \
-          --temp 0.7 \
-          --min-p 0.0 \
-          --top-p 0.8 \
-          --top-k 20 \
-          --repeat-penalty 1.05 \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -ts 70,30 \
-          -fit off
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen3-30B-A3B-Thinking-2507-GGUF/tree/main
-    "qwen3-30b-2507-thinking" = {
-      name = "Qwen3 2507 (30B) - Thinking";
-      macros.ctx = "262144";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Qwen3/Qwen3-30B-A3B-Thinking-2507-UD-Q4_K_XL.gguf \
-          -c ''${ctx} \
-          --temp 0.6 \
-          --min-p 0.0 \
-          --top-p 0.95 \
-          --top-k 20 \
-          --presence-penalty 1.0 \
-          --repeat-penalty 1.0 \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -ts 70,30 \
-          -fit off
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Nemotron-3-Nano-30B-A3B-GGUF/tree/main
-    "nemotron-3-nano-30b-thinking" = {
-      name = "Nemotron 3 Nano (30B) - Thinking";
-      macros.ctx = "1048576";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Nemotron/Nemotron-3-Nano-30B-A3B-UD-Q4_K_XL.gguf \
-          -c ''${ctx} \
-          --temp 1.1 \
-          --top-p 0.95 \
-          -fit off
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen3-VL-8B-Instruct-GGUF/tree/main
-    "qwen3-8b-vision" = {
-      name = "Qwen3 Vision (8B) - Thinking";
-      macros.ctx = "65536";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Qwen3/Qwen3-VL-8B-Instruct-UD-Q4_K_XL.gguf \
-          --mmproj /mnt/ssd/Models/Qwen3/Qwen3-VL-8B-Instruct-UD-Q4_K_XL_mmproj-F16.gguf \
-          -c ''${ctx} \
-          --temp 0.7 \
-          --min-p 0.0 \
-          --top-p 0.8 \
-          --top-k 20 \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -fit off \
-          -dev CUDA1
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen2.5-Coder-7B-Instruct-128K-GGUF/tree/main
-    "qwen2.5-coder-7b-instruct" = {
-      name = "Qwen2.5 Coder (7B) - Instruct";
-      macros.ctx = "131072";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          -m /mnt/ssd/Models/Qwen2.5/Qwen2.5-Coder-7B-Instruct-Q8_0.gguf \
-          --fim-qwen-7b-default \
-          -c ''${ctx} \
-          --port ''${PORT} \
-          -fit off \
-          -dev CUDA1
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen2.5-Coder-3B-Instruct-128K-GGUF/tree/main
-    "qwen2.5-coder-3b-instruct" = {
-      name = "Qwen2.5 Coder (3B) - Instruct";
-      macros.ctx = "131072";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          -m /mnt/ssd/Models/Qwen2.5/Qwen2.5-Coder-3B-Instruct-Q8_0.gguf \
-          --fim-qwen-3b-default \
-          --port ''${PORT} \
-          -c ''${ctx} \
-          -fit off \
-          -dev CUDA1
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # https://huggingface.co/unsloth/Qwen3-4B-Instruct-2507-GGUF/tree/main
-    "qwen3-4b-2507-instruct" = {
-      name = "Qwen3 2507 (4B) - Instruct";
-      macros.ctx = "98304";
-      cmd = ''
-        ${llama-cpp}/bin/llama-server \
-          --port ''${PORT} \
-          -m /mnt/ssd/Models/Qwen3/Qwen3-4B-Instruct-2507-Q4_K_M.gguf \
-          -c ''${ctx} \
-          -fit off \
-          -ctk q8_0 \
-          -ctv q8_0 \
-          -dev CUDA1
-      '';
-      metadata = {
-        type = [ "text-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    # ---------------------------------------
-    # ---------- Stable Diffussion ----------
-    # ---------------------------------------
-
-    "z-image-turbo" = {
-      name = "Z-Image-Turbo";
-      checkEndpoint = "/";
-      cmd = ''
-        ${stable-diffusion-cpp}/bin/sd-server \
-          --listen-port ''${PORT} \
-          --diffusion-fa \
-          --diffusion-model /mnt/ssd/StableDiffusion/ZImageTurbo/z-image-turbo-Q8_0.gguf \
-          --vae /mnt/ssd/StableDiffusion/ZImageTurbo/ae.safetensors \
-          --llm /mnt/ssd/Models/Qwen3/Qwen3-4B-Instruct-2507-Q4_K_M.gguf \
-          --cfg-scale 1.0 \
-          --steps 8 \
-          --rng cuda
-      '';
-      metadata = {
-        type = [ "image-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    "qwen-image-edit-2511" = {
-      name = "Qwen Image Edit 2511";
-      checkEndpoint = "/";
-      cmd = ''
-        ${stable-diffusion-cpp}/bin/sd-server \
-          --listen-port ''${PORT} \
-          --diffusion-fa \
-          --qwen-image-zero-cond-t \
-          --diffusion-model /mnt/ssd/StableDiffusion/QwenImage/qwen-image-edit-2511-Q5_K_M.gguf \
-          --vae /mnt/ssd/StableDiffusion/QwenImage/qwen_image_vae.safetensors \
-          --llm /mnt/ssd/Models/Qwen2.5/Qwen2.5-VL-7B-Instruct.Q4_K_M.gguf \
-          --lora-model-dir /mnt/ssd/StableDiffusion/QwenImage/Loras \
-          --cfg-scale 2.5 \
-          --sampling-method euler \
-          --flow-shift 3 \
-          --steps 20 \
-          --rng cuda
-      '';
-      metadata = {
-        type = [
-          "image-edit"
-          "image-generation"
-        ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    "qwen-image-2512" = {
-      name = "Qwen Image 2512";
-      checkEndpoint = "/";
-      cmd = ''
-        ${stable-diffusion-cpp}/bin/sd-server \
-          --listen-port ''${PORT} \
-          --diffusion-fa \
-          --diffusion-model /mnt/ssd/StableDiffusion/QwenImage/qwen-image-2512-Q5_K_M.gguf \
-          --vae /mnt/ssd/StableDiffusion/QwenImage/qwen_image_vae.safetensors \
-          --llm /mnt/ssd/Models/Qwen2.5/Qwen2.5-VL-7B-Instruct.Q4_K_M.gguf \
-          --lora-model-dir /mnt/ssd/StableDiffusion/QwenImage/Loras \
-          --cfg-scale 2.5 \
-          --sampling-method euler \
-          --flow-shift 3 \
-          --steps 20 \
-          --rng cuda
-      '';
-      metadata = {
-        type = [ "image-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-
-    "chroma-radiance" = {
-      name = "Chroma Radiance";
-      checkEndpoint = "/";
-      cmd = ''
-        ${stable-diffusion-cpp}/bin/sd-server \
-          --listen-port ''${PORT} \
-          --diffusion-fa --chroma-disable-dit-mask \
-          --diffusion-model /mnt/ssd/StableDiffusion/Chroma/chroma_radiance_x0_q8.gguf \
-          --t5xxl /mnt/ssd/StableDiffusion/Chroma/t5xxl_fp16.safetensors \
-          --cfg-scale 4.0 \
-          --sampling-method euler \
-          --rng cuda
-      '';
-      metadata = {
-        type = [ "image-generation" ];
-      };
-      env = [ "GGML_CUDA_ENABLE_UNIFIED_MEMORY=1" ];
-    };
-  };
-
-  groups = {
-    shared = {
-      swap = true;
-      exclusive = false;
-      members = [
-        "nemotron-3-nano-30b-thinking"
-        "qwen3-30b-2507-instruct"
-        "qwen3-30b-2507-thinking"
-        "qwen3-coder-30b-instruct"
-        "qwen3-next-80b-instruct"
-      ];
-    };
-
-    cuda0 = {
-      swap = true;
-      exclusive = false;
-      members = [
-        "devstral-small-2-instruct"
-        "glm-4-32b-instruct"
-        "gpt-oss-20b-thinking"
-        "gpt-oss-csec-20b-thinking"
-      ];
-    };
-
-    cuda1 = {
-      swap = true;
-      exclusive = false;
-      members = [
-        "qwen2.5-coder-3b-instruct"
-        "qwen2.5-coder-7b-instruct"
-        "qwen3-4b-2507-instruct"
-        "qwen3-8b-vision"
-      ];
-    };
-  };
-
-  peers = {
-    synthetic = {
-      proxy = "https://api.synthetic.new/openai/";
-      models = [
-        "hf:deepseek-ai/DeepSeek-R1-0528"
-        "hf:deepseek-ai/DeepSeek-V3"
-        "hf:deepseek-ai/DeepSeek-V3-0324"
-        "hf:deepseek-ai/DeepSeek-V3.1"
-        "hf:deepseek-ai/DeepSeek-V3.1-Terminus"
-        "hf:deepseek-ai/DeepSeek-V3.2"
-        "hf:meta-llama/Llama-3.3-70B-Instruct"
-        "hf:meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8"
-        "hf:MiniMaxAI/MiniMax-M2"
-        "hf:MiniMaxAI/MiniMax-M2.1"
-        "hf:moonshotai/Kimi-K2-Instruct-0905"
-        "hf:moonshotai/Kimi-K2-Thinking"
-        "hf:openai/gpt-oss-120b"
-        "hf:Qwen/Qwen3-235B-A22B-Instruct-2507"
-        "hf:Qwen/Qwen3-235B-A22B-Thinking-2507"
-        "hf:Qwen/Qwen3-Coder-480B-A35B-Instruct"
-        "hf:Qwen/Qwen3-VL-235B-A22B-Instruct"
-        "hf:zai-org/GLM-4.5"
-        "hf:zai-org/GLM-4.6"
-        "hf:zai-org/GLM-4.7"
-      ];
-    };
-  };
-}

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

@@ -1,107 +0,0 @@
-{ config
-, lib
-, pkgs
-, namespace
-, ...
-}:
-let
-  inherit (lib) mkIf mkEnableOption recursiveUpdate;
-  cfg = config.${namespace}.services.llama-swap;
-
-  llama-swap = pkgs.reichard.llama-swap;
-in
-{
-  options.${namespace}.services.llama-swap = {
-    enable = mkEnableOption "enable llama-swap service";
-    config = lib.mkOption {
-      type = lib.types.unspecified;
-      default = import ./config.nix { inherit pkgs; };
-      readOnly = true;
-      description = "The llama-swap configuration data";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Create User
-    users.groups.llama-swap = { };
-    users.users.llama-swap = {
-      isSystemUser = true;
-      group = "llama-swap";
-    };
-
-    # Create Service
-    systemd.services.llama-swap = {
-      description = "Model swapping for LLaMA C++ Server (or any local OpenAPI compatible server)";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        Type = "exec";
-        ExecStart = "${lib.getExe llama-swap} --listen :8080 --config ${
-          config.sops.templates."llama-swap.json".path
-        }";
-        Restart = "on-failure";
-        RestartSec = 3;
-
-        # for GPU acceleration
-        PrivateDevices = false;
-
-        # hardening
-        User = "llama-swap";
-        Group = "llama-swap";
-        CapabilityBoundingSet = "";
-        RestrictAddressFamilies = [
-          "AF_INET"
-          "AF_INET6"
-          "AF_UNIX"
-        ];
-        NoNewPrivileges = true;
-        PrivateMounts = true;
-        PrivateTmp = true;
-        PrivateUsers = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectSystem = "strict";
-        MemoryDenyWriteExecute = true;
-        LimitMEMLOCK = "infinity";
-        LockPersonality = true;
-        RemoveIPC = true;
-        RestrictNamespaces = true;
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        SystemCallArchitectures = "native";
-        SystemCallFilter = [
-          "@system-service"
-          "~@privileged"
-        ];
-        SystemCallErrorNumber = "EPERM";
-        ProtectProc = "invisible";
-        ProtectHostname = true;
-        ProcSubset = "pid";
-      };
-    };
-
-    # Create Config
-    sops = {
-      secrets.synthetic_apikey = {
-        sopsFile = lib.snowfall.fs.get-file "secrets/common/systems.yaml";
-      };
-      templates."llama-swap.json" = {
-        owner = "llama-swap";
-        group = "llama-swap";
-        mode = "0400";
-        content = builtins.toJSON (
-          recursiveUpdate cfg.config {
-            peers.synthetic.apiKey = config.sops.placeholder.synthetic_apikey;
-          }
-        );
-      };
-    };
-
-    networking.firewall.allowedTCPPorts = [ 8080 ];
-  };
-}

modules/nixos/services/mosh/default.nix

@@ -1,18 +0,0 @@
-{ 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

@@ -1,8 +1,4 @@
-{ config
+{ config, lib, namespace, ... }:
-, lib
-, namespace
-, ...
-}:
 let
   inherit (lib)
     types
@@ -13,18 +9,15 @@ let
 
   cfg = config.${namespace}.services.openssh;
 
-  globalKeys = [
+  authorizedKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY evanreichard@lin-va-mbp-personal"
+    # evanreichard@lin-va-mbp-personal
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWj6rd6uDtHj/gGozgIEgxho/vBKebgN5Kce/N6vQWV evanreichard@mac-va-mbp-personal"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz evanreichard@lin-va-thinkpad"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM5e6Cty+7rX5BjIEHBTU6GnzfOxPJiHpSqin/BnsypO evanreichard@lin-va-terminal"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARTNbl4lgQsp7SJEng7vprL0+ChC9e6iR7o/PiC4Jme evanreichard@mobile"
   ];
 in
 {
   options.${namespace}.services.openssh = with types; {
     enable = lib.mkEnableOption "OpenSSH support";
-    authorizedKeys = mkOpt (listOf str) [ ] "The public keys to apply.";
+    authorizedKeys = mkOpt (listOf str) authorizedKeys "The public keys to apply.";
     extraConfig = mkOpt str "" "Extra configuration to apply.";
   };
 
@@ -79,7 +72,7 @@ in
     };
 
     reichard = {
-      user.extraOptions.openssh.authorizedKeys.keys = cfg.authorizedKeys ++ globalKeys;
+      user.extraOptions.openssh.authorizedKeys.keys = cfg.authorizedKeys;
     };
   };
 }

modules/nixos/services/printing/default.nix

@@ -1,24 +0,0 @@
-{ config
-, lib
-, namespace
-, ...
-}:
-let
-  inherit (lib) mkIf mkEnableOption types;
-  inherit (lib.${namespace}) mkOpt;
-
-  cfg = config.${namespace}.services.printing;
-in
-{
-  options.${namespace}.services.printing = with types; {
-    enable = mkEnableOption "enable printing service";
-    drivers = mkOpt (listOf package) [ ] "print drivers to use";
-  };
-
-  config = mkIf cfg.enable {
-    services.printing = {
-      enable = true;
-      drivers = cfg.drivers;
-    };
-  };
-}

modules/nixos/services/rke2/default.nix

@@ -1,9 +1,4 @@
-{ config
+{ config, pkgs, lib, namespace, ... }:
-, pkgs
-, lib
-, namespace
-, ...
-}:
 let
   inherit (lib) types mkIf;
   inherit (lib.${namespace}) mkOpt mkBoolOpt;
@@ -14,25 +9,15 @@ in
   options.${namespace}.services.rke2 = with types; {
     enable = lib.mkEnableOption "Enable RKE2";
     disable = mkOpt (listOf str) [ ] "Disable services";
-    openFirewall = mkBoolOpt false "Open firewall";
+    openFirewall = mkBoolOpt true "Open firewall";
   };
 
   config = mkIf cfg.enable {
-    boot.kernel.sysctl = {
-      "fs.inotify.max_user_watches" = 1048576;
-      "fs.inotify.max_user_instances" = 8192;
-      "fs.file-max" = 2097152;
-    };
-
     services.rke2 = {
       enable = true;
       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
@@ -47,6 +32,8 @@ 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
@@ -62,11 +49,5 @@ in
       after = [ "cloud-final.service" ];
       requires = [ "cloud-final.service" ];
     };
-
-    environment.systemPackages = with pkgs; [
-      k9s
-      kubectl
-      nfs-utils
-    ];
   };
 }

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

@@ -1,32 +0,0 @@
-{ 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

@@ -1,20 +0,0 @@
-{ 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;
-    };
-  };
-}