diff --git a/flake.lock b/flake.lock index 979009a..c94b5b5 100644 --- a/flake.lock +++ b/flake.lock @@ -368,6 +368,24 @@ "type": "github" } }, + "repo-rs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754770324, + "narHash": "sha256-IfCO6+Wt4mRRMf3NMg5N3ewEX/vgtuARtk/lZcIfUpU=", + "rev": "430d988f31b2deb010d445c5beeca71bbae66d60", + "type": "tarball", + "url": "https://git.dadada.li/api/v1/repos/dadada/repo-rs/archive/430d988f31b2deb010d445c5beeca71bbae66d60.tar.gz?rev=430d988f31b2deb010d445c5beeca71bbae66d60" + }, + "original": { + "type": "tarball", + "url": "https://git.dadada.li/dadada/repo-rs/archive/main.tar.gz" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -381,6 +399,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "repo-rs": "repo-rs", "systems": "systems_2", "treefmt-nix": "treefmt-nix" } diff --git a/flake.nix b/flake.nix index 151f1b5..671ba3a 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,10 @@ url = "https://git.dadada.li/dadada/dadada.li/archive/main.tar.gz"; flake = false; }; + repo-rs = { + url = "https://git.dadada.li/dadada/repo-rs/archive/main.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index 7a0cd6c..b6d307b 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -38,7 +38,7 @@ in source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh source ${pkgs.fzf}/share/fzf/key-bindings.zsh source ${pkgs.fzf}/share/fzf/completion.zsh - eval "$(${pkgs.h}/bin/h --setup ~/src)" + eval "$(repo setup --root ~/src)" bindkey -e '^n' autosuggest-accept diff --git a/home/pkgs.nix b/home/pkgs.nix index ed9f516..3b554bd 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -45,7 +45,6 @@ with pkgs; graphviz grim gron # make json grepable - h # Manage git repos halloy hexyl # hex viewer htop diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 28819f1..606f4f8 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -47,6 +47,7 @@ environment.systemPackages = [ # For debugging and troubleshooting Secure Boot. pkgs.sbctl + config.dadada.pkgs.repo-rs ]; hardware = { diff --git a/outputs.nix b/outputs.nix index ef7a742..45773d9 100644 --- a/outputs.nix +++ b/outputs.nix @@ -33,7 +33,7 @@ formatter = treefmtEval.config.build.wrapper; - packages = import ./pkgs { inherit pkgs; } // { + packages = import ./pkgs { inherit pkgs inputs; } // { installer-iso = inputs.self.nixosConfigurations.installer.config.system.build.isoImage; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 9f52a8a..c2f54db 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,5 @@ -{ pkgs }: +{ pkgs, inputs }: { citizen-cups = pkgs.callPackage ./citizen-cups.nix { }; + repo-rs = pkgs.callPackage inputs.repo-rs { }; }