diff --git a/modules/desktop.nix b/modules/desktop.nix index 981e86d..2b66c8e 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -84,12 +84,12 @@ with lib; enable = true; settings = rec { initial_session = { - # command = "hyprland"; - command = "dbus-run-session startplasma-wayland"; + command = "hyprland"; + # command = "dbus-run-session startplasma-wayland"; user = "chris"; }; default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session startplasma-wayland' -s /etc/greetd/environments"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'hyprland' -s /etc/greetd/environments"; user = "greeter"; }; plasma_session = { diff --git a/scripts/emacslof b/scripts/emacslof index 5151e37..9c58e25 100755 --- a/scripts/emacslof +++ b/scripts/emacslof @@ -22,7 +22,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then exit else echo WAYLAND - emacsrg=$(wlrctl window list | rg emacs | rg -v dired) + emacsrg=$(wlrctl window list | rg "emacs:" | rg -v dired) echo $emacsrg emacswin=$(echo $emacsrg | sed 's/.*\: //') @@ -35,9 +35,9 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then else if [ $(pgrep -c emacs) -gt 0 ]; then - alacritty -e emacs --daemon exec emacsclient -c & else + alacritty -e emacs --daemon exec emacsclient -c & fi fi diff --git a/scripts/startup.sh b/scripts/startup.sh index 642609e..50ab96f 100755 --- a/scripts/startup.sh +++ b/scripts/startup.sh @@ -15,14 +15,6 @@ batmon & killall eww -if [ $(hostname) = "syl" ]; then - style="laptop" - eww open bar0 & - #echo "this is hidpi" -else - style="desktop" - eww open bar1 & - #echo "this is not hidpi" -fi +eww open bar0 & eww open notifications & eww open sidebar &