From 4c592ca72f68dd9a7e95da426afc51b2d95504bc Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Thu, 1 Feb 2024 14:35:46 +0100
Subject: [PATCH] Add bchacefs support, set up the first luks and bcachefs
 settings, and update plasma-manager config

---
 disko/EDI/configuration.nix                   | 66 +++++++++++++++++++
 .../plasma-desktop/configuration.nix          |  5 +-
 nixos/desktop/configuration.nix               |  4 ++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 disko/EDI/configuration.nix

diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix
new file mode 100644
index 0000000..7c17496
--- /dev/null
+++ b/disko/EDI/configuration.nix
@@ -0,0 +1,66 @@
+{
+  disko.devices = {
+    disk = {
+      vdb = {
+        device = "/dev/disk/by-path/pci-0000:71:00.0-nvme-1";
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "defaults"
+                ];
+              };
+            };
+            luks = {
+              size = "100%";
+              content = {
+                type = "luks";
+                name = "crypted";
+                # disable settings.keyFile if you want to use interactive password entry
+                #passwordFile = "/tmp/secret.key"; # Interactive
+                settings = {
+                  allowDiscards = true;
+                  keyFile = "/tmp/secret.key";
+                };
+                #additionalKeyFiles = ["/tmp/additionalSecret.key"];
+                content = {
+                  root = {
+                    name = "root";
+                    end = "-1G";
+                    content = {
+                      type = "filesystem";
+                      format = "bcachefs";
+                      mountpoint = "/";
+                    };
+                  };
+                  encryptedSwap = {
+                    size = "10M";
+                    content = {
+                      type = "swap";
+                      randomEncryption = true;
+                    };
+                  };
+                  plainSwap = {
+                    size = "100%";
+                    content = {
+                      type = "swap";
+                      resumeDevice = true; # resume from hiberation from this device
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix
index a193e98..d065b77 100644
--- a/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix
+++ b/home-manager/hosts/EDI/package-configs/plasma-desktop/configuration.nix
@@ -258,6 +258,7 @@
       "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560;
       "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024;
       "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/";
+      "dolphinrc"."IconsMode"."PreviewSize" = 80;
       "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false;
       "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22;
       "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16;
@@ -270,6 +271,7 @@
       "kded5rc"."Module-browserintegrationreminder"."autoload" = false;
       "kded5rc"."Module-device_automounter"."autoload" = false;
       "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1;
+      "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true;
       "kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
       "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475;
       "kdeglobals"."KDE"."SingleClick" = false;
@@ -590,7 +592,7 @@
       "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW";
       "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror";
       "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1;
-      "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s";
+      "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors";
       "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3;
       "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror";
       "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1";
@@ -799,6 +801,7 @@
       "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1;
       "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1";
       "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE";
+      "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = "";
       "khotkeysrc"."General"."BrowserApplication[$d]" = "";
       "khotkeysrc"."General"."ColorSchemeHash[$d]" = "";
       "khotkeysrc"."General"."ColorScheme[$d]" = "";
diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix
index 04a0d3c..ac78897 100644
--- a/nixos/desktop/configuration.nix
+++ b/nixos/desktop/configuration.nix
@@ -71,10 +71,12 @@
     direnv
     docker
     docker-compose
+    gcc-wrapper
     git-filter-repo
     pciutils
     waydroid
     xwaylandvideobridge
+    yubikey-personalization
     zsh
 
     # KDE/QT
@@ -164,6 +166,8 @@
   boot.loader.systemd-boot.configurationLimit = 3;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.bootspec.enable = true;
+  boot.supportedFilesystems = ["bcachefs"];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   users.users = {
     lillian = {