Merge branch 'master' of gitlab.com:chriscochrun/dotfiles

This commit is contained in:
Chris Cochrun 2021-05-28 20:28:08 -05:00
commit dc40c281e1
10 changed files with 178 additions and 65 deletions

View file

@ -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
})