From 385773ed26a277922adde1931c4a3360ea323e6d Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Tue, 20 Jan 2026 21:18:59 -0500
Subject: [PATCH] chore: utlity update

---
 .../evanreichard@lin-va-utility/default.nix   |  6 +----
 modules/nixos/hardware/opengl/default.nix     | 27 ++++++++++++-------
 .../lin-va-mbp-personal/default.nix           |  2 ++
 .../x86_64-linux/lin-va-utility/default.nix   | 23 +++++++++++++---
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
index 4510675..f4ff7a3 100755
--- a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
@@ -9,7 +9,7 @@ let
   inherit (lib.${namespace}) enabled;
 in
 {
-  home.stateVersion = "24.11";
+  home.stateVersion = "25.05";
 
   reichard = {
     user = {
@@ -55,10 +55,6 @@ in
         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;
       };
     };
   };
diff --git a/modules/nixos/hardware/opengl/default.nix b/modules/nixos/hardware/opengl/default.nix
index ee68cb9..0eaf1e7 100644
--- a/modules/nixos/hardware/opengl/default.nix
+++ b/modules/nixos/hardware/opengl/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, namespace, ... }:
+{ config
+, lib
+, pkgs
+, namespace
+, ...
+}:
 let
   inherit (lib) mkIf mkForce;
   inherit (lib.${namespace}) mkBoolOpt;
@@ -16,12 +21,14 @@ 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) [
-      nvtopPackages.full
-    ];
+    environment.systemPackages =
+      with pkgs;
+      [
+        libva-utils
+        vdpauinfo
+      ]
+      ++ lib.optional cfg.enableNvidia nvtopPackages.nvidia
+      ++ lib.optional cfg.enableIntel nvtopPackages.intel;
 
     # Enable Nvidia Hardware
     hardware.nvidia = mkIf cfg.enableNvidia {
@@ -38,14 +45,16 @@ in
       enable = true;
       enable32Bit = cfg.enable32Bit;
 
-      extraPackages = with pkgs;
+      extraPackages =
+        with pkgs;
         lib.optionals cfg.enableIntel [
           libvdpau-va-gl
           intel-vaapi-driver
           intel-media-driver
           intel-compute-runtime
           intel-ocl
-        ] ++ lib.optionals cfg.enableNvidia [
+        ]
+        ++ lib.optionals cfg.enableNvidia [
           cudatoolkit
         ];
     };
diff --git a/systems/aarch64-linux/lin-va-mbp-personal/default.nix b/systems/aarch64-linux/lin-va-mbp-personal/default.nix
index 3cee2e2..fe8b2e3 100755
--- a/systems/aarch64-linux/lin-va-mbp-personal/default.nix
+++ b/systems/aarch64-linux/lin-va-mbp-personal/default.nix
@@ -14,6 +14,8 @@ in
   system.stateVersion = "25.11";
   time.timeZone = "America/New_York";
 
+  programs.firejail.enable = true;
+
   # System Config
   reichard = {
     nix = enabled;
diff --git a/systems/x86_64-linux/lin-va-utility/default.nix b/systems/x86_64-linux/lin-va-utility/default.nix
index 1a0fdb7..0b6aac8 100755
--- a/systems/x86_64-linux/lin-va-utility/default.nix
+++ b/systems/x86_64-linux/lin-va-utility/default.nix
@@ -3,7 +3,7 @@ let
   inherit (lib.${namespace}) enabled;
 in
 {
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.05";
   time.timeZone = "America/New_York";
 
   reichard = {
@@ -12,20 +12,37 @@ in
     system = {
       boot = {
         enable = true;
+        enableGrub = false;
+        enableSystemd = true;
         silentBoot = true;
       };
-      networking = enabled;
+
+      disk = {
+        enable = true;
+        diskPath = "/dev/disk/by-id/nvme-KINGSTON_SA2000M8250G_50026B768429D3EB";
+      };
+
+      networking = {
+        enable = true;
+        useStatic = {
+          interface = "eno1";
+          address = "10.0.20.50";
+          defaultGateway = "10.0.20.254";
+          nameservers = [ "10.0.20.20" ];
+        };
+      };
     };
 
     hardware = {
       opengl = {
         enable = true;
-        enable32Bit = true; # Necessary?
+        enable32Bit = true;
         enableIntel = true;
       };
     };
 
     services = {
+      openssh = enabled;
       avahi = enabled;
       ydotool = enabled;
     };