summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-09-27 19:03:16 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2021-09-27 19:03:16 +0200
commitecf32ed77857e76322394cc53aa37e4d971ddd9d (patch)
treec8a130940210c68f84c3c8772b7db0e063872475
parent12a4a1c98697b38f484d247c1d85d634543f2409 (diff)
downloadnixos-ecf32ed77857e76322394cc53aa37e4d971ddd9d.tar
nixos-ecf32ed77857e76322394cc53aa37e4d971ddd9d.tar.gz
nixos-ecf32ed77857e76322394cc53aa37e4d971ddd9d.tar.bz2
nixos-ecf32ed77857e76322394cc53aa37e4d971ddd9d.tar.xz
nixos-ecf32ed77857e76322394cc53aa37e4d971ddd9d.zip
version bumps
-rw-r--r--flake.lock18
-rw-r--r--modules/uucp.nix2
-rw-r--r--system-profiles/core.nix6
3 files changed, 15 insertions, 11 deletions
diff --git a/flake.lock b/flake.lock
index c13ae8c1..e281db6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
7 ] 7 ]
8 }, 8 },
9 "locked": { 9 "locked": {
10 "lastModified": 1629347633, 10 "lastModified": 1632431340,
11 "narHash": "sha256-FGZJ7lmTAMIkjdrh6dIPck5HuB4KMT2GgDV5ZjiCWoc=", 11 "narHash": "sha256-9xUnx5aeDp8Irg2/rWBKn3AjiiQTtsjTX0UshzMXy94=",
12 "owner": "nix-community", 12 "owner": "nix-community",
13 "repo": "home-manager", 13 "repo": "home-manager",
14 "rev": "bf6b85136b47ab1a76df4a90ea4850871147494a", 14 "rev": "b0651cc2173427857b172604f85da6afe69e1d41",
15 "type": "github" 15 "type": "github"
16 }, 16 },
17 "original": { 17 "original": {
@@ -23,11 +23,11 @@
23 }, 23 },
24 "nixpkgs": { 24 "nixpkgs": {
25 "locked": { 25 "locked": {
26 "lastModified": 1629458213, 26 "lastModified": 1632733991,
27 "narHash": "sha256-1uDpJFrtNklBHHoo/9Un0CimbJ09wdhCmPO9K2nT5Nc=", 27 "narHash": "sha256-fbgyoIdT1//s3b3/PbWBGBxoRPesuGhXL0cmhUKuubg=",
28 "owner": "NixOS", 28 "owner": "NixOS",
29 "repo": "nixpkgs", 29 "repo": "nixpkgs",
30 "rev": "dc1f02f02a6a6fe2f041b3d299ee36f69d3d041b", 30 "rev": "5086684eadd9577b374522a767368fb6b1dd2f1d",
31 "type": "github" 31 "type": "github"
32 }, 32 },
33 "original": { 33 "original": {
@@ -51,11 +51,11 @@
51 ] 51 ]
52 }, 52 },
53 "locked": { 53 "locked": {
54 "lastModified": 1625936460, 54 "lastModified": 1632602278,
55 "narHash": "sha256-U6xlITKrYuhlHWe+poACaz4GJl3ZVN1BSUqZe2gFg+g=", 55 "narHash": "sha256-BJNUsxR+YwqCXMojsCK1gOnoxkLdJx5zqSYL1VMxws8=",
56 "owner": "Mic92", 56 "owner": "Mic92",
57 "repo": "sops-nix", 57 "repo": "sops-nix",
58 "rev": "ec2800174de5a7be8ec5b144819af2c7de77abe2", 58 "rev": "38e9270b774e50263ae1771922d7e4ff7d543aed",
59 "type": "github" 59 "type": "github"
60 }, 60 },
61 "original": { 61 "original": {
diff --git a/modules/uucp.nix b/modules/uucp.nix
index 0334a3db..95b675a6 100644
--- a/modules/uucp.nix
+++ b/modules/uucp.nix
@@ -242,8 +242,10 @@ in {
242 ''; 242 '';
243 }; 243 };
244 244
245 users.groups."uucp" = {};
245 users.users."uucp" = { 246 users.users."uucp" = {
246 name = "uucp"; 247 name = "uucp";
248 group = "uucp";
247 isSystemUser = true; 249 isSystemUser = true;
248 isNormalUser = false; 250 isNormalUser = false;
249 createHome = true; 251 createHome = true;
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index 18c271bd..6e9c9286 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -70,8 +70,10 @@ in {
70 }; 70 };
71 71
72 sops = lib.mkIf hasSops { 72 sops = lib.mkIf hasSops {
73 gnupgHome = "/root/.gnupg"; 73 gnupg = {
74 sshKeyPaths = []; 74 home = "/root/.gnupg";
75 sshKeyPaths = [];
76 };
75 }; 77 };
76 78
77 environment.systemPackages = [ pkgs.git ] ++ lib.optional hasSops pkgs.gnupg; 79 environment.systemPackages = [ pkgs.git ] ++ lib.optional hasSops pkgs.gnupg;