...

3 files changed, 19 insertions, 9 deletions

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 56a21b3..f9d3f6c 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -19,19 +19,14 @@
   os = {
     core = {
       allowUnfree.enable = true;
+      flatpak.enable = true;
 
       audio.enable = true;
       bootloader = {
         type = "grub";
+        efi = false;
         timeout = 0;
         luks.enable = true;
-        grub = {
-          device = "/dev/nvme0n1";
-          signing = {
-            enable = true;
-            keyId = "3D95543550A5A23A";
-          };
-        };
       };
       drivers = {
         enable = true;
@@ -62,6 +57,7 @@
     };
     srv = {
       bluetooth.enable = true;
+      i2p.enable = true;
       files = {
         enable = true;
         localsend.enable = true;
@@ -78,12 +74,26 @@
       nix-helper.enable = true;
       monero.enable = true;
       sops.enable = true;
+      syncthing.enable = true;
+      vpn.enable = true;
     };
     wm = {
       enable = true;
       niri.enable = true;
     };
   };
+  boot = {
+    kernelParams = [ "iomem=relaxed" ];
+    initrd = {
+      secrets = {
+        "/etc/cryptsetup-keys.d/root.key" = "/etc/cryptsetup-keys.d/root.key";
+      };
+      luks.devices."crypted" = {
+        device = "/dev/nvme0n1p2";
+        keyFile = "/etc/cryptsetup-keys.d/root.key";
+        allowDiscards = true;
+      };
+    };
+  };
   services.thinkfan.enable = true;
-  boot.kernelParams = [ "iomem=relaxed" ];
 }
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index 9816f7f..3ab76f4 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -16,7 +16,6 @@
               content = {
                 type = "luks";
                 name = "crypted";
-                keyFile = "/boot/root.key";
                 extraFormatArgs = [
                   "--type luks2"
                   "--pbkdf argon2id"
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 3a8215d..b121ae2 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -40,6 +40,7 @@
       starship.enable = true;
     };
     soft = {
+      sioyek.enable = true;
       browser.librewolf.enable = true;
       email.thunderbird.enable = true;
       media.enable = true;