From ed8d575d18c361ad0538e1d8d52926bcce5f2b49 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 3 Jan 2022 12:27:41 -0600 Subject: [PATCH] I DONLT KNOW ANYMORE!! --- awesome/keybindings.fnl | 2 +- mpv/mpv.conf | 4 ++-- qutebrowser/autoconfig.yml | 1 + qutebrowser/bookmarks/urls | 3 --- qutebrowser/config.py | 4 +++- qutebrowser/qsettings/QtProject.conf | 2 +- qutebrowser/quickmarks | 4 +--- rofi/launchers-git/run.sh | 2 +- scripts/emacslof | 23 ++++++++++++++--------- scripts/fflof | 19 +++++++++++++------ scripts/kderofi-rbw | 9 +++++++-- scripts/nyxtlof | 17 +++++++++++------ scripts/plasma-startup.sh | 10 +--------- scripts/qblof | 20 ++++++++++++++------ scripts/study-off.sh | 2 ++ scripts/study-on.sh | 2 ++ sway/config | 8 ++++---- tridactyl/tridactylrc | 11 ++++++++++- 18 files changed, 88 insertions(+), 55 deletions(-) create mode 100755 scripts/study-off.sh create mode 100755 scripts/study-on.sh diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 1fe9f5f..2096c73 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -170,7 +170,7 @@ {:description "select pass" :group "apps" }) (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer")) {:description "Open Writer" :group "apps" }) - (awful.key [modkey] "b" (fn [] (awful.spawn "qblof")) + (awful.key [modkey] "b" (fn [] (awful.spawn "fflof")) {:description "launch browser" :group "apps"}) ;; rofi (awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh")) diff --git a/mpv/mpv.conf b/mpv/mpv.conf index bc537f3..442eebe 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -2,8 +2,8 @@ osc=no vo=gpu af=scaletempo2 -autofit=80% -geometry=80%:80% +autofit=90% +geometry=90%:90% # input-ipc-server="/tmp/mpvsocket" hwdec=auto rtsp-transport=udp diff --git a/qutebrowser/autoconfig.yml b/qutebrowser/autoconfig.yml index 30ab72b..b569273 100644 --- a/qutebrowser/autoconfig.yml +++ b/qutebrowser/autoconfig.yml @@ -34,6 +34,7 @@ settings: https://www.dailymail.co.uk: false https://www.facebook.com: false https://www.g2a.com: false + https://www.pocket-lint.com: false https://www.reddit.com: false https://www.websitebuilderexpert.com: false https://www.youtube.com: false diff --git a/qutebrowser/bookmarks/urls b/qutebrowser/bookmarks/urls index c11e609..b3183d4 100644 --- a/qutebrowser/bookmarks/urls +++ b/qutebrowser/bookmarks/urls @@ -1,9 +1,6 @@ https://yewtu.be/feed/subscriptions Subscriptions - YewTube https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b Dashboard - Microsoft Azure https://asciiflow.com/#/ ASCIIFlow -<<<<<<< HEAD https://photos.cochrun.xyz/people/new PhotoPrism: People -======= https://staff.tfcconnection.org/apps/files/?dir=/TFC%20Documents&fileid=340 TFC Documents - Files - TFC Staff https://www.tfcconnection.org/wp-login.php Log In ‹ Teens For Christ Connection — WordPress ->>>>>>> 03da7fa (I HAVE NO IDEA!) diff --git a/qutebrowser/config.py b/qutebrowser/config.py index fdf62c4..dd18167 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -2162,7 +2162,7 @@ c.url.searchengines = { ## Default zoom level. ## Type: Perc -# c.zoom.default = '100%' +c.zoom.default = '100%' ## Available zoom levels. ## Type: List of Perc @@ -2494,6 +2494,8 @@ config.bind( "hint links spawn alacritty -e yt-dlp -x --audio-format mp3 --audio-quality 0 --embed-thumbnail --add-metadata -o ~/Music/%(title)s.%(ext)s {hint-url}", ) +config.bind("gt", 'hint links spawn --detach transadd "{hint-url}"') + config.bind('d', 'tab-close') config.bind('b', 'set-cmd-text -s :tab-select ') diff --git a/qutebrowser/qsettings/QtProject.conf b/qutebrowser/qsettings/QtProject.conf index 5ba7f39..ca55df7 100644 --- a/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/qsettings/QtProject.conf @@ -1,6 +1,6 @@ [FileDialog] history=@Invalid() -lastVisited=file:///home/chris/ +lastVisited=file:///home/chris/nextcloud/tfc/website/ qtVersion=5.15.2 shortcuts=file:, file:///home/chris, file:///home/chris/storage/tfc sidebarWidth=116 diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks index 213f1f5..20ee00b 100644 --- a/qutebrowser/quickmarks +++ b/qutebrowser/quickmarks @@ -24,10 +24,8 @@ nc https://nc.cochrun.xyz/apps/files/ oml https://outlook.live.com/mail/0/inbox stb https://table.tfcconnection.org/ tms https://teams.microsoft.com/_#/conversations/General -<<<<<<< HEAD n8n https://n8n.tfcconnection.org/workflow stbdocs https://api.seatable.io/#intro -======= svg https://icon-sets.iconify.design/ icons https://icon-sets.iconify.design/ ->>>>>>> 03da7fa (I HAVE NO IDEA!) +ai https://mastodon.online/web/getting-started diff --git a/rofi/launchers-git/run.sh b/rofi/launchers-git/run.sh index 1dfd9c7..0c9f449 100755 --- a/rofi/launchers-git/run.sh +++ b/rofi/launchers-git/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ $(hostname) = "syl" ]; then - style="laptop" + style="laptop-wayland" #echo "this is hidpi" else style="desktop" diff --git a/scripts/emacslof b/scripts/emacslof index a08f5e1..ea9415c 100755 --- a/scripts/emacslof +++ b/scripts/emacslof @@ -6,10 +6,10 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then if [ $XDG_SESSION_TYPE = "x11" ]; then #X11 emacsrg=$(wmctrl -lx | rg emacs | rg -v org-agenda | awk '{print $1}') - echo $emacsrg + # echo $emacsrg if [ -z $emacsrg ]; then - emacsclient -c + emacsclient -c & exit else wmctrl -ia $emacsrg @@ -17,16 +17,21 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then fi else - # WAYLAND - emacsrg=$(wlrctl window list | rg -v 'emacs:\sorg-agenda' | rg 'emacs:') + if [ $KDE_FULL_SESSION = "true" ]; then + ww -f emacs -c emacsclient + exit + else + # WAYLAND + emacsrg=$(wlrctl window list | rg -v 'emacs:\sorg-agenda' | rg 'emacs:') - emacswin=$(echo $emacsrg | sed 's/.*\: //') - echo $emacswin + emacswin=$(echo $emacsrg | sed 's/.*\: //') + # echo $emacswin - wlrctl toplevel focus title:"$emacswin" - exit + wlrctl toplevel focus title:"$emacswin" + exit + fi fi else - emacsclient -c + emacsclient -c & fi diff --git a/scripts/fflof b/scripts/fflof index 4db94c9..9014c6c 100755 --- a/scripts/fflof +++ b/scripts/fflof @@ -1,4 +1,6 @@ #!/bin/sh +export MOZ_ENABLE_WAYLAND=1 +echo $MOZ_ENABLE_WAYLAND # Check to see if firefox is running if [ $(pgrep -c GeckoMain) -gt 0 ]; then @@ -16,14 +18,19 @@ if [ $(pgrep -c GeckoMain) -gt 0 ]; then exit fi else - # WAYLAND - ffrg=$(wlrctl window list | rg firefox) + if [ $KDE_FULL_SESSION = "true" ]; then + ww -f firefox -c firefox + exit + else + # WAYLAND + ffrg=$(wlrctl window list | rg firefox) - ffwin=$(echo $ffrg | sed 's/.*\: //') - # echo $ffwin + ffwin=$(echo $ffrg | sed 's/.*\: //') + # echo $ffwin - wlrctl toplevel focus title:"$ffwin" - exit + wlrctl toplevel focus title:"$ffwin" + exit + fi fi else firefox diff --git a/scripts/kderofi-rbw b/scripts/kderofi-rbw index 2fdc0fc..47cf76e 100755 --- a/scripts/kderofi-rbw +++ b/scripts/kderofi-rbw @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Very basic interface for rbw using rofi if [ $(hostname) = "syl" ]; then - style="laptop-rbw-wayland" - #echo "this is hidpi" + if [ $XDG_SESSION_TYPE = "x11" ]; then + style="laptop-rbw" + echo "this is x11" + else + style="laptop-rbw-wayland" + echo "this is wayland" + fi else style="desktop-rbw" #echo "this is not hidpi" diff --git a/scripts/nyxtlof b/scripts/nyxtlof index 6a7d5e3..5cd8501 100755 --- a/scripts/nyxtlof +++ b/scripts/nyxtlof @@ -18,14 +18,19 @@ if pgrep -x nyxt > /dev/null; then fi else echo wayland - # WAYLAND - nyxtrg=$(wlrctl window list | rg nyxt:) + if [ $KDE_FULL_SESSION = "true" ]; then + ww -f nyxt -c nyxt + exit + else + # WAYLAND + nyxtrg=$(wlrctl window list | rg nyxt:) - nyxtwin=$(echo $nyxtrg | sed 's/.*\: //') - # echo $nyxtwin + nyxtwin=$(echo $nyxtrg | sed 's/.*\: //') + # echo $nyxtwin - wlrctl toplevel focus nyxt - exit + wlrctl toplevel focus nyxt + exit + fi fi else echo not running diff --git a/scripts/plasma-startup.sh b/scripts/plasma-startup.sh index e1cebe1..f89bbdc 100755 --- a/scripts/plasma-startup.sh +++ b/scripts/plasma-startup.sh @@ -1,15 +1,7 @@ #!/bin/sh exec ydotoold & -exec libinput-gestures-setup start service & - -sleep 2 - -killall mako - -sleep 1 - -latte-restart +exec systemctl enable --user --now libinput-gestures & xcape -e 'Super_L=Super_L|Control_L|Escape' diff --git a/scripts/qblof b/scripts/qblof index 4ba3c76..1dc4754 100755 --- a/scripts/qblof +++ b/scripts/qblof @@ -3,8 +3,11 @@ # Check to see if firefox is running if pgrep -x qutebrowser > /dev/null; then + echo "qb running" + if [ $XDG_SESSION_TYPE = "x11" ]; then #X11 + echo "X11" qbrg=$(wmctrl -lx | rg qutebrowser | awk '{print $1}') # echo $emacsrg @@ -16,14 +19,19 @@ if pgrep -x qutebrowser > /dev/null; then exit fi else - # WAYLAND - qbrg=$(wlrctl window list | rg qutebrowser) + if [ $KDE_FULL_SESSION = "true" ]; then + ww -f org.qutebrowser.qutebrowser -c qutebrowser + exit + else + # WAYLAND + qbrg=$(wlrctl window list | rg qutebrowser) - qbwin=$(echo $qbrg | sed 's/.*\: //') - # echo $ffwin + qbwin=$(echo $qbrg | sed 's/.*\: //') + # echo $ffwin - wlrctl toplevel focus title:"$qbwin" - exit + wlrctl toplevel focus title:"$qbwin" + exit + fi fi else qutebrowser diff --git a/scripts/study-off.sh b/scripts/study-off.sh new file mode 100755 index 0000000..84c1766 --- /dev/null +++ b/scripts/study-off.sh @@ -0,0 +1,2 @@ +#!/bin/sh +curl -X POST -F 'name=value' https://home.cochrun.xyz/api/webhook/study-off diff --git a/scripts/study-on.sh b/scripts/study-on.sh new file mode 100755 index 0000000..74f6c9d --- /dev/null +++ b/scripts/study-on.sh @@ -0,0 +1,2 @@ +#!/bin/sh +curl -X POST -F 'name=value' https://home.cochrun.xyz/api/webhook/study-on diff --git a/sway/config b/sway/config index 6b17048..0975c4f 100644 --- a/sway/config +++ b/sway/config @@ -54,10 +54,10 @@ gaps inner 10 default_border none -border_images.focused /home/chris/.config/sway/rounded_and_shadows_custom.png -border_images.focused_inactive /home/chris/.config/sway/rounded_and_shadows_custom.png -border_images.unfocused /home/chris/.config/sway/rounded_and_shadows_custom.png -border_images.urgent /home/chris/.config/sway/rounded_and_shadows_custom.png +# border_images.focused /home/chris/.config/sway/rounded_and_shadows_custom.png +# border_images.focused_inactive /home/chris/.config/sway/rounded_and_shadows_custom.png +# border_images.unfocused /home/chris/.config/sway/rounded_and_shadows_custom.png +# border_images.urgent /home/chris/.config/sway/rounded_and_shadows_custom.png font pango: VictorMono Nerd Font 10 show_marks yes diff --git a/tridactyl/tridactylrc b/tridactyl/tridactylrc index 494c914..bbbf6d3 100644 --- a/tridactyl/tridactylrc +++ b/tridactyl/tridactylrc @@ -52,17 +52,26 @@ command org-capture composite get_current_url | js -p tri.excmds.exclaim_quiet(' " MPV command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('mpv --profile=fast ' + url)) +unbind v + +command torrent js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('transadd ' + url)) + "" Adding my own bindings bind v hint -W mpv +bind gt hint -W torrent bind gv current_url mpv bind F hint -w bind gy hint -y bind gc org-capture bind gC hint -W org-capture bind m fillcmdline quickmark +bind O fillcmdline tabopen "" buffers show as windows bind b fillcmdline taball "" Smoothscroll -set smoothscroll false +set smoothscroll true + +bind --mode=ex ex.next_completion +bind --mode=ex ex.prev_completion