From f3b67ca2e94a692dfc5bf1bfd87649264d1bc898 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Sun, 23 Jul 2023 16:12:18 +0200 Subject: [PATCH] Improve hyprland-config and other small stuff --- .bin/autostart-manage | 2 ++ .config/autostart.toml | 2 +- .config/hypr/base.conf | 8 -------- .config/hypr/binds.conf | 2 ++ .config/hypr/host.conf | 17 +++++++++++++++++ .config/hypr/hyprland.conf | 25 ++++++++----------------- .config/hypr/rules.conf | 22 +++++++++++++++------- .config/hypr/vars.conf | 6 ++++-- .config/qutebrowser/config_kiosk.py | 2 +- 9 files changed, 50 insertions(+), 36 deletions(-) delete mode 100644 .config/hypr/base.conf create mode 100644 .config/hypr/host.conf diff --git a/.bin/autostart-manage b/.bin/autostart-manage index 7923b87..6a15dad 100755 --- a/.bin/autostart-manage +++ b/.bin/autostart-manage @@ -73,6 +73,8 @@ _autostart_manage_exec () { } _autostart_run_graphical () { + pass x # Try to unlock yubikey asap + start-audio pipewire wait-for-service "network-online.target" diff --git a/.config/autostart.toml b/.config/autostart.toml index 3d2ca9c..cd54eff 100644 --- a/.config/autostart.toml +++ b/.config/autostart.toml @@ -42,7 +42,7 @@ hosts = [] group = 'chat' [apps.hyprland-handler] -command = '$XDG_CONFIG_HOME/hypr/handler' +command = '$XDG_CONFIG_HOME/hypr/handler.sh' hosts = [] group = 'wayland' diff --git a/.config/hypr/base.conf b/.config/hypr/base.conf deleted file mode 100644 index d54803c..0000000 --- a/.config/hypr/base.conf +++ /dev/null @@ -1,8 +0,0 @@ -source = ~/.config/hypr/dracula.conf - -source = ~/.config/hypr/env.conf -source = ~/.config/hypr/vars.conf -source = ~/.config/hypr/binds.conf -source = ~/.config/hypr/rules.conf - -exec-once = autostart-manage run-wayland diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index ef3fd61..3eb6f06 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -9,7 +9,9 @@ bind = $main_mod, F, fullscreen, bind = $main_mod, D, exec, j4-dmenu-desktop --dmenu="$DMENU" bind = $main_mod, Pause, exec, menu-shutdown + bind = $main_mod, Print, exec, screenshot +bind = $main_mod CTRL, Print, exec, screenshot --no-upload bind = $main_mod SHIFT, R, exec, autostart-manage run-wayland diff --git a/.config/hypr/host.conf b/.config/hypr/host.conf new file mode 100644 index 0000000..f0a4728 --- /dev/null +++ b/.config/hypr/host.conf @@ -0,0 +1,17 @@ +$mon1 = DP-1 +$mon2 = HDMI-A-1 + +workspace=$ws01, monitor:$mon1, default:true +workspace=$ws02, monitor:$mon1 +workspace=$ws03, monitor:$mon1 +workspace=$ws04, monitor:$mon1 +workspace=$ws05, monitor:$mon1 +workspace=$ws06, monitor:$mon1 +workspace=$ws07, monitor:$mon1 + +workspace=$ws08, monitor:$mon2 +workspace=$ws09, monitor:$mon2, default:true +workspace=$ws10, monitor:$mon2 + +monitor = $mon1,2560x1440@144,1920x0,auto +monitor = $mon2,1920x1080@60,0x0,auto diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 178b96c..41a6232 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,21 +1,12 @@ +source = ~/.config/hypr/dracula.conf + source = ~/.config/hypr/defaults.conf -$mon1 = DP-1 -$mon2 = HDMI-A-1 +source = ~/.config/hypr/host.conf -workspace=$ws01, monitor:$mon1, default:true -workspace=$ws02, monitor:$mon1 -workspace=$ws03, monitor:$mon1 -workspace=$ws04, monitor:$mon1 -workspace=$ws05, monitor:$mon1 -workspace=$ws06, monitor:$mon1 -workspace=$ws07, monitor:$mon1 +source = ~/.config/hypr/env.conf +source = ~/.config/hypr/vars.conf +source = ~/.config/hypr/binds.conf +source = ~/.config/hypr/rules.conf -workspace=$ws08, monitor:$mon2 -workspace=$ws09, monitor:$mon2, default:true -workspace=$ws10, monitor:$mon2 - -monitor = $mon1,2560x1440@144,1920x0,auto -monitor = $mon2,1920x1080@60,0x0,auto - -source = ~/.config/hypr/base.conf +exec-once = autostart-manage run-wayland diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index 2eacbc8..c30faa6 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -5,9 +5,9 @@ windowrulev2 = workspace $ws_web, class:(firefox) windowrulev2 = workspace $ws_focus, class:^(jetbrains-) -windowrulev2 = workspace $ws_media, class:(Chromium) -windowrulev2 = workspace $ws_media, class:(FreeTube) -windowrulev2 = workspace $ws_media, class:(qutebrowser-kiosk) +windowrulev2 = workspace $ws_media silent, class:(Chromium) +windowrulev2 = workspace $ws_media silent, class:(FreeTube) +windowrulev2 = workspace $ws_media silent, class:(qutebrowser-kiosk) windowrulev2 = workspace $ws_chat silent, class:(discord) windowrulev2 = workspace $ws_chat silent, class:(Element) @@ -27,12 +27,20 @@ windowrulev2 = monitor $mon2, class:(steam), title:^(Friends List) windowrulev2 = float, class:(xdg-desktop-portal-gtk) -#windowrulev2 = monitor $mon2 silent, class:(thunderbird), title:^$ # where monitor silent rule? -windowrulev2 = noinitialfocus, class:(thunderbird), title:^$ +windowrulev2 = monitor $mon2, class:(thunderbird), title:^$ # where monitor silent rule? +windowrulev2 = nofocus, class:(thunderbird), title:^$ windowrulev2 = float, class:(thunderbird), title:^$ -windowrulev2 = move 100%-600 5, class:(thunderbird), title:^$ -windowrulev2 = float, class:(thunderbird), title:(Reminder)$ +windowrulev2 = move 5 5, class:(thunderbird), title:^$ + +windowrulev2 = float, class:(thunderbird), title:(Reminder) windowrulev2 = float, class:(org.keepassxc.KeePassXC), title:(KeePassXC - Browser Access Request) +windowrulev2 = float, class:(Pinetry-gtk-2) + windowrulev2 = fullscreen, class:(FreeTube) + +#windowrulev2 = tile, class:(discord) +#windowrulev2 = nofullscreenrequest, class:(discord) + +windowrulev2 = float, class:(com/.https://ultimaker.UltiMaker-Cura), title:(UltiMaker-Cura) diff --git a/.config/hypr/vars.conf b/.config/hypr/vars.conf index 0bb63fc..380b671 100644 --- a/.config/hypr/vars.conf +++ b/.config/hypr/vars.conf @@ -8,7 +8,7 @@ input { numlock_by_default = true follow_mouse = 1 - mouse_refocus = false + mouse_refocus = true accel_profile = flat touchpad { @@ -28,7 +28,7 @@ general { cursor_inactive_timeout = 3 no_cursor_warps = true - layout = master + layout = dwindle } decoration { @@ -59,6 +59,8 @@ dwindle { pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = yes # you probably want this + force_split = 2 # always split to right/bottom + no_gaps_when_only = yes } diff --git a/.config/qutebrowser/config_kiosk.py b/.config/qutebrowser/config_kiosk.py index 8d859a0..9f6a17e 100644 --- a/.config/qutebrowser/config_kiosk.py +++ b/.config/qutebrowser/config_kiosk.py @@ -9,4 +9,4 @@ c.tabs.show = 'never' c.statusbar.show = 'never' c.auto_save.session = False -c.url.start_pages = ['https://twitch.tv/'] +c.url.start_pages = ['https://nebula.tv/']