hosts/common/common.nix

@@ -16,6 +16,7 @@
 
   environment.systemPackages = with pkgs; [
     home-manager
+    kitty
     fastfetch
     font-awesome
     thunderbird
@@ -41,6 +42,8 @@
     mpv
     fritzing
     networkmanagerapplet
+    grim
+    slurp
     gparted
     gnome-disk-utility
     sl

hosts/desktop1/configuration.nix

@@ -14,7 +14,6 @@
     nvidia.enable = true;
     virt.enable = true;
     hyprland.enable = true;
-    kde.enable = true;
   };
 
   home-manager = {
@@ -36,6 +35,7 @@
     }
   '';
 
+  services.desktopManager.plasma6.enable = true;
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
 

hosts/laptop1/configuration.nix

@@ -9,8 +9,6 @@
   
   smayzy = {
     laptop.enable = true;
-    hyprland.enable = true;
-    kde.enable = true;
   };
 
   home-manager = {
@@ -25,12 +23,14 @@
 
   networking.hostName = "laptop1";
 
+  services.desktopManager.plasma6.enable = true;
   services.displayManager.sddm.enable = true;
   services.displayManager.sddm.wayland.enable = true;
 
   environment.systemPackages = with pkgs; [
   webcord
   obsidian
+  samrewritten
   libsForQt5.kdenlive
   floorp
   komikku

modules/nix/WM/hyprland.nix

@@ -30,9 +30,6 @@ in
       hyprlock
       pavucontrol
       cliphist
-      kitty
-      grim
-      slurp
     ];
   };
 }

modules/nix/de/default.nix

@@ -1,6 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-  imports = [
-    ./kde.nix
-  ];
-}

modules/nix/de/kde.nix

@@ -1,15 +0,0 @@
-{  lib, config, pkgs, ... }:
-let
-  inherit (lib) mkIf mkOption types;
-in
-{
-  options.smayzy.kde.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "kde";
-  };
-
-  config = mkIf config.smayzy.kde.enable {
-    services.desktopManager.plasma6.enable = true;
-  };
-}

modules/nix/default.nix

@@ -10,8 +10,7 @@
     ./shell
     ./rice
     ./groups
-    ./wm
+    ./WM
-    ./de
   ];
 
   # Timzone and locales (same for all machines so I put it here)