diff --git a/awesome/bling b/awesome/bling index 0fb8534..048cf41 160000 --- a/awesome/bling +++ b/awesome/bling @@ -1 +1 @@ -Subproject commit 0fb85341916b6de1c5cd6ddf3e8472292a93a303 +Subproject commit 048cf41e0aa5a391948d62e6168d6e54279cf627 diff --git a/awesome/init.fnl b/awesome/init.fnl index 0df1fe6..83e05ba 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -561,7 +561,7 @@ :y (- s.geometry.height yoffset) :height (dpi 33) :width (- s.geometry.width (* xoffset 2)) - :ontop true + :ontop false :stretch false :type "dock" :shape gears.shape.rounded_bar @@ -744,7 +744,7 @@ (awful.spawn.once "killall jellyfin-mpv-shim && jellyfin-mpv-shim") (awful.spawn.once "xset r rate 220 90") (awful.spawn.once "/usr/lib/kdeconnectd") -(awful.spawn.once "autorandr -c") -(awful.spawn.once "nm-applet") +;;(awful.spawn.once "autorandr -c") +(if laptop (awful.spawn.once "nm-applet")) (awful.spawn.once "xcape -e 'Super_L=Super_L|Control_L|Escape'") (awful.spawn.once "xcape -e 'Alt_L=Super_L|W'") diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 2096c73..5f9d170 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -120,6 +120,8 @@ {:description "run prompt" :group "launcher"}) (awful.key [ modkey ] "r" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/run.sh")) {:description "run prompt" :group "launcher"}) + (awful.key [ modkey ] "v" (fn [] (awful.spawn "rofi-clip")) + {:description "clipboard" :group "launcher"}) (awful.key [ modkey shift ctrl ] "x" (fn [] (let [fscr (awful.screen.focused)] @@ -203,6 +205,15 @@ (awful.key [] "XF86AudioMute" (fn [] (awful.spawn "pactl set-sink-mute @DEFAULT_SINK@ toggle") (awful.spawn "paplay /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")) {:description "Mute volume" :group "audio"}) + (awful.key [] "F3" (fn [] (awful.spawn "pactl set-sink-volume @DEFAULT_SINK@ +5%") + (awful.spawn "paplay /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")) + {:description "Increase volume by 5%" :group "audio"}) + (awful.key [] "F2" (fn [] (awful.spawn "pactl set-sink-volume @DEFAULT_SINK@ -5%") + (awful.spawn "paplay /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")) + {:description "Decrease volume by 5%" :group "audio"}) + (awful.key [] "F1" (fn [] (awful.spawn "pactl set-sink-mute @DEFAULT_SINK@ toggle") + (awful.spawn "paplay /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")) + {:description "Mute volume" :group "audio"}) (awful.key [] "XF86Launch8" (fn [] (awful.spawn "pactl set-source-mute @DEFAULT_SOURCE@ toggle") (awful.spawn "paplay /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")) {:description "Mute microphone" :group "audio"}) diff --git a/awesome/rules.fnl b/awesome/rules.fnl index d5fd7ac..9fa6523 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -37,10 +37,10 @@ :properties { :floating true :raise true - :height (dpi 800) - :screen (screen.count) + :height (dpi 1000) + :screen 2 :sticky true - :placement (+ awful.placement.no_offscreen awful.placement.centered) + :placement awful.placement.centered } } ;; Davinci Resolve is fullscreen @@ -63,6 +63,7 @@ :rule_any { :name [ "Secondary Screen" + "Church Presenter" ] } :properties { @@ -168,7 +169,7 @@ ] } :properties { - :screen (screen.count) + :screen 2 :focus awful.client.focus.filter :raise true } @@ -204,7 +205,7 @@ :properties { :floating true :raise true - :placement awful.placement.centered + :placement (+ awful.placement.centered awful.placement.no_offscreen) } } { diff --git a/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css b/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css index 803e20c..94d86e3 100644 --- a/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css +++ b/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css @@ -181,7 +181,7 @@ the close button is positioned to the far right */ /*visibility: visible !important;*/ min-height: 34px !important; max-height: 34px !important; - margin-top: 10px !important; + margin-top: 15px !important; margin-bottom: -48px !important; transition: all 200ms ease 0s !important; z-index: 5 !important; @@ -191,7 +191,7 @@ the close button is positioned to the far right */ /* make urlbar rounded */ #urlbar{ - margin-top: 36px !important; + margin-top: 21px !important; padding-right: 10px !important; padding-left: 10px !important; } @@ -206,8 +206,8 @@ the close button is positioned to the far right */ } #urlbar[breakout][breakout-extend] { - margin-top: 15px !important; - top: 0px !important; + margin-top: 5px !important; + top: 0px !important; } #urlbar[breakout][breakout-extend] > #urlbar-input-container { diff --git a/mpv/mpv.conf b/mpv/mpv.conf index 17b96fd..ce9159c 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -2,8 +2,8 @@ osc=no vo=gpu af=scaletempo2 -autofit=90% -geometry=80%:80% +autofit=99% +geometry=99%:99% # input-ipc-server="/tmp/mpvsocket" hwdec=auto rtsp-transport=udp diff --git a/nyxt/init.lisp b/nyxt/init.lisp index f7631df..38bd2d6 100644 --- a/nyxt/init.lisp +++ b/nyxt/init.lisp @@ -42,33 +42,34 @@ ;; Let's create a function to hint videos, convert the url to a sting, and play them in MPV (define-command hint-mpv (&key nyxt/web-mode::annotate-visible-only-p) - "Show a set of element hints, and copy the URL of the user inputted one." - (nyxt/web-mode:query-hints "Copy element URL" - (lambda (nyxt/web-mode::result) - ;; this converts the url to a string to be used in mpv - (let* - ((url - (format nil "~a" - (url (first nyxt/web-mode::result))))) - ;; here we take that string and pipe it into mpv - (mpv url))) - :annotate-visible-only-p - nyxt/web-mode::annotate-visible-only-p)) + "Show a set of element hints, and copy the URL of the user inputted one." + (nyxt/web-mode:query-hints "Copy element URL" + (lambda (nyxt/web-mode::result) + ;; this converts the url to a string to be used in mpv + (let* + ((url + (format nil "~a" + (url (first nyxt/web-mode::result))))) + ;; here we take that string and pipe it into mpv + (mpv url))) + :annotate-visible-only-p + nyxt/web-mode::annotate-visible-only-p) + (nyxt/) ) ;; Let's create a function to hint videos, convert the url to a sting, and download with ytdl (define-command hint-ytdl (&key nyxt/web-mode::annotate-visible-only-p) - "Show a set of element hints, and copy the URL of the user inputted one." - (nyxt/web-mode:query-hints "Copy element URL" - (lambda (nyxt/web-mode::result) - ;; this converts the url to a string to be used in mpv - (let* - ((url - (format nil "~a" - (url (first nyxt/web-mode::result))))) - ;; here we take that string and pipe it into mpv - (youtube-dl url))) - :annotate-visible-only-p - nyxt/web-mode::annotate-visible-only-p)) + "Show a set of element hints, and copy the URL of the user inputted one." + (nyxt/web-mode:query-hints "Copy element URL" + (lambda (nyxt/web-mode::result) + ;; this converts the url to a string to be used in yt-dlp + (let* + ((url + (format nil "~a" + (url (first nyxt/web-mode::result))))) + ;; here we take that string and pipe it into yt-dlp + (youtube-dl url))) + :annotate-visible-only-p + nyxt/web-mode::annotate-visible-only-p)) ;; These are my own keys that are layered over vi-normal. A lot of these ;; are similar to qutebrowser. diff --git a/picom.conf b/picom.conf index 7cd1b2d..b4eaaee 100644 --- a/picom.conf +++ b/picom.conf @@ -21,16 +21,16 @@ round-borders-exclude = [ shadow = true; # The blur radius for shadows, in pixels. (defaults to 12) -shadow-radius = 38; +shadow-radius = 24; # The opacity of shadows. (0.0 - 1.0, defaults to 0.75) shadow-opacity = 1.0; # The left offset for shadows, in pixels. (defaults to -15) -shadow-offset-x = -20; +shadow-offset-x = -15; # The top offset for shadows, in pixels. (defaults to -15) -shadow-offset-y = -20; +shadow-offset-y = -15; # Avoid drawing shadows on dock/panel windows. This option is deprecated, # you should use the *wintypes* option in your config file instead. diff --git a/qutebrowser/config.py b/qutebrowser/config.py index fcb38ca..66a2d8a 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -814,7 +814,7 @@ c.colors.webpage.darkmode.policy.page = "smart" ## Force `prefers-color-scheme: dark` colors for websites. ## Type: Bool -#c.colors.webpage.prefered_color_scheme = "dark" +c.colors.webpage.preferred_color_scheme = "dark" ## Number of commands to save in the command history. 0: no history / -1: ## unlimited diff --git a/rofi/launchers-git/desktop-clipboard.rasi b/rofi/launchers-git/desktop-clipboard.rasi new file mode 100644 index 0000000..6c5564d --- /dev/null +++ b/rofi/launchers-git/desktop-clipboard.rasi @@ -0,0 +1,25 @@ +/*-*- mode: css; -*-*/ +configuration { + font: "VictorMono Nerd Font 14.0"; + show-icons: true; + display-clipboard: " "; +} + +@import "/home/chris/.config/rofi/config.rasi" + +window { + width: 50%; +} + +element { + padding: 5px 5px 5px 10px; +} + +element-icon { + size: 0px; + padding: 0px 0px 0px; +} + +element-text { + vertical-align: 0.5; +} diff --git a/scripts/focus_window.sh b/scripts/focus_window.sh new file mode 100755 index 0000000..886f7ec --- /dev/null +++ b/scripts/focus_window.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +eval $(xdotool getmouselocation --shell) + +if [ "$1" -eq "1" ]; then + xdotool mousemove 900 $Y +elif [ "$1" -eq "2" ]; then + xdotool mousemove 2560 $Y +elif [ "$1" -eq "3" ]; then + if [ $Y -gt 700 ]; then + Y=700 + fi + xdotool mousemove 4000 $Y +fi diff --git a/scripts/rofi-clip b/scripts/rofi-clip new file mode 100755 index 0000000..0363aaf --- /dev/null +++ b/scripts/rofi-clip @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +style="desktop" +rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}' -theme ~/.config/rofi/launchers-git/$style-clipboard.rasi diff --git a/tridactyl/tridactylrc b/tridactyl/tridactylrc index 5d9528a..0eab86c 100644 --- a/tridactyl/tridactylrc +++ b/tridactyl/tridactylrc @@ -65,7 +65,7 @@ bind v hint -W mpv bind gt hint -W torrent bind gv current_url mpv bind gV hint ytdl -bind F hint -w +bind F hint -t bind gy hint -y bind gc org-capture bind gC hint -W org-capture