works on cloud

Reviewed-on: #5

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1765900816,
+        "lastModified": 1771170334,
-        "narHash": "sha256-Pa7QpF+84hTuPanVaJ/B3NgdaytUMj3PN06sEaNibaM=",
+        "narHash": "sha256-tCgoCWORfNHaRXTh2QS44LwxlV8q28jVvjN5ioMicv8=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "36b14e5e7014e471341f0807dc9a9e2d65a157f4",
+        "rev": "821b4f92c2c0981ea5b571b03403df87d2b2e2ae",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765066094,
+        "lastModified": 1767634391,
-        "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -59,97 +59,46 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
+    "flake-schemas": {
-      "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1761577921,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
-        "owner": "edolstra",
+        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
-        "repo": "flake-compat",
+        "revCount": 107,
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "type": "tarball",
-        "type": "github"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
       },
       "original": {
-        "owner": "edolstra",
+        "type": "tarball",
-        "repo": "flake-compat",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
-        "type": "github"
       }
     },
-    "flake-utils": {
+    "flake-schemas_2": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1761577921,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
-        "owner": "numtide",
+        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
-        "repo": "flake-utils",
+        "revCount": 107,
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "tarball",
-        "type": "github"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
       },
       "original": {
-        "owner": "numtide",
+        "type": "tarball",
-        "repo": "flake-utils",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
-        "type": "github"
-      }
-    },
-    "ghostty": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "zig": "zig",
-        "zon2nix": "zon2nix"
-      },
-      "locked": {
-        "lastModified": 1765908726,
-        "narHash": "sha256-tUvTIxhD2aGbyBQgDXknoKWQpuNrgt9TrGQaV9q1WOQ=",
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "rev": "67eb4805779a80bfe2d9ac5a67f19b89f4e67b16",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "type": "github"
       }
     },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "ghostty",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1755776884,
+        "lastModified": 1770260404,
-        "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
+        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
+        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765859973,
-        "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
         "type": "github"
       },
       "original": {
@@ -193,24 +142,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1763191728,
+        "lastModified": 1771043024,
-        "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=",
+        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
-        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1765762245,
-        "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
+        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
         "type": "github"
       },
       "original": {
@@ -220,7 +156,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -236,15 +172,44 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1766201043,
+        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
+        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
+        "revCount": 904049,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1769089682,
+        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
+        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
+        "revCount": 906333,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.906333%2Brev-078d69f03934859a181e81ba987c2bb033eebfc5/019bebf2-031c-7119-8fdc-ce9d29d005fa/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
+      }
+    },
     "root": {
       "inputs": {
         "aagl": "aagl",
         "darwin": "darwin",
-        "ghostty": "ghostty",
+        "home-manager": "home-manager",
-        "home-manager": "home-manager_2",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay_2",
+        "swaytreesave": "swaytreesave",
+        "vintage-story": "vintage-story"
       }
     },
     "rust-overlay": {
@@ -252,11 +217,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1764470739,
+        "lastModified": 1770952264,
-        "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=",
+        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a",
+        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
         "type": "github"
       },
       "original": {
@@ -267,86 +232,58 @@
     },
     "rust-overlay_2": {
       "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1771211437,
+        "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "swaytreesave": {
+      "inputs": {
+        "flake-schemas": "flake-schemas",
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1765852971,
+        "lastModified": 1767148467,
-        "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=",
+        "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=",
-        "owner": "oxalica",
+        "ref": "refs/heads/master",
-        "repo": "rust-overlay",
+        "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a",
-        "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319",
+        "revCount": 4,
-        "type": "github"
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
       },
       "original": {
-        "owner": "oxalica",
+        "type": "git",
-        "repo": "rust-overlay",
+        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
-        "type": "github"
       }
     },
-    "systems": {
+    "vintage-story": {
-      "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": [
+        "flake-schemas": "flake-schemas_2",
-          "ghostty",
+        "nixpkgs": "nixpkgs_5"
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1763295135,
+        "lastModified": 1769397199,
-        "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
+        "narHash": "sha256-MSajncUGZtlpl88rqFdj42eGGyWnk2jw84VbK3AgUBA=",
-        "owner": "mitchellh",
+        "ref": "refs/heads/master",
-        "repo": "zig-overlay",
+        "rev": "4d2313c50933645040a0d12556016fc2916bfa65",
-        "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
+        "revCount": 1,
-        "type": "github"
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
       },
       "original": {
-        "owner": "mitchellh",
+        "type": "git",
-        "repo": "zig-overlay",
+        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
-        "type": "github"
-      }
-    },
-    "zon2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1758405547,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -11,12 +11,15 @@
       url = "github:lnl7/nix-darwin/nix-darwin-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    ghostty.url = "github:ghostty-org/ghostty";
     rust-overlay.url = "github:oxalica/rust-overlay";
     aagl = {
       url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # My personal flakes
+    swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git";
+    vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git";
   };
 
   outputs = inputs @ {
@@ -25,15 +28,16 @@
     nix-flatpak,
     darwin,
     home-manager,
-    ghostty,
     rust-overlay,
     aagl,
+    swaytreesave,
+    vintage-story,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail ghostty;
+      inherit userName userEmail swaytreesave;
     };
 
     myOverlays = { ... }: {
@@ -54,9 +58,9 @@
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
       specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail;
         hostname = "sephiroth";
-        role = "devel";
+        role = "workstation";
       };
       modules = [
         myOverlays
@@ -67,7 +71,8 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; role = "workstation"; };
+          # home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.backupFileExtension = "bak";
           home-manager.users.${userName} = import ./home;
         }
@@ -78,9 +83,9 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail ghostty aagl;
+        inherit userName userEmail aagl vintage-story;
         hostname = "cloud";
-        role = "devel";
+        role = "workstation";
       };
       modules = [
         myOverlays
@@ -92,7 +97,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "workstation"; };
           home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
@@ -156,5 +161,28 @@
       #   }
       # ];
     };
+
+    # generic non-NixOS Linux machine
+    homeConfigurations."generic" = let
+      hostname = builtins.getEnv "HOSTNAME";
+      system = "x86_64-linux";
+    in home-manager.lib.homeManagerConfiguration {
+      pkgs = nixpkgs.legacyPackages.${system};
+      
+      extraSpecialArgs = {
+        inherit userName userEmail hostname;
+        isNixOS = false;
+        role = "workstation";
+      };
+      modules = [
+        {
+          nixpkgs.overlays = [
+            rust-overlay.overlays.default
+            self.common.overlays
+          ];
+        }
+        ./home
+      ];
+    };
   };
 }

home/browser.nix

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

home/default.nix

@@ -1,44 +1,38 @@
-{
+{ lib
-  lib,
+, pkgs
-  pkgs,
+, userName
-  userName,
+, swaytreesave
-  userEmail,
+, isNixOS ? true
-  ghostty,
+, ...
-  ...
 }: let
   # Have a file sturcture 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
+{
+  _module.args = {
+    inherit dirs;
+  };
+
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+  imports = [
-    ./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
-    ./lazygit.nix
   ];
 
-  # Home Manager needs a bit of information about you and the
+  home = lib.mkMerge [
-  # paths it should manage.
+    {
-  home = {
       username = userName;
       homeDirectory =
         if pkgs.stdenv.isDarwin
         then "/Users/${userName}"
         else "/home/${userName}";
 
+      stateVersion = "24.11";
+    }
+
+    (lib.mkIf isNixOS {
       sessionVariables = {
         XDG_CURRENT_DESKTOP = "sway";
         XDG_SESSION_TYPE = "wayland";
@@ -49,16 +43,17 @@ in {
         XDG_STATE_HOME = "$HOME/.local/state";
         NIXOS_OZONE_WL = "1";
       };
+    })
 
-    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
+    (lib.mkIf pkgs.stdenv.isLinux {
+      pointerCursor = {
         gtk.enable = true;
         package = pkgs.catppuccin-cursors.mochaDark;
         name = "catppuccin-mocha-dark-cursors";
         size = 22;
       };
-
+    })
-    stateVersion = "24.11";
+  ];
-  };
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

home/k9s.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }: {
+  programs.k9s = {
+    enable = true;
+    package = pkgs.k9s;
+    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.yaml;
+      };
+
+      ui = {
+        skin = "catppuccin-mocha";
+        enableMouse = true;
+        headless = false;
+        logoless = true;
+        crumbsless = false;
+        splashless = true;
+        reactive = false;
+        noIcons = false;
+        defaultsToFullscreen = false;
+      };
+    };
+  };
+}

home/krew.nix

@@ -0,0 +1,14 @@
+{ pkgs, lib, ... }:
+with pkgs;
+let
+  plugins = [
+    "krew"
+    "oidc-login"
+  ];
+in {
+  home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    ${lib.concatMapStringsSep "\n" (plugin: ''
+      $DRY_RUN_CMD ${krew}/bin/krew install ${plugin} || true
+    '') plugins}
+  '';
+}

home/neovim.nix

@@ -1,4 +1,8 @@
-{dirs, ...}: {
+{...}: let
+  dirs = {
+    defaults = ../defaults;
+  };
+in {
   programs.neovim = {
     enable = true;
     defaultEditor = true;

home/packages/common.nix

@@ -2,9 +2,19 @@
   pkgs,
   ...
 }: {
-  home.packages = with pkgs; [
+  imports = [
-    yazi # terminal file manager
+    ../atuin.nix
+    ../shell.nix
+    ../git.nix
+    ../starship.nix
+    ../eza.nix
+    ../neovim.nix
+    ../bat.nix
+  ];
 
+  nixpkgs.config.allowUnfree = true;
+
+  home.packages = with pkgs; [
     # archives
     zip
     xz
@@ -12,39 +22,22 @@
     p7zip
 
     # utils
+    yazi
     tmux
     bottom
     ripgrep
     jq
     yq-go
     fzf
-    fh
     aria2
-    yt-dlp
+    gnupg
-    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,10 +1,7 @@
-{
+{ lib, pkgs, ... }:
-  pkgs,
+lib.mkIf pkgs.stdenv.isDarwin {
-  lib,
+  home.packages = with pkgs; [
-  ...
-}: {
-  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
     discord
     ollama
-  ]);
+  ];
 }

home/packages/default.nix

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

home/packages/linux.nix

@@ -1,14 +1,11 @@
-{
+{ lib, pkgs, isNixOS ? true, ... }:
-  pkgs,
+lib.mkIf pkgs.stdenv.isLinux {
-  lib,
+  home.packages = with pkgs; [
-  ...
-}: {
-  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
+    xdg-utils
+  ] ++ lib.optionals isNixOS [
     betterdiscordctl
     vesktop
-    xdg-utils
-    mcrcon
     xfce.thunar
     pavucontrol
     godot
@@ -16,6 +13,5 @@
     zathura
     gpu-screen-recorder
     gpu-screen-recorder-gtk
-    # ungoogled-chromium
+  ];
-  ]);
 }

home/packages/server.nix

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

home/packages/workstation.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  pkgs,
+  isNixOS ? true,
+  ...
+}: {
+  imports = [
+    ../terminal.nix
+    ../browser.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,9 +1,11 @@
 {pkgs, lib, ...}: {
   programs.fish = {
     enable = true;
-    # initExtra = ''
+    shellInit = ''
-    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
+      if test -d $HOME/.krew/bin
-    # '';
+        set -gx PATH $HOME/.krew/bin $PATH
+      end
+    '';
 
     shellAliases = {
       # ls aliases

home/sway.nix

@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  swaytreesave,
   ...
 }: let
   dirs = {
@@ -15,6 +16,12 @@
     hash = "sha256-ZDFbI69ECsUTjbhlw2kHRufZbQMu+FQSMmncCJ5pagg=";
   };
 in {
+  imports = [
+    swaytreesave.homeManagerModules.default
+  ];
+
+  programs.swaytreesave.enable = if pkgs.stdenv.isLinux then true else false;
+
   wayland.windowManager.sway = {
     enable = pkgs.stdenv.isLinux;
     extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
@@ -148,4 +155,5 @@ in {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
   };
+
 }

home/terminal.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ghostty, ... }: {
+{ pkgs, ... }: {
   programs.alacritty = {
     enable = pkgs.stdenv.isLinux;
     settings = {
@@ -103,9 +103,4 @@
   programs.kitty = {
     enable = false; # TODO: to enable later
   };
-
-  home.packages = if pkgs.stdenv.isLinux then
-    [ ghostty.packages.${pkgs.system}.default ]
-  else
-    [ ];
 }

modules/apps/gaming.nix

@@ -3,11 +3,14 @@
   lib,
   pkgs,
   aagl,
+  vintage-story,
   ...
 }: let
   cfg = config.gaming;
 in {
-  imports = [ aagl.nixosModules.default ];
+  imports = [ 
+    aagl.nixosModules.default 
+  ];
 
   options.gaming = {
     steam = {
@@ -142,6 +145,10 @@ in {
         enable = lib.mkEnableOption "Zenless Zone Zero (ZZZ) launcher";
       };
     };
+
+    vintage-story = {
+      enable = lib.mkEnableOption "Vintage Story client and server";
+    };
   };
 
   config = let 
@@ -211,6 +218,7 @@ in {
       )) ++
       (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
       (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
+      (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++
       (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++
       (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++
       (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]);

modules/common/overlays.nix

@@ -1,8 +1,9 @@
 final: prev: let
-  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
+  # Use latest rust from overlay which should work on non-NixOS
+  rust_latest = prev.rust-bin.stable.latest.default;
   myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_1_90_0;
+    cargo = rust_latest;
-    rustc = rust_1_90_0;
+    rustc = rust_latest;
   };
 in {
   lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
@@ -47,4 +48,18 @@ in {
       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/machine/cloud/configuration.nix

@@ -107,6 +107,7 @@ in {
     ffxiv.enable = true;
     minecraft.enable = true;
     aagl.anime-game-launcher.enable = true;
+    vintage-story.enable = true;
   };
 
   # Power management (see ../../pwrMgmt/default.nix)
@@ -150,7 +151,7 @@ in {
   };
 
   # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
+  users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network" "libvirtd"];
 
   services = {
     # Enable OpenSSH
@@ -190,5 +191,23 @@ in {
     };
   };
 
+  # sched_ext userspace CPU scheduling stuff - idk
+  services.scx = {
+    enable = true;
+    scheduler = "scx_bpfland";
+  };
+
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-backgroundremoval
+      obs-pipewire-audio-capture
+      obs-vaapi #optional AMD hardware acceleration
+      obs-gstreamer
+      obs-vkcapture
+    ];
+  };
+
   system.stateVersion = "24.11";
 }

modules/virtualization/hardware.nix

@@ -1,6 +1,8 @@
 { pkgs, ... }: {
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
+  services.qemuGuest.enable = true;
+  services.spice-vdagentd.enable = true;  
   environment.systemPackages = with pkgs; [
     qemu
     quickemu