From 63907b1b170821e4d7f2ca2d2a3317a2071db9a4 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Dec 2024 22:11:05 +0100 Subject: [PATCH 1/3] nix/os/devices/sj-srv1: bump versions --- nix/os/devices/sj-srv1/flake.lock | 28 ++++++++++++++-------------- nix/os/devices/sj-srv1/flake.nix | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index 89ab52c..fcc671a 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -7,43 +7,43 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1729449015, - "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89172919243df199fe237ba0f776c3e3e3d72367", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-master": { "locked": { - "lastModified": 1729607844, - "narHash": "sha256-MNSAdzoShiZN4bhpB2Eet6R4Qyj9oLLSHuADMcrBIA4=", + "lastModified": 1733431865, + "narHash": "sha256-aBcHSuMZURsEtZaCT5DG3r5DtikpjdvCC6aL1rZ3WNY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "87c6221b509d1390128f0461d975724ec617724c", + "rev": "2e0d114024866e4c1c9b628b5b873c22bc8f9397", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729577921, - "narHash": "sha256-bxktXyAj3818+okqwaR9L/F4UREnry0OEjnYqwYVdkc=", + "lastModified": 1733380312, + "narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "29dccd64f527eebafce219e7ca2bfda5fee75456", + "rev": "a772498086eac57d97065a980a21fc0f304e3192", "type": "github" }, "original": { diff --git a/nix/os/devices/sj-srv1/flake.nix b/nix/os/devices/sj-srv1/flake.nix index 20a919c..e4de055 100644 --- a/nix/os/devices/sj-srv1/flake.nix +++ b/nix/os/devices/sj-srv1/flake.nix @@ -1,10 +1,10 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; inputs.nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; inputs.nixpkgs-master.url = "github:nixos/nixpkgs/master"; inputs.home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; From 5cb20fcb5d9ee71ebcdd80d9e05e732a679f9938 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 6 Dec 2024 09:34:12 +0100 Subject: [PATCH 2/3] nix/os/devices/sj-srv1: bump versions --- nix/os/devices/sj-srv1/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index fcc671a..6259208 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -39,11 +39,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1733431865, - "narHash": "sha256-aBcHSuMZURsEtZaCT5DG3r5DtikpjdvCC6aL1rZ3WNY=", + "lastModified": 1733472523, + "narHash": "sha256-7uLfmBHYgipmt9QbyA6/9U79vZJDlD1F8Cl4ArLUwSc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e0d114024866e4c1c9b628b5b873c22bc8f9397", + "rev": "de5658c9e4d0d47a03c8fd91c1ff7e5a368d3ac5", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733380312, - "narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=", + "lastModified": 1733426878, + "narHash": "sha256-boWvvAttPEXJbi5TiRqRuLE78mic+asXrCpcEm9XIK8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a772498086eac57d97065a980a21fc0f304e3192", + "rev": "21e9e52183fd52452c26a1d7957b0299a37fa83a", "type": "github" }, "original": { From ab020ae8eba577ce39df11faeb64395f2704d81c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 6 Dec 2024 10:27:41 +0100 Subject: [PATCH 3/3] refactor(sj-srv1) --- nix/os/devices/sj-srv1/boot.nix | 1 - nix/os/devices/sj-srv1/configuration.nix | 3 --- nix/os/devices/sj-srv1/hw.nix | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 nix/os/devices/sj-srv1/boot.nix diff --git a/nix/os/devices/sj-srv1/boot.nix b/nix/os/devices/sj-srv1/boot.nix deleted file mode 100644 index 974f788..0000000 --- a/nix/os/devices/sj-srv1/boot.nix +++ /dev/null @@ -1 +0,0 @@ -_: { boot.extraModulePackages = [ ]; } diff --git a/nix/os/devices/sj-srv1/configuration.nix b/nix/os/devices/sj-srv1/configuration.nix index 9f49bd1..5184bd1 100644 --- a/nix/os/devices/sj-srv1/configuration.nix +++ b/nix/os/devices/sj-srv1/configuration.nix @@ -17,10 +17,7 @@ }; } - ../../modules/opinionatedDisk.nix - ./system.nix ./hw.nix - ./boot.nix ]; } diff --git a/nix/os/devices/sj-srv1/hw.nix b/nix/os/devices/sj-srv1/hw.nix index 328266b..ca9158b 100644 --- a/nix/os/devices/sj-srv1/hw.nix +++ b/nix/os/devices/sj-srv1/hw.nix @@ -41,6 +41,9 @@ let ]; in { + imports = [ + ../../modules/opinionatedDisk.nix + ]; hardware.opinionatedDisk = { enable = true; encrypted = false;