Merge branch 'master' to add syl and stop using bling for a bit
This commit is contained in:
		
						commit
						1a29e5fee3
					
				
					 7 changed files with 10 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -48,7 +48,7 @@
 | 
			
		|||
(beautiful.init "/home/chris/.config/awesome/theme.lua")
 | 
			
		||||
 | 
			
		||||
;; 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.
 | 
			
		||||
(var terminal "alacritty")
 | 
			
		||||
| 
						 | 
				
			
			@ -71,13 +71,13 @@
 | 
			
		|||
(global hostname-handle (io.popen "hostname"))
 | 
			
		||||
(global hostname (hostname-handle:read "a"))
 | 
			
		||||
(hostname-handle:close)
 | 
			
		||||
(global laptop (= hostname "chris-linuxlaptop\n"))
 | 
			
		||||
(local laptop (= hostname "syl"))
 | 
			
		||||
 | 
			
		||||
;; 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
 | 
			
		||||
                           ;;bling.layout.centered
 | 
			
		||||
                           awful.layout.suit.floating
 | 
			
		||||
                           ;; awful.layout.suit.tile.left
 | 
			
		||||
                           ;; awful.layout.suit.tile.bottom
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@
 | 
			
		|||
      (awful.spawn.easy_async_with_shell "pamixer --get-volume-human" cb)))
 | 
			
		||||
 | 
			
		||||
(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/desktop.rasi"))))
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = "chris-linuxlaptop" ]; then
 | 
			
		||||
if [ $(hostname) = "syl" ]; then
 | 
			
		||||
    style="laptop"
 | 
			
		||||
    #echo "this is hidpi"
 | 
			
		||||
else 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = "chris-linuxlaptop" ]; then
 | 
			
		||||
if [ $(hostname) = "syl" ]; then
 | 
			
		||||
    style="laptop"
 | 
			
		||||
    #echo "this is hidpi"
 | 
			
		||||
else 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = "chris-linuxlaptop" ]; then
 | 
			
		||||
if [ $(hostname) = "syl" ]; then
 | 
			
		||||
    style="laptop"
 | 
			
		||||
    #echo "this is hidpi"
 | 
			
		||||
else 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
#!/usr/bin/env bash
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = "chris-linuxlaptop" ]; then
 | 
			
		||||
if [ $(hostname) = "syl" ]; then
 | 
			
		||||
    style="laptop"
 | 
			
		||||
    #echo "this is hidpi"
 | 
			
		||||
else 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
# which can be switched at runtime with shift+left/right
 | 
			
		||||
# root=/path/to/root
 | 
			
		||||
 | 
			
		||||
if [ $(hostname) = "chris-linuxlaptop" ]; then
 | 
			
		||||
if [ $(hostname) = "syl" ]; then
 | 
			
		||||
    style="laptop"
 | 
			
		||||
    #echo "this is hidpi"
 | 
			
		||||
else 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue