stopping here for a while

might move into one of the existing modules

defaults/nvim/lua/plugins/discord.lua

@@ -0,0 +1,5 @@
+return {
+  { 
+    'andweeb/presence.nvim',
+  }
+}

flake.nix

@@ -12,7 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    ucodenix.url = "github:e-tho/ucodenix";
   };
 
   outputs = inputs @ {
@@ -22,7 +21,6 @@
     darwin,
     home-manager,
     ghostty,
-    ucodenix,
     ...
   }: let
     userName = "wyatt";
@@ -49,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;
         }
       ];
@@ -65,7 +63,6 @@
       };
       modules = [
         nix-flatpak.nixosModules.nix-flatpak
-        ucodenix.nixosModules.default
         ./modules/common
         ./modules/machine/cloud
 
@@ -73,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
           ];
@@ -97,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 = [
@@ -39,13 +40,15 @@
         # ublock origin
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
         sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
-        version = "1.63.2";
+        # sha256 = lib.fakeSha256;
+        version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
         sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
-        version = "2025.3.1";
+        # sha256 = lib.fakeSha256;
+        version = "2025.5.0";
       })
     ];
   };

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/git.nix

@@ -17,6 +17,7 @@
       push.autoSetupRemote = true;
       pull.merge = true;
       merge.tool = "nvimdiff";
+      mergetool.keepBackup = false;
     };
 
     ignores = [

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/machine/cloud/configuration.nix

@@ -24,7 +24,6 @@ in {
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
-    ../../security/sudo.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
     ../../virtualization/podman.nix
@@ -177,10 +176,5 @@ in {
     };
   };
 
-  # security.sudo.needsPassword = false;
-
-  # Enable microcode updates
-  services.ucodenix.enable = true;
-
   system.stateVersion = "24.11";
 }

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";
 }

modules/security/sudo.nix

@@ -1,4 +1,3 @@
-# FIXME: this file is broken but i don't know what is wrong with it
 {
   config,
   lib,