stopping here for a while

might move into one of the existing modules

flake.lock

@@ -115,37 +115,18 @@
         "type": "github"
       }
     },
-    "nix-reshade": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1749858810,
-        "narHash": "sha256-xg/MnKlnI6G/mLrh2apPuXUq8wjYSBbt8RtilM5cutI=",
-        "owner": "LovingMelody",
-        "repo": "nix-reshade",
-        "rev": "e1a7e702b052e4a98a9f15796f048270b2aca679",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LovingMelody",
-        "repo": "nix-reshade",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1749285348,
-        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
-        "owner": "NixOS",
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -182,30 +163,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1747953325,
-        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nix-reshade": "nix-reshade",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
@@ -223,27 +187,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-reshade",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749194973,
-        "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -12,7 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    nix-reshade.url = "github:LovingMelody/nix-reshade";
   };
 
   outputs = inputs @ {
@@ -48,7 +47,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -71,7 +70,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -95,7 +94,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];

home/browser.nix

@@ -1,4 +1,5 @@
 {
+  role,
   pkgs,
   lib,
   ...
@@ -9,7 +10,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux;
+    enable = pkgs.stdenv.isLinux && role == "devel";
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [

home/default.nix

@@ -4,6 +4,7 @@
   userName,
   userEmail,
   ghostty,
+  role,
   ...
 }: let
   # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -13,7 +14,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
     ./atuin.nix
     ./shell.nix
     ./packages

home/sway.nix

@@ -1,8 +1,10 @@
 {
   lib,
   pkgs,
+  role,
   ...
 }: let
+  isDevel = pkgs.stdenv.isLinux && role == "devel";
   dirs = {
     defaults = ../defaults;
   };
@@ -16,7 +18,7 @@
   };
 in {
   wayland.windowManager.sway = {
-    enable = pkgs.stdenv.isLinux;
+    enable = isDevel;
     extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
     xwayland = true;
     systemd.enable = true;
@@ -29,11 +31,11 @@ in {
   xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
   xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
   xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
-  programs.rofi.enable = pkgs.stdenv.isLinux;
-  services.mako.enable = pkgs.stdenv.isLinux;
+  programs.rofi.enable = isDevel;
+  services.mako.enable = isDevel;
 
   programs.waybar = {
-    enable = pkgs.stdenv.isLinux;
+    enable = isDevel;
     systemd.enable = true;
 
     package = pkgs.waybar.overrideAttrs (old: {

modules/apps/gaming.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  inputs,
   ...
 }: let
   cfg = config.gaming;
@@ -109,10 +108,6 @@ in {
     ffxiv = {
       enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher";
     };
-
-    reshade = {
-      enable = lib.mkEnableOption "ReShade, a post-processing injector for games and video software";
-    };
   };
 
   config = {
@@ -159,7 +154,6 @@ in {
         cfg.lutris.extraPackages
       )) ++
       (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
-      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]) ++
-      (lib.optionals cfg.reshade.enable [inputs.packages.${pkgs.system}.reshade]);
+      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]);
   };
 }

modules/machine/valefor/configuration.nix

@@ -87,7 +87,12 @@
 
   # Core networking module (see ../../networking/core.nix)
   network = {
-    firewall.enable = true;
+    firewall = {
+      enable = true;
+      tcpPorts = {
+        allowedPorts = [8123];
+      };
+    };
     networkManager.enable = true;
   };
 
@@ -97,7 +102,37 @@
   };
 
   # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
+  users.users.${userName} = { 
+    extraGroups = ["wheel" "podman" "network"]; 
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+    ];
+  };
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
+  ];
+
+  # Add Home Assistant service
+  services.home-assistant = {
+    enable = true;
+    extraComponents = [
+      "esphome"
+      "met"
+      "radio_browser"
+      "homeassistant_hardware"
+      "zha"
+      "group"
+      "mikrotik"
+    ];
+    config = {
+      # Includes dependencies for a basic setup
+      # https://www.home-assistant.io/integrations/default_config/
+      default_config = {};
+    };
+  };
+
+  security.sudo.wheelNeedsPassword = false;
 
   system.stateVersion = "24.11";
 }