summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2023-08-13 13:47:55 -0400
committerKjetil Orbekk <kj@orbekk.com>2023-08-13 13:47:55 -0400
commit9fdc5b41c5f532ca9210c4ee0bf8f528bd7c0590 (patch)
tree08e41f6df3d869aa4ac6646f0c0bea947a1f8aa4
parent47942efb24451d7eec7fc1585de7fbe9608e6484 (diff)
Update and fix config warnings
-rw-r--r--flake.lock42
-rw-r--r--machines/x1-pincer.nix2
-rw-r--r--modules/common.nix2
3 files changed, 22 insertions, 24 deletions
diff --git a/flake.lock b/flake.lock
index abfff0e..56f74a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
]
},
"locked": {
- "lastModified": 1689334118,
- "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=",
+ "lastModified": 1690228878,
+ "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143",
+ "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
"type": "github"
},
"original": {
@@ -51,11 +51,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1690049638,
- "narHash": "sha256-A42LIS6x/tU3vbbOgJmLU3AEEDCSDD2iPyOJvzuoDQ8=",
+ "lastModified": 1691921730,
+ "narHash": "sha256-2vTR0Vq2VRQt7+4todEdOJRGIU/qyPdVCXJgbosz3Aw=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "6c47e62b612814daf38f830cd32187768b813fac",
+ "rev": "9279ce7180483c5ec9e6da74b87000a49a4942c0",
"type": "github"
},
"original": {
@@ -105,11 +105,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1689320556,
- "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
+ "lastModified": 1691871742,
+ "narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
+ "rev": "430a56dd16fe583a812b2df44dca002acab2f4f6",
"type": "github"
},
"original": {
@@ -121,11 +121,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1689940971,
- "narHash": "sha256-397xShPnFqPC59Bmpo3lS+/Aw0yoDRMACGo1+h2VJMo=",
+ "lastModified": 1691654369,
+ "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9ca785644d067445a4aa749902b29ccef61f7476",
+ "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"type": "github"
},
"original": {
@@ -137,11 +137,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1689956312,
- "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=",
+ "lastModified": 1691693223,
+ "narHash": "sha256-9t8ZY1XNAsWqxAJmXgg+GXqF5chORMVnBT6PSHaRV3I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967",
+ "rev": "18784aac1013da9b442adf29b6c7c228518b5d3f",
"type": "github"
},
"original": {
@@ -153,11 +153,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1690031011,
- "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=",
+ "lastModified": 1691654369,
+ "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "12303c652b881435065a98729eb7278313041e49",
+ "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"type": "github"
},
"original": {
@@ -169,11 +169,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1689956312,
- "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=",
+ "lastModified": 1691831739,
+ "narHash": "sha256-6e12VCvA7jOjhzJ1adLiUV1GTPXGBcCfhggsDwiuNB4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967",
+ "rev": "3fe694c4156b84dac12627685c7ae592a71e2206",
"type": "github"
},
"original": {
diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index a879e2a..2a899bc 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -21,8 +21,6 @@ let ports = {
services.printing.drivers = with pkgs; [ gutenprint brlaser ];
services.openssh.enable = true;
- system.autoUpgrade.enable = lib.mkForce false;
-
# For bridge development.
services.postgresql = {
enable = true;
diff --git a/modules/common.nix b/modules/common.nix
index 7797613..9632112 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -79,7 +79,7 @@
services = {
postgresql = { package = pkgs.postgresql_12; };
openssh.settings.PasswordAuthentication = false;
- openssh.kbdInteractiveAuthentication = false;
+ openssh.settings.KbdInteractiveAuthentication = false;
fwupd.enable = true;
};