remove ff sponsored

fix sops
fix bindings
2025-04-19 21:12:13 -04:00 · 2025-04-19 21:08:21 -04:00 · 2025-04-19 20:37:58 -04:00 · 2025-04-19 20:35:52 -04:00 · 2025-04-19 20:35:22 -04:00 · 2025-04-19 20:09:49 -04:00
39 changed files with 771 additions and 431 deletions
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +0,0 @@
- Nix Builder
-
-  - Keys
-  - User
-  - Etc
-
- SSH
-  - Known Hosts
--- a/bootstrap.sh
+++ b/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>"
+    local usage="Usage: $0 image --name <image-name> [--remote]"
    local name=""
    local remote=false

@@ -31,13 +31,13 @@ function cmd_image() {

    # Validate Config Exists
    if ! nix eval --json --impure \
-        ".#vmwareConfigurations" \
+        ".#qcowConfigurations" \
        --apply "s: builtins.hasAttr \"$name\" s" 2>/dev/null | grep -q "true"; then
        echo "Error: NixOS Generator Config '$name' not found"
        exit 1
    fi

-    build_args=(".#vmwareConfigurations.$name")
+    build_args=(".#qcowConfigurations.$name")
    if [ "$remote" = true ]; then
        build_args+=("-j0")
    fi
@@ -80,11 +80,9 @@ function cmd_install() {
        exit 1
    fi

-    #$ TODO
-    #
    # Validate mainDiskID Exists
    if ! disk_id=$(nix eval --raw --impure \
-	".#nixosConfigurations.$name.config.mainDiskID" 2>/dev/null); then
+	".#nixosConfigurations.$name.config.disko.devices.disk.main.device" 2>/dev/null); then
        echo "Error: mainDiskID not defined for configuration '$name'"
        exit 1
    fi
--- a/flake.lock
+++ b/flake.lock
@@ -220,6 +220,22 @@
        "type": "github"
      }
    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1744098102,
+        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1743813633,
@@ -244,6 +260,7 @@
        "home-manager": "home-manager",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
        "snowfall-lib": "snowfall-lib",
        "sops-nix": "sops-nix"
      }
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@

  inputs = {
    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";
--- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/README.md
+++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/README.md
@@ -1,40 +0,0 @@
-# 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
-```
--- a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/README.md
+++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/README.md
@@ -1,40 +0,0 @@
-# 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
-```
--- a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
+++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
@@ -14,6 +14,7 @@ in
    services = {
      ssh-agent = enabled;
      fusuma = enabled;
+      swww = enabled;
      sops = {
        enable = true;
        defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
@@ -23,7 +24,12 @@ in

    programs = {
      graphical = {
-        wms.hyprland = enabled;
+        wms.hyprland = {
+          enable = true;
+          monitors = [
+            ",highres,auto,2" # Optional - 1.68
+          ];
+        };
        ghostty = enabled;
        ghidra = enabled;
        browsers.firefox = {
@@ -43,20 +49,30 @@ in
    };
  };

+  # home.packages = with pkgs; [
+  #   catppuccin-gtk
+  # ];
+
  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 = {
-    x11.enable = true;
    gtk.enable = true;
-    package = pkgs.catppuccin-cursors.macchiatoMauve;
    name = "catppuccin-macchiato-mauve-cursors";
-    size = 64;
+    package = pkgs.catppuccin-cursors.macchiatoMauve;
+    size = 24;
  };

  # Kubernetes Secrets
--- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
@@ -0,0 +1,85 @@
+{ 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;
+      sops = {
+        enable = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
+        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
+      };
+    };
+
+    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;
+      };
+    };
+  };
+
+  # home.packages = with pkgs; [
+  #   catppuccin-gtk
+  # ];
+
+  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";
+    };
+  };
+
+  # SQLite Configuration
+  home.file.".sqliterc".text = ''
+    .headers on
+    .mode column
+  '';
+}
--- a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
@@ -0,0 +1,98 @@
+{ 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;
+      sops = {
+        enable = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/default.yaml";
+        sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
+      };
+    };
+
+    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;
+      };
+    };
+  };
+
+  # home.packages = with pkgs; [
+  #   catppuccin-gtk
+  # ];
+
+  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";
+    };
+  };
+
+  # 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
+  '';
+}
--- a/modules/home/programs/graphical/browsers/firefox/default.nix
+++ b/modules/home/programs/graphical/browsers/firefox/default.nix
@@ -47,12 +47,6 @@ 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";
@@ -91,9 +85,11 @@ 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;
--- a/modules/home/programs/graphical/ghostty/config/ghostty-catppuccin-macchiato.conf
+++ b/modules/home/programs/graphical/ghostty/config/ghostty-catppuccin-macchiato.conf
@@ -0,0 +1,23 @@
+# 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
--- a/modules/home/programs/graphical/ghostty/config/ghostty-catppuccin-mocha.conf
+++ b/modules/home/programs/graphical/ghostty/config/ghostty-catppuccin-mocha.conf
@@ -0,0 +1,23 @@
+# 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
--- a/modules/home/programs/graphical/ghostty/config/ghostty-melange-dark.conf
+++ b/modules/home/programs/graphical/ghostty/config/ghostty-melange-dark.conf
@@ -0,0 +1,21 @@
+# 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
--- a/modules/home/programs/graphical/ghostty/config/ghostty.conf
+++ b/modules/home/programs/graphical/ghostty/config/ghostty.conf
@@ -5,49 +5,54 @@ font-family = "MesloLGM Nerd Font Mono"
 confirm-close-surface = true

 # Keybindings - Tabs & Splits
-keybind = ctrl+t=new_tab
-keybind = ctrl+w=close_surface
-keybind = ctrl+d=new_split:right
-keybind = ctrl+shift+d=new_split:down
-keybind = ctrl+enter=toggle_split_zoom
+keybind = cmd+t=new_tab
+keybind = cmd+w=close_surface
+keybind = cmd+d=new_split:right
+keybind = cmd+shift+d=new_split:down
+keybind = cmd+shift+enter=toggle_split_zoom

 # Keybindings - Navigation - Splits
-keybind = ctrl+left=goto_split:left
-keybind = ctrl+right=goto_split:right
-keybind = ctrl+up=goto_split:up
-keybind = ctrl+down=goto_split:down
-keybind = ctrl+]=goto_split:next
-keybind = ctrl+[=goto_split:previous
+keybind = cmd+left=goto_split:left
+keybind = cmd+right=goto_split:right
+keybind = cmd+up=goto_split:up
+keybind = cmd+down=goto_split:down
+keybind = cmd+]=goto_split:next
+keybind = cmd+[=goto_split:previous

 # Keybindings - Navigation - Tabs
-keybind = ctrl+1=goto_tab:1
-keybind = ctrl+2=goto_tab:2
-keybind = ctrl+3=goto_tab:3
-keybind = ctrl+4=goto_tab:4
-keybind = ctrl+5=goto_tab:5
-keybind = ctrl+6=goto_tab:6
-keybind = ctrl+7=goto_tab:7
-keybind = ctrl+8=goto_tab:8
-keybind = ctrl+9=goto_tab:9
+keybind = cmd+1=goto_tab:1
+keybind = cmd+2=goto_tab:2
+keybind = cmd+3=goto_tab:3
+keybind = cmd+4=goto_tab:4
+keybind = cmd+5=goto_tab:5
+keybind = cmd+6=goto_tab:6
+keybind = cmd+7=goto_tab:7
+keybind = cmd+8=goto_tab:8
+keybind = cmd+9=goto_tab:9

-# 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
+keybind = performable:cmd+c=copy_to_clipboard
+keybind = performable:cmd+v=paste_from_clipboard
+
+# 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
--- a/modules/home/programs/graphical/ghostty/default.nix
+++ b/modules/home/programs/graphical/ghostty/default.nix
@@ -20,12 +20,14 @@ in
      profileExtra = ''
        SHELL="$BASH"
        PATH=~/.bin:$PATH
+        bind "set show-mode-in-prompt on"
+
+        set -o vi || true
        VISUAL=vim
        EDITOR="$VISUAL"
-        eval "$(thefuck --alias)"
-        set -o vi || true
-        bind "set show-mode-in-prompt on"
+
        fastfetch
+        eval "$(thefuck --alias)"
      '';
    };

@@ -72,6 +74,5 @@ in
        [ "@BASH_PATH@" ]
        [ bashPath ]
        (builtins.readFile ./config/ghostty.conf);
-
  };
 }
--- a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf
+++ b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf
@@ -1,54 +1,7 @@
-################
-### 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
@@ -180,94 +133,11 @@ gestures {
    workspace_swipe_invert = true
 }

-# 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
+# Thinkpad Trackpoint
+device {
+    name = tpps/2-elan-trackpoint
+    sensitivity = -0.3
+}

 ##############################
 ### WINDOWS AND WORKSPACES ###
--- a/modules/home/programs/graphical/wms/hyprland/config/waybar-style.css
+++ b/modules/home/programs/graphical/wms/hyprland/config/waybar-style.css
@@ -61,11 +61,6 @@
  background-color: @surface0;
 }

-#workspaces {
-  padding: 0px;
-  margin-left: 1rem;
-}
-
 #workspaces button {
  color: @lavender;
  border-radius: 1rem;
@@ -118,11 +113,6 @@
  color: @red;
 }

-#clock {
-  color: @blue;
-  margin-right: 1rem;
-}
-
 /* Left Border Radius */
 #clock,
 #network,
@@ -144,3 +134,13 @@
  border-top-right-radius: 1rem;
  border-bottom-right-radius: 1rem;
 }
+
+#workspaces {
+  padding: 0px;
+  margin-left: 1rem;
+}
+
+#clock {
+  color: @blue;
+  margin-right: 1rem;
+}
--- a/modules/home/programs/graphical/wms/hyprland/default.nix
+++ b/modules/home/programs/graphical/wms/hyprland/default.nix
@@ -1,22 +1,107 @@
 { lib, pkgs, config, namespace, ... }:
 let
-  inherit (lib) mkIf;
-  inherit (lib.${namespace}) enabled;
+  inherit (lib) types mkIf;
+  inherit (lib.${namespace}) mkOpt enabled;

  cfg = config.${namespace}.programs.graphical.wms.hyprland;
 in
 {
  options.${namespace}.programs.graphical.wms.hyprland = {
    enable = lib.mkEnableOption "Hyprland";
+    mainMod = mkOpt types.str "SUPER" "Hyprland main modifier key";
+    monitors = mkOpt (with types; listOf str) [
+      ", preferred, auto, 1"
+    ] "Hyprland 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;
+        "$terminal" = "ghostty";
+        "$menu" = "wofi --show drun";
+
+        monitor = cfg.monitors;
+
+        bind = [
+          # Super Bindings (macOS Transition)
+          "ALT_SHIFT, 1, exec, hyprshot -m output"
+          "ALT_SHIFT, 2, exec, hyprshot -m window"
+          "ALT_SHIFT, 3, exec, hyprshot -m region"
+
+          # Primary Bindings
+          "$mainMod, SPACE, exec, $menu"
+          "$mainMod, RETURN, exec, $terminal"
+          "$mainMod, Q, killactive"
+          "$mainMod, M, exit"
+          "$mainMod, V, togglefloating"
+          "$mainMod, P, pseudo" # dwindle
+          "$mainMod, J, togglesplit" # dwindle
+          "$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
+          "ALT, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight s 10%+"
+          "ALT, 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 = {
@@ -88,10 +173,6 @@ in
          format-alt = "  {used:0.1f}G";
          max-length = 10;
        };
-        # backlight = {
-        #   format = "󰖨  {}%";
-        #   device = "acpi_video0";
-        # };

        backlight = {
          format = "{icon}";
@@ -176,15 +257,18 @@ in
    };

    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
+      '';
    };
  };
 }
--- a/modules/home/programs/terminal/nvim/config/lua/base.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/base.lua
@@ -2,10 +2,11 @@
 -- 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 Leader
-vim.keymap.set("n", "<Space>", "<Nop>", {silent = true})
+vim.keymap.set("n", "<Space>", "<Nop>", { silent = true })
 vim.g.mapleader = " "

 -- Set Timeout
@@ -52,15 +53,17 @@ local toggle_diagnostics_loclist = function()
 	if diagnostics_loclist_active then
 		vim.diagnostic.setloclist()
 	else
-        vim.cmd('lclose')
+		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)
+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)
--- a/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/lsp-config.lua
@@ -175,6 +175,8 @@ nvim_lsp.golangci_lint_ls.setup({
 			"golangci-lint",
 			"run",
 			"--output.json.path",
+			"stdout",
+			"--show-stats=false",
 			"--issues-exit-code=1",
 		},
 	},
--- a/modules/home/programs/terminal/nvim/default.nix
+++ b/modules/home/programs/terminal/nvim/default.nix
@@ -57,7 +57,8 @@ in
        lualine-nvim # Bottom Line
        noice-nvim # UI Tweaks
        # nord-nvim # Theme
-        melange-nvim # Theme
+        # melange-nvim # Theme
+        catppuccin-nvim # Theme
        nvim-notify # Noice Dependency
        nvim-web-devicons # Dev Icons

--- a/modules/home/services/swww/default.nix
+++ b/modules/home/services/swww/default.nix
@@ -0,0 +1,73 @@
+{ 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";
+        };
+      };
+    };
+  };
+}
--- a/modules/nixos/display-managers/sddm/default.nix
+++ b/modules/nixos/display-managers/sddm/default.nix
@@ -1,19 +1,17 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf types;
+  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 = {
@@ -25,9 +23,12 @@ in
      };
    };

+    environment.systemPackages = with pkgs; [
+      catppuccin-sddm
+    ];
+
    environment.sessionVariables = {
-      QT_SCREEN_SCALE_FACTORS = "2";
-      QT_FONT_DPI = "192";
+      QT_SCREEN_SCALE_FACTORS = cfg.scale;
    };
  };
 }
--- a/modules/nixos/hardware/opengl/default.nix
+++ b/modules/nixos/hardware/opengl/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkForce;
  inherit (lib.${namespace}) mkBoolOpt;

  cfg = config.${namespace}.hardware.opengl;
@@ -24,7 +24,7 @@ in
    ];

    # Add Intel Arc / Nvidia Drivers
-    hardware.enableRedistributableFirmware = cfg.enableIntel;
+    hardware.enableRedistributableFirmware = mkIf cfg.enableIntel (mkForce true);
    hardware.graphics = {
      enable = true;
      enable32Bit = cfg.enable32Bit;
--- a/modules/nixos/home/default.nix
+++ b/modules/nixos/home/default.nix
@@ -0,0 +1,8 @@
+{
+  config = {
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+    };
+  };
+}
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, namespace, host, ... }:
+{ config, lib, pkgs, inputs, namespace, host, ... }:
 let
  inherit (lib) types mkIf;
  inherit (lib.${namespace}) mkBoolOpt mkOpt;
@@ -14,6 +14,14 @@ 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"
@@ -40,16 +48,18 @@ 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 = [
@@ -66,6 +76,26 @@ 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="
+          ];
        };
      };
  };
--- a/modules/nixos/services/avahi/default.nix
+++ b/modules/nixos/services/avahi/default.nix
@@ -23,5 +23,11 @@ in
        workstation = true;
      };
    };
+
+    # Cloud Init
+    systemd.services.avahi-daemon = mkIf config.${namespace}.services.cloud-init.enable {
+      after = [ "cloud-final.service" ];
+      requires = [ "cloud-final.service" ];
+    };
  };
 }
--- a/modules/nixos/services/cloud-init/default.nix
+++ b/modules/nixos/services/cloud-init/default.nix
@@ -22,5 +22,6 @@ in
        };
      };
    };
+    networking.hostName = lib.mkForce "";
  };
 }
--- a/modules/nixos/services/openssh/default.nix
+++ b/modules/nixos/services/openssh/default.nix
@@ -12,6 +12,8 @@ let
  authorizedKeys = [
    # evanreichard@lin-va-mbp-personal
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+    # evanreichard@lin-va-thinkpad
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
  ];
 in
 {
--- a/modules/nixos/system/boot/default.nix
+++ b/modules/nixos/system/boot/default.nix
@@ -1,6 +1,6 @@
 { config, lib, namespace, ... }:
 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkDefault;

  cfg = config.${namespace}.system.boot;
 in
@@ -39,7 +39,7 @@ in
          editor = false;
        };

-        timeout = 1;
+        timeout = mkDefault 1;
      };

      initrd = mkIf cfg.xenGuest {
--- a/modules/nixos/system/networking/default.nix
+++ b/modules/nixos/system/networking/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, namespace, ... }:
 let
-  inherit (lib) mkIf mkDefault mkEnableOption;
+  inherit (lib) types mkIf mkForce mkOption mkEnableOption;
  inherit (lib.${namespace}) mkBoolOpt enabled;

  cfg = config.${namespace}.system.networking;
@@ -11,6 +11,35 @@ in
    enableIWD = mkEnableOption "Enable IWD";
    useDHCP = mkBoolOpt true "Use DHCP";
    useNetworkd = mkBoolOpt false "Use networkd";
+    useStatic = mkOption {
+      type = types.nullOr (types.submodule {
+        options = {
+          interface = mkOption {
+            type = lib.types.str;
+            description = "Network interface name";
+            example = "enp0s3";
+          };
+          address = mkOption {
+            type = types.str;
+            description = "Static IP address";
+            example = "10.0.20.200";
+          };
+          defaultGateway = mkOption {
+            type = types.str;
+            description = "Default gateway IP";
+            example = "10.0.20.254";
+          };
+          nameservers = mkOption {
+            type = types.listOf types.str;
+            description = "List of DNS servers";
+            example = [ "10.0.20.254" "8.8.8.8" ];
+            default = [ "8.8.8.8" "8.8.4.4" ];
+          };
+        };
+      });
+      default = null;
+      description = "Static Network Configuration";
+    };
  };

  config = mkIf cfg.enable {
@@ -24,24 +53,19 @@ in

    networking = {
      firewall = enabled;
-      useDHCP = mkDefault cfg.useDHCP;
+      useDHCP = mkForce (cfg.useDHCP && cfg.useStatic == null);
      useNetworkd = cfg.useNetworkd;
-    } // (lib.optionalAttrs cfg.enableIWD) {
+    } // (lib.optionalAttrs (cfg.enableIWD) {
      wireless.iwd = {
        enable = true;
        settings.General.EnableNetworkConfiguration = true;
      };
-    };
-
-    # TODO - Network Configuration
-    # (lib.mkIf (config.network != null) {
-    #   networking = {
-    #     inherit (config.network) defaultGateway nameservers;
-    #     interfaces.${config.network.interface}.ipv4.addresses = [{
-    #       inherit (config.network) address;
-    #       prefixLength = 24;
-    #     }];
-    #   };
-    # })
+    }) // (lib.optionalAttrs (cfg.useStatic != null) {
+      inherit (cfg.useStatic) defaultGateway nameservers;
+      interfaces.${cfg.useStatic.interface}.ipv4.addresses = [{
+        inherit (cfg.useStatic) address;
+        prefixLength = 24;
+      }];
+    });
  };
 }
--- a/modules/nixos/system/networking/networkmanager/default.nix
+++ b/modules/nixos/system/networking/networkmanager/default.nix
@@ -10,6 +10,7 @@ in

    networking.networkmanager = {
      enable = true;
+      wifi.backend = mkIf cfg.enableIWD "iwd";

      connectionConfig = {
        "connection.mdns" = "2";
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -11,9 +11,7 @@ in
    extraGroups = mkOpt (listOf str) [ ] "Groups for the user to be assigned.";
    extraOptions = mkOpt attrs { } "Extra options passed to <option>users.users.<name></option>.";
    fullName = mkOpt str "Evan Reichard" "The full name of the user.";
-    initialPassword =
-      mkOpt str "password"
-        "The initial password to use when the user is first created.";
+    initialPassword = mkOpt str "changeMe2025!" "The initial password to use when the user is first created.";
    name = mkOpt str "evanreichard" "The name to use for the user account.";
  };

--- a/secrets/default.yaml
+++ b/secrets/default.yaml
@@ -15,8 +15,8 @@ sops:
            SC91WFNocEN2K1NFK2dBUHYwZTQrVFkKKb3AlaRX96vJwEmxNNAThTlO9ZwtD1tv
            c6aBELEbmJFdHOcIJITzmS3YOssDOgTL2TbcSFu8mdAQYsRvxC96HA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-05T02:29:22Z"
-    mac: ENC[AES256_GCM,data:2rI+pEYmQIPmtcnDTuyroAbfIvLIZKvsyAMEbQM2y9xYXhLyK8Vt7IzmdHy//hQRBSWdBV7/HfCMWJcg9i1B/P9fXrKx+OxaIb654SkthWhkORq32Sr1Gee3Yj195MffIUrEZ4rVauCeprzdEXqN6oTVXjHvnqV2/VXuTkkbztE=,iv:gCgo+8uLH6H9R3OQvzf2K9SgXb3tXG7Lvu6lxL0P2xo=,tag:ev+vMOn6UAfKexfyUnMP5Q==,type:str]
+    lastmodified: "2025-04-09T00:53:28Z"
+    mac: ENC[AES256_GCM,data:NKv91i8Ms4TfbU0t9td4QoGD+9d9KYGQ9Mu1QlFdCc4AjMfRCcUCrvb9SVMF5JbYa8oZAH4Qp9FEJ5fFmgoTNrewspLUMpyjUYRgARYQWiHYhZjE/uTNhFo2FxXYLWsAlQjEJ8abbwUyr2y6NsK2tcQcOBDIWUssb4XqajNcylE=,iv:gvwQZB20JR4bKfMMR6sYjTnf3CNiOjcd8T30s2drKwY=,tag:mF9etyVyPVw5YblI8VdtTw==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.9.4
--- a/systems/aarch64-linux/lin-va-mbp-personal/default.nix
+++ b/systems/aarch64-linux/lin-va-mbp-personal/default.nix
@@ -43,8 +43,7 @@ in
    security = {
      sops = {
        enable = true;
-        # sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-        defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-mbp-personal/default.yaml";
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-va-mbp-personal/default.yaml";
      };
    };

--- a/systems/x86_64-linux/lin-va-nix-builder/default.nix
+++ b/systems/x86_64-linux/lin-va-nix-builder/default.nix
@@ -1,10 +1,11 @@
-{ namespace, config, pkgs, lib, ... }:
+{ namespace, config, pkgs, ... }:
 let
-  inherit (lib.${namespace}) enabled;
-
  cfg = config.${namespace}.user;
 in
 {
+  time.timeZone = "America/New_York";
+  system.stateVersion = "24.11";
+
  reichard = {
    system = {
      boot = {
@@ -15,7 +16,15 @@ in
        enable = true;
        diskPath = "/dev/xvda";
      };
-      networking = enabled; # TODO - Network Config
+      networking = {
+        enable = true;
+        useStatic = {
+          interface = "enX0";
+          address = "10.0.50.130";
+          defaultGateway = "10.0.50.254";
+          nameservers = [ "10.0.50.254" ];
+        };
+      };
    };

    services = {
@@ -24,6 +33,8 @@ in
        authorizedKeys = [
          # evanreichard@lin-va-mbp-personal
          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+          # evanreichard@lin-va-thinkpad
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
          # NixOS Builder
          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDF8QjeN8lpT+Mc70zwEJQqN9W/GKvTOTd32VgfNhVdN"
        ];
@@ -36,30 +47,19 @@ in
      authorizedKeys.keys = [
        # evanreichard@lin-va-mbp-personal
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJJoyXQOv9cAjGUHrUcvsW7vY9W0PmuPMQSI9AMZvNY"
+        # evanreichard@lin-va-thinkpad
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5JQr/6WJMIHhR434nK95FrDmf2ApW2Ahd2+cBKwDz"
        # NixOS Builder
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDF8QjeN8lpT+Mc70zwEJQqN9W/GKvTOTd32VgfNhVdN"
      ];
    };
  };

-  networking = {
-    defaultGateway = {
-      address = "10.0.50.254";
-      interface = "enX0";
-    };
-    interfaces.enX0.ipv4.addresses = [{
-      address = "10.0.50.130";
-      prefixLength = 24;
-    }];
-  };
-
  # System Packages
  environment.systemPackages = with pkgs; [
-    htop
+    btop
+    git
    tmux
    vim
  ];
-
-  time.timeZone = "America/New_York";
-  system.stateVersion = "24.11";
 }
--- a/systems/x86_64-linux/lin-va-thinkpad/default.nix
+++ b/systems/x86_64-linux/lin-va-thinkpad/default.nix
@@ -0,0 +1,55 @@
+{ namespace, lib, ... }:
+let
+  inherit (lib.${namespace}) enabled;
+in
+{
+  system.stateVersion = "24.11";
+  time.timeZone = "America/New_York";
+  hardware.enableRedistributableFirmware = true;
+
+  # System Config
+  reichard = {
+    nix = enabled;
+
+    system = {
+      boot = {
+        enable = true;
+        silentBoot = true;
+      };
+      disk = {
+        enable = true;
+        diskPath = "/dev/nvme0n1";
+      };
+      networking = {
+        enable = true;
+        enableIWD = true;
+      };
+    };
+
+    hardware = {
+      opengl = enabled;
+    };
+
+    services = {
+      avahi = enabled;
+      ydotool = enabled;
+    };
+
+    virtualisation = {
+      podman = enabled;
+    };
+
+    programs = {
+      graphical = {
+        wms.hyprland = enabled;
+      };
+    };
+
+    security = {
+      sops = {
+        enable = true;
+        defaultSopsFile = lib.snowfall.fs.get-file "secrets/lin-va-thinkpad/default.yaml";
+      };
+    };
+  };
+}
--- a/systems/x86_64-linux/lin-va-utility/default.nix
+++ b/systems/x86_64-linux/lin-va-utility/default.nix
@@ -1,57 +1,43 @@
-{ pkgs, ... }:
-
+{ namespace, lib, ... }:
 let
-  home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
-    sha256 = "156hc11bb6xiypj65q6gzkhw1gw31dwv6dfh6rnv20hgig1sbfld";
-  };
+  inherit (lib.${namespace}) enabled;
 in
 {
-  imports = [
-    "${home-manager}/nixos"
-  ];
+  system.stateVersion = "24.11";
+  time.timeZone = "America/New_York";

-  # Enable Graphics
-  hardware.graphics = {
+  reichard = {
+    nix = enabled;
+
+    system = {
+      boot = {
        enable = true;
-    enable32Bit = true;
-    extraPackages = with pkgs; [ vaapiIntel intel-media-driver ];
+        silentBoot = true;
+      };
+      networking = enabled;
    };

-  # User Configuration
-  users.users.evanreichard = {
-    isNormalUser = true;
-    home = "/home/evanreichard";
-    group = "evanreichard";
-    extraGroups = [ "wheel" "networkmanager" "video" ];
-    shell = pkgs.bash;
-  };
-  users.groups.evanreichard = { };
-
-  # Home Manager
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.evanreichard = import ../home-manager/home.nix;
-  };
-
-  # Enable HyprLand
-  programs.hyprland = {
+    hardware = {
+      opengl = {
        enable = true;
-    withUWSM = true;
+        enable32Bit = true; # Necessary?
+        enableIntel = true;
+      };
    };

-  # Networking Configuration
-  networking.firewall = {
-    enable = true;
+    services = {
+      avahi = enabled;
+      ydotool = enabled;
    };

-  # System Packages
-  environment.systemPackages = with pkgs; [
-    ghostty
-    htop
-    tmux
-    vim
-    wget
-  ];
+    virtualisation = {
+      podman = enabled;
+    };
+
+    programs = {
+      graphical = {
+        wms.hyprland = enabled;
+      };
+    };
+  };
 }
--- a/systems/x86_64-vmware/lin-va-rke2/default.nix
+++ b/systems/x86_64-vmware/lin-va-rke2/default.nix
Author	SHA1	Message	Date
Evan Reichard	559ef8c17d	remove ff sponsored	2025-04-19 21:12:13 -04:00
Evan Reichard	036f162264	fix sops	2025-04-19 21:08:21 -04:00
Evan Reichard	00070837c2	fix bindings	2025-04-19 20:37:58 -04:00
Evan Reichard	e84f6e7cb4	again	2025-04-19 20:35:52 -04:00
Evan Reichard	914f8e8d30	more	2025-04-19 20:35:22 -04:00
Evan Reichard	fb1b69153b	thinkpad conf	2025-04-19 20:09:49 -04:00
Evan Reichard	cf82afea4b	utility	2025-04-10 20:01:05 -04:00
Evan Reichard	4d04f2600f	snowfall migration	2025-04-10 17:40:56 -04:00