diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix index 45af481..1f55985 100644 --- a/modules/core/stylix.nix +++ b/modules/core/stylix.nix @@ -7,6 +7,5 @@ stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - targets.console.enable = false; }; } diff --git a/modules/core/wayland.nix b/modules/core/wayland.nix index f00a3f5..edfa3be 100644 --- a/modules/core/wayland.nix +++ b/modules/core/wayland.nix @@ -4,11 +4,7 @@ username, ... }: { - programs.hyprland = { - enable = true; - withUWSM = true; - }; - + programs.hyprland.enable = true; xdg.portal = { enable = true; wlr.enable = true; @@ -34,11 +30,9 @@ }; cageArgs = ["-s" "-m" "last"]; # Only show on the last monitor }; - services.greetd.settings.initial_session = { - command = "uwsm start hyprland-uwsm.desktop"; + command = "Hyprland"; user = "${username}"; }; - environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es"; } diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 781817d..fac924a 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -3,15 +3,16 @@ settings = { # autostart exec-once = [ - "uwsm app -- nm-applet" - "uwsm app -- wl-clip-persist --clipboard regular" - "uwsm app -- bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'" - "uwsm app -- swaybg -m fill -i ~/.config/hypr/wallpaper.png &" - "uwsm app -- poweralertd" - "uwsm app -- waybar" - "uwsm app -- swaync" - "uwsm app -- ckb-next -b" - "uwsm app -- element-desktop --hidden" + "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent &" + "nm-applet &" + "wl-clip-persist --clipboard regular &" + "bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'" + "swaybg -m fill -i ~/.config/hypr/wallpaper.png &" + "poweralertd &" + "waybar &" + "swaync &" + "ckb-next -b &" + "element-desktop --hidden &" ]; input = { @@ -126,33 +127,32 @@ "$mainMod, F1, exec, show-keybinds" # keybindings - "$mainMod, Return, exec, uwsm app -- kitty" - "ALT, Return, exec, uwsm app -- kitty --title float_kitty" - "$mainMod SHIFT, Return, exec, uwsm app -- kitty --start-as=fullscreen -o 'font_size=16'" - "$mainMod, B, exec, uwsm app -- librewolf" - "$mainMod, N, exec, uwsm app -- swaync-client -t" - "$mainMod SHIFT, N, exec, uwsm app -- swaync-client -d" + "$mainMod, Return, exec, kitty" + "ALT, Return, exec, kitty --title float_kitty" + "$mainMod SHIFT, Return, exec, kitty --start-as=fullscreen -o 'font_size=16'" + "$mainMod, B, exec, librewolf" + "$mainMod, N, exec, swaync-client -t" + "$mainMod SHIFT, N, exec, swaync-client -d" "$mainMod SHIFT, Q, killactive," "$mainMod, F, fullscreen, 0" "$mainMod SHIFT, F, fullscreen, 1" "$mainMod, Space, togglefloating," - "$mainMod, D, exec, uwsm app -- fuzzel" - "$mainMod SHIFT, E, exec, uwsm app -- bemoji -n" - "$mainMod, M, exec, uwsm app -- element-desktop" - "$mainMod, Y, exec, uwsm app -- kitty spotify_player" - "$mainMod, X, exec, uwsm app -- rofi-rbw" - "$mainMod, Escape, exec, uwsm app -- loginctl lock-session" - "$mainMod SHIFT, Escape, exec, uwsm app -- shutdown-script" + "$mainMod, D, exec, fuzzel" + "$mainMod SHIFT, E, exec, bemoji -n" + "$mainMod, M, exec, element-desktop" + "$mainMod, Y, exec, kitty spotify_player" + "$mainMod, Escape, exec, loginctl lock-session" + "$mainMod SHIFT, Escape, exec, shutdown-script" "$mainMod, P, pseudo," "$mainMod SHIFT, P, togglesplit," - "$mainMod, E, exec, uwsm app -- nemo" - "$mainMod SHIFT, B, exec, uwsm app -- pkill -SIGUSR1 .waybar-wrapped" - "$mainMod, C ,exec, uwsm app -- hyprpicker -a" - "$mainMod, W,exec, uwsm app -- wallpaper-picker" + "$mainMod, E, exec, nemo" + "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped" + "$mainMod, C ,exec, hyprpicker -a" + "$mainMod, W,exec, wallpaper-picker" # screenshot - "$mainMod, Print, exec, uwsm app -- screenshot-menu" - ",Print, exec, uwsm app -- grimblast --notify --freeze copy area" + "$mainMod, Print, exec, screenshot-menu" + ",Print, exec, grimblast --notify --freeze copy area" ] ++ ( # workspaces diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index d4ca52a..7c4515d 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -23,8 +23,6 @@ # hidpi = true; }; # enableNvidiaPatches = false; - systemd.enable = false; + systemd.enable = true; }; - - services.hyprpolkitagent.enable = true; }