add shell init path

darwin build success
ready for pr ig
2025-12-19 15:37:16 -05:00 · 2025-12-13 17:04:28 -05:00 · 2025-12-13 14:04:54 -05:00 · 2025-12-12 15:52:04 -05:00 · 2025-12-12 15:39:23 -05:00 · 2025-12-12 14:15:19 -05:00
28 changed files with 287 additions and 454 deletions
--- a/defaults/k9s/catppuccin-mocha.yaml
+++ b/defaults/k9s/catppuccin-mocha.yaml
--- a/flake.lock
+++ b/flake.lock
@@ -1,27 +1,5 @@
 {
  "nodes": {
-    "aagl": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1765900816,
-        "narHash": "sha256-Pa7QpF+84hTuPanVaJ/B3NgdaytUMj3PN06sEaNibaM=",
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "rev": "36b14e5e7014e471341f0807dc9a9e2d65a157f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ezKEa",
-        "repo": "aagl-gtk-on-nix",
-        "type": "github"
-      }
-    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@@ -29,16 +7,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1765066094,
-        "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=",
+        "lastModified": 1759509947,
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "688427b1aab9afb478ca07989dc754fa543e03d5",
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
        "type": "github"
      },
      "original": {
        "owner": "lnl7",
-        "ref": "nix-darwin-25.11",
+        "ref": "nix-darwin-25.05",
        "repo": "nix-darwin",
        "type": "github"
      }
@@ -46,27 +24,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
-        "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",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -95,19 +57,18 @@
    },
    "ghostty": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
        "zig": "zig",
        "zon2nix": "zon2nix"
      },
      "locked": {
-        "lastModified": 1765908726,
-        "narHash": "sha256-tUvTIxhD2aGbyBQgDXknoKWQpuNrgt9TrGQaV9q1WOQ=",
+        "lastModified": 1761172581,
+        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "67eb4805779a80bfe2d9ac5a67f19b89f4e67b16",
+        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
        "type": "github"
      },
      "original": {
@@ -119,16 +80,15 @@
    "home-manager": {
      "inputs": {
        "nixpkgs": [
-          "ghostty",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1755776884,
-        "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
        "type": "github"
      },
      "original": {
@@ -138,27 +98,6 @@
        "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": {
-        "owner": "nix-community",
-        "ref": "release-25.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
    "nix-flatpak": {
      "locked": {
        "lastModified": 1739444422,
@@ -177,45 +116,42 @@
    },
    "nixpkgs": {
      "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"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1763191728,
-        "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=",
-        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
+        "lastModified": 315532800,
+        "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
+        "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
      }
    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1758360447,
+        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
+        "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": 1765762245,
-        "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
+        "lastModified": 1761016216,
+        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
+        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -238,43 +174,24 @@
    },
    "root": {
      "inputs": {
-        "aagl": "aagl",
        "darwin": "darwin",
        "ghostty": "ghostty",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay"
      }
    },
    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1764470739,
-        "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
      "inputs": {
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1765852971,
-        "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=",
+        "lastModified": 1761100675,
+        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319",
+        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
        "type": "github"
      },
      "original": {
@@ -314,11 +231,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763295135,
-        "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
+        "lastModified": 1760401936,
+        "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
+        "rev": "365085b6652259753b598d43b723858184980bbe",
        "type": "github"
      },
      "original": {
@@ -329,10 +246,7 @@
    },
    "zon2nix": {
      "inputs": {
-        "nixpkgs": [
-          "ghostty",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1758405547,
--- a/flake.nix
+++ b/flake.nix
@@ -1,22 +1,18 @@
 {
  description = "Wyatt's nix configuration suite";
  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
      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";
-    };
  };

  outputs = inputs @ {
@@ -25,21 +21,18 @@
    nix-flatpak,
    darwin,
    home-manager,
-    ghostty,
    rust-overlay,
-    aagl,
    ...
  }: let
    userName = "wyatt";
    userEmail = "wyatt@wyattjmiller.com";
    extraSpecialArgs = {
-      inherit userName userEmail ghostty;
+      inherit userName userEmail;
    };

    myOverlays = { ... }: {
      nixpkgs.overlays = [
        rust-overlay.overlays.default
-        aagl.overlays.default
        self.common.overlays
      ];
    };
@@ -54,9 +47,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 +60,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 +72,9 @@
    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
-        inherit userName userEmail ghostty aagl;
+        inherit userName userEmail;
        hostname = "cloud";
-        role = "devel";
+        role = "workstation";
      };
      modules = [
        myOverlays
@@ -92,7 +86,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 +150,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
+      ];
+    };
  };
 }
--- a/home/browser.nix
+++ b/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 = [
@@ -40,37 +41,14 @@
        id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
        sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
        # sha256 = lib.fakeSha256;
-        version = "1.67.0";
+        version = "1.64.0";
      })
      (createChromiumExtension {
        # bitwarden
        id = "nngceckbapebfimnlniiiahkandclblb";
        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
-        version = "2025.10.0";
-      })
-      (createChromiumExtension {
-        # react dev tools
-        id = "fmkadmapgofadopljbjfkapdkoienihi";
-        sha256 = "sha256:01vy0x7hdkj4g3m2l4kw5rwldhhpkcxmd2miy5rj2dzxdnbchw2z";
-        version = "7.0.1";
-      })
-      (createChromiumExtension {
-        # wappalyzer
-        id = "gppongmhjkpfnbhagpmjfkannfbllamg";
-        sha256 = "sha256:1mi1wpm714r8yp0zh0yg6kccnld36rj4xb8j4y0c18y9176vc6wx";
-        version = "6.10.86";
-      })
-      (createChromiumExtension {
-        # obsidian web clipper
-        id = "cnjifjpddelmedmihgijeibhnjfabmlf";
-        sha256 = "sha256:0bp6g63g9hk2xbq054lpf5hzwmn73jzh3hswyjfp9r7yqj83mzgy";
-        version = "0.12.0";
-      })
-      (createChromiumExtension {
-        # dark reader
-        id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";
-        sha256 = "sha256:06a9dz589i1da519kivzp7bljksl2xxsd151y7ww0hx28jd1694b";
-        version = "4.9.113";
+        # sha256 = lib.fakeSha256;
+        version = "2025.5.0";
      })
    ];
  };
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,64 +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
-    ./lazygit.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;
--- a/home/k9s.nix
+++ b/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;
+      };
+    };
+  };
+}
--- a/home/krew.nix
+++ b/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}
+  '';
+}
--- a/home/packages/common.nix
+++ b/home/packages/common.nix
@@ -2,9 +2,19 @@
  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
@@ -12,39 +22,22 @@
    p7zip

    # utils
+    yazi
    tmux
    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
  ];
 }
--- a/home/packages/darwin.nix
+++ b/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
-  ]);
+  ];
 }
--- a/home/packages/default.nix
+++ b/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;
 }
--- a/home/packages/linux.nix
+++ b/home/packages/linux.nix
@@ -1,21 +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
-    zathura
    gpu-screen-recorder
    gpu-screen-recorder-gtk
-    # ungoogled-chromium
-  ]);
+  ];
 }
--- a/home/packages/server.nix
+++ b/home/packages/server.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+  home.packages = [
+  ];
+}
--- a/home/packages/workstation.nix
+++ b/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
+  ];
+}
--- a/home/shell.nix
+++ b/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
--- a/home/terminal.nix
+++ b/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
-    [ ];
 }
--- a/lib/checkSystem.nix
+++ b/lib/checkSystem.nix
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -1,14 +1,11 @@
-{ 
+{
  config,
  lib,
  pkgs,
-  aagl,
  ...
 }: let
  cfg = config.gaming;
 in {
-  imports = [ aagl.nixosModules.default ];
-
  options.gaming = {
    steam = {
      enable = lib.mkEnableOption "Steam gaming platform";
@@ -65,14 +62,6 @@ in {
      };
    };

-    vkbasalt = {
-      enable = lib.mkEnableOption "vkBasalt/ReShade/GShade post processing shaders";
-    };
-
-    mangohud = {
-      enable = lib.mkEnableOption "OpenGL/Vulkan overlay tool shown in games presenting FPS, CPU/GPU/memory utilization, load, etc.";
-    };
-
    lutris = {
      enable = lib.mkEnableOption "Lutris game manager and launcher";
      package = lib.mkOption {
@@ -119,34 +108,9 @@ in {
    ffxiv = {
      enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher";
    };
-
-    # TODO: when aagl gets it's unified launcher all finished/in a stable state, transition to that launcher
-    aagl = {
-      anime-game-launcher = {
-        enable = lib.mkEnableOption "Genshin Impact launcher (legacy)";
-      };
-
-      honkers-railway-launcher = {
-        enable = lib.mkEnableOption "Honkai: Star Rail launcher";
-      };
-
-      honkers-launcher = {
-        enable = lib.mkEnableOption "Honkai: Impact 3rd launcher";
-      };
-
-      wavey-launcher = {
-        enable = lib.mkEnableOption "Wuthering Waves launcher";
-      };
-
-      sleepy-launcher = {
-        enable = lib.mkEnableOption "Zenless Zone Zero (ZZZ) launcher";
-      };
-    };
  };

-  config = let 
-    agl = cfg.aagl;
-  in {
+  config = {
    programs.steam = lib.mkIf cfg.steam.enable {
      enable = true;
      remotePlay.openFirewall = cfg.steam.firewall.remotePlay;
@@ -175,26 +139,6 @@ in {
        ];
    };

-    programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable {
-      enable = true;
-    };
-
-    programs.honkers-railway-launcher = lib.mkIf agl.honkers-railway-launcher.enable {
-      enable = true;
-    };
-
-    programs.honkers-launcher = lib.mkIf agl.honkers-launcher.enable {
-      enable = true;
-    };
-
-    programs.wavey-launcher = lib.mkIf agl.wavey-launcher.enable {
-      enable = true;
-    };
-
-    programs.sleepy-launcher = lib.mkIf agl.sleepy-launcher.enable {
-      enable = true;
-    };
-
    environment.systemPackages =
      (lib.optionals cfg.lutris.enable (
        [cfg.lutris.package] ++
@@ -210,19 +154,6 @@ in {
        cfg.lutris.extraPackages
      )) ++
      (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
-      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
-      (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]);
-
-    nix.settings = let 
-      inherit agl;
-    in (lib.mkIf
-      (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable)
-      {
-        substituters = [ "https://ezkea.cachix.org" ];
-        trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ];
-      }
-    );
+      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]);
  };
 }
--- a/modules/common/README.md
+++ b/modules/common/README.md
@@ -7,11 +7,3 @@ Licensed by the Mozilla Public License v2
 ## Synopsis

 This is the directory that holds shared configuration files amongst computers that I own. They are called by the root `flake.nix` file.
-
-Here's a quick synopsis of each file:
-
- core: Sane Nix options that I set for myself
- environment: Core packages and environment variables to be set and installed
- fonts: Fonts and icons that are to be installed
- overlays: Customized packages tailored to my needs
- users: Users to be set on my system
--- a/modules/common/environment.nix
+++ b/modules/common/environment.nix
@@ -13,6 +13,7 @@
    systemd
    lshw
    dmidecode
+    nix-ld
  ]) ++
  lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
      # nothing here, yet ;)
--- a/modules/common/fonts.nix
+++ b/modules/common/fonts.nix
@@ -6,14 +6,10 @@
  fonts.packages = with pkgs;
    [
      noto-fonts
-      noto-fonts-color-emoji
+      noto-fonts-emoji
      liberation_ttf
      noto-fonts-cjk-sans
      monaspace
    ]
    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-
-  environment.systemPackages = with pkgs; [
-    adwaita-icon-theme
-  ];
 }
--- a/modules/common/linker.nix
+++ b/modules/common/linker.nix
@@ -1,62 +0,0 @@
-{ pkgs, ... }: {
-  programs.nix-ld = {
-    enable = true;
-    libraries = with pkgs;
-    [
-      acl
-      attr
-      bzip2
-      dbus
-      expat
-      fontconfig
-      freetype
-      fuse3
-      icu
-      libnotify
-      libsodium
-      libssh
-      libunwind
-      libusb1
-      libuuid
-      nspr
-      nss
-      stdenv.cc.cc
-      util-linux
-      zlib
-      zstd 
-      pipewire
-      cups
-      libxkbcommon
-      pango
-      mesa
-      libdrm
-      libglvnd
-      libpulseaudio
-      atk
-      cairo
-      alsa-lib
-      at-spi2-atk
-      at-spi2-core
-      gdk-pixbuf
-      glib
-      gtk3
-      libGL
-      libappindicator-gtk3
-      vulkan-loader
-      xorg.libX11
-      xorg.libXScrnSaver
-      xorg.libXcomposite
-      xorg.libXcursor
-      xorg.libXdamage
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXi
-      xorg.libXrandr
-      xorg.libXrender
-      xorg.libXtst
-      xorg.libxcb
-      xorg.libxkbfile
-      xorg.libxshmfence
-    ];
-  };
-}
--- a/modules/common/overlays.nix
+++ b/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;
-    rustc = rust_1_90_0;
+    cargo = rust_latest;
+    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"
+  #   ];
+  # });
 }
--- a/modules/graphics/default.nix
+++ b/modules/graphics/default.nix
@@ -40,6 +40,7 @@ in {
  config = mkIf cfg.enable (mkMerge [
    {
      environment.systemPackages = with pkgs; [
+        glxinfo
        vulkan-tools
        mesa-demos
      ];
@@ -61,9 +62,9 @@ in {

    (mkIf (cfg.gpuVendor == "amd") {
      services.xserver.videoDrivers = ["amdgpu"];
-      # hardware.graphics.extraPackages = with pkgs; [
-      #   amdvlk
-      # ];
+      hardware.graphics.extraPackages = with pkgs; [
+        amdvlk
+      ];
      environment.systemPackages = with pkgs; [
        radeontop
      ];
--- a/modules/machine/README.md
+++ b/modules/machine/README.md
@@ -12,4 +12,4 @@ These are named after Final Fantasy VII characters.

 ### Servers/Network Infrastructure

-These are named after Final Fantasy summons. There is some infrastructure missing here like my routers and switches that I also name after summons.
+These are named after Final Fantasy summons.
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -1,8 +1,8 @@
 {
+  config,
  lib,
  pkgs,
  userName,
-  aagl,
  ...
 }: let
  flatpakPackages = [
@@ -18,7 +18,7 @@
 in {
  imports = [
    (import ../../apps/flatpak.nix {
-      inherit lib pkgs flatpakPackages userName aagl;
+      inherit lib pkgs flatpakPackages userName;
    })
    ../../apps/gaming.nix
    ../../apps/appimage.nix
@@ -89,10 +89,8 @@ in {
        localNetworkGameTransfers = true;
      };
    };
-    vkbasalt.enable = true;
    gamemode.enable = true;
    gamescope.enable = true;
-    mangohud.enable = true;
    lutris = {
      enable = true;
      wine = {
@@ -102,11 +100,14 @@ in {
      compatibility = {
        protonSupport = true;
      };
+      extraPackages = with pkgs; [
+        gamemode
+        mangohud
+      ];
    };

    ffxiv.enable = true;
    minecraft.enable = true;
-    aagl.anime-game-launcher.enable = true;
  };

  # Power management (see ../../pwrMgmt/default.nix)
--- a/modules/machine/cloud/default.nix
+++ b/modules/machine/cloud/default.nix
@@ -2,6 +2,5 @@
  imports = [
    ./configuration.nix
    ./hardware-configuration.nix
-    ../../common/linker.nix
  ];
 }
--- a/modules/sound/pipewire.nix
+++ b/modules/sound/pipewire.nix
@@ -1,11 +1,6 @@
-# TODO: refactor into module
-{ pkgs, ...}: {
+{...}: {
  services.pipewire = {
    enable = true;
    pulse.enable = true;
  };
-
-  environment.systemPackages = with pkgs; [
-    helvum
-  ];
 }
--- a/modules/virtualization/hardware.nix
+++ b/modules/virtualization/hardware.nix
@@ -1,8 +1,4 @@
-{ pkgs, ... }: {
+{...}: {
  virtualisation.libvirtd.enable = true;
  programs.virt-manager.enable = true;
-  environment.systemPackages = with pkgs; [
-    qemu
-    quickemu
-  ];
 }
Author	SHA1	Message	Date
Wyatt J. Miller	7a3c83f088	add shell init path	2025-12-19 15:37:16 -05:00
Wyatt J. Miller	1cbfb37409	darwin build success ready for pr ig	2025-12-13 17:04:28 -05:00
Wyatt J. Miller	83d1494d4a	nixos build success darwin next maybe?	2025-12-13 14:04:54 -05:00
Wyatt J. Miller	f8da56fe52	working build fixed up krew home module	2025-12-12 15:52:04 -05:00
Wyatt J. Miller	bcf5b224cb	trying this	2025-12-12 15:39:23 -05:00
Wyatt J. Miller	b762b06f05	cleanup?	2025-12-12 14:15:19 -05:00
Wyatt J. Miller	9fedd2d61e	removed k9s overlay this commit got builds working, working in the sense that the build actually threw an error! have to fix that	2025-12-10 17:09:19 -05:00
Wyatt J. Miller	4207b320c9	working? plus cleanup and fallbacks	2025-11-17 12:12:17 -05:00
Wyatt J. Miller	6561e37119	wip: still broken	2025-11-06 17:14:39 -05:00
Wyatt J. Miller	717e8c452d	wip: broken, still working on it'	2025-10-31 17:07:59 -04:00
Wyatt J. Miller	8fd3ca8c9a	wip: modularizing?	2025-10-30 17:34:55 -04:00