added browser extension

flake.lock

@@ -64,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1761172581,
-        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
+        "lastModified": 1761933492,
+        "narHash": "sha256-DNGhpvYt6dVbkDse4s/L/jJvejvOV0bs+YWfAAskJ7g=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
+        "rev": "765ee6842930f0d6918574b9b87c2ee6583e4727",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1761597516,
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
         "type": "github"
       },
       "original": {
@@ -187,11 +187,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1761100675,
-        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
+        "lastModified": 1761964689,
+        "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
+        "rev": "63d22578600f70d293aede6bc737efef60ebd97f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -21,13 +21,14 @@
     nix-flatpak,
     darwin,
     home-manager,
+    ghostty,
     rust-overlay,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail;
+      inherit userName userEmail ghostty;
     };
 
     myOverlays = { ... }: {
@@ -47,9 +48,9 @@
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
       specialArgs = {
-        inherit userName userEmail;
+        inherit userName userEmail ghostty;
         hostname = "sephiroth";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
         myOverlays
@@ -60,8 +61,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; role = "workstation"; };
-          # home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.backupFileExtension = "bak";
           home-manager.users.${userName} = import ./home;
         }
@@ -72,9 +72,9 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail;
+        inherit userName userEmail ghostty;
         hostname = "cloud";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
         myOverlays
@@ -86,7 +86,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "workstation"; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
@@ -150,28 +150,5 @@
       #   }
       # ];
     };
-
-    # 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,7 +1,6 @@
 {
   pkgs,
   lib,
-  isNixOS ? true,
   ...
 }: {
   programs.firefox = {
@@ -10,7 +9,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux && isNixOS;
+    enable = pkgs.stdenv.isLinux;
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [
@@ -41,14 +40,37 @@
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
         sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
         # sha256 = lib.fakeSha256;
-        version = "1.64.0";
+        version = "1.67.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
         sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
-        # sha256 = lib.fakeSha256;
-        version = "2025.5.0";
+        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";
       })
     ];
   };

home/default.nix

@@ -1,58 +1,64 @@
-{ 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)
+{
+  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
   dirs = {
     defaults = ../defaults;
   };
-in
-{
-  _module.args = {
-    inherit dirs;
-  };
-
+in {
   # Import sub modules
-  imports = [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+    ./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 = lib.mkMerge [
-    {
-      username = userName;
-      homeDirectory =
-        if pkgs.stdenv.isDarwin
-        then "/Users/${userName}"
-        else "/home/${userName}";
+  # 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}";
 
-      stateVersion = "24.11";
-    }
+    sessionVariables = {
+      XDG_CURRENT_DESKTOP = "sway";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP="sway";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
+      NIXOS_OZONE_WL = "1";
+    };
 
-    (lib.mkIf isNixOS {
-      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";
-      };
-    })
+    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
+      gtk.enable = true;
+      package = pkgs.catppuccin-cursors.mochaDark;
+      name = "catppuccin-mocha-dark-cursors";
+      size = 22;
+    };
 
-    (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

@@ -1,32 +0,0 @@
-{ 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

@@ -1,14 +0,0 @@
-{ 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,19 +2,9 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ../atuin.nix
-    ../shell.nix
-    ../git.nix
-    ../starship.nix
-    ../eza.nix
-    ../neovim.nix
-    ../bat.nix
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-
   home.packages = with pkgs; [
+    yazi # terminal file manager
+
     # archives
     zip
     xz
@@ -22,22 +12,39 @@
     p7zip
 
     # utils
-    yazi
     tmux
     bottom
     ripgrep
     jq
     yq-go
     fzf
+    fh
     aria2
-    gnupg
+    yt-dlp
+    obsidian
+    vscode
+    weechat
     inetutils
 
     # misc
+    cowsay
     file
     which
     tree
     gnutar
+    gnupg
+    zoxide
     babelfish
+
+    # language-specific package managers
+    nodejs
+    cargo
+    python3
+
+    # nix specific stuff
+    nixd
+    deadnix
+    alejandra
+    statix
   ];
 }

home/packages/darwin.nix

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

home/packages/default.nix

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

home/packages/linux.nix

@@ -1,16 +1,20 @@
-{ lib, pkgs, isNixOS ? true, ... }:
-lib.mkIf pkgs.stdenv.isLinux {
-  home.packages = with pkgs; [
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.mkIf pkgs.stdenv.isLinux (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

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

home/packages/workstation.nix

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

home/terminal.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ lib, pkgs, ghostty, ... }: {
   programs.alacritty = {
     enable = pkgs.stdenv.isLinux;
     settings = {
@@ -103,4 +103,9 @@
   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,9 +1,8 @@
 final: prev: let
-  # Use latest rust from overlay which should work on non-NixOS
-  rust_latest = prev.rust-bin.stable.latest.default;
+  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
   myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_latest;
-    rustc = rust_latest;
+    cargo = rust_1_90_0;
+    rustc = rust_1_90_0;
   };
 in {
   lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
@@ -48,18 +47,4 @@ 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"
-  #   ];
-  # });
 }