From 5729629ba76236f9636db9ea90301ef481f5afdd Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 10 Dec 2021 12:02:06 -0600 Subject: [PATCH] I HAVE NO IDEA! --- awesome/bling | 2 +- awesome/init.fnl | 409 +++++++++++---------- awesome/keybindings.fnl | 9 +- espanso/config/default.yml | 4 + espanso/default.yml | 4 + espanso/match/base.yml | 28 ++ espanso/match/packages/dadjoke/package.yml | 11 + picom.conf | 4 +- qutebrowser/autoconfig.yml | 2 + qutebrowser/bookmarks/urls | 5 + qutebrowser/quickmarks | 5 + rofi/launchers-git/desktop-search.rasi | 13 + scripts/getplayerstatus | 2 + scripts/ping.sh | 3 + scripts/plasma-startup.sh | 3 +- 15 files changed, 298 insertions(+), 206 deletions(-) create mode 100644 espanso/config/default.yml create mode 100644 espanso/match/base.yml create mode 100644 espanso/match/packages/dadjoke/package.yml create mode 100644 rofi/launchers-git/desktop-search.rasi create mode 100755 scripts/getplayerstatus create mode 100755 scripts/ping.sh 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 f989e01..da000fe 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -52,7 +52,7 @@ (local bling (require "bling")) ;; (local awestore (require "awestore")) -(set naughty.config.defaults.position "bottom_middle") +(set naughty.config.defaults.position "top_middle") (set naughty.config.defaults.margin 10) (set naughty.config.defaults.border_width 0) (set naughty.config.defaults.hover_timeout 5) @@ -87,7 +87,7 @@ (if (= "syl\n" stdout) (global laptop true) (global laptop false)))) -(local laptop true) +(local laptop false) ;; Table of layouts to cover with awful.layout.inc, order matters. (set awful.layout.layouts [ @@ -268,67 +268,67 @@ :id "background_role" :widget wibox.container.background } -:widget wibox.container.margin -:left (dpi 10) -:right (dpi 1) -:top (dpi 5) -:bottom (dpi 5) -} - })) - - (set s.myminimizedtasklist (awful.widget.tasklist { - :screen s - :filter awful.widget.tasklist.filter.minimizedcurrenttags - :buttons tasklist_buttons - :style { - :border_width 0 - :shape gears.shape.rounded_bar - } - :layout { - :spacing (dpi 20) - :spacing_widget { - 1 { - :forced_width (dpi 5) - :forced_height (dpi 20) - :widget wibox.widget.separator - } - :valign "center" - :halign "center" - :widget wibox.container.place - } - :layout wibox.layout.flex.horizontal - } - :widget_template { - 1 { - 1 { - 1 { - 1 { - :id "icon_role" - :widget wibox.widget.imagebox - } - :margins 2 - :widget wibox.container.margin - } - 2 { - :id "text_role" - :widget wibox.widget.textbox - } - :layout wibox.layout.align.horizontal - } - :left (dpi 10) - :right (dpi 10) :widget wibox.container.margin + :left (dpi 10) + :right (dpi 1) + :top (dpi 5) + :bottom (dpi 5) } - :id "background_role" - :widget wibox.container.background - } - })) + })) + + (set s.myminimizedtasklist (awful.widget.tasklist { + :screen s + :filter awful.widget.tasklist.filter.minimizedcurrenttags + :buttons tasklist_buttons + :style { + :border_width 0 + :shape gears.shape.rounded_bar + } + :layout { + :spacing (dpi 20) + :spacing_widget { + 1 { + :forced_width (dpi 5) + :forced_height (dpi 20) + :widget wibox.widget.separator + } + :valign "center" + :halign "center" + :widget wibox.container.place + } + :layout wibox.layout.flex.horizontal + } + :widget_template { + 1 { + 1 { + 1 { + 1 { + :id "icon_role" + :widget wibox.widget.imagebox + } + :margins 2 + :widget wibox.container.margin + } + 2 { + :id "text_role" + :widget wibox.widget.textbox + } + :layout wibox.layout.align.horizontal + } + :left (dpi 10) + :right (dpi 10) + :widget wibox.container.margin + } + :id "background_role" + :widget wibox.container.background + } + })) (set s.mytextclock { 1 { 1 (wibox.widget { - :layout wibox.layout.fixed.horizontal - 1 { - :format " %a %b %d, %l:%M %p " - :widget wibox.widget.textclock}}) + :layout wibox.layout.fixed.horizontal + 1 { + :format " %a %b %d, %l:%M %p " + :widget wibox.widget.textclock}}) :widget wibox.container.margin :left 10 :right 10} @@ -338,19 +338,25 @@ :fg beautiful.base0B}) (set s.myemptywidget (wibox.widget { ;; an empty widget for spacing things out - :text "" - :align "" - :valign "" - :widget wibox.widget.textbox})) + :text "" + :align "" + :valign "" + :widget wibox.widget.textbox})) - (set s.temptext (awful.widget.watch "cat /sys/class/thermal/thermal_zone3/temp" 10)) - (set s.tempicon (wibox.widget.textbox " ")) - (set s.tempspace (wibox.widget.textbox " ")) - (set s.tempwidget (wibox.widget { - 1 s.tempicon - 2 s.temptext - 3 s.tempspace - :layout wibox.layout.fixed.horizontal})) + (set s.pingtext (awful.widget.watch "ping.sh" 15)) + (set s.pingspace (wibox.widget.textbox " ")) + (set s.pingwidget {1 {1 {1 (wibox.widget { + 1 s.pingtext + 2 s.pingspace + :layout wibox.layout.fixed.horizontal}) + :widget wibox.container.margin + :left (dpi 5)} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.transparent + :fg beautiful.base0C} + :widget wibox.container.margin + :right (dpi 5)}) (set s.volumetext (awful.widget.watch "pamixer --get-volume-human" 0.5)) (set s.mictext (awful.widget.watch "pamixer --default-source --get-volume-human" 1)) @@ -359,22 +365,22 @@ (set s.volumespace (wibox.widget.textbox " ")) (set s.volumewidget { 1 { 1 { 1 (wibox.widget { - 1 s.volumeicon - 2 s.volumetext - 3 s.volumespace - 4 s.micicon - 5 s.mictext - 6 s.volumespace - :layout wibox.layout.fixed.horizontal - }) - :widget wibox.container.margin - :left (dpi 5)} - :widget wibox.container.background - :shape gears.shape.rounded_bar - :bg beautiful.transparent - :fg beautiful.base09} - :widget wibox.container.margin - :right (dpi 5)}) + 1 s.volumeicon + 2 s.volumetext + 3 s.volumespace + 4 s.micicon + 5 s.mictext + 6 s.volumespace + :layout wibox.layout.fixed.horizontal + }) + :widget wibox.container.margin + :left (dpi 5)} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.transparent + :fg beautiful.base09} + :widget wibox.container.margin + :right (dpi 5)}) (set s.batterytext (awful.widget.watch "cat /sys/class/power_supply/BAT1/capacity" 30)) (set s.batterytext2 (awful.widget.watch "cat /sys/class/power_supply/BAT2/capacity" 30)) @@ -382,147 +388,148 @@ (set s.batteryspace (wibox.widget.textbox " ")) (set s.batterywidget { 1 { 1 { 1 (wibox.widget { - 1 s.batteryicon - 2 s.batterytext - 3 s.batteryspace - :layout wibox.layout.fixed.horizontal}) - :widget wibox.container.margin - :left (dpi 5)} - :widget wibox.container.background - :shape gears.shape.rounded_bar - :bg beautiful.transparent - :fg beautiful.base0C} - :widget wibox.container.margin - :right (dpi 5)}) + 1 s.batteryicon + 2 s.batterytext + 3 s.batteryspace + :layout wibox.layout.fixed.horizontal}) + :widget wibox.container.margin + :left (dpi 5)} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.transparent + :fg beautiful.base0C} + :widget wibox.container.margin + :right (dpi 5)}) (set s.cputext (awful.widget.watch "cpu" 5)) (set s.cpuicon (wibox.widget.textbox " ")) (set s.cpuspace (wibox.widget.textbox " ")) (set s.cpuwidget { 1 { 1 { 1 (wibox.widget { - 1 s.cpuicon - 2 s.cputext - 3 s.cpuspace - :layout wibox.layout.fixed.horizontal - }) + 1 s.cpuicon + 2 s.cputext + 3 s.cpuspace + :layout wibox.layout.fixed.horizontal + }) :widget wibox.container.margin :left (dpi 5)} :widget wibox.container.background :shape gears.shape.rounded_bar :bg beautiful.transparent :fg beautiful.base0A} - :widget wibox.container.margin - :right (dpi 5)}) + :widget wibox.container.margin + :right (dpi 5)}) (set s.memtext (awful.widget.watch "mem" 2)) (set s.memicon (wibox.widget.textbox " ")) (set s.memspace (wibox.widget.textbox " ")) (set s.memwidget { 1 { 1 { 1 (wibox.widget { - 1 s.memicon - 2 s.memtext - 3 s.memspace - :layout wibox.layout.fixed.horizontal - }) + 1 s.memicon + 2 s.memtext + 3 s.memspace + :layout wibox.layout.fixed.horizontal + }) :widget wibox.container.margin :left (dpi 5)} :widget wibox.container.background :shape gears.shape.rounded_bar :bg beautiful.transparent :fg beautiful.base0E} - :widget wibox.container.margin - :right (dpi 5)}) + :widget wibox.container.margin + :right (dpi 5)}) (set s.nettext (awful.widget.watch "netwidget" 10)) (set s.neticon (wibox.widget.textbox " ")) (set s.netspace (wibox.widget.textbox " ")) (set s.netwidget { 1 { 1 { 1 (wibox.widget { - ;; 1 s.neticon - 2 s.nettext - 3 s.netspace - :layout wibox.layout.fixed.horizontal - }) + ;; 1 s.neticon + 2 s.nettext + 3 s.netspace + :layout wibox.layout.fixed.horizontal + }) :widget wibox.container.margin :left (dpi 5)} :widget wibox.container.background :shape gears.shape.rounded_bar :bg beautiful.transparent :fg beautiful.base08} - :widget wibox.container.margin - :right (dpi 5)}) + :widget wibox.container.margin + :right (dpi 5)}) (set s.mailtext (awful.widget.watch "muunread" 360)) (set s.mailicon (wibox.widget.textbox " ")) (set s.mailspace (wibox.widget.textbox " ")) (set s.mailwidget { 1 { 1 { 1 (wibox.widget { - 1 s.mailicon - 2 s.mailtext - 3 s.mailspace - :layout wibox.layout.fixed.horizontal - }) - :widget wibox.container.margin - :left (dpi 5)} - :widget wibox.container.background - :shape gears.shape.rounded_bar - :bg beautiful.transparent - :fg beautiful.base0D} - :widget wibox.container.margin - :right (dpi 5)}) + 1 s.mailicon + 2 s.mailtext + 3 s.mailspace + :layout wibox.layout.fixed.horizontal + }) + :widget wibox.container.margin + :left (dpi 5)} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.transparent + :fg beautiful.base0D} + :widget wibox.container.margin + :right (dpi 5)}) (set s.wttrtext (awful.widget.watch "wttr" 1200)) (set s.wttrspace (wibox.widget.textbox " ")) - + (set s.wttrwidget { 1 { 1 { 1 (wibox.widget { - 1 s.wttrtext - 2 s.wttrspace - :layout wibox.layout.fixed.horizontal - :fg beautiful.base0B - }) + 1 s.wttrtext + 2 s.wttrspace + :layout wibox.layout.fixed.horizontal + :fg beautiful.base0B + }) + :widget wibox.container.margin + :left (dpi 9)} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.transparent + :fg beautiful.base0C} + :widget wibox.container.margin + :right (dpi 10)}) + + (set s.mysystray { 1 { 1 { 1 (wibox.widget.systray) :widget wibox.container.margin - :left (dpi 9)} + :right (dpi 2) + :top (dpi 5) + :bottom (dpi 5) + :left (dpi 2)} :widget wibox.container.background :shape gears.shape.rounded_bar + :opacity 0.7 :bg beautiful.transparent :fg beautiful.base0C} - :widget wibox.container.margin - :right (dpi 10)}) - - (set s.mysystray { 1 { 1 { 1 (wibox.widget.systray) - :widget wibox.container.margin - :right (dpi 2) - :top (dpi 5) - :bottom (dpi 5) - :left (dpi 2)} - :widget wibox.container.background - :shape gears.shape.rounded_bar - :opacity 0.7 - :bg beautiful.transparent - :fg beautiful.base0C} - :widget wibox.container.margin - :right (dpi 10)}) + :widget wibox.container.margin + :right (dpi 10)}) (set s.myrightwidgets { 1 { :layout wibox.layout.fixed.horizontal - 1 s.netwidget - 2 s.mailwidget - 3 s.memwidget - 4 s.cpuwidget - 5 s.volumewidget - 6 (if laptop s.batterywidget s.myemptywidget) - 7 (if (= s.index 1) s.mysystray) - 8 s.mylayoutbox + 1 s.pingwidget + 2 s.netwidget + 3 s.mailwidget + 4 s.memwidget + 5 s.cpuwidget + 6 s.volumewidget + 7 (if laptop s.batterywidget s.myemptywidget) + 8 (if (= s.index 1) s.mysystray) + 9 s.mylayoutbox } - :widget wibox.container.margin - :top (dpi 1) - :bottom (dpi 1) + :widget wibox.container.margin + :top (dpi 1) + :bottom (dpi 1) }) (local yoffset (dpi 45)) ;; variables to be used for placing the wibox (local xoffset (dpi 26)) - ;; Create the wibox + ;; Create the wibox (set s.mywibox (wibox {;; since we are using a wibox we have a lot we need to set ;; as opposed to what we normally need to do with a wibar :position "bottom" @@ -541,39 +548,39 @@ (: s.mywibox :struts { :bottom (dpi 40) }) - ;; Add widgets to the wibox - (: s.mywibox :setup { - :layout wibox.layout.align.horizontal - :expand "outside" - 1 { ;; Left widgets - 1 { - :layout wibox.layout.align.horizontal - 1 s.mytaglist - 2 s.mytasklist ;; Middle widget - 3 s.myemptywidget - } - :left (dpi 10) - :right (dpi 10) - :widget wibox.container.margin - } - 2 s.mytextclock :fg beautiful.base0B - 3 { ;; Right widgets - 1 { - :layout wibox.layout.align.horizontal - 1 s.myemptywidget - 2 { - 1 s.myminimizedtasklist - :left (dpi 10) - :right (dpi 20) - :widget wibox.container.margin - } - 3 s.myrightwidgets - } - :left (dpi 10) - :right (dpi 10) - :widget wibox.container.margin - } - }) + ;; Add widgets to the wibox + (: s.mywibox :setup { + :layout wibox.layout.align.horizontal + :expand "outside" + 1 { ;; Left widgets + 1 { + :layout wibox.layout.align.horizontal + 1 s.mytaglist + 2 s.mytasklist ;; Middle widget + 3 s.myemptywidget + } + :left (dpi 10) + :right (dpi 10) + :widget wibox.container.margin + } + 2 s.mytextclock :fg beautiful.base0B + 3 { ;; Right widgets + 1 { + :layout wibox.layout.align.horizontal + 1 s.myemptywidget + 2 { + 1 s.myminimizedtasklist + :left (dpi 10) + :right (dpi 20) + :widget wibox.container.margin + } + 3 s.myrightwidgets + } + :left (dpi 10) + :right (dpi 10) + :widget wibox.container.margin + } + }) (set s.mywibox.visible true) ;; this is needed to ensure the raw wibox is shown. Wibar normally does this )) diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 147b841..1fe9f5f 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -31,7 +31,6 @@ :dont_focus_before_close true ;; :awestore {:x anim-x :y anim-y} })) - (fn get-volume [?callback] (let [cb (or ?callback (fn [] nil))] (awful.spawn.easy_async_with_shell "pamixer --get-volume-human" cb))) @@ -207,6 +206,14 @@ (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"}) + (awful.key [] "F6" (fn [] (awful.spawn "playerctl play-pause")) + {:description "Play-pause playback" :group "audio"}) + (awful.key [] "F5" (fn [] (awful.spawn "playerctl position 10-")) + {:description "Previous 10s playback" :group "audio"}) + (awful.key [] "F7" (fn [] (awful.spawn "playerctl position 10+")) + {:description "Previous 10s playback" :group "audio"}) + (awful.key [] "F8" (fn [] (awful.spawn "getplayerstatus")) + {:description "Get status audio" :group "audio"}) (awful.key [modkey] "]" (fn [] (awful.spawn "mpvc -x 0.10")) {:description "MPV speed up by .10" :group "audio"}) (awful.key [modkey] "[" (fn [] (awful.spawn "mpvc -x -0.10")) diff --git a/espanso/config/default.yml b/espanso/config/default.yml new file mode 100644 index 0000000..ec78da9 --- /dev/null +++ b/espanso/config/default.yml @@ -0,0 +1,4 @@ +# Automatically generated by espanso migration tool +# Original file: default.yml + +{} \ No newline at end of file diff --git a/espanso/default.yml b/espanso/default.yml index 88e9c1a..4933988 100644 --- a/espanso/default.yml +++ b/espanso/default.yml @@ -4,6 +4,10 @@ # You can refer to the official documentation: # https://espanso.org/docs/ +# disable search bar +search_shortcut: OFF +search_trigger: OFF + # Matches are the substitution rules, when you type the "trigger" string # it gets replaced by the "replace" string. matches: diff --git a/espanso/match/base.yml b/espanso/match/base.yml new file mode 100644 index 0000000..8a58f3b --- /dev/null +++ b/espanso/match/base.yml @@ -0,0 +1,28 @@ +# Automatically generated by espanso migration tool +# Original file: default.yml + +matches: + - trigger: ":espanso" + replace: Hi there! + - trigger: ":date" + replace: "{{mydate}}" + vars: + - name: mydate + type: date + params: + format: "%m/%d/%Y" + - trigger: ":shell" + replace: "{{output}}" + vars: + - name: output + type: shell + params: + cmd: echo Hello from your shell + - trigger: ":gml" + replace: ccochrun21@gmail.com + - trigger: ":otl" + replace: chris.cochrun@outlook.com + - trigger: ":tfcml" + replace: chris@tfcconnection.org + - trigger: ":name" + replace: Chris Cochrun \ No newline at end of file diff --git a/espanso/match/packages/dadjoke/package.yml b/espanso/match/packages/dadjoke/package.yml new file mode 100644 index 0000000..725f4aa --- /dev/null +++ b/espanso/match/packages/dadjoke/package.yml @@ -0,0 +1,11 @@ +# Automatically generated by espanso migration tool +# Original file: packages/dadjoke/package.yml + +matches: + - trigger: ":dadjoke" + replace: "{{output}}" + vars: + - name: output + type: shell + params: + cmd: "curl -H 'Accept: text/plain' https://icanhazdadjoke.com/" \ No newline at end of file diff --git a/picom.conf b/picom.conf index 6fdb4b3..dd0e3fe 100644 --- a/picom.conf +++ b/picom.conf @@ -27,10 +27,10 @@ shadow-radius = 38; shadow-opacity = 1.0; # The left offset for shadows, in pixels. (defaults to -15) -shadow-offset-x = -28; +shadow-offset-x = -26; # The top offset for shadows, in pixels. (defaults to -15) -shadow-offset-y = -28; +shadow-offset-y = -26; # 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/autoconfig.yml b/qutebrowser/autoconfig.yml index bc54459..30ab72b 100644 --- a/qutebrowser/autoconfig.yml +++ b/qutebrowser/autoconfig.yml @@ -26,10 +26,12 @@ settings: https://staff.tfcconnection.org: true content.notifications.enabled: https://jelly.cochrun.xyz: true + https://na.op.gg: false https://nc.cochrun.xyz: false https://staff.tfcconnection.org: true https://teams.microsoft.com: true https://toolbox.iskysoft.com: false + https://www.dailymail.co.uk: false https://www.facebook.com: false https://www.g2a.com: false https://www.reddit.com: false diff --git a/qutebrowser/bookmarks/urls b/qutebrowser/bookmarks/urls index cd74cf6..c11e609 100644 --- a/qutebrowser/bookmarks/urls +++ b/qutebrowser/bookmarks/urls @@ -1,4 +1,9 @@ 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/quickmarks b/qutebrowser/quickmarks index 3ad2f01..213f1f5 100644 --- a/qutebrowser/quickmarks +++ b/qutebrowser/quickmarks @@ -24,5 +24,10 @@ 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!) diff --git a/rofi/launchers-git/desktop-search.rasi b/rofi/launchers-git/desktop-search.rasi new file mode 100644 index 0000000..214daaa --- /dev/null +++ b/rofi/launchers-git/desktop-search.rasi @@ -0,0 +1,13 @@ +/*-*- mode: css; -*-*/ + + +configuration { + font: "VictorMono Nerd Font 14.0"; + show-icons: false; +} +@import "/home/chris/.config/rofi/config.rasi" + + +window { + width: 70%; +} \ No newline at end of file diff --git a/scripts/getplayerstatus b/scripts/getplayerstatus new file mode 100755 index 0000000..6a04721 --- /dev/null +++ b/scripts/getplayerstatus @@ -0,0 +1,2 @@ +#!/bin/sh +notify-send "$(playerctl metadata xesam:title)" diff --git a/scripts/ping.sh b/scripts/ping.sh new file mode 100755 index 0000000..ce9bd00 --- /dev/null +++ b/scripts/ping.sh @@ -0,0 +1,3 @@ +#!/bin/sh +ping=$(ping -c 4 1.1.1.1 | tail -1| awk '{print $4}' | cut -d '/' -f 2) +echo " $ping" diff --git a/scripts/plasma-startup.sh b/scripts/plasma-startup.sh index 2d8044a..e1cebe1 100755 --- a/scripts/plasma-startup.sh +++ b/scripts/plasma-startup.sh @@ -11,4 +11,5 @@ sleep 1 latte-restart -exec xcape -e 'Super_L=Super_L|Control_L|Escape' +xcape -e 'Super_L=Super_L|Control_L|Escape' +