diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index 8b4c4ef..742778e 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -51,15 +51,21 @@ in enable = true; package = pkgs.fish; - # TODO: unify into single if interactiveShellInit = '' - if test -z $INSIDE_EMACS ; - if test $TERM != linux ; - eval (${pkgs.zellij}/bin/zellij setup --generate-auto-start fish | string collect) - end + # TODO do not run on headless systems + function kde_run + ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed \ + ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland end - any-nix-shell fish --info-right | source + ############################################ + # Adds a seperating arrow inbetween commands + # ~ ls <----------- at 12:12 + # some home folders + # ~ echo 123 <----------- at 12:13 + # 123 + # ~ _ + ############################################ function starship_transient_rprompt_func set width "$(calc "($(tput cols)-12)/2")" echo -n " <" @@ -67,6 +73,17 @@ in echo -n " " starship module time end + + if test -z $INSIDE_EMACS && test $TERM != linux ; + eval (${pkgs.zellij}/bin/zellij setup --generate-auto-start fish | string collect) + end + + if test $TERM = linux && test (who am i | string split " ")[2] = tty1; + kde_run && exit + end + + any-nix-shell fish --info-right | source + cat /var/lib/rust-motd/motd ''; loginShellInit = '' diff --git a/os-mods/desktop/default.nix b/os-mods/desktop/default.nix index 038ed8b..7fddb02 100644 --- a/os-mods/desktop/default.nix +++ b/os-mods/desktop/default.nix @@ -64,14 +64,17 @@ programs.kdeconnect.enable = true; security.pam.services = { - sddm.kwallet.enable = true; + # sddm.kwallet.enable = true; useless due to tty as dm kdewallet.kwallet.enable = true; + kdewallet.kwallet.forceRun = true; # tty as dm support }; services = { desktopManager.plasma6.enable = true; desktopManager.plasma6.enableQt5Integration = true; - displayManager.sddm.enable = true; + displayManager.enable = false; # tty as dm ftw + displayManager.sddm.enable = false; # tty as dm ftw + xserver.displayManager.lightdm.enable = false; # tty as dm ftw xserver = { enable = true; xkb = {