Update

13 files changed, 44 insertions, 36 deletions

diff --git a/flake.lock b/flake.lock
index 0849a9e..5058c95 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728334376,
-        "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=",
+        "lastModified": 1729099656,
+        "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe",
+        "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1727610429,
-        "narHash": "sha256-zqsNFzOHPkopQzfzTr05TQRZOvXLtYnsqEqYlY3va2Q=",
+        "lastModified": 1728666168,
+        "narHash": "sha256-UpcYJaIbV84sfKu8fZxeKLKYgUBp2+nMSzgj0jZqhDg=",
         "owner": "vinceliuice",
         "repo": "grub2-themes",
-        "rev": "85db6e7ceacf659aa12b5d335dd3b18a9b9bb788",
+        "rev": "47a6467e2770252d30c2110dadddfbf887a288ba",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728337164,
-        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
+        "lastModified": 1729027341,
+        "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
+        "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1727649413,
-        "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
+        "lastModified": 1729068498,
+        "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
+        "rev": "e337457502571b23e449bf42153d7faa10c0a562",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728534991,
-        "narHash": "sha256-wLUZyvtOOowAz0kTrU2MoC4nXWniFaVezGyzuEt5HPc=",
+        "lastModified": 1729147711,
+        "narHash": "sha256-R1o1sOYQQWfCf1uQOWo33GGyqkPUSLRrIl2kQjunuNE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6b955bdbb9efe4a5c047746323951fe1bdf8d01b",
+        "rev": "d64a5f4c731d8ffe19f5f88e33523f5600a540b9",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728241625,
-        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
         "type": "github"
       },
       "original": {
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index c216ced..fbd553f 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -13,9 +13,9 @@ in {
     "core/global.nix"
     "core/impermanence.nix"
 
+    "nvidia.nix"
     "amdgpu.nix"
     "amd.nix"
-    "nvidia.nix"
     "laptop.nix"
 
     "core/audio.nix"
@@ -23,13 +23,14 @@ in {
     "core/fonts.nix"
 
     "compromyse.nix"
-    "login.nix"
-    "polkit.nix"
 
     "virtualization.nix"
     "remapcapslock.nix"
 
-    "wm_utils.nix"
+    # "wm_utils.nix"
+    # "polkit.nix"
+    "login.nix"
+    "plasma.nix"
   ]);
 
   boot.loader = {
diff --git a/machines/x/hardware-configuration.nix b/machines/x/hardware-configuration.nix
index 3827c89..39216b4 100644
--- a/machines/x/hardware-configuration.nix
+++ b/machines/x/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
diff --git a/machines/x/home.nix b/machines/x/home.nix
index 90d7883..ac33318 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -44,11 +44,11 @@
     "nvim"
 
     # "qtile"
-    "dwl.nix"
-    "themes.nix"
-    "way-displays"
-    "swaylock"
-    "dunst"
+    # "dwl.nix"
+    # "themes.nix"
+    # "way-displays"
+    # "swaylock"
+    # "dunst"
 
     "alacritty"
   ]);
diff --git a/modules/amd.nix b/modules/amd.nix
index 351318c..dcbcaa2 100644
--- a/modules/amd.nix
+++ b/modules/amd.nix
@@ -3,6 +3,6 @@ let
   kver = config.boot.kernelPackages.kernel.version;
 in
 {
-  boot.kernelParams = [ "amd_pstate=active" "amd_iommu=on" "amdgpu.sg_display=0" ];
+  boot.kernelParams = [ "amd_pstate=active" "amd_iommu=on" /* "amdgpu.sg_display=0" */ ];
   hardware.cpu.amd.updateMicrocode = config.hardware.enableRedistributableFirmware;
 }
diff --git a/modules/core/bluetooth.nix b/modules/core/bluetooth.nix
index 5e64d97..fbd9b48 100644
--- a/modules/core/bluetooth.nix
+++ b/modules/core/bluetooth.nix
@@ -3,5 +3,5 @@
 {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
-  services.blueman.enable = true;
+  # services.blueman.enable = true;
 }
diff --git a/modules/core/impermanence.nix b/modules/core/impermanence.nix
index 8540ed2..a26124f 100644
--- a/modules/core/impermanence.nix
+++ b/modules/core/impermanence.nix
@@ -26,6 +26,7 @@
       "/var/log"
       "/var/lib/bluetooth"
       "/var/lib/nixos"
+      "/var/lib/libvirt"
       "/var/lib/systemd/coredump"
       "/etc/NetworkManager/system-connections"
     ];
diff --git a/modules/laptop.nix b/modules/laptop.nix
index 3dfdd29..092e61f 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 
 {
-  services.tlp = {
+  /* services.tlp = {
     enable = true;
     settings = {
       CPU_SCALING_GOVERNOR_ON_AC = "performance";
@@ -10,7 +10,7 @@
       CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
       CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
     };
-  };
+  }; */
 
   boot = {
     kernelModules = [ "acpi_call" ];
diff --git a/modules/login.nix b/modules/login.nix
index 038f4a3..ab32e2d 100644
--- a/modules/login.nix
+++ b/modules/login.nix
@@ -10,7 +10,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "tuigreet --time --remember --cmd \"dwl -s dwlb\"";
+        command = "tuigreet --time --remember --cmd \"startplasma-wayland\"";
         user = "greeter";
       };
     };
diff --git a/modules/plasma.nix b/modules/plasma.nix
new file mode 100644
index 0000000..6fbe589
--- /dev/null
+++ b/modules/plasma.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  services.desktopManager.plasma6.enable = true;
+}
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
index d8d972f..b353793 100644
--- a/modules/virtualization.nix
+++ b/modules/virtualization.nix
@@ -26,6 +26,7 @@
     pkgs.looking-glass-client
     pkgs.libvirt
     pkgs.vagrant
+    pkgs.virt-viewer
 
     (pkgs.writeShellScriptBin "pin-cpu" ''
       if [[ $1 == "" ]]; then
diff --git a/packages/dwl.nix b/packages/dwl.nix
index c0e1586..28f3cdd 100644
--- a/packages/dwl.nix
+++ b/packages/dwl.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "compromyse";
     repo = "dwl";
     rev = "compromyse";
-    hash = "sha256-P9ieyKFBk+ROm+DzXOGmu05nYg0aoqhF9vRl8LpChg0=";
+    hash = "sha256-PP9abXvvnfig9rErtMLI50DwydLKng6XuOhXbYys2EY=";
   };
 
   nativeBuildInputs = [
diff --git a/packages/wlroots.nix b/packages/wlroots.nix
index c7ec477..6d8a2b3 100644
--- a/packages/wlroots.nix
+++ b/packages/wlroots.nix
@@ -15,8 +15,8 @@ let
     repo = "wlroots";
     repo_git = "https://${domain}/${owner}/${repo}";
     branch = "master";
-    rev = "a8d1e5273abad02e594c4ad2f237a204ca239528";
-    sha256 = "sha256-u1YttUkeA/vplXuQs27K38uqDZyBxXZHcbqz7ywRrVY=";
+    rev = "47fb00f66d5a8367d0108bd960f99e51ab1a1318";
+    sha256 = "sha256-HkpTML14tbYBLiHkqoFRSn/qKsVny/oso2TuG6LY/fk=";
   };
   ignore = [
     "wlroots"