From 9fedd2d61e37f0705ab218a020dfd14dd9dac57f Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 10 Dec 2025 17:09:19 -0500 Subject: [PATCH] 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" + # ]; + # }); }