From 32bc317904296279bc7762bcf63ead477de17bab Mon Sep 17 00:00:00 2001
From: Sebastian Schulze <github.com@bascht.com>
Date: Mon, 19 Jun 2023 18:12:48 +0200
Subject: [PATCH] [nix] Bump flake and state and drop unused key files

---
 dot_config/nixos/configuration.nix     |  2 +-
 dot_config/nixos/flake.lock            | 28 +++++++++++++-------------
 dot_config/nixos/flake.nix             |  2 +-
 dot_config/nixos/host-apfelstrudel.nix |  2 --
 dot_config/nixos/host-pierogi.nix      |  3 +--
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/dot_config/nixos/configuration.nix b/dot_config/nixos/configuration.nix
index 61b52c6..c403a33 100644
--- a/dot_config/nixos/configuration.nix
+++ b/dot_config/nixos/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [];
 
-  system.stateVersion = "23.05";
+  system.stateVersion = "22.05";
   nix.settings.auto-optimise-store = true;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nix.settings.trusted-users = [ "root" "bascht" ];
diff --git a/dot_config/nixos/flake.lock b/dot_config/nixos/flake.lock
index 4eaed43..23a39fb 100644
--- a/dot_config/nixos/flake.lock
+++ b/dot_config/nixos/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1685644093,
-        "narHash": "sha256-HT9zmuyV5piW9sVLkwgrh3VgB9pfRerzA4jluXyxYVs=",
+        "lastModified": 1685633212,
+        "narHash": "sha256-Aol+hQn6gbsXCyDXGgmOXJN8WFXBzrWF4FEWLl+NLFs=",
         "ref": "main",
-        "rev": "c597e8b52c0eb74ad752ef712d5ffafd46425d20",
-        "revCount": 23,
+        "rev": "f8f0d7d367f623871546820a5e994b4e351917bb",
+        "revCount": 21,
         "type": "git",
         "url": "https://git.dorhamm.me/bascht/nixos-private.git"
       },
@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687098182,
-        "narHash": "sha256-kBys+Cwmcxzh7UNVWTrunOgaR02zl2XN3feA8fSlqVo=",
+        "lastModified": 1685573051,
+        "narHash": "sha256-zrpbdQVJFpNVFK3SlA6mE0le8qnKjUjcuY4OzL+wSHw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0480dabc99e1b669ebe909949180fa2786e733cd",
+        "rev": "3876cc613ac3983078964ffb5a0c01d00028139e",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1686838567,
-        "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
+        "lastModified": 1684899633,
+        "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
+        "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
         "type": "github"
       },
       "original": {
@@ -71,16 +71,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1686921029,
-        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
+        "lastModified": 1685468986,
+        "narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+        "rev": "9af373a61647257d16ae6062cddaa9094d24920c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/dot_config/nixos/flake.nix b/dot_config/nixos/flake.nix
index 2e95507..5774541 100644
--- a/dot_config/nixos/flake.nix
+++ b/dot_config/nixos/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   inputs.bascht-private.url = "git+https://git.dorhamm.me/bascht/nixos-private.git?ref=main";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
   inputs.home-manager = {
     url = "github:nix-community/home-manager";
     inputs.nixpkgs.follows = "nixpkgs";
diff --git a/dot_config/nixos/host-apfelstrudel.nix b/dot_config/nixos/host-apfelstrudel.nix
index c439cc0..6bc6f18 100644
--- a/dot_config/nixos/host-apfelstrudel.nix
+++ b/dot_config/nixos/host-apfelstrudel.nix
@@ -7,12 +7,10 @@
     virtualisation.libvirtd.enable = true;
 
 
-#    boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/22d00e62-3409-4f07-a400-8e5de944f56a";
     boot.initrd.luks.devices = {
       root = {
         device = "/dev/disk/by-uuid/22d00e62-3409-4f07-a400-8e5de944f56a";
         preLVM = true;
-        keyFile = "/keyfile0.bin";
         allowDiscards = true;
       };
 
diff --git a/dot_config/nixos/host-pierogi.nix b/dot_config/nixos/host-pierogi.nix
index 2166aea..abef67e 100644
--- a/dot_config/nixos/host-pierogi.nix
+++ b/dot_config/nixos/host-pierogi.nix
@@ -5,12 +5,11 @@
   config = {
     networking.hostName = "pierogi";
 
-#    boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/00b9f4c9-396a-4078-9d99-c00e3a0070be";
     boot.initrd.luks.devices = {
       root = {
         device = "/dev/disk/by-uuid/00b9f4c9-396a-4078-9d99-c00e3a0070be";
         preLVM = true;
-        keyFile = "/keyfile0.bin";
+        allowDiscards = true;
       };
     };