From 7e553b8b7b183cae6ea658100a8d9610bc54556f Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 28 May 2021 20:26:09 -0500 Subject: [PATCH] Adding a lot of aWM changes --- awesome/bling | 2 +- awesome/init.fnl | 100 ++++++++++++++++++++++++---------------- awesome/keybindings.fnl | 2 +- awesome/rc.lua | 2 +- awesome/rules.fnl | 7 ++- awesome/theme.lua | 2 + picom.conf | 3 +- scripts/wttr | 2 + 8 files changed, 74 insertions(+), 46 deletions(-) create mode 100755 scripts/wttr diff --git a/awesome/bling b/awesome/bling index 2cb0c54..ae211c2 160000 --- a/awesome/bling +++ b/awesome/bling @@ -1 +1 @@ -Subproject commit 2cb0c54ebe6aea8c133da8259fd44b40ae94b9eb +Subproject commit ae211c2cae257a19cf2aed3faeb76959ad714da9 diff --git a/awesome/init.fnl b/awesome/init.fnl index 2595acf..47d57f7 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -48,7 +48,8 @@ (beautiful.init "/home/chris/.config/awesome/theme.lua") ;; Import the bling modules and layouts -;;(local bling (require "bling")) +(local bling (require "bling")) +;;(local awestore (require "awestore")) ;; This is used later as the default terminal and editor to run. (var terminal "alacritty") @@ -76,7 +77,7 @@ ;; Table of layouts to cover with awful.layout.inc, order matters. (set awful.layout.layouts [ - ;;bling.layout.mstab + bling.layout.mstab awful.layout.suit.tile ;;bling.layout.centered awful.layout.suit.floating @@ -156,38 +157,38 @@ ;; Make buffers on all sides so that tiled clients aren't pushed to edges (set s.padding (dpi 10)) - ;; Create a promptbox for each screen - (set s.mypromptbox (awful.widget.prompt)) - ;; Create an imagebox widget which will contain an icon indicating which layout we're using. - ;; We need one layoutbox per screen. - (set s.mylayoutbox (awful.widget.layoutbox s)) - (: s.mylayoutbox :buttons (gears.table.join - (awful.button [] 1 (fn [] (awful.layout.inc 1 s awful.layout.layouts))) - (awful.button [] 3 (fn [] (awful.layout.inc -1 s))) - (awful.button [] 4 (fn [] (awful.layout.inc 1 s))) - (awful.button [] 5 (fn [] (awful.layout.inc -1 s))))) - - ;; Create a taglist widget - (set s.mytaglist (awful.widget.taglist { - :screen s - :filter awful.widget.taglist.filter.all - :buttons taglist_buttons - :style { - :bg_focus beautiful.bg_focus - :fg_focus beautiful.base01 - :bg_occupied beautiful.bg_normal - :bg_empty beautiful.bg_normal - } - :layout { - :spacing (dpi 5) - :spacing_widget { - :valign "center" - :halign "center" - :widget wibox.container.place - } - :layout wibox.layout.flex.horizontal - } - })) + ;; Create a promptbox for each screen + (set s.mypromptbox (awful.widget.prompt)) + ;; Create an imagebox widget which will contain an icon indicating which layout we're using. + ;; We need one layoutbox per screen. + (set s.mylayoutbox (awful.widget.layoutbox s)) + (: s.mylayoutbox :buttons (gears.table.join + (awful.button [] 1 (fn [] (awful.layout.inc 1 s awful.layout.layouts))) + (awful.button [] 3 (fn [] (awful.layout.inc -1 s))) + (awful.button [] 4 (fn [] (awful.layout.inc 1 s))) + (awful.button [] 5 (fn [] (awful.layout.inc -1 s))))) + + ;; Create a taglist widget + (set s.mytaglist (awful.widget.taglist { + :screen s + :filter awful.widget.taglist.filter.all + :buttons taglist_buttons + :style { + :bg_focus beautiful.bg_focus + :fg_focus beautiful.base01 + :bg_occupied beautiful.bg_normal + :bg_empty beautiful.bg_normal + } + :layout { + :spacing (dpi 5) + :spacing_widget { + :valign "center" + :halign "center" + :widget wibox.container.place + } + :layout wibox.layout.flex.horizontal + } + })) ;; (set s.mytaglistbg ( { ;; 1 { @@ -383,7 +384,6 @@ 2 s.cputext 3 s.cpuspace :layout wibox.layout.fixed.horizontal - :fg beautiful.base0B }) :widget wibox.container.margin :left (dpi 9)} @@ -403,6 +403,23 @@ 2 s.mailtext 3 s.mailspace :layout wibox.layout.fixed.horizontal + }) + :widget wibox.container.margin + :left (dpi 9)} + :widget wibox.container.background + :shape gears.shape.rounded_bar + :bg beautiful.bg_normal + :fg beautiful.base0C} + :widget wibox.container.margin + :right (dpi 10)}) + + (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 }) :widget wibox.container.margin @@ -430,12 +447,13 @@ (set s.myrightwidgets { 1 { :layout wibox.layout.fixed.horizontal - 1 s.mailwidget - 2 s.cpuwidget - 3 s.volumewidget - 4 (if laptop s.batterywidget s.myemptywidget) - 5 (if (= s.index 1) s.mysystray) - 6 s.mylayoutbox + 1 s.wttrwidget + 2 s.mailwidget + 3 s.cpuwidget + 4 s.volumewidget + 5 (if laptop s.batterywidget s.myemptywidget) + 6 (if (= s.index 1) s.mysystray) + 7 s.mylayoutbox } :widget wibox.container.background }) diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 0fc1c5f..8cb4d7b 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -131,7 +131,7 @@ (awful.key [ modkey ] "x" (fn [] (awful.spawn "emacsclient -c -e '(org-capture)'")) {:description "launch scratchpad in new emacs frame" :group "apps" }) (awful.key [ modkey ] "'" (fn [] (awful.spawn "emacsclient -e '(org-agenda-list)'" -{:name "*Org Agenda(a)*"})) +{:name "*Org Agenda(a)*" :floating true :placement awful.placement.centered :class "org-agenda" :instance "org-agenda"})) {:description "launch org-agenda in new emacs frame" :group "apps" }) (awful.key [ modkey alt ] "m" (fn [] (awful.spawn "emacsclient -c -e '(org-roam-capture)'")) {:description "launch org-roam-capture in new emacs frame" :group "apps" }) diff --git a/awesome/rc.lua b/awesome/rc.lua index 0331f8c..ce74da0 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -1,4 +1,4 @@ --- pcall(require, "luarocks.loader") +pcall(require, "luarocks.loader") fennel = require("fennel") local gears = require("gears") fennel.path = fennel.path .. ";.config/awesome/?.fnl" diff --git a/awesome/rules.fnl b/awesome/rules.fnl index da82d90..2425d3e 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -76,11 +76,16 @@ :name [ "*Org Agenda(a)*" ] + :class [ + "org-agenda" + ] + :instance [ + "org-agenda" + ] } :properties { :floating true :raise true - :screen 1 :placement (+ awful.placement.no_offscreen awful.placement.centered) } } diff --git a/awesome/theme.lua b/awesome/theme.lua index af3f00e..52c104f 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -34,6 +34,8 @@ theme.base0D = "#57c7ff" theme.base0E = "#ff6ac1" theme.base0F = "#b2643c" +theme.bg_darker = "#1a1a25" + theme.bg_normal = theme.base00 theme.bg_light = theme.base01 theme.bg_focus = theme.base0D -- Base02 diff --git a/picom.conf b/picom.conf index 97cab62..13ff795 100644 --- a/picom.conf +++ b/picom.conf @@ -20,7 +20,7 @@ round-borders-exclude = [ shadow = true; # The blur radius for shadows, in pixels. (defaults to 12) -shadow-radius = 13; +shadow-radius = 18; # The opacity of shadows. (0.0 - 1.0, defaults to 0.75) shadow-opacity = .75; @@ -169,6 +169,7 @@ opacity-rule = [ # "100:class_g = 'kitty'", "100:class_g = 'Alacritty'", "100:class_g = 'qutebrowser'", + "100:class_g = 'scribus'", "100:class_g = 'OpenLP'", "80:class_g = 'Polybar'", "100:class_g = 'code-oss'", diff --git a/scripts/wttr b/scripts/wttr new file mode 100755 index 0000000..ccb5680 --- /dev/null +++ b/scripts/wttr @@ -0,0 +1,2 @@ +#!/usr/bin/sh +curl 'wttr.in/long_island,ks?format=%c%t+💦+%h+☔+%p\n'