From e84577560c2617b8b750a8d021b73a8c25ba0a7f Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 15 Feb 2024 16:05:24 -0600 Subject: [PATCH] switch to new pinix flake --- flake.lock | 28 ++++++---------------------- flake.nix | 3 +-- hosts/othalan/default.nix | 1 - modules/nix.nix | 1 + overlays/default.nix | 6 +----- 5 files changed, 9 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index df91557..1b5a06d 100644 --- a/flake.lock +++ b/flake.lock @@ -269,19 +269,18 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "systems": "systems_3" + ] }, "locked": { - "lastModified": 1707852451, - "narHash": "sha256-6FkObpMDcQJ53Wfzs/uWzk9JapQQ72UuJ6DRrMDRbY0=", - "owner": "daylinmorgan", + "lastModified": 1708024475, + "narHash": "sha256-D6rH2MD9yoslhA98cX9I3Ncf2J5JC6JMCh/837dTE4A=", + "owner": "remi-dupre", "repo": "pinix", - "rev": "f148a5dbc84e53dbcc1cb983bb80c65df620616d", + "rev": "a488c0e7cf36b0a20fa8d237d5b3930ad7c5d3ce", "type": "github" }, "original": { - "owner": "daylinmorgan", + "owner": "remi-dupre", "repo": "pinix", "type": "github" } @@ -326,21 +325,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index f20b165..63cec68 100644 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,7 @@ nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; - # https://github.com/remi-dupre/pinix/pull/2 - pinix.url = "github:daylinmorgan/pinix"; + pinix.url = "github:remi-dupre/pinix"; pinix.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 7a93ac0..3744f07 100644 --- a/hosts/othalan/default.nix +++ b/hosts/othalan/default.nix @@ -25,7 +25,6 @@ zk rclone quarto - pinix ]; programs.hyprland.enable = true; diff --git a/modules/nix.nix b/modules/nix.nix index 03152f8..f9b55da 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -20,6 +20,7 @@ nix-output-monitor alejandra inputs.self.packages.${pkgs.system}.oizys + inputs.pinix.packages.${pkgs.system}.default ]; nix.settings = { diff --git a/overlays/default.nix b/overlays/default.nix index bdc833c..852504e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,9 +10,5 @@ (f: f != "default.nix") (builtins.attrNames (builtins.readDir ./.))); in { - nixpkgs.overlays = - defaultOverlays - ++ [ - inputs.pinix.overlays.default - ]; + nixpkgs.overlays = defaultOverlays; }