diff --git a/flake.lock b/flake.lock index 0fdeb40..603d7cd 100644 --- a/flake.lock +++ b/flake.lock @@ -241,6 +241,26 @@ "type": "github" } }, + "nish": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694420535, + "narHash": "sha256-dbFegxUbjyfgqE7WLU/ixPfNszov0cGjxqIA1wlatXI=", + "owner": "ryanccn", + "repo": "nish", + "rev": "cd74ffc6ded40715af06ee4aa72d4810e0d38d5e", + "type": "github" + }, + "original": { + "owner": "ryanccn", + "repo": "nish", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -308,6 +328,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "naersk": "naersk", + "nish": "nish", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", "nyoom": "nyoom", diff --git a/flake.nix b/flake.nix index 223ad1b..fd7166d 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nish = { + url = "github:ryanccn/nish"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nyoom = { url = "https://flakehub.com/f/ryanccn/nyoom/0.*.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; @@ -101,7 +106,9 @@ ./system.nix ]; - specialArgs = {inherit inputs;}; + specialArgs = { + inherit inputs; + }; }; checks = { diff --git a/home/programs/fish/conf.d/02_tooling.fish b/home/programs/fish/conf.d/02_tooling.fish index befc583..04a5eab 100644 --- a/home/programs/fish/conf.d/02_tooling.fish +++ b/home/programs/fish/conf.d/02_tooling.fish @@ -22,8 +22,6 @@ set -x DIRENV_LOG_FORMAT "" fish_add_path "$HOME/.docker/bin" # local bin fish_add_path "$HOME/.local/bin" -# nish -fish_add_path "$HOME/dev/nish/bin" # fish set fish_greeting diff --git a/home/programs/zsh/envExtra.zsh b/home/programs/zsh/envExtra.zsh index c61a525..cf742de 100644 --- a/home/programs/zsh/envExtra.zsh +++ b/home/programs/zsh/envExtra.zsh @@ -21,6 +21,3 @@ export PATH="$HOME/.docker/bin:$PATH" # local bin export PATH="$HOME/.local/bin:$PATH" - -# nish -export PATH="$HOME/dev/nish/bin:$PATH" diff --git a/modules/nix.nix b/modules/nix.nix index 8f0e26a..f8c74c5 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -32,6 +32,7 @@ in { inputs.attic.overlays.default inputs.nyoom.overlays.default inputs.am.overlays.default + inputs.nish.overlays.default inputs.fh.overlays.default flakeOverlays.ryan-mono-bin flakeOverlays.ibm-plex diff --git a/modules/packages.nix b/modules/packages.nix index c868529..524150c 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -73,6 +73,8 @@ am nyoom + nish + spicetify-cli exiftool ];