From 3c8d630bd5ada8c8830f548dde783bffcff5c8a4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 27 Apr 2025 16:49:46 +0900 Subject: nix: use my own nur-packages --- README | 3 --- flake.lock | 45 ++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 11 ++++++++++- home-manager/home.nix | 3 +++ mitamae/default.rb | 4 ---- 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/README b/README index 1eddc2a..0e1bfc8 100644 --- a/README +++ b/README @@ -30,9 +30,6 @@ $ sudo adduser $(whoami) docker $ cargo install alacritty -$ cd ~/src/reparojson -$ cargo install --path . - $ cd ~/src/git-helpers $ go install ./cmd/... ``` diff --git a/flake.lock b/flake.lock index a4a1af4..2669137 100644 --- a/flake.lock +++ b/flake.lock @@ -55,12 +55,34 @@ "type": "github" } }, + "nur-packages": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1745739267, + "narHash": "sha256-SPZuyHC7uEg+m//ofO9XqHQcGR90GL5xwTwn2P3wxOI=", + "owner": "nsfisis", + "repo": "nur-packages", + "rev": "939f02ceab3cecf66a399e50e72af46e4d277bd1", + "type": "github" + }, + "original": { + "owner": "nsfisis", + "repo": "nur-packages", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "treefmt-nix": "treefmt-nix" + "nur-packages": "nur-packages", + "treefmt-nix": "treefmt-nix_2" } }, "systems": { @@ -79,6 +101,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur-packages", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 302aaa8..a626915 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nur-packages = { + url = "github:nsfisis/nur-packages"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -30,6 +35,7 @@ nixpkgs, flake-utils, treefmt-nix, + nur-packages, home-manager, ... }: @@ -55,7 +61,10 @@ }: home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { inherit system; }; - extraSpecialArgs = { inherit env; }; + extraSpecialArgs = { + inherit env; + nurpkgs = nur-packages.legacyPackages.${system}; + }; modules = [ ./home-manager/home.nix ]; diff --git a/home-manager/home.nix b/home-manager/home.nix index 046efca..30b09b3 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -62,6 +62,9 @@ in pkgs.nodePackages.pnpm pkgs.nodePackages.typescript-language-server pkgs.nodePackages.yarn + + specialArgs.nurpkgs.hgrep + specialArgs.nurpkgs.reparojson ] ++ ( let diff --git a/mitamae/default.rb b/mitamae/default.rb index a2b56a5..061f1a9 100644 --- a/mitamae/default.rb +++ b/mitamae/default.rb @@ -73,10 +73,6 @@ execute "rustup: install nightly toolchain" do command "rustup toolchain install nightly" not_if "rustup toolchain list | grep nightly" end -execute "cargo: install hgrep" do - command "cargo install hgrep" - not_if "type hgrep" -end if node[:profile] == "private" package "pkg-config" -- cgit v1.2.3-70-g09d2