flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1767520119,
+        "lastModified": 1771170334,
-        "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=",
+        "narHash": "sha256-tCgoCWORfNHaRXTh2QS44LwxlV8q28jVvjN5ioMicv8=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "5720d3282844b6b23b26dfac075a5f1f58ea8844",
+        "rev": "821b4f92c2c0981ea5b571b03403df87d2b2e2ae",
         "type": "github"
       },
       "original": {
@@ -46,27 +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": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -103,80 +87,18 @@
         "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "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": 1769985646,
-        "narHash": "sha256-ubfC9fLfdQ0xpQuFmGQCYIRyEEmOzXd+ya5rShM217k=",
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "rev": "769fff5dfb322594c0dc7a379ee70897a7db773f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ghostty-org",
-        "repo": "ghostty",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "ghostty",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1768068402,
+        "lastModified": 1770260404,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
+        "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
+        "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769580047,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
         "type": "github"
       },
       "original": {
@@ -220,24 +142,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768032153,
+        "lastModified": 1771043024,
-        "narHash": "sha256-zvxtwlM8ZlulmZKyYCQAPpkm5dngSEnnHjmjV7Teloc=",
+        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
-        "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre925418.3146c6aa9995/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1769900590,
-        "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646",
+        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
         "type": "github"
       },
       "original": {
@@ -247,7 +156,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -263,7 +172,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1766201043,
         "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
@@ -277,7 +186,7 @@
         "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1769089682,
         "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
@@ -295,10 +204,9 @@
       "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",
         "swaytreesave": "swaytreesave",
         "vintage-story": "vintage-story"
@@ -309,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": {
@@ -324,14 +232,14 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1769915446,
+        "lastModified": 1771211437,
-        "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=",
+        "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "bc00300f010275e46feb3c3974df6587ff7b7808",
+        "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
         "type": "github"
       },
       "original": {
@@ -343,7 +251,7 @@
     "swaytreesave": {
       "inputs": {
         "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1767148467,
@@ -359,25 +267,10 @@
         "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "vintage-story": {
       "inputs": {
         "flake-schemas": "flake-schemas_2",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1769397199,
@@ -392,57 +285,6 @@
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
       }
-    },
-    "zig": {
-      "inputs": {
-        "flake-compat": [
-          "ghostty",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "ghostty",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763295135,
-        "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mitchellh",
-        "repo": "zig-overlay",
-        "type": "github"
-      }
-    },
-    "zon2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768231828,
-        "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=",
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jcollie",
-        "repo": "zon2nix",
-        "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -11,7 +11,6 @@
       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";
@@ -29,7 +28,6 @@
     nix-flatpak,
     darwin,
     home-manager,
-    ghostty,
     rust-overlay,
     aagl,
     swaytreesave,
@@ -39,7 +37,7 @@
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail ghostty swaytreesave;
+      inherit userName userEmail swaytreesave;
     };
 
     myOverlays = { ... }: {
@@ -60,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
@@ -73,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;
         }
@@ -84,9 +83,9 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail ghostty aagl vintage-story;
+        inherit userName userEmail aagl vintage-story;
         hostname = "cloud";
-        role = "devel";
+        role = "workstation";
       };
       modules = [
         myOverlays
@@ -98,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
@@ -187,5 +186,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,65 +1,59 @@
-{
+{ lib
-  lib,
+, pkgs
-  pkgs,
+, userName
-  userName,
+, swaytreesave
-  userEmail,
+, isNixOS ? true
-  ghostty,
+, ...
-  swaytreesave,
-  ...
 }: 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 = [
-    ./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;
-    username = userName;
+      homeDirectory =
-    homeDirectory =
+        if pkgs.stdenv.isDarwin
-      if pkgs.stdenv.isDarwin
+        then "/Users/${userName}"
-      then "/Users/${userName}"
+        else "/home/${userName}";
-      else "/home/${userName}";
 
-    sessionVariables = {
+      stateVersion = "24.11";
-      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";
-    };
 
-    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
+    (lib.mkIf isNixOS {
-      gtk.enable = true;
+      sessionVariables = {
-      package = pkgs.catppuccin-cursors.mochaDark;
+        XDG_CURRENT_DESKTOP = "sway";
-      name = "catppuccin-mocha-dark-cursors";
+        XDG_SESSION_TYPE = "wayland";
-      size = 22;
+        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";
+      };
+    })
 
-    stateVersion = "24.11";
+    (lib.mkIf pkgs.stdenv.isLinux {
-  };
+      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/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/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,21 @@
     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,
+    [
-  ...
+      ./common.nix
-}: {
+      ./darwin.nix
-  imports = [
+      ./linux.nix
-    ./common.nix
+    ]
-    ./darwin.nix
+    ++ lib.optional (role == "workstation") ./workstation.nix
-    ./linux.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,6 @@
     zathura
     gpu-screen-recorder
     gpu-screen-recorder-gtk
-    # ungoogled-chromium
+    inetutils
-  ]);
+  ];
 }

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/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/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"
+  #   ];
+  # });
 }