update

diff --git a/configuration.nix b/configuration.nix
index 99cd8be554db3734425837b2a85fc34c115c5b75..5ab6712089182fc66769ae195faa84b4cdaa67e9 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -129,6 +129,8 @@ in
   # Services
   services = {
     displayManager = {
+      sddm.enable = true;
+      sddm.autoLogin.relogin = true;
       defaultSession = "xfce+i3";
     };
     desktopManager = {
@@ -138,24 +140,13 @@ in
       enable = true;
       
       displayManager = {
-        lightdm = {
-          enable = true;
-          greeters.gtk = {
-            theme = {
-              name = "Qogir-Dark";
-              package = pkgs.qogir-theme;
-            };
-            iconTheme = {
-              name = "Qogir-dark";
-              package = pkgs.qogir-icon-theme;
-            };
-            cursorTheme = {
-              name = "volantes_light_cursors";
-              package = pkgs.volantes-cursors;
-            };
-          };
-          background = "${wallpaper}";
-        };
+        session = [
+          {
+            manage = "desktop";
+            name = "plasma-i3wm";
+            start = "KDEWM=${pkgs.i3}/bin/i3 /run/current-system/sw/bin/startplasma-x11";
+          }
+        ];
       };
 
       desktopManager = {
@@ -167,8 +158,8 @@ in
         };
       };
       windowManager.i3.enable = true;
-      windowManager.awesome.enable = true;
-      windowManager.herbstluftwm.enable = true;
+      # windowManager.awesome.enable = true;
+      # windowManager.herbstluftwm.enable = true;
 
       xkb = {
         layout = "de";
@@ -181,17 +172,6 @@ in
     };
   };
 
-  systemd.user.services.plasma-i3wm = {
-    wantedBy = [ "plasma-workspace-x11.target" ];
-    # before = [ "plasma-workspace-x11.target" ];
-    description = "Launch Plasma with i3";
-    environment = lib.mkForce {};
-    serviceConfig = {
-      ExecStart = "${pkgs.i3}/bin/i3";
-      Restart = "on-failure";
-    };
-  };
-  systemd.user.services.plasma-workspace-x11.after = [ "plasma-i3wm.target" ];
   systemd.user.services.plasma-kwin_x11.enable = false;
 
   services.autorandr = {
@@ -398,6 +378,7 @@ in
     shellify
     deno
     typst
+    jdt-language-server
 
     scrcpy
 

diff --git a/home-common.nix b/home-common.nix
index 37ab7b4944b99f6868ec49182e8ab04aa32ce1b4..1a40609d005941df01f9732c7fd644cfc437f348 100644 (file)
--- a/home-common.nix
+++ b/home-common.nix
@@ -83,6 +83,7 @@
       vim.lsp.enable('clangd')
       vim.lsp.config('zuban', {})
       vim.lsp.enable('zuban')
+      vim.lsp.enable('jdtls')
       require('guess-indent').setup {}
       local actions = require("telescope.actions")
       require('telescope').setup {

diff --git a/home-ps.nix b/home-ps.nix
index f38a24fba179e2bd8ed504f10f009c66dcca400e..9ee81ad150949ca3f177d734d984b350f54eeb7f 100644 (file)
--- a/home-ps.nix
+++ b/home-ps.nix
@@ -225,7 +225,6 @@ in
           };
     };
     extraConfig = ''
-      exec ${pkgs.xfce.xfce4-panel}/bin/xfce4-panel
       for_window [window_role="pop-up"] floating enable
       for_window [window_role="task_dialog"] floating enable
       for_window [workspace="9"] floating enable