a lot of changes

7 files changed, 85 insertions, 56 deletions

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 4505408..c43d4de 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,13 +1,19 @@
-{ config, inputs, username, ... }:
+{
+  config,
+  inputs,
+  username,
+  pkgs,
+  ...
+}:
 {
   system.stateVersion = "25.05";
 
   imports = [
-      inputs.disko.nixosModules.disko
+    inputs.disko.nixosModules.disko
 
-      ./hardware-configuration.nix
-      ../../os/default.nix
-    ];
+    ./hardware-configuration.nix
+    ../../os/default.nix
+  ];
 
   os = {
     core = {
@@ -22,6 +28,7 @@
       drivers = {
         enable = true;
         amdgpu.enable = true;
+        stability = "unstable";
       };
       fonts.enable = true;
       greet.enable = true;
@@ -62,8 +69,9 @@
       kvm.enable = true;
       nix-helper.enable = true;
       ollama.enable = true;
-      bluetooth.enable = true;
-      zzz.enable = true;
+      # bluetooth.enable = true;
+      kdeconnect.enable = true;
+      # zzz.enable = true;
     };
     wm = {
       enable = true;
@@ -71,6 +79,11 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    krusader
+    kdePackages.kio-extras
+  ];
+
   xdg.terminal-exec = {
     enable = true;
     settings = {
@@ -81,8 +94,8 @@
   boot = {
     kernelParams = [ "video=DP-1:2560x1440@240" ];
     kernelModules = [ "nct6687" ];
-    extraModulePackages = [ 
-      config.boot.kernelPackages.nct6687d 
+    extraModulePackages = [
+      config.boot.kernelPackages.nct6687d
     ];
   };
 }
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 8431d37..e274907 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -47,8 +47,6 @@
         brave.enable = true;
       };
       email.evolution.enable = true;
-      kdeconnect.enable = true;
-      kdenlive.enable = true;
       media.enable = true;
       mpv.enable = true;
       nixcord.enable = true;
@@ -72,6 +70,4 @@
   home.sessionVariables = {
     XDG_UTILS_TERMINAL = "foot";
   };
-
-  programs.firefox.enable = true;
 }
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index d790d57..3390af0 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -3,9 +3,9 @@
   system.stateVersion = "25.05";
 
   imports = [
-      ./hardware-configuration.nix
-      ../../os/default.nix
-    ];
+    ./hardware-configuration.nix
+    ../../os/default.nix
+  ];
 
   os = {
     core = {
@@ -49,6 +49,7 @@
         steam.enable = true;
       };
       nix-helper.enable = true;
+      kdeconnect.enable = true;
     };
     wm = {
       enable = true;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index bfcf58a..e5b5f32 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -37,7 +37,6 @@
     };
     soft = {
       browser.librewolf.enable = true;
-      kdeconnect.enable = true;
       mpv.enable = true;
       media.enable = true;
       nixcord.enable = true;
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 69134eb..f97d714 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -3,12 +3,12 @@
   system.stateVersion = "25.05";
 
   imports = [
-      inputs.disko.nixosModules.disko
-      ./disko.nix
+    inputs.disko.nixosModules.disko
+    ./disko.nix
 
-      ./hardware-configuration.nix
-      ../../os/default.nix
-    ];
+    ./hardware-configuration.nix
+    ../../os/default.nix
+  ];
 
   os = {
     core = {
@@ -47,12 +47,8 @@
         thunar.enable = true;
         utils.enable = true;
       };
-      # gaming = {
-      #   enable = true;
-      #   steam.enable = true;
-      #   vr.enable = true;
-      # };
       # kvm.enable = true;
+      kdeconnect.enable = true;
       nix-helper.enable = true;
     };
     wm = {
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index 120efbc..f3243d8 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -8,7 +8,7 @@
           type = "gpt";
           partitions = {
             ESP = {
-              size = "1G";
+              size = "2G";
               type = "EF00";
               content = {
                 type = "filesystem";
@@ -17,35 +17,60 @@
                 mountOptions = [ "umask=0077" ];
               };
             };
-            root = {
+            luks = {
               size = "100%";
               content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "@" = {
-                    mountpoint = "/";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@home" = {
-                    mountpoint = "/home";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@log" = {
-                    mountpoint = "/var/log";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@vms" = {
-                    mountpoint = "/vms";
-                    mountOptions = [ "nodatacow" "noatime" ];
-                  };
-                  "@swap" = {
-                    mountpoint = "/.swapvol";
-                    mountOptions = [ "nodatacow" "noatime" ];
+                type = "luks";
+                name = "crypted";
+                settings = {
+                  allowDiscards = true;
+                };
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-f" ];
+                  subvolumes = {
+                    "@" = {
+                      mountpoint = "/";
+                      mountOptions = [
+                        "compress=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@home" = {
+                      mountpoint = "/home";
+                      mountOptions = [
+                        "compress=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@nix" = {
+                      mountpoint = "/nix";
+                      mountOptions = [
+                        "compress=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@log" = {
+                      mountpoint = "/var/log";
+                      mountOptions = [
+                        "compress=zstd:1"
+                        "noatime"
+                      ];
+                    };
+                    "@vms" = {
+                      mountpoint = "/vms";
+                      mountOptions = [
+                        "nodatacow"
+                        "noatime"
+                      ];
+                    };
+                    "@swap" = {
+                      mountpoint = "/.swapvol";
+                      mountOptions = [
+                        "nodatacow"
+                        "noatime"
+                      ];
+                    };
                   };
                 };
               };
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 666a3b0..78a39d9 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -37,7 +37,6 @@
     };
     soft = {
       browser.brave.enable = true;
-      kdeconnect.enable = true;
       media.enable = true;
       mpv.enable = true;
       nixcord.enable = true;