diff --git a/README.org b/README.org index 5c855f0..141d5cd 100644 --- a/README.org +++ b/README.org @@ -495,7 +495,7 @@ Let's create our own custom LightlyShaders package. This is in it's own file for Let's also add our own package from my WIP presenter #+NAME: librepresenter #+begin_src nix -(with import {}; libsForQt5.callPackage /home/chris/dev/church-presenter {}) +(libsForQt5.callPackage /home/chris/dev/church-presenter {}) #+end_src Firefox has it's own setup @@ -810,7 +810,7 @@ Notice how I am including all of my software here. It may be a big file, but hav # Dev tools <> <> - # <> + <> # (with import {}; libsForQt5.callPackage ../../bismuth {}) ]; diff --git a/awesome/init.fnl b/awesome/init.fnl index 1c39dff..87abb0d 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -704,10 +704,12 @@ ;; MPV wasn't centering right (when (= c.class "mpv") (awful.placement.centered c)) + (when (= c.class "mpv") (set c.height (dpi 900))) (when (= c.class "imv") (awful.placement.centered c)) (when (= c.class "Sxiv") (awful.placement.centered c)) (when (= c.class "Libre Presenter") (awful.placement.centered c)) (when (= c.name "Display Window") (set c.fullscreen true)) + (when (= c.name "presentation-window") (set c.fullscreen true)) (awful.client.focus.byidx 1) ;; Rounded windows done right diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 60afb6b..1a23015 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -39,8 +39,8 @@ general { } gestures { - workspace_swipe=true - workspace_swipe_fingers=4 + workspace_swipe=true + workspace_swipe_fingers=3 } decoration { @@ -77,11 +77,13 @@ dwindle { } master { - # special_scale_factor=0.6 - new_is_master=false - new_on_top=false + special_scale_factor=0.7 + new_is_master=false + new_on_top=false } +misc:disable_autoreload = true + # example window rules # for windows named/classed as abc and xyz #windowrule=move 69 420,abc @@ -95,6 +97,7 @@ windowrule=float,mpv windowrule=size 90% 76%,mpv windowrule=center,mpv windowrule=float,pulsemixer +windowrule=workspace special,mpv # example binds bind=SUPER,RETURN,exec,alacritty @@ -103,6 +106,7 @@ bind=SUPERSHIFT,Q,exit, bind=SUPERSHIFT,D,exec,dolphin bind=SUPERSHIFT,F,togglefloating, bindr=SUPER,Super_L,exec,/home/chris/bin/launcher.sh +bindr=ALT,Alt_L,exec,/home/chris/bin/windows.sh bind=SUPER,E,exec,/home/chris/bin/emacslof bind=SUPER,B,exec,/home/chris/bin/fflof bind=SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer @@ -133,24 +137,27 @@ bind=SUPER,8,workspace,8 bind=SUPER,9,workspace,9 bind=SUPER,0,workspace,10 -bind=SUPERALT,l,workspace,next -bind=SUPERALT,h,workspace,previous +bind=SUPERALT,l,workspace,m+1 +bind=SUPERALT,h,workspace,m-1 -bind=ALT,1,movetoworkspace,1 -bind=ALT,2,movetoworkspace,2 -bind=ALT,3,movetoworkspace,3 -bind=ALT,4,movetoworkspace,4 -bind=ALT,5,movetoworkspace,5 -bind=ALT,6,movetoworkspace,6 -bind=ALT,7,movetoworkspace,7 -bind=ALT,8,movetoworkspace,8 -bind=ALT,9,movetoworkspace,9 -bind=ALT,0,movetoworkspace,10 +bind=SUPERSHIFT,1,movetoworkspace,1 +bind=SUPERSHIFT,2,movetoworkspace,2 +bind=SUPERSHIFT,3,movetoworkspace,3 +bind=SUPERSHIFT,4,movetoworkspace,4 +bind=SUPERSHIFT,5,movetoworkspace,5 +bind=SUPERSHIFT,6,movetoworkspace,6 +bind=SUPERSHIFT,7,movetoworkspace,7 +bind=SUPERSHIFT,8,movetoworkspace,8 +bind=SUPERSHIFT,9,movetoworkspace,9 +bind=SUPERSHIFT,0,movetoworkspace,10 bind=SUPER,O,movetoworkspace,next +bind=SUPER,y,togglespecialworkspace +bind=SUPER,i,pin +bind=SUPER,n,movetoworkspace,special -binde=, XF86AudioRaiseVolume, exec, pamixer -i 5 -binde=, XF86AudioLowerVolume, exec, pamixer -d 5 +binde=, XF86AudioRaiseVolume, exec, volup +binde=, XF86AudioLowerVolume, exec, voldown binde=, XF86AudioMute, exec, pamixer -t binde=, XF86MonBrightnessUp, exec, brightnessctl s +10% diff --git a/scripts/voldown b/scripts/voldown index d2c7cb8..d2f1bc5 100755 --- a/scripts/voldown +++ b/scripts/voldown @@ -2,6 +2,6 @@ awesome-client "naughty.destroy_all_notifications()" pamixer --allow-boost -d 5 -pw-play /nix/store/grc8na7vz23zlz0q9g76y6f66qrgr2cv-sound-theme-freedesktop-0.8/share/sounds/freedesktop/stereo/audio-volume-change.oga +pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga volume=$(pulsemixer --get-volume | awk '{print $1}') notify-send $volume diff --git a/scripts/volup b/scripts/volup index 99bc741..a9b1ebb 100755 --- a/scripts/volup +++ b/scripts/volup @@ -2,6 +2,6 @@ awesome-client "naughty.destroy_all_notifications()" pamixer --allow-boost -i 5 -pw-play /nix/store/grc8na7vz23zlz0q9g76y6f66qrgr2cv-sound-theme-freedesktop-0.8/share/sounds/freedesktop/stereo/audio-volume-change.oga +pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga volume=$(pulsemixer --get-volume | awk '{print $1}') notify-send $volume diff --git a/scripts/window.sh b/scripts/window.sh new file mode 100755 index 0000000..355b629 --- /dev/null +++ b/scripts/window.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +list_windows() ( + wlrctl window list +) + +window=$(list_windows | rofi -sync -dmenu -p "select window..." -theme ~/.config/rofi/launchers-git/laptop-rbw.rasi | awk '{print $1}' | sed 's/://') + +echo $window + +wlrctl window focus $window diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 0de7971..d949446 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -393,7 +393,7 @@ sqlite fennel (libsForQt5.callPackage ../../LightlyShaders {}) - # (with import {}; libsForQt5.callPackage /home/chris/dev/church-presenter {}) + (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # (with import {}; libsForQt5.callPackage ../../bismuth {}) ]; diff --git a/waybar/config b/waybar/config index 6b0d870..00589e4 100644 --- a/waybar/config +++ b/waybar/config @@ -51,7 +51,7 @@ // "timezone": "America/New_York", "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d}", - "format": "{:%a %b%e, %I:%M %p}" + "format": "{:%a %b %e, %I:%M %p}" }, "cpu": { "format": " {usage}%",