From d0eb8bfc11d4b1ae00e1f3267bb55913ada718d8 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 1 Mar 2023 14:34:08 +0100 Subject: [PATCH] Update deps and switch from agenix to ragenix --- flake.lock | 131 +++++++++++++++++++++++++++------ flake.nix | 5 +- home/programs/nvim/plugins.nix | 48 ++++++------ system/flakes/Styx.nix | 2 +- system/flakes/sail.nix | 4 +- system/hosts/Styx.nix | 2 + system/hosts/adsb-antenna.nix | 2 + system/hosts/sail.nix | 2 + 8 files changed, 143 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index b39d6d1..55c310e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,19 +2,18 @@ "nodes": { "agenix": { "inputs": { - "darwin": [ - "darwin" - ], + "darwin": "darwin_2", "nixpkgs": [ + "ragenix", "nixpkgs" ] }, "locked": { - "lastModified": 1677453742, - "narHash": "sha256-/DNOThcCGz21Met/aMhm7NGqughtpxQzrlAqTuq+YZQ=", + "lastModified": 1677126346, + "narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=", "owner": "ryantm", "repo": "agenix", - "rev": "4828951d9d05accd244bf8c24706f046b485aceb", + "rev": "c2a71c83c70844c5e31db69347e86af080bcdad0", "type": "github" }, "original": { @@ -65,6 +64,29 @@ "type": "github" } }, + "darwin_2": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -117,6 +139,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "haskell-flake": { "locked": { "lastModified": 1675296942, @@ -141,11 +178,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677533532, - "narHash": "sha256-2Ie47MONhIFOxvbLmwhmCCe/IoVDVd7YnoK61vu5Xy8=", + "lastModified": 1677621055, + "narHash": "sha256-n3D/pZX0cYEpWKcLJSFImo5Dpk3D1RrxKVDmI6lnaIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "305daba44a9df57738cffc67c08129005a25579a", + "rev": "ef7d316578367ed7732a21eede6c79546a36124f", "type": "github" }, "original": { @@ -164,11 +201,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1677570356, - "narHash": "sha256-KbXK9ByJtuuO+NG/QOl5ULvSktqLq0IAF6DJjsgOO/Y=", + "lastModified": 1677635785, + "narHash": "sha256-38Gk7Sdhm7Luec+1bcDeg0awq4zOSOVl2EdXN4Hqik0=", "owner": "neovim", "repo": "neovim", - "rev": "8acb3d742ce68adadf1def9e1d1bb5bfd671988c", + "rev": "aa840ab5668aa9bc013461a48da771f778b39e49", "type": "github" }, "original": { @@ -187,11 +224,11 @@ ] }, "locked": { - "lastModified": 1677572160, - "narHash": "sha256-DEEwY6si6ZNVAQePpNUooMTOH/mRe04XVqtTlYCWiE8=", + "lastModified": 1677658555, + "narHash": "sha256-59ucL5p0MvIgl6ot4+OJi6FFDoKppetsmFqwV5pvA+4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4b2773ee687616104855a759a71591f875c29414", + "rev": "427fbeb38fb2f9a4a48a7078498f1d668ba561d6", "type": "github" }, "original": { @@ -207,11 +244,11 @@ ] }, "locked": { - "lastModified": 1677572777, - "narHash": "sha256-8CCYFEC1u4BEGJz5PJXpTDrsYSMvC5dGVhRp2zDomDY=", + "lastModified": 1677659187, + "narHash": "sha256-jjGAfz8Thug3Y2E6Fe4oGsiCMvDhExtgp8XOeyMce48=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "cc991f7546659ef3c6cc3515ef199dbb05782ffd", + "rev": "11037099d3fa264219476a8dc49d5496192411ad", "type": "github" }, "original": { @@ -222,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677534593, - "narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=", + "lastModified": 1677560409, + "narHash": "sha256-PIvUIsVNozPXe1FmNe9c6B8Febl3t9+51uBKMJ1Q8o0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a", + "rev": "9e56d6ec92c8fb4192f1392aa5c4101ad77f2070", "type": "github" }, "original": { @@ -236,15 +273,63 @@ "type": "github" } }, - "root": { + "ragenix": { "inputs": { "agenix": "agenix", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1677625082, + "narHash": "sha256-62xmRPfjZgDn8AgEhb6eRoJrTxGeM8HfhfF+PkJokok=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "6f2dacf3d6af36228a8fad3b136990a6b6dfe30b", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, + "root": { + "inputs": { "arion": "arion", "darwin": "darwin", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nifoc-overlay": "nifoc-overlay", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "ragenix": "ragenix" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1676687290, + "narHash": "sha256-DP0CJ7qtUXf+mmMglJL1yANizzV1O4UfQ9NrKgy7O04=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "bdccd5e973d45159f7d13f7c65a4271dc02cf6d4", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "utils": { diff --git a/flake.nix b/flake.nix index ba810b0..14a1278 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - agenix = { - url = "github:ryantm/agenix"; + ragenix = { + url = "github:yaxitech/ragenix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.darwin.follows = "darwin"; }; neovim-nightly-overlay = { diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index f504551..e145e5d 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -47,23 +47,23 @@ rec { }; nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-osc52"; - version = "2023-02-16"; + version = "2023-02-28"; src = pkgs.fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; - sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; + rev = "0abf3267090905accf348d19951640e3b95755c3"; + sha256 = "0q1vax6jnhay125ljmm3296kg2vn0vlj8fwwbgj4jbljqpp5l7n0"; fetchSubmodules = false; }; }; yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "yanky.nvim"; - version = "2023-02-20"; + version = "2023-03-01"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "c41e4c31990ae1f5f3517de8dc006e4da235a043"; - sha256 = "1w15ils8clcwildc4sf8xzjwwyvasbn1x0awgmm2mzwm7xpb30gb"; + rev = "2ccd52506dd0d9374c845e52b5373e901227639e"; + sha256 = "1nf1sls66k0k0qq4rp13i03l0msiina5six7ifllhk7xphh7zic9"; fetchSubmodules = false; }; }; @@ -91,12 +91,12 @@ rec { }; leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-02-16"; + version = "2023-03-01"; src = pkgs.fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; - sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; + rev = "de9c1b3c694078baf4e9be4288dbcff10a74a9f2"; + sha256 = "00iirw33qhvlm69jfyigr7b0j69ss4i11zzpcgrrn7557xfc7w44"; fetchSubmodules = false; }; }; @@ -112,12 +112,12 @@ rec { }; }; nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { - version = "2023-02-28"; + version = "2023-03-01"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "934113c913c773d8b60225c0f570f5f8ce88eb68"; - sha256 = "0rxqmd45j0b3w7wgf6finba608g4a7mxqs6y9bm9rx1kzxq1r8bd"; + rev = "9dd1b9c09707bf1cdd565b999c79ac6461602591"; + sha256 = "138wzdpcf90jxlqcrvnmswvjvz7db77ja8mgz766cnxp68v1wxra"; fetchSubmodules = false; }; }); @@ -225,23 +225,23 @@ rec { }; nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-02-24"; + version = "2023-03-01"; src = pkgs.fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9"; - sha256 = "0daa6q1q2sscgjqcgif8qigqmiv31s3a4bwbrpradfd3aac44gs0"; + rev = "95b7a69bc6da2a6a740584ea3c555e5327638b7d"; + sha256 = "0vrhsxnr65h3haxv3haj68fhply4q61s0ag21sqfv7pjzrrvfdqp"; fetchSubmodules = false; }; }; nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-02-09"; + version = "2023-02-28"; src = pkgs.fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; - sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; + rev = "db08bfb87300fca2db91d15b64ca88a62970fb58"; + sha256 = "0rybpdkcja0kadf9arwx6r33nj7mzmadq660w7jcni3niy7545sw"; fetchSubmodules = false; }; }; @@ -313,12 +313,12 @@ rec { }; friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-02-20"; + version = "2023-03-01"; src = pkgs.fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5"; - sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g"; + rev = "02ed98a1d4bc8baac405480935f3353d3bd60359"; + sha256 = "1sjhy3s9d9dwyvylc785rl66732jz06il5mv4jhqnc76iaxj1l82"; fetchSubmodules = false; }; }; @@ -544,12 +544,12 @@ rec { }; gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-02-16"; + version = "2023-02-28"; src = pkgs.fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f388995990aba04cfdc7c3ab870c33e280601109"; - sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; + rev = "76b71f74ce002119fce322df13bd21cc52c1d112"; + sha256 = "01as5k5xa31jm5nv9vfk65lvg1fwys1bzc8ynz55gjcfj9fl3ibd"; fetchSubmodules = false; }; }; diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index a2aedee..5779ac1 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -14,7 +14,7 @@ let nixpkgs.lib.fix (self: (import "${src}/flake.nix").outputs { inherit self nixpkgs; }); overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; - overlay-agenix = inputs.agenix.overlays.default; + overlay-agenix = inputs.ragenix.overlays.default; overlay-neovim = inputs.neovim-nightly-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay; diff --git a/system/flakes/sail.nix b/system/flakes/sail.nix index 45fb440..1e3999a 100644 --- a/system/flakes/sail.nix +++ b/system/flakes/sail.nix @@ -1,4 +1,4 @@ -{ nixpkgs, home-manager, agenix, arion, inputs, ... }: +{ nixpkgs, home-manager, ragenix, arion, inputs, ... }: let overlay-neovim = inputs.neovim-nightly-overlay.overlay; @@ -24,7 +24,7 @@ in home-manager.nixosModules.home-manager - agenix.nixosModules.default + ragenix.nixosModules.default arion.nixosModules.arion diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index 9a6c708..fb4cdf4 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -23,6 +23,7 @@ in substituters = [ "https://nix-community.cachix.org" + "https://wurzelpfropf.cachix.org" "https://nifoc.cachix.org" ] ++ optionals secret.nix-cache.nifoc.enabled [ secret.nix-cache.nifoc.s3Url @@ -30,6 +31,7 @@ in trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" ] ++ optionals secret.nix-cache.nifoc.enabled [ secret.nix-cache.nifoc.publicKeyValue diff --git a/system/hosts/adsb-antenna.nix b/system/hosts/adsb-antenna.nix index 0a95e1d..1d27423 100644 --- a/system/hosts/adsb-antenna.nix +++ b/system/hosts/adsb-antenna.nix @@ -28,6 +28,7 @@ in substituters = [ "https://nix-community.cachix.org" + "https://wurzelpfropf.cachix.org" "https://nifoc.cachix.org" ] ++ optionals secret.nix-cache.nifoc.enabled [ secret.nix-cache.nifoc.s3Url @@ -35,6 +36,7 @@ in trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" ] ++ optionals secret.nix-cache.nifoc.enabled [ secret.nix-cache.nifoc.publicKeyValue diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix index 604d56f..bd4e20f 100644 --- a/system/hosts/sail.nix +++ b/system/hosts/sail.nix @@ -52,6 +52,7 @@ in substituters = [ "https://nix-community.cachix.org" + "https://wurzelpfropf.cachix.org" "https://nifoc.cachix.org" ] ++ optionals secret.nix-cache.nifoc.enabled [ secret.nix-cache.nifoc.s3Url @@ -59,6 +60,7 @@ in trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" ] ++ optionals secret.nix-cache.nifoc.enabled [ secret.nix-cache.nifoc.publicKeyValue