daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps and switch back to agenix

Browse source
This commit is contained in:
Daniel Kempkens 2023-04-14 10:23:54 +02:00
parent ee2e301287
commit f6ea2d892f
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
12 changed files with 51 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
flake.lock
View file

@ -2,18 +2,19 @@
"nodes": {
"agenix": {
"inputs": {
"darwin": "darwin_2",
"darwin": [
"darwin"
],
"nixpkgs": [
"ragenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1677126346,
"narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=",
"lastModified": 1680281360,
"narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm",
"repo": "agenix",
"rev": "c2a71c83c70844c5e31db69347e86af080bcdad0",
"rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github"
},
"original": {
@ -96,29 +97,6 @@
"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": {
@ -181,21 +159,6 @@
"type": "github"
}
},
"flake-utils_3": {
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -204,11 +167,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1681250798,
"narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=",
"lastModified": 1681457346,
"narHash": "sha256-9cDHr8CRhcH7zdDpcHL5f/Cks7ecezlbGxqhHuhZTvs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "28698126bd825aff21cae9ffd15cf83e169051b0",
"rev": "8631c0441614587a10c9e10372f85561211a4bb8",
"type": "github"
},
"original": {
@ -227,11 +190,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1681363670,
"narHash": "sha256-yT+y9SZwtS8cdeOw4oCXc/Ks3KyNb231rTdAMlP9YyE=",
"lastModified": 1681441109,
"narHash": "sha256-18pKVQvULQ8ZGnzoGbfImRO179yShRkRBmV7bK1Hm58=",
"owner": "neovim",
"repo": "neovim",
"rev": "99c1010aa740b76df341a756231e99d0116fc3be",
"rev": "37bb40701d672d5213ec1be4e21d7808aee968e7",
"type": "github"
},
"original": {
@ -250,11 +213,11 @@
]
},
"locked": {
"lastModified": 1681373632,
"narHash": "sha256-N8bm1b+KB39iXVWxZKgZKAjS9YuIAu82c6CiuMTq+hE=",
"lastModified": 1681459992,
"narHash": "sha256-KpZPBJgqxTXX6PPRKZvynYxP0hnI5rHGXjfg9jkIhjU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "3f4a95fe4b14b51a3f645624bd9c5e84d064b6f7",
"rev": "ba5bb0552b0a3d09b0dcdbe0602cd0ae06d29256",
"type": "github"
},
"original": {
@ -285,11 +248,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1681272286,
"narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=",
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6b70761ea8c896aff8994eb367d9526686501860",
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
"type": "github"
},
"original": {
@ -315,38 +278,15 @@
"type": "github"
}
},
"ragenix": {
"inputs": {
"agenix": "agenix",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1677625082,
"narHash": "sha256-62xmRPfjZgDn8AgEhb6eRoJrTxGeM8HfhfF+PkJokok=",
"owner": "yaxitech",
"repo": "ragenix",
"rev": "6f2dacf3d6af36228a8fad3b136990a6b6dfe30b",
"type": "github"
},
"original": {
"owner": "yaxitech",
"repo": "ragenix",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
"attic": "attic",
"darwin": "darwin",
"home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nifoc-overlay": "nifoc-overlay",
"nixpkgs": "nixpkgs",
"ragenix": "ragenix"
"nixpkgs": "nixpkgs"
}
},
"rust-overlay": {
@ -376,31 +316,6 @@
"type": "github"
}
},
"rust-overlay_2": {
"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": {
"locked": {
"lastModified": 1678901627,

11
flake.nix
View file

@ -12,9 +12,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
ragenix = {
url = "github:yaxitech/ragenix";
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.darwin.follows = "darwin";
};
attic = {
@ -45,14 +46,14 @@
sail = import ./system/flakes/sail.nix {
inherit (inputs) nixpkgs;
inherit (inputs) home-manager;
inherit (inputs) ragenix;
inherit (inputs) agenix;
inherit inputs;
};
attic = import ./system/flakes/attic.nix {
inherit (inputs) nixpkgs;
inherit (inputs) home-manager;
inherit (inputs) ragenix;
inherit (inputs) agenix;
inherit (inputs) attic;
inherit inputs;
};
@ -60,7 +61,7 @@
mediaserver = import ./system/flakes/mediaserver.nix {
inherit (inputs) nixpkgs;
inherit (inputs) home-manager;
inherit (inputs) ragenix;
inherit (inputs) agenix;
inherit inputs;
};

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

@ -107,12 +107,12 @@ in
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-04-12";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "18f9e1a47fc25272836a84aa8adb03925c73b33d";
sha256 = "0fz55c0fsx919bxrx5yhi663nwsgm2fs9j996y7akpg6ajz1jx0w";
rev = "ba6c55b203748ec099127914d34554a575e051c0";
sha256 = "1qlq691vrl6bicd1i19ycm7zjg8g6bkz2jg0p5pq0v72gjaf11xs";
fetchSubmodules = false;
};
};
@ -220,12 +220,12 @@ in
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-04-12";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "6fe69025b8825029ea9bf291ab3b1750f9bcb39e";
sha256 = "1jp2qmlfx3yd05d4qv51vxhn98qkfw1bvpj0mkphvj6p9jsnm4rw";
rev = "7f776b7d0a028e9d63d2e9389d7fdfc48cbb15d6";
sha256 = "0mm3j7l2ih92v6kb2im3r9as3ncv18bpiqxgw64lb5crd9j4z4dv";
fetchSubmodules = false;
};
};
@ -297,23 +297,23 @@ in
};
LuaSnip = buildVimPluginFrom2Nix {
pname = "LuaSnip";
version = "2023-04-12";
version = "2023-04-14";
src = fetchFromGitHub {
owner = "L3MON4D3";
repo = "LuaSnip";
rev = "eb592e4be52fff5a514b7540d5341b55ca4c3226";
sha256 = "14sxkw4jdc0fr2h7mv9w0flk0mq0s794v7qnzpbjdk2ipqd1dhwb";
rev = "a6355b12a3b7da0aef71f02560e17ff480182b97";
sha256 = "1hf3k1fl3g90xgabkw8gs9bnij1bq9d259nfzxmrvj8bax52ssib";
fetchSubmodules = false;
};
};
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2023-03-26";
version = "2023-04-14";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "8d91ba2dc2421a54981115f61b914974f938fa77";
sha256 = "0j45scar2frdk3a31lsc536z5vyzwanpg3nn89awp9idzhyviwys";
rev = "781af8c404ce351e999b5102b9724ee847f3ad18";
sha256 = "0yzdn18gq15ky1gl8jrydn46qifw95fqppwz3rwdn2rldh6zsa1p";
fetchSubmodules = false;
};
};
@ -418,12 +418,12 @@ in
};
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2023-03-31";
version = "2023-04-14";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "e18e0cc2641dd78f0cdb0ddd575843045d672dde";
sha256 = "0vprb47wcpwnsij6iyxzirfkcbzr4jaj2cc8flb41d42lsjr0mnj";
rev = "aca320ad601338c93eca50ab4c86fca964a18d96";
sha256 = "17wcvqwddw4nlcpfvlaxxkcyl93axb1hqdcn73xb4c1yr8fdwaxi";
fetchSubmodules = false;
};
};
@ -440,12 +440,12 @@ in
};
nvim-ts-autotag = buildVimPluginFrom2Nix {
pname = "nvim-ts-autotag";
version = "2023-04-12";
version = "2023-04-13";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-ts-autotag";
rev = "0716740e006c26bf233fe63203be29a135fe1f57";
sha256 = "04ww5fj569prs0d2yqks4ni8rlpb6wmya1bpn2wl88ppccbxris4";
rev = "cac97f3b47bcb927db6d1d784c0c323056506ef3";
sha256 = "0fl804msvrhykw6haskn9n0f1yxmjxy8mv0b3hja0ya7pqblybda";
fetchSubmodules = false;
};
};

2
system/flakes/Styx.nix
View file

@ -4,7 +4,7 @@ let
default-system = "aarch64-darwin";
overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; };
overlay-agenix = inputs.ragenix.overlays.default;
overlay-agenix = inputs.agenix.overlays.default;
overlay-attic = inputs.attic.overlays.default;
overlay-neovim = inputs.neovim-nightly-overlay.overlay;
overlay-nifoc = inputs.nifoc-overlay.overlay;

4
system/flakes/attic.nix
View file

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

4
system/flakes/mediaserver.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, home-manager, ragenix, inputs, ... }:
{ nixpkgs, home-manager, agenix, inputs, ... }:
let
overlay-attic = inputs.attic.overlays.default;
@ -26,7 +26,7 @@ in
home-manager.nixosModules.home-manager
ragenix.nixosModules.default
agenix.nixosModules.default
{
nixpkgs = nixpkgsConfig;

4
system/flakes/sail.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, home-manager, ragenix, inputs, ... }:
{ nixpkgs, home-manager, agenix, inputs, ... }:
let
overlay-attic = inputs.attic.overlays.default;
@ -26,7 +26,7 @@ in
home-manager.nixosModules.home-manager
ragenix.nixosModules.default
agenix.nixosModules.default
{
nixpkgs = nixpkgsConfig;

2
system/hosts/Styx.nix
View file

@ -20,14 +20,12 @@
"https://attic.cache.daniel.sx/nifoc-systems"
"https://nifoc.cachix.org"
"https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
];
trusted-public-keys = [
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
];
trusted-users = [ "@admin" ];

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

@ -30,14 +30,12 @@ in
"https://attic.cache.daniel.sx/nifoc-systems"
"https://nifoc.cachix.org"
"https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
];
trusted-public-keys = [
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
];
};

2
system/hosts/attic.nix
View file

@ -34,14 +34,12 @@ in
"https://attic.cache.daniel.sx/nifoc-systems"
"https://nifoc.cachix.org"
"https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
];
trusted-public-keys = [
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
];
};

2
system/hosts/mediaserver.nix
View file

@ -31,14 +31,12 @@ in
"https://attic.cache.daniel.sx/nifoc-systems"
"https://nifoc.cachix.org"
"https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
];
trusted-public-keys = [
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
];
};

2
system/hosts/sail.nix
View file

@ -63,14 +63,12 @@ in
"https://attic.cache.daniel.sx/nifoc-systems"
"https://nifoc.cachix.org"
"https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org"
];
trusted-public-keys = [
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
];
};