3 files changed, 13 insertions, 29 deletions

diff --git a/nixos/desktop-environment.nix b/nixos/desktop-environment.nix
index 7f4fa4e..3945035 100644
--- a/nixos/desktop-environment.nix
+++ b/nixos/desktop-environment.nix
@@ -1,34 +1,33 @@
-{ config, pkgs, quickshell, ... }:
+{ config, pkgs, quickshell, sessions, ... }:
 {
   services.xserver.enable = true;
   services.xserver.displayManager.startx.enable = true;
   services.displayManager.ly.enable = true;
   services.desktopManager.gnome.enable = false;
   services.desktopManager.plasma6.enable = true;
-  programs.hyprland.enable = true;
-  programs.hyprlock.enable = true;
+  programs.hyprland.enable = sessions.hyprland_wayland;
+  programs.hyprlock.enable = session.hyprland_wayland;
   programs.foot.enable = true;
   programs.sway.enable = true;
   programs.dconf.enable = true;
   environment.systemPackages = with pkgs; [
+    playerctl
+    libnotify
     libGL
-
+    mako
+    lm_sensors
+    slurp
+  ] ++ (if sessions.hyprland_wayland then [
     quickshell.packages.${pkgs.system}.quickshell
     qt6.qtwayland
     catppuccin-cursors.mochaMauve
     swaybg
-    mako
-    lm_sensors
     grim
-    slurp
     hyprcursor
     hyprsunset
     hyprpicker
-    playerctl
-    libnotify
-
     wl-clipboard
-
+  ] else []) ++ (if sessions.plasma_x11 then [
     xclip
     libx11
     libxrandr
@@ -37,5 +36,5 @@
     libxi
     libxext
     libxfixes
-  ];
+  ] else []);
 }
diff --git a/nixos/nvim.nix b/nixos/nvim.nix
index ae3c94c..e3ee7ff 100644
--- a/nixos/nvim.nix
+++ b/nixos/nvim.nix
@@ -6,12 +6,11 @@
     zip
     unzip
 
+    direnv
     xsel
     ripgrep
     tree-sitter
-    
-    luajitPackages.magick
 
-    vscode-langservers-extracted
+    luajitPackages.magick
   ];
 }
diff --git a/nixos/services.nix b/nixos/services.nix
index 5c17b64..2cbd8b5 100644
--- a/nixos/services.nix
+++ b/nixos/services.nix
@@ -31,20 +31,6 @@
   services.cloudflare-warp.enable = true;
   services.openssh.enable = true;
   services.flatpak.enable = true;
-  # services.postgresql = {
-  #   enable = true;
-  #   ensureUsers = [
-  #     {
-  #       name = username;
-  #       ensureDBOwnership = true;
-  #     }
-  #   ];
-  #   ensureDatabases = [ username ];
-  #   authentication = pkgs.lib.mkOverride 10 ''
-  #     #type database  DBuser  auth-method
-  #     local all       all     trust
-  #   '';
-  # };
   services.kanata = {
     enable = true;
     keyboards = {