Merge branch 'master' to add syl and stop using bling for a bit

This commit is contained in:
Chris Cochrun 2021-03-30 06:17:48 -05:00
commit 1a29e5fee3
7 changed files with 10 additions and 10 deletions

View file

@ -48,7 +48,7 @@
(beautiful.init "/home/chris/.config/awesome/theme.lua") (beautiful.init "/home/chris/.config/awesome/theme.lua")
;; Import the bling modules and layouts ;; Import the bling modules and layouts
(local bling (require "bling")) ;;(local bling (require "bling"))
;; This is used later as the default terminal and editor to run. ;; This is used later as the default terminal and editor to run.
(var terminal "alacritty") (var terminal "alacritty")
@ -71,13 +71,13 @@
(global hostname-handle (io.popen "hostname")) (global hostname-handle (io.popen "hostname"))
(global hostname (hostname-handle:read "a")) (global hostname (hostname-handle:read "a"))
(hostname-handle:close) (hostname-handle:close)
(global laptop (= hostname "chris-linuxlaptop\n")) (local laptop (= hostname "syl"))
;; Table of layouts to cover with awful.layout.inc, order matters. ;; Table of layouts to cover with awful.layout.inc, order matters.
(set awful.layout.layouts [ (set awful.layout.layouts [
bling.layout.mstab ;;bling.layout.mstab
awful.layout.suit.tile awful.layout.suit.tile
bling.layout.centered ;;bling.layout.centered
awful.layout.suit.floating awful.layout.suit.floating
;; awful.layout.suit.tile.left ;; awful.layout.suit.tile.left
;; awful.layout.suit.tile.bottom ;; awful.layout.suit.tile.bottom

View file

@ -15,7 +15,7 @@
(awful.spawn.easy_async_with_shell "pamixer --get-volume-human" cb))) (awful.spawn.easy_async_with_shell "pamixer --get-volume-human" cb)))
(awful.spawn.easy_async "cat /etc/hostname" (fn [ stdout stderr reason exit_code ] (awful.spawn.easy_async "cat /etc/hostname" (fn [ stdout stderr reason exit_code ]
(if (= "chris-linuxlaptop\n" stdout) (if (= "syl" stdout)
(global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/laptop.rasi") (global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/laptop.rasi")
(global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/desktop.rasi")))) (global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/desktop.rasi"))))

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ $(hostname) = "chris-linuxlaptop" ]; then if [ $(hostname) = "syl" ]; then
style="laptop" style="laptop"
#echo "this is hidpi" #echo "this is hidpi"
else else

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ $(hostname) = "chris-linuxlaptop" ]; then if [ $(hostname) = "syl" ]; then
style="laptop" style="laptop"
#echo "this is hidpi" #echo "this is hidpi"
else else

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ $(hostname) = "chris-linuxlaptop" ]; then if [ $(hostname) = "syl" ]; then
style="laptop" style="laptop"
#echo "this is hidpi" #echo "this is hidpi"
else else

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ $(hostname) = "chris-linuxlaptop" ]; then if [ $(hostname) = "syl" ]; then
style="laptop" style="laptop"
#echo "this is hidpi" #echo "this is hidpi"
else else

View file

@ -2,7 +2,7 @@
# which can be switched at runtime with shift+left/right # which can be switched at runtime with shift+left/right
# root=/path/to/root # root=/path/to/root
if [ $(hostname) = "chris-linuxlaptop" ]; then if [ $(hostname) = "syl" ]; then
style="laptop" style="laptop"
#echo "this is hidpi" #echo "this is hidpi"
else else