From 4f1e43e923f8d51b3eed8b291d6f484acea5b328 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sat, 7 Sep 2024 18:31:54 +0200 Subject: [PATCH] continue work on wayland things --- .../desktop-environment/home/sway/default.nix | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index 2522cc6..44b4c5f 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -6,6 +6,7 @@ }: { programs.wofi.enable = true; programs.swaylock.enable = true; + services.network-manager-applet.enable = true; xdg.portal = { enable = true; @@ -64,11 +65,7 @@ }; startup = [ { - command = "eww open topBar; eww open bottomBar"; - } - { - command = "pkill nm-applet; sleep 1 && nm-applet"; - always = true; + command = "eww open-many topBar bottomBar"; } { command = "sleep 1 && mullvad-gui"; @@ -77,6 +74,16 @@ bars = []; menu = "wofi -d"; modifier = "Mod4"; + assigns = { + "1" = [ + {class = "^Signal$";} + {class = "^Element$";} + {class = "^Evolution$";} + ]; + "2" = [ + {app_id = "^firefox$";} + ]; + }; keybindings = with { #mod = config.xsession.windowManager.i3.config.modifier; # mod = "Mod1"; @@ -112,14 +119,6 @@ # rofi fuckery "${mod}+d" = "exec wofi -S drun --allow-images"; "${mod}+i" = "exec rofimoji --selector wofi -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; - # TODO: wayland - # "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../../other/rofi-themes/applauncher.rasi}"; - # "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../../other/rofi-themes/applauncher.rasi}"; - # "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; - # "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../../other/rofi-themes/applauncher.rasi}"; - # "${mod}+m" = "exec --no-startup-id menu-qalc"; - - # "${mod}+o" = "exec --no-startup-id rofi -show searchwolf -modes \"searchwolf:${searchwolf.outPath}/bin/searchwolf\""; # audio "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status"; @@ -138,16 +137,11 @@ "XF86KbdBrightnessUp" = "exec brillo -kA 10.0"; "XF86KbdBrightnessDown" = "exec brillo -kU 10.0"; - - # macros - # "${mod}+q" = "exec em-record.sh"; - # "${mod}+p" = "exec em-play.sh"; - # "${mod}+Shift+p" = "exec em-play-loop.sh"; - - # permaclip - # "${mod}+c" = "exec rofi -show register -modes \"register:${pc-set.outPath}/bin/pc-set.sh\" -theme gruvbox-dark"; - # "${mod}+v" = "exec rofi -show register -modes \"register:${pc-get.outPath}/bin/pc-get.sh\" -theme gruvbox-dark"; }; + workspaceAutoBackAndForth = true; + focus = { + wrapping = "yes"; + }; fonts = { names = ["Atkinson Hyperlegible"]; style = "Regular";