working declarative nvim

need to add plugins

defaults/sway/config

@@ -13,9 +13,9 @@ set $term alacritty
 set $menu wofi --term '$term'
 
 ### Output configuration
-output DP-3 pos 1920 0 res 1920x1080@60Hz
+output DP-3 pos 3840 0 res 1920x1080@59Hz
-output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
+output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
-output DP-2 pos 3840 0 res 1920x1080@60Hz
+output DP-2 pos 1920 0 res 1920x1080@60Hz
 
 ### Wallpaper
 output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
@@ -25,22 +25,22 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
 ### Workspace binding
 
 ## DP-3 bindings
-workspace 1 output DP-3
+workspace 1 output DP-2
-workspace 2 output DP-3
+workspace 2 output DP-2
-workspace 4 output DP-3
+workspace 4 output DP-2
-workspace 5 output DP-3
+workspace 5 output DP-2
 
 ## HDMI-A-1 bindings
 workspace 3 output HDMI-A-1
 workspace 9 output HDMI-A-1
 
 ## DP-2 bindings
-workspace 6 output DP-2
+workspace 6 output DP-3
-workspace 7 output DP-2
+workspace 7 output DP-3
-workspace 8 output DP-2
+workspace 8 output DP-3
 
 ### Colour options
-set $bg 	       #24283b
+set $bg 	#24283b
 set $bg-inactive   #323232
 set $bg-urgent     #000000
 set $text          #eeeeec

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759509947,
+        "lastModified": 1749744770,
-        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
+        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
+        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
         "type": "github"
       },
       "original": {
@@ -37,6 +37,43 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "ref": "refs/heads/main",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "revCount": 92,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753121425,
+        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -64,11 +101,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1761172581,
+        "lastModified": 1751123364,
-        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
+        "narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
+        "rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5",
         "type": "github"
       },
       "original": {
@@ -84,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
+        "lastModified": 1750792728,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
         "type": "github"
       },
       "original": {
@@ -98,6 +135,21 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1748710831,
+        "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1739444422,
@@ -116,37 +168,24 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 315532800,
+        "lastModified": 1748189127,
-        "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
+        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
-        "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1758360447,
+        "lastModified": 1750969886,
-        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
+        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
-        "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
         "type": "github"
       },
       "original": {
@@ -156,48 +195,52 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1744536153,
+        "lastModified": 1753432016,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1754552918,
+        "narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "d61de135ce174f4e04b4e509de02e1afe040a834",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay"
+        "nvf": "nvf"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1761100675,
-        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
       }
     },
     "systems": {
@@ -215,11 +258,25 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "zig": {
       "inputs": {
         "flake-compat": [
-          "ghostty",
+          "ghostty"
-          "flake-compat"
         ],
         "flake-utils": [
           "ghostty",
@@ -231,11 +288,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760401936,
+        "lastModified": 1748261582,
-        "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
+        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "365085b6652259753b598d43b723858184980bbe",
+        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
         "type": "github"
       },
       "original": {
@@ -246,20 +303,27 @@
     },
     "zon2nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1758405547,
+        "lastModified": 1742104771,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
         "owner": "jcollie",
         "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       },
       "original": {
         "owner": "jcollie",
+        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
         "type": "github"
       }
     }

flake.nix

@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    rust-overlay.url = "github:oxalica/rust-overlay";
+    nvf.url = "github:notashelf/nvf";
   };
 
   outputs = inputs @ {
@@ -22,37 +22,26 @@
     darwin,
     home-manager,
     ghostty,
-    rust-overlay,
+    nvf,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail ghostty;
+      inherit userName userEmail ghostty nvf;
-    };
-
-    myOverlays = { ... }: {
-      nixpkgs.overlays = [
-        rust-overlay.overlays.default
-      ] ++ (nixpkgs.lib.attrValues self.common.overlays);
     };
   in {
     meta = import ./meta;
 
-    common = {
-      overlays = import ./modules/common/overlays.nix;
-    };
-
     # Primary laptop - MacBook Pro (2023, M3)
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
       specialArgs = {
         inherit userName userEmail ghostty;
         hostname = "sephiroth";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
-        myOverlays
         ./modules/common
         ./modules/machine/sephiroth
 
@@ -60,9 +49,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
-          # home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -72,12 +59,11 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail; 
         hostname = "cloud";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
-        myOverlays
         nix-flatpak.nixosModules.nix-flatpak
         ./modules/common
         ./modules/machine/cloud
@@ -87,7 +73,6 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -104,7 +89,6 @@
         role = "server";
       };
       modules = [
-        myOverlays
         ./modules/common
         ./modules/machine/valefor
 
@@ -113,7 +97,6 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -130,7 +113,6 @@
         role = "server";
       };
       # modules = [
-      #   myOverlays
       #   nix-flatpak.nixosModules.nix-flatpak
       #   nix-ld.nixosModules.nix-ld
       #   ./modules/nixos/hardware-configuration.nix
@@ -143,30 +125,11 @@
       #     home-manager.useGlobalPkgs = true;
       #     home-manager.useUserPackages = true;
       #     home-manager.extraSpecialArgs = extraSpecialArgs;
-      #     home-manager.backupFileExtension = "bak";
       #     home-manager.users.${userName}.imports = [
       #       ./home
       #     ];
       #   }
       # ];
     };
-
-    # generic non-NixOS Linux machine
-    homeConfigurations."generic" = let
-      hostname = builtins.getEnv "HOSTNAME";
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-    in home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      # system = "x86_64-linux";
-      extraSpecialArgs = extraSpecialArgs // { 
-        isNixOS = false; 
-        hostname = hostname;
-        role = "workstation";
-      };
-      modules = [
-        myOverlays
-        ./home
-      ];
-    };
   };
 }

home/atuin.nix

@@ -1,7 +1,6 @@
-{ pkgs, ...}: {
+{...}: {
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
-    package = pkgs.atuinLatest;
   };
 }

home/browser.nix

@@ -1,8 +1,6 @@
 {
   pkgs,
   lib,
-  isNixOS,
-  role,
   ...
 }: {
   programs.firefox = {
@@ -11,7 +9,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux && isNixOS;
+    enable = pkgs.stdenv.isLinux;
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [

home/default.nix

@@ -1,57 +1,64 @@
-{ lib
+{
-, pkgs
+  lib,
-, userName
+  pkgs,
-, userEmail
+  userName,
-, ghostty
+  userEmail,
-, isNixOS ? true
+  ghostty,
-, role
+  nvf,
-, ...
+  ...
-}:
+}: let
-let
+  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
-  # Have a file structure that holds all the configuration files that can't be configured by Nix
+  # or maybe I'm too lazy to do anything about it? I dunno
   dirs = {
     defaults = ../defaults;
   };
-in
+in {
-{
   # Import sub modules
-  imports = [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty nvf;}) [
+    ./atuin.nix
+    ./shell.nix
     ./packages
+    ./git.nix
+    ./starship.nix
+    ./eza.nix
+    ./neovim.nix
+    ./direnv.nix
+    ./sway.nix
+    ./terminal.nix
+    ./browser.nix
+    ./zellij.nix
+    ./bat.nix
   ];
 
-  home = lib.mkMerge [
+  # Home Manager needs a bit of information about you and the
-    {
+  # paths it should manage.
-      username = userName;
+  home = {
-      homeDirectory =
+    username = userName;
-        if pkgs.stdenv.isDarwin
+    homeDirectory =
-        then "/Users/${userName}"
+      if pkgs.stdenv.isDarwin
-        else "/home/${userName}";
+      then "/Users/${userName}"
+      else "/home/${userName}";
 
-      stateVersion = "24.11";
+    sessionVariables = {
-    }
+      XDG_CURRENT_DESKTOP = "sway";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP="sway";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
+      NIXOS_OZONE_WL = "1";
+    };
 
-    (lib.mkIf isNixOS {
+    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
-      sessionVariables = {
+      gtk.enable = true;
-        XDG_CURRENT_DESKTOP = "sway";
+      package = pkgs.catppuccin-cursors.mochaDark;
-        XDG_SESSION_TYPE = "wayland";
+      name = "catppuccin-mocha-dark-cursors";
-        XDG_SESSION_DESKTOP = "sway";
+      size = 22;
-        XDG_CONFIG_HOME = "$HOME/.config";
+    };
-        XDG_CACHE_HOME = "$HOME/.cache";
-        XDG_DATA_HOME = "$HOME/.local/share";
-        XDG_STATE_HOME = "$HOME/.local/state";
-        NIXOS_OZONE_WL = "1";
-      };
-    })
 
-    (lib.mkIf pkgs.stdenv.isLinux {
+    stateVersion = "24.11";
-      pointerCursor = {
+  };
-        gtk.enable = true;
-        package = pkgs.catppuccin-cursors.mochaDark;
-        name = "catppuccin-mocha-dark-cursors";
-        size = 22;
-      };
-    })
-  ];
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

home/git.nix

@@ -15,7 +15,7 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.rebase = false;
+      pull.merge = true;
       merge.tool = "nvimdiff";
       mergetool.keepBackup = false;
     };

home/k9s.nix

@@ -1,32 +0,0 @@
-{ pkgs, ... }: {
-  programs.k9s = {
-    enable = true;
-    package = pkgs.k9sLatest;
-    settings.k9s = {
-      refreshRate = "2s";
-      liveViewAutoRefresh = false;
-      apiServerTimeout = "30s";
-      maxConnRetry = 5;
-      readOnly = true;
-      noExitOnCtrlC = false;
-      portForwardAddress = "localhost";
-      skipLatestRevCheck = false;
-      
-      skin = {
-        catppuccin-mocha = ./defaults/k9s/catppuccin-mocha.yml;
-      };
-
-      ui = {
-        skin = "catppuccin-mocha";
-        enableMouse = true;
-        headless = false;
-        logoless = true;
-        crumbsless = false;
-        splashless = true;
-        reactive = false;
-        noIcons = false;
-        defaultsToFullscreen = false;
-      };
-    };
-  };
-}

home/krew.nix

@@ -1,12 +0,0 @@
-{ pkgs, lib, ... }:
-with pkgs;
-let
-  plugins = writeText "plugins" ''
-    krew
-    oidc-login
-  '';
-in {
-  home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    $DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins}
-  '';
-}

home/lazygit.nix

@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
+{...}: {
   programs.lazygit = {
     enable = true;
-    package = pkgs.lazygitLatest;
 
     settings = {
       gui.theme = {

home/neovim.nix

@@ -1,14 +1,22 @@
-{dirs, ...}: {
+{ nvf, ...}: {
-  programs.neovim = {
+  imports = [
-    enable = true;
+    nvf.homeManagerModules.default
-    defaultEditor = true;
+  ];
-    vimAlias = true;
-  };
 
-  xdg.configFile = {
+  programs.nvf.enable = true;
-    nvim = {
+
-      onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+  ### --- OLD NEOVIM CONFIG BASED ON LUA CONFIG ---
-      source = dirs.defaults + /nvim;
+  #
-    };
+  # programs.neovim = {
-  };
+  #   enable = true;
+  #   defaultEditor = true;
+  #   vimAlias = true;
+  # };
+  #
+  # xdg.configFile = {
+  #   nvim = {
+  #     onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+  #     source = dirs.defaults + /nvim;
+  #   };
+  # };
 }

home/packages/common.nix

@@ -3,17 +3,9 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ../atuin.nix
-    ../shell.nix
-    ../git.nix
-    ../starship.nix
-    ../eza.nix
-    ../neovim.nix
-    ../bat.nix
-  ];
-
   home.packages = with pkgs; [
+    yazi # terminal file manager
+
     # archives
     zip
     xz
@@ -21,22 +13,40 @@
     p7zip
 
     # utils
-    yazi
     tmux
+    lazygit
     bottom
     ripgrep
     jq
     yq-go
     fzf
+    fh
     aria2
-    gnupg
+    yt-dlp
+    obsidian
+    vscode
+    weechat
     inetutils
 
     # misc
+    cowsay
     file
     which
     tree
     gnutar
+    gnupg
+    zoxide
     babelfish
+
+    # language-specific package managers
+    nodejs
+    cargo
+    python3
+
+    # nix specific stuff
+    nixd
+    deadnix
+    alejandra
+    statix
   ];
 }

home/packages/darwin.nix

@@ -1,9 +1,10 @@
 {
   pkgs,
+  lib,
   ...
 }: {
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
     discord
     ollama
-  ];
+  ]);
 }

home/packages/default.nix

@@ -1,9 +1,11 @@
-{ pkgs, lib, role, ... }:
 {
-  imports =
+  pkgs,
-    [ ./common.nix ]
+  lib,
-    ++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix
+  ...
-    ++ lib.optional pkgs.stdenv.isLinux ./linux.nix
+}: {
-    ++ lib.optional (role == "workstation") ./workstation.nix
+  imports = [
-    ++ lib.optional (role == "server") ./server.nix;
+    ./common.nix
-}
+    ./darwin.nix
+    ./linux.nix
+  ];
+}

home/packages/linux.nix

@@ -1,8 +1,9 @@
 {
   pkgs,
+  lib,
   ...
 }: {
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
     betterdiscordctl
     vesktop
@@ -15,5 +16,5 @@
     gpu-screen-recorder
     gpu-screen-recorder-gtk
     # ungoogled-chromium
-  ];
+  ]);
 }

home/packages/server.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }: {
-    home.packages = with pkgs; [
-    ];
-}

home/packages/workstation.nix

@@ -1,39 +0,0 @@
-{
-  lib,
-  pkgs,
-  dirs,
-  userName,
-  userEmail,
-  ghostty,
-  isNixOS,
-  ...
-}: {
-  imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [
-    ../terminal.nix
-    ../broswer.nix
-    ../zellij.nix
-    ../lazygit.nix
-    ../k9s.nix
-    ../krew.nix
-    ../direnv.nix
-  ] ++ lib.optional isNixOS [
-    ../sway.nix
-  ];
-
-  home.packages = with pkgs; [
-    fh
-    kubectl # kube config is deliberately not included
-    kubectx
-    obsidian
-    vscode
-    yt-dlp
-    weechat
-    nodejs
-    cargo
-    python3
-    nixd
-    deadnix
-    alejandra
-    statix
-  ];
-}

home/shell.nix

@@ -1,4 +1,4 @@
-{pkgs, lib, ...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
     # initExtra = ''
@@ -43,25 +43,7 @@
             "Can I get a waffle? Can I please get a waffle?" \
             "I'm lesbian. I thought you were American." \
             "You gotta give 'em that 'hawk tuah' and spit on that thang!" \
-            "We don't do that here..." \
+            "We don't do that here..."
-            "What are those?! They are my crocs..." \
-            "It's an avocado... Thanks!" \
-            "I am once again asking for your financial support" \
-            "Is that a weed?" \
-            "No, this is Patrick!" \
-            "Come ride, heroes, ride" \
-            "Away with the tide" \
-            "Concede your mind unto the fiend" \
-            "Darkness come, rend the shield of light" \
-            "The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
-            "Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
-            "Snap click clank whirr whizz wham boom!" \
-            "Rohs an kyn ala na" \
-            "If you’ve brought your ivory standard, I’ll be happy to tell you where you can stick it" \
-            "Speeches? Oh, yes, I love them. There's nothing like a good exposition when you're having trouble sleeping!" \
-            "Somehow, the boy just isn't very buoyant" \
-            "I am...not interested, little sun. Try again when you have become a man"
-
 
           set choose_meme (random)"%"(count $memes)
           set choose_meme $memes[(math $choose_meme"+1")]
@@ -70,27 +52,6 @@
         '';
         onEvent = "fish_greeting";
       };
-    } // lib.optionalAttrs pkgs.stdenv.isLinux {
-      block = {
-        body = ''
-          systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
-          set -g INHIBIT_PID $last_pid
-          echo "Sleep inhibited. PID: $INHIBIT_PID"
-        '';
-      };
-
-      unblock = {
-        body = ''
-          if set -q INHIBIT_PID
-            kill $INHIBIT_PID 2>/dev/null
-            and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
-            or echo "Failed to kill process or already terminated."
-            set -e INHIBIT_PID
-          else
-            echo "No active sleep inhibitor found."
-          end
-        '';
-      };
     };
   };
 

home/sway.nix

@@ -147,5 +147,20 @@ in {
   programs.waybar = {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
+
+    package = pkgs.waybar.overrideAttrs (old: {
+      version = "0.11.0";
+
+      src = pkgs.fetchFromGitHub {
+        owner = "Alexays";
+        repo = "Waybar";
+        rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
+        sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
+      # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+    });
   };
 }

home/terminal.nix

@@ -1,4 +1,4 @@
-{ pkgs, ghostty, ... }: {
+{ lib, pkgs, ghostty, ... }: {
   programs.alacritty = {
     enable = pkgs.stdenv.isLinux;
     settings = {

modules/apps/appimage.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.appimage;
-in {
-  options.appimage = {
-    enable = mkEnableOption "AppImage support";
-  };
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      appimageupdate
-      appimage-run
-    ];
-  };
-}

modules/common/core.nix

@@ -8,9 +8,6 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.permittedInsecurePackages = [
-    "mbedtls-2.28.10"
-  ];
 
   nix.package = pkgs.nix;
 

modules/common/default.nix

@@ -1,9 +1,12 @@
-{ ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ./core.nix
     ./environment.nix
     ./fonts.nix
-    # ./overlays.nix
     ./users.nix
   ];
 }

modules/common/environment.nix

@@ -1,23 +1,20 @@
 { lib, pkgs, ... }: {
+  # Common packages that every system will use
   environment.systemPackages = with pkgs; [
     git
     vim
     neovim
     usbutils
     coreutils
+    lshw
+    systemd
+    dmidecode
     pciutils
+    nix-ld
     patchelf
     htop
-  ] ++ 
+  ];
-  lib.optionals pkgs.stdenv.isLinux (with pkgs; [
-    systemd
-    lshw
-    dmidecode
-    nix-ld
-  ]) ++
-  lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-      # nothing here, yet ;)
-  ]);
 
+  # Common environment variables that every system will use
   environment.variables.EDITOR = "nvim";
 }

modules/common/overlays.nix

@@ -1,64 +0,0 @@
-final: prev: let
-  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
-  myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_1_90_0;
-    rustc = rust_1_90_0;
-  };
-in {
-  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.55.1";
-    src = prev.fetchFromGitHub {
-      owner = "jesseduffield";
-      repo = "lazygit";
-      rev = "v${version}";
-      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
-    };
-    vendorHash = null;
-    subPackages = [ "." ];
-    ldflags = [
-      "-X main.version=${version}"
-      "-X main.buildSource=nix"
-    ];
-  });
-
-  atuinLatest = (prev.atuin.override {
-    rustPlatform = myRustPlatform;
-  }).overrideAttrs (oldAttrs: rec {
-    version = "18.10.0";
-
-    src = prev.fetchFromGitHub {
-      owner = "atuinsh";
-      repo = "atuin";
-      rev = "v${version}";
-      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
-    };
-
-    cargoDeps = myRustPlatform.fetchCargoVendor {
-      # name = "atuin-${version}-vendor.tar.gz";
-      inherit src;
-      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
-    };
-
-    preCheck = (oldAttrs.preCheck or "") + ''
-      export HOME="$TMPDIR"
-      export XDG_CONFIG_HOME="$TMPDIR/.config"
-      export XDG_DATA_HOME="$TMPDIR/.local/share"
-      export XDG_STATE_HOME="$TMPDIR/.local/state"
-      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
-    '';
-  });
-
-  k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
-    version = "0.30.16";
-    src = prev.fetchFromGitHub {
-      owner = "derailed";
-      repo = "k9s";
-      rev = "v${version}";
-      hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
-    };
-    ldflags = [
-      "-X github.com/derailed/k9s/version.Version=${version}"
-      "-X github.com/derailed/k9s/version.BuildSource=nix"
-    ];
-  });
-}

modules/common/users.nix

@@ -1,23 +1,30 @@
-{ lib, pkgs, userName, hostname, ... }:
-
 {
+  lib,
+  pkgs,
+  userName,
+  hostname,
+  ...
+} @ args: {
   networking.hostName = hostname;
-  
-  users.users."${userName}" = {
-    home = if pkgs.stdenv.isDarwin 
-           then "/Users/${userName}" 
-           else "/home/${userName}";
-    description = userName;
-  } // lib.optionalAttrs pkgs.stdenv.isLinux {
-    group = "${userName}";
-    isNormalUser = true;
-  };
-  
-  users.groups.wyatt = {};
-  nix.settings.trusted-users = [userName];
 
-  security = lib.optionalAttrs pkgs.stdenv.isLinux {
+  # Don't forget to set a password with ‘passwd’!
-    sudo.extraRules = [
+  users.users."${userName}" = lib.mkMerge [
+    {
+      home =
+        if pkgs.stdenv.isDarwin
+        then "/Users/${userName}"
+        else "/home/${userName}";
+      description = userName;
+    }
+
+    (lib.mkIf (pkgs.stdenv.isLinux) {
+      group = "${userName}";
+      isNormalUser = true;
+    })
+  ];
+
+  security.sudo = {
+    extraRules = [
       {
         groups = [ "wheel" ];
         commands = [
@@ -30,9 +37,7 @@
     ];
   };
 
-  environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
+  users.groups.wyatt = {};
-    etc."sudoers.d/wheel-nopasswd".text = ''
+
-      %wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
+  nix.settings.trusted-users = [userName];
-    '';
-  };
 }

modules/machine/cloud/configuration.nix

@@ -18,16 +18,14 @@
 in {
   imports = [
     (import ../../apps/flatpak.nix {
-      inherit lib pkgs flatpakPackages userName;
+      inherit lib pkgs flatpakPackages;
     })
     ../../apps/gaming.nix
-    ../../apps/appimage.nix
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
-    ../../sound/focusrite.nix
     ../../virtualization/podman.nix
     ../../virtualization/hardware.nix
   ];
@@ -36,13 +34,9 @@ in {
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Custom kernel/boot stuff
-  boot = {
+  boot.kernelPackages = pkgs.linuxPackages_latest;
-    kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
-    loader = {
+  boot.loader.efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
 
   # Enable Bluetooth if present
   hardware.bluetooth.enable = true;
@@ -69,6 +63,21 @@ in {
     wl-clip-persist
   ];
 
+  # Enable OpenSSH
+  services.openssh.enable = true;
+
+  # Enable keyring
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable GnuPG
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable SUID wrappers (some programs need them)
+  programs.mtr.enable = true;
+
   # Enable Polkit
   security.polkit.enable = true;
 
@@ -136,39 +145,14 @@ in {
     networkManager.enable = true;
   };
 
-  programs = {
+  # Enable dconf
-    # Enable GnuPG
+  programs.dconf.enable = true;
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    # Enable SUID wrappers (some programs need them)
-    mtr.enable = true;
-
-    # Enable dconf
-    dconf.enable = true;
-  };
 
   # Add username to groups "wheel" and "video" - more may be added here later
   users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
 
-  services = {
+  # Flatpak packages (see ../../apps/flatpak.nix)
-    # Enable OpenSSH
+  services.flatpak.packages = flatpakPackages;
-    openssh.enable = true;
-
-    # Enable keyring
-    gnome.gnome-keyring.enable = true;
-
-    # Flatpak packages (see ../../apps/flatpak.nix)
-    flatpak.packages = flatpakPackages;
-  };
-
-  # Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
-  sound.hardware.focusrite.enable = true;
-
-  # AppImage support
-  appimage.enable = true;
 
   # XDG stuff
   xdg = {
@@ -176,12 +160,12 @@ in {
       enable = true;
       config = {
         sway = {
-          default = ["wlr" "gtk"];
+          default = [ "wlr" "gtk" ];
-          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+          "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
         };
         common = {
-          default = ["gtk"];
+          default = [ "gtk" ];
-          "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+          "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
         };
       };
       extraPortals = with pkgs; [

modules/machine/cloud/hardware-configuration.nix

@@ -12,24 +12,24 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
+    device = "/dev/disk/by-label/COMPUTER";
     fsType = "xfs";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B72F-087F";
+    device = "/dev/disk/by-label/BOOT";
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };
 
   swapDevices = [
-    {device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
+    {device = "/dev/disk/by-label/SWAP";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

modules/security/sudo.nix

@@ -5,7 +5,7 @@
 }:
 with lib; {
   options = {
-    security.sudoers = {
+    security.sudo = {
       needsPassword = mkOption {
         type = types.bool;
         default = true;

modules/sound/focusrite.nix

@@ -1,33 +0,0 @@
-# Must be paired with the pipewire Nix module, this does nothing but install packages
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.sound.hardware.focusrite;
-in {
-  options.sound.hardware.focusrite = {
-    enable = mkEnableOption "Focusrite audio interface support";
-    guiSupport = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
-    };
-  };
-  config = mkIf cfg.enable (mkMerge [
-    {
-      environment.systemPackages = with pkgs;
-        [
-          scarlett2
-          alsa-scarlett-gui
-        ]
-        ++ (
-          if cfg.guiSupport
-          then [pkgs.alsa-scarlett-gui]
-          else []
-        );
-    }
-  ]);
-}

modules/sound/shairport.nix

@@ -1,16 +1,7 @@
-{ lib, pkgs, userName, ...}: {
+{pkgs, ...}: {
   services.shairport-sync = {
     enable = pkgs.stdenv.isLinux;
     openFirewall = pkgs.stdenv.isLinux;
-    # arguments = "-v -o pa";
+    arguments = "-v -o pw";
-  };
-
-  systemd.services.shairport-sync = {
-    serviceConfig = {
-      User = lib.mkForce "${userName}";
-    };
-    environment = {
-      XDG_RUNTIME_DIR = "/run/user/1000";
-    };
   };
 }