diff options
| -rwxr-xr-x | autostart.sh | 1 | ||||
| -rw-r--r-- | hypr/hypridle.conf | 4 | ||||
| -rw-r--r-- | hypr/hyprland.conf | 160 | ||||
| -rw-r--r-- | lf/lfrc | 1 | ||||
| -rw-r--r-- | niri/config.kdl | 6 | ||||
| -rwxr-xr-x | nsxiv/exec/key-handler | 2 | ||||
| -rw-r--r-- | sh/functions | 1 | ||||
| -rw-r--r-- | waybar/config | 5 |
8 files changed, 102 insertions, 78 deletions
diff --git a/autostart.sh b/autostart.sh index 42eb092..7124a5e 100755 --- a/autostart.sh +++ b/autostart.sh @@ -18,6 +18,7 @@ killandrun () { } if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then + dinit & notify-sound.sh off & runifnot swayidle killandrun hyprpaper diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 3a58aea..5494a33 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -13,8 +13,8 @@ listener { # turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. listener { timeout = 150 # 2.5min. - on-timeout = brightnessctl -d led::kbd_backlight set 0 # turn off keyboard backlight. - on-resume = brightnessctl -rd led::kbd_backlight # turn on keyboard backlight. + on-timeout = brightnessctl -d tpacpi::kbd_backlight set 0 # turn off keyboard backlight. + on-resume = brightnessctl -rd tpacpi::kbd_backlight # turn on keyboard backlight. } listener { diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index d8db576..47be77b 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -2,7 +2,7 @@ #{{{ Monitor config #monitor = DP-2, highres highrr, 0x0, 1 #monitor = HDMI-A-1, highres highrr, 1920x0, 1 -#monitor = eDP-1, highres highrr, 0x0, 1 +monitor = eDP-1, highres highrr, 0x0, 1 monitor = , highres highrr, auto, 1 #}}} @@ -16,23 +16,26 @@ monitor = , highres highrr, auto, 1 #{{{ Autostart # Execute your favorite apps at launch # exec-once = waybar & hyprpaper & firefox +<<<<<<< HEAD +exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # These are for systems with no systemd -#exec-once = hyprpm reload -n -#exec-once = pypr -#exec-once = bl-save -#exec-once = hyprpaper -#exec-once = hypridle -#exec-once = waybar -#exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent -#exec-once = dunst -#exec-once = hypridle -#exec-once = xwayland-satellite :1 -#exec-once = mpd +exec-once = dinitctl start hyprpaper.user +exec-once = hyprpm reload -n +exec-once = pypr +exec-once = bl-save +exec-once = hyprpaper +exec-once = hypridle +exec-once = waybar +exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent +exec-once = dunst +exec-once = hypridle +exec-once = xwayland-satellite :1 +exec-once = mpd # These are for systems with uwsm/systemd -exec-once = uwsm app -- hyprpm reload -n -exec-once = uwsm app -- xdph -exec-once = uwsm app -- pypr -exec-once = uwsm app -- bl-save +#exec-once = uwsm app -- hyprpm reload -n +#exec-once = uwsm app -- xdph +#exec-once = uwsm app -- pypr +#exec-once = uwsm app -- bl-save #}}} #{{{ env @@ -227,7 +230,24 @@ plugin { # Example windowrule v2 # windowrule = float, class:^(kitty)$, title:^(kitty)$ # See https://wiki.hypr.land/Configuring/Window-Rules/ for more -windowrulev2 = workspace special:easyeffects silent, match: class ^(com\.github\.wwmm\.easyeffects)$ +windowrule = fullscreen on, match:class ^(Xephyr)$ +windowrule = float on, match:title ^(LibreWolf - Choose User Profile)$ +windowrule = float on, match:class ^(xdg-desktop-portal-gtk) +windowrule = float on, match:title ^(UNDERTALE)$ +windowrule = float on, match:class ^(Tk)$ +windowrule = float on, match:class ^(lxqt-policykit-agent)$ +windowrule = stay_focused on, match:title ^()$, match:class ^(steam)$ +windowrule = min_size 1 1, match:title ^()$, match:class ^(steam)$ +windowrule = stay_focused on, match:title ^(menu)$, match:class ^(yabridge-host.exe.so)$ +windowrule = min_size 1 1, match:title ^(menu)$, match:class ^(yabridge-host.exe.so)$ +windowrule = float on, match:class ^(yabridge-host.exe.so)$, match:title ^(menu)$ +windowrule = float on, match:float 0, match:title ^(menu*) +windowrule = workspace 2, match:title ^(REAPER .*initializing.*)$ +windowrule = tile on, match:class ^(REAPER)$, match:title ^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ +windowrule = tile on, match:class ^(WebApp-Qobuz[0-9]*)$ +windowrule = float on, match:title ^(menu)$ +windowrule = move cursor -50% -50%, match:class ^(yabridge-host.exe.so)$, match:title ^(menu)$ +windowrule = workspace special:easyeffects silent, match:class ^(com\.github\.wwmm\.easyeffects)$ # Fix brave xray menus windowrule = xray 0, match:class ^(\s*), match:title ^(\s*)$ # Center floating XWayland windows @@ -262,7 +282,7 @@ $secdMod = ALT #{{{ Layout toggle bind # Layout toggle -#bind = $mainMod $secdMod, A, exec, uwsm app -- hypr-layout -t +#bind = $mainMod $secdMod, A, exec, hypr-layout -t #}}} #{{{ Master layout binds @@ -314,17 +334,17 @@ bind = $mainMod+ALT, K, changegroupactive, b #}}} #{{{ Device binds -bind = $mainMod, Backspace, exec, uwsm app -- touchpad.sh +bind = $mainMod, Backspace, exec, touchpad.sh #}}} #{{{ WC binds bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, E, exec, uwsm stop bind = $mainMod SHIFT, SPACE, togglefloating, -bind = $mainMod $secdMod, F2, exec, uwsm app -- ~/.config/hypr/gamemode.sh +bind = $mainMod $secdMod, F2, exec, ~/.config/hypr/gamemode.sh bind = $mainMod, F, fullscreen, 0 bind = $mainMod, M, fullscreen, 1 -bind = $mainMod, N, exec, uwsm app -- pypr toggle_special +bind = $mainMod, N, exec, pypr toggle_special bind = $mainMod SHIFT, N, togglespecialworkspace, minimized #}}} @@ -421,46 +441,46 @@ submap = reset #}}} #{{{ Menu bindings -bind = $mainMod, E, exec, uwsm app -- sh -c "tofi-drun --drun-launch=true -c $HOME/.config/tofi/themes/dmenu_vertical" -bind = $mainMod, D, exec, uwsm app -- sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_vertical)" -bind = $mainMod, R, exec, uwsm app -- rs -bind = $mainMod $secdMod, Q, exec, uwsm app -- qbc -bind = $mainMod $secdMod, W, exec, uwsm app -- lwc -bind = $mainMod $secdMod, E, exec, uwsm app -- brc -bind = $mainMod $secdMod, R, exec, uwsm app -- ffc -bind = $mainMod $secdMod, 1, exec, uwsm app -- bm -bind = $mainMod $secdMod, comma, exec, uwsm app -- dmount -p -bind = $mainMod $secdMod, period, exec, uwsm app -- dmenuumount -bind = $mainMod $secdMod CONTROL, U, exec, uwsm app -- dmenuunicode -bind = $mainMod $secdMod, U, exec, uwsm app -- mprisctl -bind = $mainMod $secdMod, P, exec, uwsm app -- passmenu +bind = $mainMod, E, exec, sh -c "tofi-drun --drun-launch=true -c $HOME/.config/tofi/themes/dmenu_vertical" +bind = $mainMod, D, exec, sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_vertical)" +bind = $mainMod, R, exec, rs +bind = $mainMod $secdMod, Q, exec, qbc +bind = $mainMod $secdMod, W, exec, lwc +bind = $mainMod $secdMod, E, exec, brc +bind = $mainMod $secdMod, R, exec, ffc +bind = $mainMod $secdMod, 1, exec, bm +bind = $mainMod $secdMod, comma, exec, dmount -p +bind = $mainMod $secdMod, period, exec, dmenuumount +bind = $mainMod $secdMod CONTROL, U, exec, dmenuunicode +bind = $mainMod $secdMod, U, exec, mprisctl +bind = $mainMod $secdMod, P, exec, passmenu #}}} #{{{ Misc bindings -bind = $mainMod, Return, exec, uwsm app -- kitty -bind = $mainMod $secdMod, F, exec, uwsm app -- kitty lf -bind = $mainMod, W, exec, uwsm app -- pkill -USR1 waybar -bind = $mainMod, Q, exec, uwsm app -- loginctl lock-session -bind = $mainMod $secdMod CONTROL, Q, exec, uwsm app -- systemctl suspend -bind = $mainMod SHIFT, G, exec, uwsm app -- get-app-id -bind = $mainMod Control, M, exec, uwsm app -- volsv -m -#bind = $mainMod, Comma, exec, uwsm app -- acpi-notify.sh -#bind = $mainMod CONTROL, R, exec, uwsm app -- startx -- /usr/bin/Xephyr -screen 1920x1080 :1 +bind = $mainMod, Return, exec, kitty +bind = $mainMod $secdMod, F, exec, kitty lf +bind = $mainMod, W, exec, pkill -USR1 waybar +bind = $mainMod, Q, exec, loginctl lock-session +bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend +bind = $mainMod SHIFT, G, exec, get-app-id +bind = $mainMod Control, M, exec, volsv -m +#bind = $mainMod, Comma, exec, acpi-notify.sh +#bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} #{{{ Scratchpads -bind = $mainMod CONTROL, Z, exec, uwsm app -- pypr toggle sphtop -bind = $mainMod CONTROL, X, exec, uwsm app -- pypr toggle spterm -bind = $mainMod CONTROL, C, exec, uwsm app -- pypr toggle sppmxr -bind = $mainMod CONTROL, V, exec, uwsm app -- pypr toggle spblue -bind = $mainMod CONTROL, B, exec, uwsm app -- pypr toggle spncmp -bind = $mainMod CONTROL, A, exec, uwsm app -- pypr toggle spmutt -bind = $mainMod CONTROL, S, exec, uwsm app -- pypr toggle spprof -bind = $mainMod CONTROL, D, exec, uwsm app -- pypr toggle spirss -bind = $mainMod CONTROL, F, exec, uwsm app -- pypr toggle spvimw -bind = $mainMod CONTROL, G, exec, uwsm app -- pypr toggle sptrmc -bind = $mainMod CONTROL, Q, exec, uwsm app -- pypr toggle helvum -bind = $mainMod CONTROL, E, exec, uwsm app -- pypr toggle easyfx +bind = $mainMod CONTROL, Z, exec, pypr toggle sphtop +bind = $mainMod CONTROL, X, exec, pypr toggle spterm +bind = $mainMod CONTROL, C, exec, pypr toggle sppmxr +bind = $mainMod CONTROL, V, exec, pypr toggle spblue +bind = $mainMod CONTROL, B, exec, pypr toggle spncmp +bind = $mainMod CONTROL, A, exec, pypr toggle spmutt +bind = $mainMod CONTROL, S, exec, pypr toggle spprof +bind = $mainMod CONTROL, D, exec, pypr toggle spirss +bind = $mainMod CONTROL, F, exec, pypr toggle spvimw +bind = $mainMod CONTROL, G, exec, pypr toggle sptrmc +bind = $mainMod CONTROL, Q, exec, pypr toggle helvum +bind = $mainMod CONTROL, E, exec, pypr toggle easyfx #}}} #{{{ OBS bindings @@ -484,19 +504,19 @@ submap = reset #}}} #{{{ Media bindings -bindl = $secdMod, P, exec, uwsm app -- playerctl play-pause -bindel = , XF86AudioRaiseVolume, exec, uwsm app -- volsv -i 5 -bindel = , XF86AudioLowerVolume, exec, uwsm app -- volsv -d 5 -bind = , XF86AudioPlay, exec, uwsm app -- playerctl play-pause -bind = , XF86AudioStop, exec, uwsm app -- playerctl stop -bind = , XF86AudioPrev, exec, uwsm app -- playerctl previous -bind = , XF86AudioNext, exec, uwsm app -- playerctl next -bind = , XF86AudioMute, exec, uwsm app -- volsv -t -#bindl = , XF86AudioMicMute, exec, uwsm app -- volsv -m -bind = , XF86AudioMicMute, exec, uwsm app -- volsv -m -bindel = , XF86MonBrightnessUp, exec, uwsm app -- bl -i -bindel = , XF86MonBrightnessDown, exec, uwsm app -- bl -d -bindl = $mainMod, XF86MonBrightnessUp, exec, uwsm app -- bl -I 1 -bindl = $mainMod, XF86MonBrightnessDown, exec, uwsm app -- bl -D 1 -bind = , Print, exec, uwsm app -- scrshot +bindl = $secdMod, P, exec, playerctl play-pause +bindel = , XF86AudioRaiseVolume, exec, volsv -i 5 +bindel = , XF86AudioLowerVolume, exec, volsv -d 5 +bind = , XF86AudioPlay, exec, playerctl play-pause +bind = , XF86AudioStop, exec, playerctl stop +bind = , XF86AudioPrev, exec, playerctl previous +bind = , XF86AudioNext, exec, playerctl next +bind = , XF86AudioMute, exec, volsv -t +#bindl = , XF86AudioMicMute, exec, volsv -m +bind = , XF86AudioMicMute, exec, volsv -m +bindel = , XF86MonBrightnessUp, exec, bl -i +bindel = , XF86MonBrightnessDown, exec, bl -d +bindl = $mainMod, XF86MonBrightnessUp, exec, bl -I 1 +bindl = $mainMod, XF86MonBrightnessDown, exec, bl -D 1 +bind = , Print, exec, scrshot #}}} @@ -415,3 +415,4 @@ map gyb cd "~/.cache/yay" map gyc cd "~/.config/yay" map gzs cd "~/.config/zsh" map gzx cd "~/Documents/zachir.xyz" +map gdr cd "~/Documents/work" diff --git a/niri/config.kdl b/niri/config.kdl index 8fa7330..4ef45bd 100644 --- a/niri/config.kdl +++ b/niri/config.kdl @@ -71,7 +71,7 @@ input { // Find more information on the wiki: // https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs // Remember to uncomment the node by removing "/-"! -/-output "eDP-1" { +output "eDP-1" { // Uncomment this line to disable this output. //off @@ -272,8 +272,8 @@ layout { // This line starts waybar, a commonly used bar for Wayland compositors. spawn-at-startup "waybar" -spawn-at-startup "hyprpaper" -spawn-at-startup "hypridle" +spawn-at-startup "dinitctl start hyprpaper" +spawn-at-startup "dinitctl start hypridle" spawn-at-startup "dunst" spawn-at-startup "xwayland-satellite" diff --git a/nsxiv/exec/key-handler b/nsxiv/exec/key-handler index 53099e4..e653dd6 100755 --- a/nsxiv/exec/key-handler +++ b/nsxiv/exec/key-handler @@ -10,7 +10,7 @@ while read file; do magick "$file" ~/Pictures/background.png ;; esac - t -r hyprpaper + dinitctl restart hyprpaper ;; esac done diff --git a/sh/functions b/sh/functions index e7270bc..7d4cb32 100644 --- a/sh/functions +++ b/sh/functions @@ -191,6 +191,7 @@ zx - $XDG_DOCUMENTS_DIR/zachir.xyz "yc") cd "$XDG_CONFIG_HOME/yay" ;; "zs") cd "$XDG_CONFIG_HOME/zsh" ;; "zx") cd "$XDG_DOCUMENTS_DIR/zachir.xyz" ;; +"dr") cd "$XDG_DOCUMENTS_DIR/work" ;; # STOPPATHS *) echo "\"$1\" is not a known location" ;; esac diff --git a/waybar/config b/waybar/config index da85cd3..6f89f64 100644 --- a/waybar/config +++ b/waybar/config @@ -12,7 +12,7 @@ "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "battery", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"], // Modules configuration @@ -162,7 +162,8 @@ "format": "{used}G " }, "battery": { - "bat": "BAT0", + //"bat": "BAT0", + "weighted-average": "true", "interval": 60, "state": { "warning": 30, |