From 344eff72a9c246619686c18cd6d9819fe0311134 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 10 Jan 2024 18:07:31 +0100 Subject: [PATCH] switch back to ragenix --- flake.lock | 142 ++++++++++++++++++++++++++++++++++++++------ flake.nix | 4 +- systems/common.nix | 6 +- systems/default.nix | 2 +- systems/desktop.nix | 6 +- 5 files changed, 133 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index fffdeae..783ab5d 100644 --- a/flake.lock +++ b/flake.lock @@ -3,22 +3,23 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nixpkgs": [ + "ragenix", "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1704904989, - "narHash": "sha256-PkYsmQGhx1G1wlxiXkB4D2w1btE+J2d+TGEHKmx0z9k=", - "owner": "uku3lig", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "owner": "ryantm", "repo": "agenix", - "rev": "2bb2c0d64b99b3c97d7254b751099218742ed4f2", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { - "owner": "uku3lig", + "owner": "ryantm", "repo": "agenix", "type": "github" } @@ -59,9 +60,31 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704819371, + "narHash": "sha256-oFUfPWrWGQTZaCM3byxwYwrMLwshDxVGOrMH5cVP/X8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5c234301a1277e4cc759c23a2a7a00a06ddd7111", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ + "ragenix", "agenix", "nixpkgs" ] @@ -119,7 +142,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1694529238, @@ -135,6 +158,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -160,16 +201,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1704809957, + "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", "type": "github" }, "original": { @@ -181,15 +221,17 @@ "home-manager_2": { "inputs": { "nixpkgs": [ + "ragenix", + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1704809957, - "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -303,15 +345,39 @@ "type": "github" } }, - "root": { + "ragenix": { "inputs": { "agenix": "agenix", + "crane": "crane_2", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1682237245, + "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "root": { + "inputs": { "catppuccin": "catppuccin", "flake-parts": "flake-parts", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_2", + "ragenix": "ragenix" } }, "rust-overlay": { @@ -339,6 +405,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704853054, + "narHash": "sha256-xD87M7isL2XqlFr+2f+j86jy8s5lfIaAEWO4TpQQZUA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "6dea03e0c8a81cf28340564259d4762b6d6f01de", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -368,6 +459,21 @@ "repo": "default", "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e20d1cb..69b1d4a 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,8 @@ }; }; - agenix = { - url = "github:uku3lig/agenix"; + ragenix = { + url = "github:yaxitech/ragenix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/systems/common.nix b/systems/common.nix index 295789f..8cc41fa 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -3,10 +3,14 @@ pkgs, config, nixpkgs, + ragenix, ... }: { environment = { - systemPackages = with pkgs; [ + systemPackages = with pkgs; let + inherit (pkgs.stdenv.hostPlatform) system; + in [ + ragenix.packages.${system}.default neovim git curl diff --git a/systems/default.nix b/systems/default.nix index a42c645..ad06292 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -24,7 +24,7 @@ nixos = with inputs; [ ./common.nix - agenix.nixosModules.default + ragenix.nixosModules.default ]; desktop = with inputs; diff --git a/systems/desktop.nix b/systems/desktop.nix index 3dfe09c..e6b9bec 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -2,7 +2,6 @@ lib, pkgs, config, - agenix, catppuccin, ... }: let @@ -129,10 +128,7 @@ in { catppuccin.homeManagerModules.catppuccin ]; - home.packages = with pkgs; let - inherit (pkgs.stdenv.hostPlatform) system; - in [ - agenix.packages.${system}.default + home.packages = with pkgs; [ aseprite blockbench-electron font-manager