From 2202ebef0ba83dfbc9a181b970d94310f09e0661 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Sat, 2 Nov 2024 09:46:12 +0000
Subject: [PATCH] zenix: plymouth, fixes

---
 hardware/zenix.nix                 | 25 ++++++++++++++++---------
 home/desktop/hyprland/default.nix  |  7 ++++++-
 home/programs/graphical.nix        |  1 -
 home/programs/personal/default.nix |  3 ---
 home/programs/work.nix             |  1 +
 nixos/default.nix                  |  4 ++++
 nixos/programs/gamer.nix           |  1 +
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/hardware/zenix.nix b/hardware/zenix.nix
index 22ea30e..f0ce359 100644
--- a/hardware/zenix.nix
+++ b/hardware/zenix.nix
@@ -6,7 +6,6 @@
   ...
 }: let
   user = config.user;
-  decrypt = import ../lib/decrypt.nix;
 in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
@@ -20,7 +19,7 @@ in {
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/2dad5ed6-44cc-4d9d-9392-32afaa7b3909";
+    device = "/dev/mapper/cryptroot";
     fsType = "btrfs";
     options = ["subvol=@" "compress=zstd" "autodefrag"];
   };
@@ -32,30 +31,38 @@ in {
     options = ["noatime"];
   };
 
-  boot.initrd.postDeviceCommands = pkgs.lib.mkBefore (decrypt {
-    keydevice = "/dev/disk/by-id/usb-Generic_Flash_Disk_BCC97785-0:0";
-    keypartname = "usbkey";
-  });
+  boot.initrd.luks.devices."usbkey" = {
+    device = "/dev/disk/by-id/usb-Generic_Flash_Disk_BCC97785-0:0";
+  };
 
   boot.initrd.luks.devices."cryptroot" = {
     device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151";
     keyFileSize = 4096;
+    preOpenCommands = ''
+      mkdir -m 0755 -p /key
+      mount -n -t vfat -o ro /dev/mapper/usbkey /key
+    '';
     keyFile = "/key/keyfile";
     preLVM = false;
   };
 
   fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/2dad5ed6-44cc-4d9d-9392-32afaa7b3909";
+    device = "/dev/mapper/cryptroot";
     fsType = "btrfs";
     options = ["subvol=@home" "compress=zstd" "autodefrag"];
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/FE7E-0DE3";
+    device = "/dev/disk/by-label/boot";
     fsType = "vfat";
   };
 
-  swapDevices = [{device = "/dev/disk/by-uuid/da57b489-ab77-4830-b710-9f96cf43d053";}];
+  boot.plymouth.enable = true;
+  boot.initrd.verbose = false;
+  boot.consoleLogLevel = 1;
+  boot.kernelParams = ["quiet" "udev.log_level=3"];
+
+  swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix
index 33fb7a2..3b0c4dd 100644
--- a/home/desktop/hyprland/default.nix
+++ b/home/desktop/hyprland/default.nix
@@ -277,5 +277,10 @@ in {
     enable = true;
   };
 
-  programs.waybar.settings.mainBar.modules-left = ["hyprland/workspaces" "hyprland/window"];
+  programs.waybar = {
+    settings.mainBar.modules-left = ["hyprland/workspaces" "hyprland/window"];
+    systemd.target = "hyprland-session.target";
+  };
+
+  systemd.user.services.hypridle.Install.WantedBy = ["hyprland-session.target"];
 }
diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix
index 9dc9f03..8215ca1 100644
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@@ -18,7 +18,6 @@
     gimp
     libreoffice
     dbeaver-bin
-    drawio
 
     # entertainment
     libsForQt5.kasts
diff --git a/home/programs/personal/default.nix b/home/programs/personal/default.nix
index a740d23..d56f1e2 100644
--- a/home/programs/personal/default.nix
+++ b/home/programs/personal/default.nix
@@ -15,9 +15,6 @@
   services.nextcloud-client.enable = true;
 
   programs.nixvim.plugins = {
-    lsp = {
-      servers.gdscript.enable = true;
-    };
     godot.enable = true;
     dap = {
       enable = true;
diff --git a/home/programs/work.nix b/home/programs/work.nix
index 51140b3..7417aba 100644
--- a/home/programs/work.nix
+++ b/home/programs/work.nix
@@ -22,6 +22,7 @@ in {
   };
 
   home.packages = [
+    pkgs.drawio
     pkgs.thunderbird
     pkgs.remmina
     pkgs.postman
diff --git a/nixos/default.nix b/nixos/default.nix
index e0a0092..554aec0 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -94,6 +94,10 @@ in {
     fzf
     sops
     lsof
+    nix-tree
+    nix-index
+    nh
+    jq
   ];
 
   boot.kernel.sysctl = {
diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix
index b676f2e..bf201a9 100644
--- a/nixos/programs/gamer.nix
+++ b/nixos/programs/gamer.nix
@@ -6,6 +6,7 @@
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
       "steam"
+      "steam-unwrapped"
       "steam-run"
       "steam-original"
       "osu-lazer"