chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding a lot of aWM changes

Browse source
This commit is contained in:
Chris Cochrun 2021-05-28 20:26:09 -05:00
parent 63b367dbb4
commit 7e553b8b7b
8 changed files with 74 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
awesome/bling

@ -1 +1 @@
Subproject commit 2cb0c54ebe6aea8c133da8259fd44b40ae94b9eb
Subproject commit ae211c2cae257a19cf2aed3faeb76959ad714da9

100
awesome/init.fnl
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
})

2
awesome/keybindings.fnl
View file

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

2
awesome/rc.lua
View file

@ -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"

7
awesome/rules.fnl
View file

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

2
awesome/theme.lua
View file

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