aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock110
-rw-r--r--flake.nix2
-rw-r--r--nixos/configurations.nix1
-rw-r--r--nixos/modules/develop.nix1
4 files changed, 88 insertions, 26 deletions
diff --git a/flake.lock b/flake.lock
index 4862dd1..16ce83c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,46 @@
{
"nodes": {
+ "agenix": {
+ "inputs": {
+ "darwin": "darwin",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1682101079,
+ "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
+ "owner": "ryantm",
+ "repo": "agenix",
+ "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ryantm",
+ "repo": "agenix",
+ "type": "github"
+ }
+ },
+ "darwin": {
+ "inputs": {
+ "nixpkgs": [
+ "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": {
@@ -109,15 +150,15 @@
"inputs": {
"flake-compat": "flake-compat",
"lowdown-src": "lowdown-src",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_2",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1681829373,
- "narHash": "sha256-ePNYkq/HPGb4ELomI3FFqMVtoIgg7LwURdsk85x70ZM=",
+ "lastModified": 1683646964,
+ "narHash": "sha256-DZZa3OZIOeIrGwEt9lGXSih4BoO0RBKyrZdYrCx1LQA=",
"owner": "NixOS",
"repo": "nix",
- "rev": "28d7ffd448b51deedc87c4b350169394ee93b601",
+ "rev": "aacde38d2c8a0cf159794e5ec87ef63dccf59e35",
"type": "github"
},
"original": {
@@ -128,7 +169,7 @@
"nixbigclown": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1680946769,
@@ -146,11 +187,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1680876084,
- "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
+ "lastModified": 1683269598,
+ "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
+ "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
"type": "github"
},
"original": {
@@ -160,16 +201,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1670461440,
- "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
+ "lastModified": 1677676435,
+ "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
+ "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11-small",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -192,6 +233,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1670461440,
+ "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-22.11-small",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1679319606,
"narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=",
"owner": "NixOS",
@@ -204,13 +261,13 @@
"type": "indirect"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
- "lastModified": 1681770396,
- "narHash": "sha256-tq+GZOkRA3uF3I/jIzuBGfnTRQFT4QnnRCWJ8DKSaMg=",
+ "lastModified": 1683665855,
+ "narHash": "sha256-+zaVmryrI+qh+LuSgC8j10x/qWG0fYbMXAdXjzs7hm8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4df48038a44e9f3a3da8e9b42ca182726b743de4",
+ "rev": "4487c14ec3f62ebbb677f2da4f83d4c0a424b6e2",
"type": "github"
},
"original": {
@@ -220,7 +277,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
@@ -234,7 +291,7 @@
"type": "indirect"
}
},
- "nixpkgs_5": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1637875414,
"narHash": "sha256-Ica++SXFuLyxX9Q7YxhfZulUif6/gwM8AEQYlUxqSgE=",
@@ -249,7 +306,7 @@
"type": "indirect"
}
},
- "nixpkgs_6": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1664847737,
"narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=",
@@ -301,11 +358,12 @@
},
"root": {
"inputs": {
+ "agenix": "agenix",
"flake-utils": "flake-utils",
"nix": "nix",
"nixbigclown": "nixbigclown",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"nixturris": "nixturris",
"personal-secret": "personal-secret",
"shellrc": "shellrc",
@@ -317,7 +375,7 @@
"shellrc": {
"inputs": {
"flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1679654704,
@@ -335,7 +393,7 @@
},
"sterm": {
"inputs": {
- "nixpkgs": "nixpkgs_5"
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1661025608,
@@ -369,7 +427,7 @@
"usbkey": {
"inputs": {
"flake-utils": "flake-utils_5",
- "nixpkgs": "nixpkgs_6"
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1665754388,
@@ -388,11 +446,11 @@
},
"vpsadminos": {
"locked": {
- "lastModified": 1681831259,
- "narHash": "sha256-83xMn7BZpZ0utQtsT6PeURXwG6N5D7HprV4lTq5I6BE=",
+ "lastModified": 1683615591,
+ "narHash": "sha256-+/Ww8opcfNw16hpSQEFlfRJvPrul0HrEEFFjNAhX9LU=",
"owner": "vpsfreecz",
"repo": "vpsadminos",
- "rev": "a5c817b78882fa72b5a294af06b7ee8ae41aed1e",
+ "rev": "11ab10652190fa10f95f56e5ef3d8af2d1298048",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 74defe2..76ff3a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,8 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret";
+ agenix.url = "github:ryantm/agenix";
+
nixturris = {
url = "github:cynerd/nixturris";
inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 96c74b9..9525888 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -13,6 +13,7 @@ with nixpkgs.lib; let
networking.hostName = hostname;
nixpkgs.overlays = [
self.overlays.default
+ agenix.overlays.default
sterm.overlay
];
system.configurationRevision = self.rev or "dirty";
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 6a68e7f..cb99ac0 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -40,6 +40,7 @@ with lib; {
statix
nixfmt
nixpkgs-fmt
+ agenix
# Shell
dash # Posix shell