diff --git a/flake.nix b/flake.nix
index 1c34b48..0a74596 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
     nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes";
 
     # This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone
-    nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
+    #nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
     home-manager = {
       url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -62,7 +62,8 @@
             };
           pkgs = mkPkgs inputs.nixpkgs;
           pkgs-unstable = mkPkgs inputs.nixpkgs-unstable;
-          pkgs-local =  mkPkgs inputs.nixpkgs-local;
+          pkgs-local = mkPkgs inputs.nixpkgs-unstable;
+          #pkgs-local =  mkPkgs inputs.nixpkgs-local;
         in {
           inherit pkgs pkgs-unstable pkgs-local;
         };
diff --git a/modules/hardware/disko/disko-config.nix b/modules/hardware/disko/disko-config.nix
index 000fd4f..53cee37 100644
--- a/modules/hardware/disko/disko-config.nix
+++ b/modules/hardware/disko/disko-config.nix
@@ -24,56 +24,41 @@ _: {
                 };
               };
 
-              luks = {
+              root = {
                 size = "100%";
 
                 content = {
-                  type = "luks";
-                  name = "cryptroot";
+                  type = "btrfs";
 
-                  # You will type this password at boot.
-                  settings.allowDiscards = true;
+                  extraArgs = [ "-f" ];
 
-                  content = {
-                    type = "btrfs";
+                  subvolumes = {
+                    "@root" = {
+                      mountpoint = "/";
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
 
-                    extraArgs = ["-f"];
+                    "@home" = {
+                      mountpoint = "/home";
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
 
-                    subvolumes = {
-                      "@root" = {
-                        mountpoint = "/";
-                        mountOptions = [
-                          "compress=zstd"
-                          "noatime"
-                        ];
-                      };
+                    "@nix" = {
+                      mountpoint = "/nix";
+                      mountOptions = [
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
 
-                      "@home" = {
-                        mountpoint = "/home";
-                        mountOptions = [
-                          "compress=zstd"
-                          "noatime"
-                        ];
-                      };
-
-                      "@nix" = {
-                        mountpoint = "/nix";
-                        mountOptions = [
-                          "compress=zstd"
-                          "noatime"
-                        ];
-                      };
-
-                      "@snapshots" = {
-                        mountpoint = "/.snapshots";
-                      };
-
-                      # Keyfile storage.
-                      # This subvolume will contain the key used
-                      # to unlock the HDD automatically.
-                      "@keys" = {
-                        mountpoint = "/keys";
-                      };
+                    "@snapshots" = {
+                      mountpoint = "/.snapshots";
                     };
                   };
                 };
@@ -92,27 +77,13 @@ _: {
             type = "gpt";
 
             partitions = {
-              luks = {
+              data = {
                 size = "100%";
 
                 content = {
-                  type = "luks";
-
-                  name = "cryptdata";
-
-                  # IMPORTANT:
-                  # This keyfile will be created after installation.
-                  # The SSD unlocks first.
-                  # Then this keyfile unlocks the HDD automatically.
-                  settings = {
-                    keyFile = "/keys/hdd.key";
-                  };
-
-                  content = {
-                    type = "filesystem";
-                    format = "ext4";
-                    mountpoint = "/data";
-                  };
+                  type = "filesystem";
+                  format = "ext4";
+                  mountpoint = "/data";
                 };
               };
             };
diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix
index a325b27..e973963 100644
--- a/modules/hosts/desktop.nix
+++ b/modules/hosts/desktop.nix
@@ -30,7 +30,7 @@
       #hardware-configuration-desktop
       hyprland
       IO
-      kdrive-desktop # we will setup this later
+      #kdrive-desktop # we will setup this later
       latex
       ly
       mullvad
diff --git a/modules/packages/hyprlandPlugins.nix b/modules/packages/hyprlandPlugins.nix
deleted file mode 100644
index db288c8..0000000
--- a/modules/packages/hyprlandPlugins.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-_: {
-  perSystem = _: {
-    packages.hypr-dynamic-cursors-manual = {
-      lib,
-      mkHyprlandPlugin,
-      fetchFromGitHub,
-      nix-update-script,
-    }:
-      mkHyprlandPlugin {
-        pluginName = "hypr-dynamic-cursors";
-        version = "0-unstable-2026-05-29";
-
-        src = fetchFromGitHub {
-          owner = "VirtCode";
-          repo = "hypr-dynamic-cursors";
-          rev = "1de08deb7d495124ce88b342fecc7e7542d0672f";
-          hash = "sha256-Ck9dFUfj/zDSab16CzsGWEMNeSNDhhDOB0JWeHzVvjk=";
-        };
-
-        dontUseCmakeConfigure = true;
-
-        installPhase = ''
-          runHook preInstall
-
-          mkdir -p $out/lib
-          mv out/dynamic-cursors.so $out/lib/libhypr-dynamic-cursors.so
-
-          runHook postInstall
-        '';
-
-        passthru.updateScript = nix-update-script {extraArgs = ["--version=branch"];};
-
-        meta = {
-          description = "Plugin to make your Hyprland cursor more realistic";
-          homepage = "https://github.com/VirtCode/hypr-dynamic-cursors";
-          license = lib.licenses.mit;
-          maintainers = with lib.maintainers; [donovanglover];
-          platforms = lib.platforms.linux;
-        };
-      };
-  };
-}
diff --git a/modules/packages/sbb-tuiManuallyDerived.nix b/modules/packages/sbb-tuiManuallyDerived.nix
deleted file mode 100644
index 8b817b8..0000000
--- a/modules/packages/sbb-tuiManuallyDerived.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-_: {
-  perSystem = {
-    pkgs,
-    pkgs-unstable,
-    ...
-  }: {
-    packages.sbb-tuiManuallyDerived = pkgs-unstable.buildGoModule (finalAttrs: {
-      pname = "sbb-tui";
-      version = "1.14.2";
-      __structuredAttrs = true;
-      src = pkgs.fetchFromGitHub {
-        owner = "Necrom4";
-        repo = "sbb-tui";
-        tag = "v${finalAttrs.version}";
-        hash = pkgs.lib.fakeHash;
-      };
-
-      vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w=";
-
-      ldflags = [
-        "-s"
-        "-w"
-        "-X main.version=${finalAttrs.version}"
-      ];
-
-      allowGoReference = true;
-
-      doCheck = true;
-
-      nativeCheckInputs = [pkgs.versionCheckHook];
-
-      passthru.updateScript = pkgs.nix-update-script {};
-
-      meta = {
-        description = "TUI client for Switzerland's public transport timetables, inspired by SBB/CFF/FFS app";
-        homepage = "https://github.com/Necrom4/sbb-tui";
-        license = pkgs.lib.licenses.mit;
-        platforms = pkgs.lib.platforms.unix;
-        maintainers = with pkgs.lib.maintainers; [tomasrivera];
-        mainProgram = "sbb-tui";
-      };
-    });
-  };
-}