add shell init path

ready for pr ig

flake.lock

@@ -64,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1760808459,
-        "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
+        "lastModified": 1761172581,
+        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
+        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1760580664,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "lastModified": 1761016216,
+        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
         "type": "github"
       },
       "original": {
@@ -156,13 +156,48 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "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": {

flake.nix

@@ -12,6 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
+    rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
   outputs = inputs @ {
@@ -20,26 +21,38 @@
     nix-flatpak,
     darwin,
     home-manager,
-    ghostty,
+    rust-overlay,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail ghostty;
+      inherit userName userEmail;
+    };
+
+    myOverlays = { ... }: {
+      nixpkgs.overlays = [
+        rust-overlay.overlays.default
+        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;
+        inherit userName userEmail;
         hostname = "sephiroth";
-        role = "devel";
+        role = "workstation";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/sephiroth
 
@@ -47,7 +60,9 @@
         {
           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;
         }
       ];
@@ -57,11 +72,12 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail ghostty;
+        inherit userName userEmail;
         hostname = "cloud";
-        role = "devel";
+        role = "workstation";
       };
       modules = [
+        myOverlays
         nix-flatpak.nixosModules.nix-flatpak
         ./modules/common
         ./modules/machine/cloud
@@ -70,7 +86,8 @@
         {
           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
           ];
@@ -87,6 +104,7 @@
         role = "server";
       };
       modules = [
+        myOverlays
         ./modules/common
         ./modules/machine/valefor
 
@@ -95,6 +113,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -111,6 +130,7 @@
         role = "server";
       };
       # modules = [
+      #   myOverlays
       #   nix-flatpak.nixosModules.nix-flatpak
       #   nix-ld.nixosModules.nix-ld
       #   ./modules/nixos/hardware-configuration.nix
@@ -123,11 +143,35 @@
       #     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";
+      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/atuin.nix

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

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,63 +1,58 @@
-{
-  lib,
-  pkgs,
-  userName,
-  userEmail,
-  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
+{ lib
+, pkgs
+, userName
+, isNixOS ? true
+, ...
+}:
+let
+  # TODO: Have a file structure that holds all the configuration files that can't be configured by Nix (or I haven't found the time to do so)
   dirs = {
     defaults = ../defaults;
   };
-in {
+in
+{
+  _module.args = {
+    inherit dirs;
+  };
+
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
-    ./atuin.nix
-    ./shell.nix
+  imports = [
     ./packages
-    ./git.nix
-    ./starship.nix
-    ./eza.nix
-    ./neovim.nix
-    ./direnv.nix
-    ./sway.nix
-    ./terminal.nix
-    ./browser.nix
-    ./zellij.nix
-    ./bat.nix
   ];
 
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home = {
-    username = userName;
-    homeDirectory =
-      if pkgs.stdenv.isDarwin
-      then "/Users/${userName}"
-      else "/home/${userName}";
+  home = lib.mkMerge [
+    {
+      username = userName;
+      homeDirectory =
+        if pkgs.stdenv.isDarwin
+        then "/Users/${userName}"
+        else "/home/${userName}";
 
-    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";
-    };
+      stateVersion = "24.11";
+    }
 
-    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
-      gtk.enable = true;
-      package = pkgs.catppuccin-cursors.mochaDark;
-      name = "catppuccin-mocha-dark-cursors";
-      size = 22;
-    };
+    (lib.mkIf isNixOS {
+      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";
+      };
+    })
 
-    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/lazygit.nix

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

home/packages/common.nix

@@ -1,11 +1,20 @@
 {
-  lib,
   pkgs,
   ...
 }: {
-  home.packages = with pkgs; [
-    yazi # terminal file manager
+  imports = [
+    ../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
@@ -13,40 +22,22 @@
     p7zip
 
     # utils
+    yazi
     tmux
-    lazygit
     bottom
     ripgrep
     jq
     yq-go
     fzf
-    fh
     aria2
-    yt-dlp
-    obsidian
-    vscode
-    weechat
+    gnupg
     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 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
+{ lib, pkgs, ... }:
+lib.mkIf pkgs.stdenv.isDarwin {
+  home.packages = with pkgs; [
     discord
     ollama
-  ]);
+  ];
 }

home/packages/default.nix

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

home/packages/linux.nix

@@ -1,20 +1,16 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
+{ lib, pkgs, isNixOS ? true, ... }:
+lib.mkIf pkgs.stdenv.isLinux {
+  home.packages = with pkgs; [
     imv
+    xdg-utils
+  ] ++ lib.optionals isNixOS [
     betterdiscordctl
     vesktop
-    xdg-utils
-    mcrcon
     xfce.thunar
     pavucontrol
     godot
     aseprite
     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 = ''
-    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
-    # '';
+    shellInit = ''
+      if test -d $HOME/.krew/bin
+        set -gx PATH $HOME/.krew/bin $PATH
+      end
+    '';
 
     shellAliases = {
       # ls aliases
@@ -43,7 +45,25 @@
             "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")]

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

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

modules/common/default.nix

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

modules/common/overlays.nix

@@ -0,0 +1,65 @@
+final: prev: let
+  # Use latest rust from overlay which should work on non-NixOS
+  rust_latest = prev.rust-bin.stable.latest.default;
+  myRustPlatform = prev.makeRustPlatform {
+    cargo = rust_latest;
+    rustc = rust_latest;
+  };
+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"
+  #   ];
+  # });
+}