removed k9s overlay
this commit got builds working, working in the sense that the build actually threw an error! have to fix that
This commit is contained in:
@@ -21,14 +21,13 @@
|
|||||||
nix-flatpak,
|
nix-flatpak,
|
||||||
darwin,
|
darwin,
|
||||||
home-manager,
|
home-manager,
|
||||||
ghostty,
|
|
||||||
rust-overlay,
|
rust-overlay,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
userName = "wyatt";
|
userName = "wyatt";
|
||||||
userEmail = "wyatt@wyattjmiller.com";
|
userEmail = "wyatt@wyattjmiller.com";
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit userName userEmail ghostty;
|
inherit userName userEmail;
|
||||||
};
|
};
|
||||||
|
|
||||||
myOverlays = { ... }: {
|
myOverlays = { ... }: {
|
||||||
@@ -48,7 +47,7 @@
|
|||||||
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
|
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
|
||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit userName userEmail ghostty;
|
inherit userName userEmail;
|
||||||
hostname = "sephiroth";
|
hostname = "sephiroth";
|
||||||
role = "workstation";
|
role = "workstation";
|
||||||
};
|
};
|
||||||
@@ -73,7 +72,7 @@
|
|||||||
nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
|
nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit userName userEmail ghostty;
|
inherit userName userEmail;
|
||||||
hostname = "cloud";
|
hostname = "cloud";
|
||||||
role = "workstation";
|
role = "workstation";
|
||||||
};
|
};
|
||||||
@@ -160,7 +159,7 @@
|
|||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit userName userEmail hostname ghostty;
|
inherit userName userEmail hostname;
|
||||||
isNixOS = false;
|
isNixOS = false;
|
||||||
role = "workstation";
|
role = "workstation";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
skipLatestRevCheck = false;
|
skipLatestRevCheck = false;
|
||||||
|
|
||||||
skin = {
|
skin = {
|
||||||
catppuccin-mocha = ./defaults/k9s/catppuccin-mocha.yml;
|
catppuccin-mocha = ../defaults/k9s-skins/catppuccin-mocha.yml;
|
||||||
};
|
};
|
||||||
|
|
||||||
ui = {
|
ui = {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ghostty, ... }: {
|
{ pkgs, ... }: {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
settings = {
|
settings = {
|
||||||
@@ -103,9 +103,4 @@
|
|||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = false; # TODO: to enable later
|
enable = false; # TODO: to enable later
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = if pkgs.stdenv.isLinux then
|
|
||||||
[ ghostty.packages.${pkgs.system}.default ]
|
|
||||||
else
|
|
||||||
[ ];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,17 +48,17 @@ in {
|
|||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
|
# k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
|
||||||
version = "0.30.16";
|
# version = "0.30.16";
|
||||||
src = prev.fetchFromGitHub {
|
# src = prev.fetchFromGitHub {
|
||||||
owner = "derailed";
|
# owner = "derailed";
|
||||||
repo = "k9s";
|
# repo = "k9s";
|
||||||
rev = "v${version}";
|
# rev = "v${version}";
|
||||||
hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
|
# hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
|
||||||
};
|
# };
|
||||||
ldflags = [
|
# ldflags = [
|
||||||
"-X github.com/derailed/k9s/version.Version=${version}"
|
# "-X github.com/derailed/k9s/version.Version=${version}"
|
||||||
"-X github.com/derailed/k9s/version.BuildSource=nix"
|
# "-X github.com/derailed/k9s/version.BuildSource=nix"
|
||||||
];
|
# ];
|
||||||
});
|
# });
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user