fixes to greetd and switching back to fish

This commit is contained in:
Chris Cochrun 2025-08-04 14:02:37 -05:00
parent 9d38ed5fa2
commit 109ae12bcc
2 changed files with 21 additions and 8 deletions

View file

@ -1249,6 +1249,23 @@ in {
starship init fish | source starship init fish | source
''; '';
shellAliases = {
ls = "eza -l";
la = "eza -la";
mpf = "mpv --profile=fast";
mps = "mpv --profile=slow";
ec = "emacsclient -t";
ecc = "emacsclient -c";
# mkdir = "mkdir -p";
nupd = "update-nix";
nupg = "upgrade-nix";
suspend = "systemctl suspend";
sysuse = "systemctl --user";
myip = "curl icanhazip.com";
nixs = "nix search nixpkgs";
# ytd = "yt-dlp -o '~/Videos/%(title)s.%(ext)s'";
};
}; };
programs.nushell = { programs.nushell = {
@ -1463,7 +1480,7 @@ in {
padding.y = 10; padding.y = 10;
dynamic_padding = true; dynamic_padding = true;
}; };
terminal.shell.program = "nu"; terminal.shell.program = "fish";
font = { font = {
normal = { normal = {
family = "VictorMono Nerd Font"; family = "VictorMono Nerd Font";

View file

@ -82,16 +82,12 @@ in
enable = true; enable = true;
settings = rec { settings = rec {
initial_session = { initial_session = {
command = "if uwsm check may-start; then command = "uwsm start hyprland-uwsm.desktop";
exec uwsm start hyprland-uwsm.desktop
fi";
# command = "dbus-run-session startplasma-wayland"; # command = "dbus-run-session startplasma-wayland";
user = "chris"; user = "chris";
}; };
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'if uwsm check may-start; then command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'uwsm start hyprland-uwsm.desktop' -s /etc/greetd/environments";
exec uwsm start hyprland-uwsm.desktop
fi' -s /etc/greetd/environments";
user = "greeter"; user = "greeter";
}; };
plasma_session = { plasma_session = {
@ -99,7 +95,7 @@ fi' -s /etc/greetd/environments";
user = "chris"; user = "chris";
}; };
hyprland_session = { hyprland_session = {
command = "Hyprland"; command = "uwsm start hyprland-uwsm.desktop";
user = "chris"; user = "chris";
}; };
}; };