diff --git a/configuration.nix b/configuration.nix
index 8b490e0..57c274e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,10 +12,10 @@ in
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
-    # settings = {
-    #     substituters = ["https://hyprland.cachix.org"];
-    #     trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-    # };
+    settings = {
+        substituters = ["https://hyprland.cachix.org"];
+        trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+    };
   };
 
   imports =
@@ -57,7 +57,7 @@ in
   };
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  services.xserver.enable = use-kde;
 
   # Enable the KDE Plasma Desktop Environment.
   services.xserver.displayManager.sddm.enable = use-kde;
@@ -133,7 +133,6 @@ in
      neovim
      wget
      unzip
-     wayland
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/home.nix b/home.nix
index 064c7f7..c6f87cd 100644
--- a/home.nix
+++ b/home.nix
@@ -55,7 +55,7 @@ in
 
       vim-bufkill
 
-  suda-vim
+      suda-vim
 
   # navigation
       nerdtree
@@ -108,15 +108,22 @@ in
     extraConfig = import ./kitty.conf.nix;
   };
 
-  xsession.windowManager.xmonad = if use-kde then {
-      enable = true;
-      config = pkgs.writeText "xmonad.hs" ''
-        import XMonad
-        main = xmonad defaultConfig
-            { terminal    = "kitty"
-            , modMask     = mod4Mask
-            , borderWidth = 3
-            }
-      '';
-  } else {};
+  # xsession.windowManager.xmonad = if use-kde then {
+  #     enable = true;
+  #     config = pkgs.writeText "xmonad.hs" ''
+  #       import XMonad
+  #       main = xmonad defaultConfig
+  #           { terminal    = "kitty"
+  #           , modMask     = mod4Mask
+  #           , borderWidth = 3
+  #           }
+  #     '';
+  # } else {};
+
+  wayland.windowManager.hyprland = if use-kde
+  then {}
+  else {
+    enable = true;
+    enableNvidiaPatches = true;
+  };
 }