From 8fd3ca8c9a017bacef7ec714b30ea4020801ecf1 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 30 Oct 2025 17:34:55 -0400 Subject: [PATCH 01/14] wip: modularizing? --- flake.nix | 21 ++++++++- home/browser.nix | 3 +- home/default.nix | 85 +++++++++++++++++++---------------- home/packages/common.nix | 23 +--------- home/packages/workstation.nix | 19 ++++++++ lib/checkSystem.nix | 0 6 files changed, 89 insertions(+), 62 deletions(-) create mode 100644 lib/checkSystem.nix diff --git a/flake.nix b/flake.nix index 453d977..36f254f 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,8 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = extraSpecialArgs; + home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; }; + # home-manager.extraSpecialArgs = extraSpecialArgs; home-manager.backupFileExtension = "bak"; home-manager.users.${userName} = import ./home; } @@ -150,5 +151,23 @@ # } # ]; }; + + # generic non-NixOS Linux machine + homeConfigurations."generic" = let + hostname = builtins.getEnv "HOSTNAME"; + pkgs = nixpkgs.legacyPackages.x86_64-linux; + in home-manager.lib.homeManagerConfiguration { + inherit pkgs; + # system = "x86_64-linux"; + extraSpecialArgs = extraSpecialArgs // { + isNixOS = false; + hostname = hostname; + }; + modules = [ + myOverlays + ./modules/common/core + ./home + ]; + }; }; } diff --git a/home/browser.nix b/home/browser.nix index 9cd69e9..953775c 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -1,6 +1,7 @@ { pkgs, lib, + isNixOS, ... }: { 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 = [ diff --git a/home/default.nix b/home/default.nix index 19219a2..5283664 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,19 +1,20 @@ -{ - 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 +, userEmail +, ghostty +, isNixOS ? true +, ... +}: +let + # Have a file structure that holds all the configuration files that can't be configured by Nix dirs = { defaults = ../defaults; }; -in { +in +{ # Import sub modules - imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [ + imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [ ./atuin.nix ./shell.nix ./packages @@ -22,43 +23,49 @@ in { ./eza.nix ./neovim.nix ./direnv.nix - ./sway.nix + # ./sway.nix ./terminal.nix ./browser.nix ./zellij.nix ./bat.nix ./lazygit.nix + ] ++ lib.optionalattrs isNixOS [ + ./sway.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; diff --git a/home/packages/common.nix b/home/packages/common.nix index b43311a..abbe5fd 100644 --- a/home/packages/common.nix +++ b/home/packages/common.nix @@ -3,8 +3,6 @@ ... }: { home.packages = with pkgs; [ - yazi # terminal file manager - # archives zip xz @@ -12,39 +10,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 ]; } diff --git a/home/packages/workstation.nix b/home/packages/workstation.nix index e69de29..0d0454f 100644 --- a/home/packages/workstation.nix +++ b/home/packages/workstation.nix @@ -0,0 +1,19 @@ +{ + pkgs, + ... +}: { + home.packages = with pkgs; [ + fh + obsidian + vscode + yt-dlp + weechat + nodejs + cargo + python3 + nixd + deadnix + alejandra + statix + ]; +} diff --git a/lib/checkSystem.nix b/lib/checkSystem.nix new file mode 100644 index 0000000..e69de29 From 717e8c452dabe682ed47ae0461b4ca6e89f48367 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 31 Oct 2025 17:07:59 -0400 Subject: [PATCH 02/14] wip: broken, still working on it' --- defaults/k9s/catppuccin-mocha.yaml | 0 flake.nix | 9 ++++----- home/browser.nix | 1 + home/default.nix | 18 ++--------------- home/k9s.nix | 32 ++++++++++++++++++++++++++++++ home/krew.nix | 12 +++++++++++ home/packages/common.nix | 11 ++++++++++ home/packages/darwin.nix | 5 ++--- home/packages/default.nix | 18 ++++++++--------- home/packages/linux.nix | 5 ++--- home/packages/server.nix | 4 ++++ home/packages/workstation.nix | 20 +++++++++++++++++++ home/terminal.nix | 2 +- modules/common/overlays.nix | 14 +++++++++++++ 14 files changed, 113 insertions(+), 38 deletions(-) create mode 100644 defaults/k9s/catppuccin-mocha.yaml create mode 100644 home/k9s.nix create mode 100644 home/krew.nix diff --git a/defaults/k9s/catppuccin-mocha.yaml b/defaults/k9s/catppuccin-mocha.yaml new file mode 100644 index 0000000..e69de29 diff --git a/flake.nix b/flake.nix index 36f254f..4770e28 100644 --- a/flake.nix +++ b/flake.nix @@ -34,8 +34,7 @@ myOverlays = { ... }: { nixpkgs.overlays = [ rust-overlay.overlays.default - self.common.overlays - ]; + ] ++ (nixpkgs.lib.attrValues self.common.overlays); }; in { meta = import ./meta; @@ -50,7 +49,7 @@ specialArgs = { inherit userName userEmail ghostty; hostname = "sephiroth"; - role = "devel"; + role = "workstation"; }; modules = [ myOverlays @@ -75,7 +74,7 @@ specialArgs = { inherit userName userEmail ghostty; hostname = "cloud"; - role = "devel"; + role = "workstation"; }; modules = [ myOverlays @@ -162,10 +161,10 @@ extraSpecialArgs = extraSpecialArgs // { isNixOS = false; hostname = hostname; + role = "workstation"; }; modules = [ myOverlays - ./modules/common/core ./home ]; }; diff --git a/home/browser.nix b/home/browser.nix index 953775c..cbe2f9f 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -2,6 +2,7 @@ pkgs, lib, isNixOS, + role, ... }: { programs.firefox = { diff --git a/home/default.nix b/home/default.nix index 5283664..50aefef 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,6 +4,7 @@ , userEmail , ghostty , isNixOS ? true +, role , ... }: let @@ -14,23 +15,8 @@ let in { # Import sub modules - imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [ - ./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 - ] ++ lib.optionalattrs isNixOS [ - ./sway.nix ]; home = lib.mkMerge [ diff --git a/home/k9s.nix b/home/k9s.nix new file mode 100644 index 0000000..a836d01 --- /dev/null +++ b/home/k9s.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: { + programs.k9s = { + enable = true; + package = pkgs.k9sLatest; + 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.yml; + }; + + ui = { + skin = "catppuccin-mocha"; + enableMouse = true; + headless = false; + logoless = true; + crumbsless = false; + splashless = true; + reactive = false; + noIcons = false; + defaultsToFullscreen = false; + }; + }; + }; +} diff --git a/home/krew.nix b/home/krew.nix new file mode 100644 index 0000000..1cf929e --- /dev/null +++ b/home/krew.nix @@ -0,0 +1,12 @@ +{ pkgs, lib, ... }: +with pkgs; +let + plugins = writeText "plugins" '' + krew + oidc-login + ''; +in { + home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + $DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins} + ''; +} diff --git a/home/packages/common.nix b/home/packages/common.nix index abbe5fd..b7a9456 100644 --- a/home/packages/common.nix +++ b/home/packages/common.nix @@ -1,7 +1,18 @@ { + lib, pkgs, ... }: { + imports = [ + ../atuin.nix + ../shell.nix + ../git.nix + ../starship.nix + ../eza.nix + ../neovim.nix + ../bat.nix + ]; + home.packages = with pkgs; [ # archives zip diff --git a/home/packages/darwin.nix b/home/packages/darwin.nix index 4306b58..f078397 100644 --- a/home/packages/darwin.nix +++ b/home/packages/darwin.nix @@ -1,10 +1,9 @@ { pkgs, - lib, ... }: { - home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [ + home.packages = with pkgs; [ discord ollama - ]); + ]; } diff --git a/home/packages/default.nix b/home/packages/default.nix index 58789ec..aad9bb1 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,11 +1,9 @@ +{ pkgs, lib, role, ... }: { - pkgs, - lib, - ... -}: { - imports = [ - ./common.nix - ./darwin.nix - ./linux.nix - ]; -} + imports = + [ ./common.nix ] + ++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix + ++ lib.optional pkgs.stdenv.isLinux ./linux.nix + ++ lib.optional (role == "workstation") ./workstation.nix + ++ lib.optional (role == "server") ./server.nix; +} \ No newline at end of file diff --git a/home/packages/linux.nix b/home/packages/linux.nix index eb7c33a..f901481 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -1,9 +1,8 @@ { pkgs, - lib, ... }: { - home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [ + home.packages = with pkgs; [ imv betterdiscordctl vesktop @@ -16,5 +15,5 @@ gpu-screen-recorder gpu-screen-recorder-gtk # ungoogled-chromium - ]); + ]; } diff --git a/home/packages/server.nix b/home/packages/server.nix index e69de29..fff827a 100644 --- a/home/packages/server.nix +++ b/home/packages/server.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + ]; +} diff --git a/home/packages/workstation.nix b/home/packages/workstation.nix index 0d0454f..ec9d438 100644 --- a/home/packages/workstation.nix +++ b/home/packages/workstation.nix @@ -1,9 +1,29 @@ { + lib, pkgs, + dirs, + userName, + userEmail, + ghostty, + isNixOS, ... }: { + imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [ + ../terminal.nix + ../broswer.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 diff --git a/home/terminal.nix b/home/terminal.nix index 8050faa..f41efad 100644 --- a/home/terminal.nix +++ b/home/terminal.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ghostty, ... }: { +{ pkgs, ghostty, ... }: { programs.alacritty = { enable = pkgs.stdenv.isLinux; settings = { diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index 75b0748..efad2c6 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -47,4 +47,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" + ]; + }); } From 6561e37119ca7ca2d6bea6e4be37b3ca4ed62742 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 6 Nov 2025 17:14:39 -0500 Subject: [PATCH 03/14] wip: still broken --- flake.nix | 21 ++++++++++++++------- home/packages/default.nix | 21 ++++++++++++++++----- home/packages/workstation.nix | 6 ++---- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 4770e28..e9a541e 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,8 @@ myOverlays = { ... }: { nixpkgs.overlays = [ rust-overlay.overlays.default - ] ++ (nixpkgs.lib.attrValues self.common.overlays); + self.common.overlays + ]; }; in { meta = import ./meta; @@ -154,17 +155,23 @@ # generic non-NixOS Linux machine homeConfigurations."generic" = let hostname = builtins.getEnv "HOSTNAME"; - pkgs = nixpkgs.legacyPackages.x86_64-linux; + system = "x86_64-linux"; in home-manager.lib.homeManagerConfiguration { - inherit pkgs; - # system = "x86_64-linux"; - extraSpecialArgs = extraSpecialArgs // { + pkgs = nixpkgs.legacyPackages.${system}; + + extraSpecialArgs = { + inherit userName userEmail hostname; + ghostty = ghostty.packages.${system}.default; isNixOS = false; - hostname = hostname; role = "workstation"; }; modules = [ - myOverlays + { + nixpkgs.overlays = [ + rust-overlay.overlays.default + self.common.overlays + ]; + } ./home ]; }; diff --git a/home/packages/default.nix b/home/packages/default.nix index aad9bb1..b824755 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,9 +1,20 @@ { pkgs, lib, role, ... }: { imports = - [ ./common.nix ] - ++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix - ++ lib.optional pkgs.stdenv.isLinux ./linux.nix - ++ lib.optional (role == "workstation") ./workstation.nix - ++ lib.optional (role == "server") ./server.nix; + [ ./common.nix ]; + + config = lib.mkMerge [ + (lib.mkIf pkgs.stdenv.isDarwin { + imports = [ ./darwin.nix ]; + }) + (lib.mkIf pkgs.stdenv.isLinux { + imports = [ ./linux.nix ]; + }) + (lib.mkIf (role == "workstation") { + imports = [ ./workstation.nix ]; + }) + (lib.mkIf (role == "server") { + imports = [ ./server.nix ]; + }) + ]; } \ No newline at end of file diff --git a/home/packages/workstation.nix b/home/packages/workstation.nix index ec9d438..7a97699 100644 --- a/home/packages/workstation.nix +++ b/home/packages/workstation.nix @@ -8,7 +8,7 @@ isNixOS, ... }: { - imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [ + imports = [ ../terminal.nix ../broswer.nix ../zellij.nix @@ -16,9 +16,7 @@ ../k9s.nix ../krew.nix ../direnv.nix - ] ++ lib.optional isNixOS [ - ../sway.nix - ]; + ] ++ lib.optional isNixOS ../sway.nix; home.packages = with pkgs; [ fh From 4207b320c92c91faf40f5b1616a1e54b5bbba62b Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 17 Nov 2025 12:12:17 -0500 Subject: [PATCH 04/14] working? plus cleanup and fallbacks --- flake.nix | 5 ++--- home/browser.nix | 3 +-- home/default.nix | 9 +++++---- home/packages/common.nix | 3 ++- home/packages/darwin.nix | 6 ++---- home/packages/default.nix | 27 +++++++++------------------ home/packages/linux.nix | 11 ++++------- home/packages/server.nix | 4 ++-- home/packages/workstation.nix | 8 ++------ 9 files changed, 29 insertions(+), 47 deletions(-) diff --git a/flake.nix b/flake.nix index e9a541e..ac5deb5 100644 --- a/flake.nix +++ b/flake.nix @@ -160,9 +160,8 @@ pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = { - inherit userName userEmail hostname; - ghostty = ghostty.packages.${system}.default; - isNixOS = false; + inherit userName userEmail hostname ghostty; + isNixOS = false; role = "workstation"; }; modules = [ diff --git a/home/browser.nix b/home/browser.nix index cbe2f9f..956ead3 100644 --- a/home/browser.nix +++ b/home/browser.nix @@ -1,8 +1,7 @@ { pkgs, lib, - isNixOS, - role, + isNixOS ? true, ... }: { programs.firefox = { diff --git a/home/default.nix b/home/default.nix index 50aefef..6176523 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,19 +1,20 @@ { lib , pkgs , userName -, userEmail -, ghostty , isNixOS ? true -, role , ... }: let - # Have a file structure that holds all the configuration files that can't be configured by Nix + # 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 { + _module.args = { + inherit dirs; + }; + # Import sub modules imports = [ ./packages diff --git a/home/packages/common.nix b/home/packages/common.nix index b7a9456..5ffebe3 100644 --- a/home/packages/common.nix +++ b/home/packages/common.nix @@ -1,5 +1,4 @@ { - lib, pkgs, ... }: { @@ -13,6 +12,8 @@ ../bat.nix ]; + nixpkgs.config.allowUnfree = true; + home.packages = with pkgs; [ # archives zip diff --git a/home/packages/darwin.nix b/home/packages/darwin.nix index f078397..11e3893 100644 --- a/home/packages/darwin.nix +++ b/home/packages/darwin.nix @@ -1,7 +1,5 @@ -{ - pkgs, - ... -}: { +{ lib, pkgs, ... }: +lib.mkIf pkgs.stdenv.isDarwin { home.packages = with pkgs; [ discord ollama diff --git a/home/packages/default.nix b/home/packages/default.nix index b824755..c815e4c 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,20 +1,11 @@ -{ pkgs, lib, role, ... }: +{ lib, role, ... }: { imports = - [ ./common.nix ]; - - config = lib.mkMerge [ - (lib.mkIf pkgs.stdenv.isDarwin { - imports = [ ./darwin.nix ]; - }) - (lib.mkIf pkgs.stdenv.isLinux { - imports = [ ./linux.nix ]; - }) - (lib.mkIf (role == "workstation") { - imports = [ ./workstation.nix ]; - }) - (lib.mkIf (role == "server") { - imports = [ ./server.nix ]; - }) - ]; -} \ No newline at end of file + [ + ./common.nix + ./darwin.nix + ./linux.nix + ] + ++ lib.optional (role == "workstation") ./workstation.nix + ++ lib.optional (role == "server") ./server.nix; +} diff --git a/home/packages/linux.nix b/home/packages/linux.nix index f901481..b2fe47e 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -1,19 +1,16 @@ -{ - pkgs, - ... -}: { +{ lib, pkgs, isNixOS ? true, ... }: +lib.mkIf pkgs.stdenv.isLinux { home.packages = with pkgs; [ imv + xdg-utils + ] ++ lib.optional isNixOS [ betterdiscordctl vesktop - xdg-utils - mcrcon xfce.thunar pavucontrol godot aseprite gpu-screen-recorder gpu-screen-recorder-gtk - # ungoogled-chromium ]; } diff --git a/home/packages/server.nix b/home/packages/server.nix index fff827a..5fcd428 100644 --- a/home/packages/server.nix +++ b/home/packages/server.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - ]; + home.packages = [ + ]; } diff --git a/home/packages/workstation.nix b/home/packages/workstation.nix index 7a97699..083eab9 100644 --- a/home/packages/workstation.nix +++ b/home/packages/workstation.nix @@ -1,16 +1,12 @@ { lib, pkgs, - dirs, - userName, - userEmail, - ghostty, - isNixOS, + isNixOS ? true, ... }: { imports = [ ../terminal.nix - ../broswer.nix + ../browser.nix ../zellij.nix ../lazygit.nix ../k9s.nix From 9fedd2d61e37f0705ab218a020dfd14dd9dac57f Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 10 Dec 2025 17:09:19 -0500 Subject: [PATCH 05/14] removed k9s overlay this commit got builds working, working in the sense that the build actually threw an error! have to fix that --- flake.nix | 9 ++++----- home/k9s.nix | 2 +- home/terminal.nix | 7 +------ modules/common/overlays.nix | 26 +++++++++++++------------- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/flake.nix b/flake.nix index ac5deb5..1bc8308 100644 --- a/flake.nix +++ b/flake.nix @@ -21,14 +21,13 @@ nix-flatpak, darwin, home-manager, - ghostty, rust-overlay, ... }: let userName = "wyatt"; userEmail = "wyatt@wyattjmiller.com"; extraSpecialArgs = { - inherit userName userEmail ghostty; + inherit userName userEmail; }; myOverlays = { ... }: { @@ -48,7 +47,7 @@ darwinConfigurations."sephiroth" = darwin.lib.darwinSystem { system = "aarch64-darwin"; specialArgs = { - inherit userName userEmail ghostty; + inherit userName userEmail; hostname = "sephiroth"; role = "workstation"; }; @@ -73,7 +72,7 @@ nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit userName userEmail ghostty; + inherit userName userEmail; hostname = "cloud"; role = "workstation"; }; @@ -160,7 +159,7 @@ pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = { - inherit userName userEmail hostname ghostty; + inherit userName userEmail hostname; isNixOS = false; role = "workstation"; }; diff --git a/home/k9s.nix b/home/k9s.nix index a836d01..b4fcac1 100644 --- a/home/k9s.nix +++ b/home/k9s.nix @@ -13,7 +13,7 @@ skipLatestRevCheck = false; skin = { - catppuccin-mocha = ./defaults/k9s/catppuccin-mocha.yml; + catppuccin-mocha = ../defaults/k9s-skins/catppuccin-mocha.yml; }; ui = { diff --git a/home/terminal.nix b/home/terminal.nix index f41efad..f1bea40 100644 --- a/home/terminal.nix +++ b/home/terminal.nix @@ -1,4 +1,4 @@ -{ 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 - [ ]; } diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index efad2c6..c8ff98a 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -48,17 +48,17 @@ in { ''; }); - 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" - ]; - }); + # 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" + # ]; + # }); } From b762b06f05ac6881614cc52bb6207105228ea81a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 12 Dec 2025 14:15:19 -0500 Subject: [PATCH 06/14] cleanup? --- home/k9s.nix | 4 ++-- home/krew.nix | 12 +++++++----- modules/common/overlays.nix | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/home/k9s.nix b/home/k9s.nix index b4fcac1..9fb883b 100644 --- a/home/k9s.nix +++ b/home/k9s.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { programs.k9s = { enable = true; - package = pkgs.k9sLatest; + package = pkgs.k9s; settings.k9s = { refreshRate = "2s"; liveViewAutoRefresh = false; @@ -13,7 +13,7 @@ skipLatestRevCheck = false; skin = { - catppuccin-mocha = ../defaults/k9s-skins/catppuccin-mocha.yml; + catppuccin-mocha = ../defaults/k9s/catppuccin-mocha.yaml; }; ui = { diff --git a/home/krew.nix b/home/krew.nix index 1cf929e..c237ec8 100644 --- a/home/krew.nix +++ b/home/krew.nix @@ -1,12 +1,14 @@ { pkgs, lib, ... }: with pkgs; let - plugins = writeText "plugins" '' - krew - oidc-login - ''; + plugins = [ + "krew" + "oidc-login" + ]; in { home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - $DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins} + ${lib.concatMapStringsSep "\n" (plugin: '' + $DRY_RUN_CMD ${krew}/bin/kubectl-krew install ${plugin} || true + '') plugins} ''; } diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index c8ff98a..53aa1d5 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -5,6 +5,9 @@ final: prev: let rustc = rust_1_90_0; }; in { + xz = prev.xz.overrideAttrs (old: { + configureFlags = (old.configureFlags or []) ++ [ "--disable-sandbox" ]; + }); lazygitLatest = prev.lazygit.overrideAttrs (_: rec { version = "0.55.1"; src = prev.fetchFromGitHub { From bcf5b224cb3f491f3b5a93c48b6e50874351d2b3 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 12 Dec 2025 15:39:23 -0500 Subject: [PATCH 07/14] trying this --- modules/common/overlays.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/common/overlays.nix b/modules/common/overlays.nix index 53aa1d5..a8978ef 100644 --- a/modules/common/overlays.nix +++ b/modules/common/overlays.nix @@ -1,13 +1,11 @@ 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 { - xz = prev.xz.overrideAttrs (old: { - configureFlags = (old.configureFlags or []) ++ [ "--disable-sandbox" ]; - }); lazygitLatest = prev.lazygit.overrideAttrs (_: rec { version = "0.55.1"; src = prev.fetchFromGitHub { From f8da56fe525cae587d1818be06c6747491a87d1b Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 12 Dec 2025 15:52:04 -0500 Subject: [PATCH 08/14] working build fixed up krew home module --- home/krew.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/krew.nix b/home/krew.nix index c237ec8..8169aa0 100644 --- a/home/krew.nix +++ b/home/krew.nix @@ -8,7 +8,7 @@ let in { home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] '' ${lib.concatMapStringsSep "\n" (plugin: '' - $DRY_RUN_CMD ${krew}/bin/kubectl-krew install ${plugin} || true + $DRY_RUN_CMD ${krew}/bin/krew install ${plugin} || true '') plugins} ''; } From 83d1494d4af4e0f421a100a1b5058598f569aa13 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 13 Dec 2025 14:04:54 -0500 Subject: [PATCH 09/14] nixos build success darwin next maybe? --- flake.nix | 2 +- home/packages/default.nix | 2 +- home/packages/linux.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 1bc8308..fd792b8 100644 --- a/flake.nix +++ b/flake.nix @@ -86,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 diff --git a/home/packages/default.nix b/home/packages/default.nix index c815e4c..b4df5a6 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,4 +1,4 @@ -{ lib, role, ... }: +{ lib, role ? "workstation", ... }: { imports = [ diff --git a/home/packages/linux.nix b/home/packages/linux.nix index b2fe47e..c56a6c9 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -3,7 +3,7 @@ lib.mkIf pkgs.stdenv.isLinux { home.packages = with pkgs; [ imv xdg-utils - ] ++ lib.optional isNixOS [ + ] ++ lib.optionals isNixOS [ betterdiscordctl vesktop xfce.thunar From 1cbfb37409f8b08181edbc649521e5c7c7928b80 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 13 Dec 2025 17:04:28 -0500 Subject: [PATCH 10/14] darwin build success ready for pr ig --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fd792b8..d05d785 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; }; + home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; role = "workstation"; }; # home-manager.extraSpecialArgs = extraSpecialArgs; home-manager.backupFileExtension = "bak"; home-manager.users.${userName} = import ./home; From 7a3c83f088711194c3949d8ad4b3431e6865248a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 19 Dec 2025 15:37:16 -0500 Subject: [PATCH 11/14] add shell init path --- home/shell.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/shell.nix b/home/shell.nix index 7222977..7b07646 100644 --- 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 From 6dbfc5805e47ae440e948d58606b8555c26869ad Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 1 Feb 2026 21:32:32 -0500 Subject: [PATCH 12/14] updated flake to 25.11 --- flake.lock | 122 +++++++++++++++++++++++++++++------------------------ flake.nix | 6 +-- 2 files changed, 70 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 00a5eb6..cb52454 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1759509947, - "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", + "lastModified": 1767634391, + "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", + "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2", "type": "github" }, "original": { "owner": "lnl7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } @@ -24,11 +24,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -59,16 +59,17 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "home-manager": "home-manager", "nixpkgs": "nixpkgs", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1761172581, - "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=", + "lastModified": 1769985646, + "narHash": "sha256-ubfC9fLfdQ0xpQuFmGQCYIRyEEmOzXd+ya5rShM217k=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4", + "rev": "769fff5dfb322594c0dc7a379ee70897a7db773f", "type": "github" }, "original": { @@ -80,20 +81,41 @@ "home-manager": { "inputs": { "nixpkgs": [ + "ghostty", "nixpkgs" ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "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": { + "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -116,11 +138,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", - "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", + "lastModified": 1768032153, + "narHash": "sha256-zvxtwlM8ZlulmZKyYCQAPpkm5dngSEnnHjmjV7Teloc=", + "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre925418.3146c6aa9995/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -129,34 +151,21 @@ }, "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" + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -176,22 +185,22 @@ "inputs": { "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" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1761100675, - "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=", + "lastModified": 1769915446, + "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae", + "rev": "bc00300f010275e46feb3c3974df6587ff7b7808", "type": "github" }, "original": { @@ -231,11 +240,11 @@ ] }, "locked": { - "lastModified": 1760401936, - "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", + "lastModified": 1763295135, + "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "365085b6652259753b598d43b723858184980bbe", + "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", "type": "github" }, "original": { @@ -246,20 +255,23 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] }, "locked": { - "lastModified": 1758405547, - "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", + "lastModified": 1768231828, + "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=", "owner": "jcollie", "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", + "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", "type": "github" }, "original": { "owner": "jcollie", "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", + "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", "type": "github" } } diff --git a/flake.nix b/flake.nix index d05d785..9ffd512 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,14 @@ { description = "Wyatt's nix configuration suite"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin/nix-darwin-25.05"; + url = "github:lnl7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "github:ghostty-org/ghostty"; From c81ca5ee4ca57c88ae6a72a7822f1ba95f8453e3 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 16 Feb 2026 19:33:25 -0500 Subject: [PATCH 13/14] works on cloud --- flake.lock | 260 ++++++----------------------------------------------- flake.nix | 13 +-- 2 files changed, 31 insertions(+), 242 deletions(-) diff --git a/flake.lock b/flake.lock index c5b1b1e..eae1659 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767520119, - "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=", + "lastModified": 1771170334, + "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, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "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": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -103,84 +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", -<<<<<<< HEAD - "nixpkgs": "nixpkgs", -======= - "nixpkgs": "nixpkgs_2", ->>>>>>> origin - "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, - "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", - "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", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -208,8 +126,6 @@ }, "nixpkgs": { "locked": { -<<<<<<< HEAD -======= "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", @@ -226,26 +142,11 @@ }, "nixpkgs_2": { "locked": { ->>>>>>> origin - "lastModified": 1768032153, - "narHash": "sha256-zvxtwlM8ZlulmZKyYCQAPpkm5dngSEnnHjmjV7Teloc=", - "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" - } - }, -<<<<<<< HEAD - "nixpkgs_2": { - "locked": { - "lastModified": 1769900590, - "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", "type": "github" }, "original": { @@ -257,42 +158,22 @@ }, "nixpkgs_3": { "locked": { -======= - "nixpkgs_3": { - "locked": { - "lastModified": 1769900590, - "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", - "owner": "nixos", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.11", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { ->>>>>>> origin - "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_5": { - "locked": { "lastModified": 1766201043, "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", @@ -305,7 +186,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1769089682, "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", @@ -323,41 +204,24 @@ "inputs": { "aagl": "aagl", "darwin": "darwin", - "ghostty": "ghostty", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", -<<<<<<< HEAD "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay" -======= - "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay_2", "swaytreesave": "swaytreesave", "vintage-story": "vintage-story" ->>>>>>> origin } }, "rust-overlay": { "inputs": { -<<<<<<< HEAD - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1769915446, - "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "bc00300f010275e46feb3c3974df6587ff7b7808", -======= "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1770952264, + "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", ->>>>>>> origin + "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", "type": "github" }, "original": { @@ -368,14 +232,14 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1769915446, - "narHash": "sha256-f1F/umtX3ZD7fF9DHSloVHc0mnAT0ry0YK2jI/6E0aI=", + "lastModified": 1771211437, + "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bc00300f010275e46feb3c3974df6587ff7b7808", + "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f", "type": "github" }, "original": { @@ -387,7 +251,7 @@ "swaytreesave": { "inputs": { "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1767148467, @@ -403,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, @@ -436,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", diff --git a/flake.nix b/flake.nix index 7790b47..45f93d3 100644 --- a/flake.nix +++ b/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"; @@ -38,11 +37,7 @@ userName = "wyatt"; userEmail = "wyatt@wyattjmiller.com"; extraSpecialArgs = { -<<<<<<< HEAD - inherit userName userEmail; -======= - inherit userName userEmail ghostty swaytreesave; ->>>>>>> origin + inherit userName userEmail swaytreesave; }; myOverlays = { ... }: { @@ -88,11 +83,7 @@ nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { -<<<<<<< HEAD - inherit userName userEmail; -======= - inherit userName userEmail ghostty aagl vintage-story; ->>>>>>> origin + inherit userName userEmail aagl vintage-story; hostname = "cloud"; role = "workstation"; }; From 08adc255d69b638cdd4116615500cae9da30e5bc Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 16 Feb 2026 19:59:35 -0500 Subject: [PATCH 14/14] darwin changes --- home/packages/common.nix | 1 - home/packages/linux.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/home/packages/common.nix b/home/packages/common.nix index 5ffebe3..4071c93 100644 --- a/home/packages/common.nix +++ b/home/packages/common.nix @@ -31,7 +31,6 @@ fzf aria2 gnupg - inetutils # misc file diff --git a/home/packages/linux.nix b/home/packages/linux.nix index 602b446..79436a2 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -13,5 +13,6 @@ lib.mkIf pkgs.stdenv.isLinux { zathura gpu-screen-recorder gpu-screen-recorder-gtk + inetutils ]; }