Merge branch 'sway' of git.keegandeppe.com:kdeppe/dotfiles into sway
This commit is contained in:
		
						commit
						c7fede1af8
					
				@ -10,12 +10,17 @@ default_border none
 | 
				
			|||||||
gaps inner 10
 | 
					gaps inner 10
 | 
				
			||||||
smart_gaps on
 | 
					smart_gaps on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# exec --no-startup-id waybar;
 | 
				
			||||||
 | 
					bar {
 | 
				
			||||||
 | 
					    swaybar_command waybar;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
# setup screens
 | 
					# setup screens
 | 
				
			||||||
exec_always "killall kanshi; kanshi"
 | 
					exec_always "killall kanshi; kanshi"
 | 
				
			||||||
# background
 | 
					# background
 | 
				
			||||||
exec_always wallpaper.sh
 | 
					exec_always wallpaper.sh
 | 
				
			||||||
# waybar
 | 
					# waybar
 | 
				
			||||||
exec_always "killall waybar; waybar"
 | 
					# Restarts waybar if running, starts otherwise
 | 
				
			||||||
 | 
					exec_always pgrep waybar && (killall -SIGUSR2 waybar) || (waybar)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# loading layout
 | 
					# loading layout
 | 
				
			||||||
assign [class="st-256color"] 1
 | 
					assign [class="st-256color"] 1
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
    "layer": "top",
 | 
					    "layer": "top",
 | 
				
			||||||
    "modules-left": ["sway/workspaces", "sway/window", "pulseaudio/slider"],
 | 
					    "modules-left": ["sway/workspaces", "sway/window", "pulseaudio/slider"],
 | 
				
			||||||
    "modules-center": ["custom/weather"],
 | 
					    "modules-center": ["custom/weather"],
 | 
				
			||||||
    "modules-right": ["cpu", "memory", "network", "custom/bg", "custom/date"],
 | 
					    "modules-right": ["cpu", "memory", "network", "battery", "custom/bg", "custom/date"],
 | 
				
			||||||
    "sway/workspaces": {
 | 
					    "sway/workspaces": {
 | 
				
			||||||
        "all-outputs": true
 | 
					        "all-outputs": true
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
@ -32,17 +32,23 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "network": {
 | 
					    "network": {
 | 
				
			||||||
        "interval": 2,
 | 
					        "interval": 2,
 | 
				
			||||||
 | 
					        "format-icons": [" ", " ", " ", " "],
 | 
				
			||||||
        "format-ethernet": "ETH: {bandwidthTotalBytes}",
 | 
					        "format-ethernet": "ETH: {bandwidthTotalBytes}",
 | 
				
			||||||
        "format-wifi": "WLAN: {ssid}",
 | 
					        "format-wifi": "WLAN: {icon}",
 | 
				
			||||||
        "tooltip-format": "DOWN: {bandwidthDownBits} UP: {bandwidthUpBits} IP: {ipaddr}"
 | 
					        "tooltip-format": "DOWN: {bandwidthDownBits} UP: {bandwidthUpBits} IP: {ipaddr}"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "battery": {
 | 
				
			||||||
 | 
					        "format": "BAT: {capacity}%",
 | 
				
			||||||
 | 
					        "format-tooltip": "{timeTo}",
 | 
				
			||||||
 | 
					        "format-time":  "{H} hours {M} minutes",
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "custom/bg": {
 | 
					    "custom/bg": {
 | 
				
			||||||
        "exec": "echo -e '\uf1c5'",
 | 
					        "exec": "echo -e '\uf1c5'",
 | 
				
			||||||
        "interval": "once",
 | 
					        "interval": "once",
 | 
				
			||||||
        "on-click": "wallpaper.sh -s"
 | 
					        "on-click": "wallpaper.sh -s"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "custom/date": {
 | 
					    "custom/date": {
 | 
				
			||||||
        "exec": "date +'%A, %b %d %l:%M %P'",
 | 
					        "exec": "date +'%a, %b %d %l:%M %P'",
 | 
				
			||||||
        "interval": 10
 | 
					        "interval": 10
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
window.LVDS-1 * {
 | 
					window.LVDS-1 * {
 | 
				
			||||||
    font-size: 12pt;
 | 
					    font-size: 10pt;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
window#waybar {
 | 
					window#waybar {
 | 
				
			||||||
@ -20,7 +20,7 @@ window#waybar.empty {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#workspaces button {
 | 
					#workspaces button {
 | 
				
			||||||
    padding: 0 5px;
 | 
					    padding: 0 3px;
 | 
				
			||||||
    color: #ddd;
 | 
					    color: #ddd;
 | 
				
			||||||
    background-color: rgba(29, 31, 21, 0.8);
 | 
					    background-color: rgba(29, 31, 21, 0.8);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -32,7 +32,7 @@ window#waybar.empty {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#workspaces button.focused {
 | 
					#workspaces button.focused {
 | 
				
			||||||
    background-color: #64727D;
 | 
					    background-color: #64727D;
 | 
				
			||||||
    box-shadow: inset 0 3px #ffffff;
 | 
					    box-shadow: inset 0 4px 2px -2px  #ffffff;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#workspaces button.urgent {
 | 
					#workspaces button.urgent {
 | 
				
			||||||
@ -45,6 +45,7 @@ window#waybar.empty {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#backlight,
 | 
					#backlight,
 | 
				
			||||||
 | 
					#battery,
 | 
				
			||||||
#battery.bat1,
 | 
					#battery.bat1,
 | 
				
			||||||
#battery.bat2,
 | 
					#battery.bat2,
 | 
				
			||||||
#clock,
 | 
					#clock,
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,5 @@
 | 
				
			|||||||
- link:
 | 
					- link:
 | 
				
			||||||
    ~/.config/sway/config: gui/sway/thinkpad
 | 
					    ~/.config/sway/config: gui/sway/thinkpad
 | 
				
			||||||
 | 
					    ~/.config/sway/base: gui/sway/base
 | 
				
			||||||
    ~/.config/sway/lock.png: gui/sway/lock.png
 | 
					    ~/.config/sway/lock.png: gui/sway/lock.png
 | 
				
			||||||
    ~/.local/bin/swaylock-blur: bin/swaylock-blur
 | 
					    ~/.local/bin/swaylock-blur: bin/swaylock-blur
 | 
				
			||||||
 | 
				
			|||||||
@ -1 +1 @@
 | 
				
			|||||||
Subproject commit 36cce9a088c8cd7d7b1a3adccc74cf2a130c51e0
 | 
					Subproject commit 5bba4b849b04da665d9776930f47371ebb9974a4
 | 
				
			||||||
							
								
								
									
										2
									
								
								src/fzf
									
									
									
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								src/fzf
									
									
									
									
									
								
							@ -1 +1 @@
 | 
				
			|||||||
Subproject commit a714e76ae17985708dde9e87ad59002c1616906f
 | 
					Subproject commit 90b818788249bb080f9eddcc4b36ad4080b55c5c
 | 
				
			||||||
@ -1 +1 @@
 | 
				
			|||||||
Subproject commit 9a9abc5d13d94aa404c02d19b7184143d020ecb7
 | 
					Subproject commit bf0b2721df35ec195798cc493d356e6a70aac8f2
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user