tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Switch to tty as dm

Browse source
This commit is contained in:
Tristan D. 2024-08-07 11:37:31 +02:00
parent fd70eb041a
commit 4ea27fd1f0
Signed by: tristan
SSH key fingerprint: SHA256:9oFM1J63hYWJjCnLG6C0fxBS15rwNcWwdQNMOHYKJ/4
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
home-mods/shell/default.nix
View file

@ -51,15 +51,21 @@ in
enable = true; enable = true;
package = pkgs.fish; package = pkgs.fish;
# TODO: unify into single if
interactiveShellInit = '' interactiveShellInit = ''
if test -z $INSIDE_EMACS ; # TODO do not run on headless systems
if test $TERM != linux ; function kde_run
eval (${pkgs.zellij}/bin/zellij setup --generate-auto-start fish | string collect) ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed \
end ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland
end 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 function starship_transient_rprompt_func
set width "$(calc "($(tput cols)-12)/2")" set width "$(calc "($(tput cols)-12)/2")"
echo -n " <" echo -n " <"
@ -67,6 +73,17 @@ in
echo -n " " echo -n " "
starship module time starship module time
end 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 cat /var/lib/rust-motd/motd
''; '';
loginShellInit = '' loginShellInit = ''

7
os-mods/desktop/default.nix
View file

@ -64,14 +64,17 @@
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
security.pam.services = { security.pam.services = {
sddm.kwallet.enable = true; # sddm.kwallet.enable = true; useless due to tty as dm
kdewallet.kwallet.enable = true; kdewallet.kwallet.enable = true;
kdewallet.kwallet.forceRun = true; # tty as dm support
}; };
services = { services = {
desktopManager.plasma6.enable = true; desktopManager.plasma6.enable = true;
desktopManager.plasma6.enableQt5Integration = 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 = { xserver = {
enable = true; enable = true;
xkb = { xkb = {