diff --git a/flake.lock b/flake.lock index aed6261..d104c6f 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,24 @@ "type": "github" } }, + "nix-kubectl-gs": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1724402001, + "narHash": "sha256-fHPKRhxEQhwfS8GeB2un/mupfWJcgrcwzPJJNgSiUGg=", + "owner": "swoehrl-mw", + "repo": "nix-kubectl-gs", + "rev": "9a3071573695b7a5d62edd742e650fd532afd79a", + "type": "github" + }, + "original": { + "owner": "swoehrl-mw", + "repo": "nix-kubectl-gs", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1723310128, @@ -77,18 +95,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723605625, - "narHash": "sha256-kmHbHopY6lvCUfRh7I5EPlGcE3zv7qeVt6219RnFo9k=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e9cedadfd22a4eb5c8a97eb1065d9575029b1ae", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-nixos": { @@ -123,13 +139,30 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1723605625, + "narHash": "sha256-kmHbHopY6lvCUfRh7I5EPlGcE3zv7qeVt6219RnFo9k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e9cedadfd22a4eb5c8a97eb1065d9575029b1ae", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-24.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "darwin": "darwin", "flake-utils": "flake-utils", "home-manager": "home-manager", + "nix-kubectl-gs": "nix-kubectl-gs", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-nixos": "nixpkgs-nixos", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/flake.nix b/flake.nix index 6f1129a..bff76ac 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,8 @@ flake-utils.url = "github:numtide/flake-utils"; + nix-kubectl-gs.url = "github:swoehrl-mw/nix-kubectl-gs"; + # neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; # neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/home.nix b/home-manager/home.nix index 8573383..d18cc70 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,6 +1,7 @@ { config, pkgs, inputs, username, stateVersion, ... }: let unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; + kubectl-gs = inputs.nix-kubectl-gs.packages.${pkgs.system}.kubectl-gs; user = username; in { @@ -39,6 +40,7 @@ in jdk17_headless jq unstable.kubectl + kubectl-gs unstable.kubecolor unstable.kubernetes-helm unstable.krew