From: Patrick Date: Thu, 20 Nov 2025 22:18:54 +0000 (+0100) Subject: update X-Git-Url: https://gitweb.ps.run/flake_thinkpad/commitdiff_plain/0af24122fe45b550330ef6e2aa2ab0bd8f0598a8 update --- diff --git a/configuration.nix b/configuration.nix index 99cd8be..5ab6712 100644 --- 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 37ab7b4..1a40609 100644 --- 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 f38a24f..9ee81ad 100644 --- 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