From 10ec752fa6507f6b03b720c68d6550006a446836 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Fri, 22 Sep 2023 15:32:16 +0200 Subject: [PATCH 1/3] updated dependencies --- flake.lock | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 4f71017..64650eb 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -39,14 +39,15 @@ "flake-compat": [], "nixpkgs": [], "nixpkgs-22_11": "nixpkgs-22_11", + "nixpkgs-23_05": "nixpkgs-23_05", "utils": "utils" }, "locked": { - "lastModified": 1686468558, - "narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=", + "lastModified": 1689976554, + "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=", "ref": "refs/heads/master", - "rev": "290d00f6db4e80467013728819ad73dd4a394d9a", - "revCount": 554, + "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e", + "revCount": 570, "type": "git", "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git" }, @@ -57,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686412476, - "narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", + "lastModified": 1695145219, + "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21951114383770f96ae528d0ae68824557768e81", + "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "type": "github" }, "original": { @@ -86,14 +87,29 @@ "type": "indirect" } }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1684782344, + "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1685564631, - "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { From fc1fb670612778337b2a24eba12149bd2d90e06f Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Fri, 22 Sep 2023 19:36:48 +0200 Subject: [PATCH 2/3] first running config (fingers crossed) --- nixos/machines/nyarlathotep/hardware-configuration.nix | 2 +- nixos/machines/nyarlathotep/network.nix | 2 +- nixos/roles/nix_keys.nix | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 nixos/roles/nix_keys.nix diff --git a/nixos/machines/nyarlathotep/hardware-configuration.nix b/nixos/machines/nyarlathotep/hardware-configuration.nix index 078d8e1..bc541e1 100644 --- a/nixos/machines/nyarlathotep/hardware-configuration.nix +++ b/nixos/machines/nyarlathotep/hardware-configuration.nix @@ -2,7 +2,7 @@ imports = [ ]; boot.initrd.availableKernelModules = - [ "ata_piix" "sr_mod" "xen_bklfront" ]; + [ "ata_piix" "sr_mod" "xen_blkfront" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; diff --git a/nixos/machines/nyarlathotep/network.nix b/nixos/machines/nyarlathotep/network.nix index 3641375..b5389eb 100644 --- a/nixos/machines/nyarlathotep/network.nix +++ b/nixos/machines/nyarlathotep/network.nix @@ -5,7 +5,7 @@ imports = [ ]; networking = { interfaces.enX0.ipv4.addresses = [ { - addresses = "192.168.0.28"; + address = "192.168.0.28"; prefixLength = 16; } ]; defaultGateway = "192.168.0.155"; diff --git a/nixos/roles/nix_keys.nix b/nixos/roles/nix_keys.nix new file mode 100644 index 0000000..af3f21d --- /dev/null +++ b/nixos/roles/nix_keys.nix @@ -0,0 +1,4 @@ +{lib, ...} : + nix.settings.trusted-public-keys = [ + "nerflap2-1:pDZCg0oo9PxNQxwVSQSvycw7WXTl53PGvVeZWvxuqJc=" + ]; From 23283f6141245c9bae7916be98864ce5786fce7c Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Fri, 22 Sep 2023 20:00:35 +0200 Subject: [PATCH 3/3] fixed small error in trusted nix keys handling --- nixos/roles/admins.nix | 2 +- nixos/roles/default.nix | 5 ++++- nixos/roles/nix_keys.nix | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/roles/admins.nix b/nixos/roles/admins.nix index 4f189e0..43a86aa 100644 --- a/nixos/roles/admins.nix +++ b/nixos/roles/admins.nix @@ -5,7 +5,7 @@ let admins = { nerf = { hashedPassword = - "$6$rounds=424242$FaEtIXMUScxgAYyF$Fl8GbPFgiEv.1iwrhtVpTixG1BTJys3aIfLyTzocQYZV4JymrYEXtnyCTURmVDe8stxbxgDutmtlyElfn1DQc/"; + "$y$j9T$SJcjUIcs3JYuM5oyxfEQa/$tUBQT07FK4cb9xm.A6ZKVnFIPNOYMOKC6Dt6hadCuJ7"; keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEdA4LpEGUUmN8esFyrNZXFb2GiBID9/S6zzhcnofQuP nerf@nerflap2" ]; diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index 6a6fe3d..dcfab4f 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -1,6 +1,9 @@ {pkgs, config, lib, ...} : { -imports = [ ./admins.nix ]; +imports = [ + ./admins.nix + ./nix_keys.nix + ]; nix = { extraOptions = '' experimental-features = nix-command flakes diff --git a/nixos/roles/nix_keys.nix b/nixos/roles/nix_keys.nix index af3f21d..85c7835 100644 --- a/nixos/roles/nix_keys.nix +++ b/nixos/roles/nix_keys.nix @@ -1,4 +1,6 @@ -{lib, ...} : +{ + imports = [ ]; nix.settings.trusted-public-keys = [ "nerflap2-1:pDZCg0oo9PxNQxwVSQSvycw7WXTl53PGvVeZWvxuqJc=" ]; +}