daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps and switch from agenix to ragenix

Browse source
This commit is contained in:
Daniel Kempkens 2023-03-01 14:34:08 +01:00
parent ae12d31336
commit d0eb8bfc11
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
8 changed files with 143 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
flake.lock
View file

@ -2,19 +2,18 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": [ "darwin": "darwin_2",
"darwin"
],
"nixpkgs": [ "nixpkgs": [
"ragenix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1677453742, "lastModified": 1677126346,
"narHash": "sha256-/DNOThcCGz21Met/aMhm7NGqughtpxQzrlAqTuq+YZQ=", "narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "4828951d9d05accd244bf8c24706f046b485aceb", "rev": "c2a71c83c70844c5e31db69347e86af080bcdad0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -65,6 +64,29 @@
"type": "github" "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -117,6 +139,21 @@
"type": "github" "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": { "haskell-flake": {
"locked": { "locked": {
"lastModified": 1675296942, "lastModified": 1675296942,
@ -141,11 +178,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1677533532, "lastModified": 1677621055,
"narHash": "sha256-2Ie47MONhIFOxvbLmwhmCCe/IoVDVd7YnoK61vu5Xy8=", "narHash": "sha256-n3D/pZX0cYEpWKcLJSFImo5Dpk3D1RrxKVDmI6lnaIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "305daba44a9df57738cffc67c08129005a25579a", "rev": "ef7d316578367ed7732a21eede6c79546a36124f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +201,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1677570356, "lastModified": 1677635785,
"narHash": "sha256-KbXK9ByJtuuO+NG/QOl5ULvSktqLq0IAF6DJjsgOO/Y=", "narHash": "sha256-38Gk7Sdhm7Luec+1bcDeg0awq4zOSOVl2EdXN4Hqik0=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "8acb3d742ce68adadf1def9e1d1bb5bfd671988c", "rev": "aa840ab5668aa9bc013461a48da771f778b39e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -187,11 +224,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677572160, "lastModified": 1677658555,
"narHash": "sha256-DEEwY6si6ZNVAQePpNUooMTOH/mRe04XVqtTlYCWiE8=", "narHash": "sha256-59ucL5p0MvIgl6ot4+OJi6FFDoKppetsmFqwV5pvA+4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "4b2773ee687616104855a759a71591f875c29414", "rev": "427fbeb38fb2f9a4a48a7078498f1d668ba561d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +244,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677572777, "lastModified": 1677659187,
"narHash": "sha256-8CCYFEC1u4BEGJz5PJXpTDrsYSMvC5dGVhRp2zDomDY=", "narHash": "sha256-jjGAfz8Thug3Y2E6Fe4oGsiCMvDhExtgp8XOeyMce48=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "cc991f7546659ef3c6cc3515ef199dbb05782ffd", "rev": "11037099d3fa264219476a8dc49d5496192411ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +259,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677534593, "lastModified": 1677560409,
"narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=", "narHash": "sha256-PIvUIsVNozPXe1FmNe9c6B8Febl3t9+51uBKMJ1Q8o0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a", "rev": "9e56d6ec92c8fb4192f1392aa5c4101ad77f2070",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,15 +273,63 @@
"type": "github" "type": "github"
} }
}, },
"root": { "ragenix": {
"inputs": { "inputs": {
"agenix": "agenix", "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", "arion": "arion",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nifoc-overlay": "nifoc-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": { "utils": {

5
flake.nix
View file

@ -12,10 +12,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
agenix = { ragenix = {
url = "github:ryantm/agenix"; url = "github:yaxitech/ragenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.darwin.follows = "darwin";
}; };
neovim-nightly-overlay = { neovim-nightly-overlay = {

48
home/programs/nvim/plugins.nix
View file

@ -47,23 +47,23 @@ rec {
}; };
nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-osc52 = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-osc52"; pname = "nvim-osc52";
version = "2023-02-16"; version = "2023-02-28";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ojroques"; owner = "ojroques";
repo = "nvim-osc52"; repo = "nvim-osc52";
rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; rev = "0abf3267090905accf348d19951640e3b95755c3";
sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; sha256 = "0q1vax6jnhay125ljmm3296kg2vn0vlj8fwwbgj4jbljqpp5l7n0";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "yanky.nvim"; pname = "yanky.nvim";
version = "2023-02-20"; version = "2023-03-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "gbprod"; owner = "gbprod";
repo = "yanky.nvim"; repo = "yanky.nvim";
rev = "c41e4c31990ae1f5f3517de8dc006e4da235a043"; rev = "2ccd52506dd0d9374c845e52b5373e901227639e";
sha256 = "1w15ils8clcwildc4sf8xzjwwyvasbn1x0awgmm2mzwm7xpb30gb"; sha256 = "1nf1sls66k0k0qq4rp13i03l0msiina5six7ifllhk7xphh7zic9";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -91,12 +91,12 @@ rec {
}; };
leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "leap.nvim"; pname = "leap.nvim";
version = "2023-02-16"; version = "2023-03-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "leap.nvim"; repo = "leap.nvim";
rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; rev = "de9c1b3c694078baf4e9be4288dbcff10a74a9f2";
sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; sha256 = "00iirw33qhvlm69jfyigr7b0j69ss4i11zzpcgrrn7557xfc7w44";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -112,12 +112,12 @@ rec {
}; };
}; };
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = "2023-02-28"; version = "2023-03-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "934113c913c773d8b60225c0f570f5f8ce88eb68"; rev = "9dd1b9c09707bf1cdd565b999c79ac6461602591";
sha256 = "0rxqmd45j0b3w7wgf6finba608g4a7mxqs6y9bm9rx1kzxq1r8bd"; sha256 = "138wzdpcf90jxlqcrvnmswvjvz7db77ja8mgz766cnxp68v1wxra";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}); });
@ -225,23 +225,23 @@ rec {
}; };
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-02-24"; version = "2023-03-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "62856b20751b748841b0f3ec5a10b1e2f6a6dbc9"; rev = "95b7a69bc6da2a6a740584ea3c555e5327638b7d";
sha256 = "0daa6q1q2sscgjqcgif8qigqmiv31s3a4bwbrpradfd3aac44gs0"; sha256 = "0vrhsxnr65h3haxv3haj68fhply4q61s0ag21sqfv7pjzrrvfdqp";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-jdtls"; pname = "nvim-jdtls";
version = "2023-02-09"; version = "2023-02-28";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-jdtls"; repo = "nvim-jdtls";
rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; rev = "db08bfb87300fca2db91d15b64ca88a62970fb58";
sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; sha256 = "0rybpdkcja0kadf9arwx6r33nj7mzmadq660w7jcni3niy7545sw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -313,12 +313,12 @@ rec {
}; };
friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2023-02-20"; version = "2023-03-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5"; rev = "02ed98a1d4bc8baac405480935f3353d3bd60359";
sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g"; sha256 = "1sjhy3s9d9dwyvylc785rl66732jz06il5mv4jhqnc76iaxj1l82";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -544,12 +544,12 @@ rec {
}; };
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-02-16"; version = "2023-02-28";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "f388995990aba04cfdc7c3ab870c33e280601109"; rev = "76b71f74ce002119fce322df13bd21cc52c1d112";
sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; sha256 = "01as5k5xa31jm5nv9vfk65lvg1fwys1bzc8ynz55gjcfj9fl3ibd";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

2
system/flakes/Styx.nix
View file

@ -14,7 +14,7 @@ let
nixpkgs.lib.fix (self: (import "${src}/flake.nix").outputs { inherit self nixpkgs; }); nixpkgs.lib.fix (self: (import "${src}/flake.nix").outputs { inherit self nixpkgs; });
overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; 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-neovim = inputs.neovim-nightly-overlay.overlay;
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;

4
system/flakes/sail.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, home-manager, agenix, arion, inputs, ... }: { nixpkgs, home-manager, ragenix, arion, inputs, ... }:
let let
overlay-neovim = inputs.neovim-nightly-overlay.overlay; overlay-neovim = inputs.neovim-nightly-overlay.overlay;
@ -24,7 +24,7 @@ in
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
agenix.nixosModules.default ragenix.nixosModules.default
arion.nixosModules.arion arion.nixosModules.arion

2
system/hosts/Styx.nix
View file

@ -23,6 +23,7 @@ in
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
"https://nifoc.cachix.org" "https://nifoc.cachix.org"
] ++ optionals secret.nix-cache.nifoc.enabled [ ] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.s3Url secret.nix-cache.nifoc.s3Url
@ -30,6 +31,7 @@ in
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
] ++ optionals secret.nix-cache.nifoc.enabled [ ] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.publicKeyValue secret.nix-cache.nifoc.publicKeyValue

2
system/hosts/adsb-antenna.nix
View file

@ -28,6 +28,7 @@ in
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
"https://nifoc.cachix.org" "https://nifoc.cachix.org"
] ++ optionals secret.nix-cache.nifoc.enabled [ ] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.s3Url secret.nix-cache.nifoc.s3Url
@ -35,6 +36,7 @@ in
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
] ++ optionals secret.nix-cache.nifoc.enabled [ ] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.publicKeyValue secret.nix-cache.nifoc.publicKeyValue

2
system/hosts/sail.nix
View file

@ -52,6 +52,7 @@ in
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
"https://nifoc.cachix.org" "https://nifoc.cachix.org"
] ++ optionals secret.nix-cache.nifoc.enabled [ ] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.s3Url secret.nix-cache.nifoc.s3Url
@ -59,6 +60,7 @@ in
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
] ++ optionals secret.nix-cache.nifoc.enabled [ ] ++ optionals secret.nix-cache.nifoc.enabled [
secret.nix-cache.nifoc.publicKeyValue secret.nix-cache.nifoc.publicKeyValue