Add waybar to swaywm config

base/.vim/bundle/ale

@@ -1 +1 @@
-Subproject commit c0eff9f2f18c5408596ce1e8e43dc7933340e514
+Subproject commit 5ce2bf84ca00cee8f375f108952789302980ae57

base/.vim/bundle/lightline-gruvbox.vim

@@ -1 +1 @@
-Subproject commit d233416d566e61f879bd19d9d498b01b1b7e336c
+Subproject commit e94af37820d9c2e6d9eb27c735bb8ef926a66c7e

base/.vim/bundle/vim-css-color

@@ -1 +1 @@
-Subproject commit 5687a7978bc80263cd03d0a667c2f56890cfb940
+Subproject commit 1c4b78f5512980227ca747e76f1f6c904f2eb3dc

base/.vim/bundle/vim-terraform

@@ -1 +1 @@
-Subproject commit 2bbc5f65a80c79a5110494a2ba1b869075fcf7a0
+Subproject commit f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443

desktop-gruvbox-sway/.config/foot/foot.ini

@@ -0,0 +1,198 @@
+# -*- conf -*-
+
+# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
+# term=foot (or xterm-256color if built with -Dterminfo=disabled)
+# login-shell=no
+
+# app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode
+# title=foot
+# locked-title=no
+
+# font=monospace:size=8
+# font-bold=<bold variant of regular font>
+# font-italic=<italic variant of regular font>
+# font-bold-italic=<bold+italic variant of regular font>
+# font-size-adjustment=0.5
+# line-height=<font metrics>
+# letter-spacing=0
+# horizontal-letter-offset=0
+# vertical-letter-offset=0
+# underline-offset=<font metrics>
+# underline-thickness=<font underline thickness>
+# box-drawings-uses-font-glyphs=no
+# dpi-aware=no
+
+# initial-window-size-pixels=700x500  # Or,
+# initial-window-size-chars=<COLSxROWS>
+# initial-window-mode=windowed
+# pad=0x0                             # optionally append 'center'
+# resize-delay-ms=100
+
+# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body}
+
+# bold-text-in-bright=no
+# word-delimiters=,│`|:"'()[]{}<>
+# selection-target=primary
+# workers=<number of logical CPUs>
+# utmp-helper=/usr/lib/utempter/utempter  # When utmp backend is ‘libutempter’ (Linux)
+# utmp-helper=/usr/libexec/ulog-helper    # When utmp backend is ‘ulog’ (FreeBSD)
+
+[environment]
+# name=value
+
+[bell]
+# urgent=no
+# notify=no
+# command=
+# command-focused=no
+
+[scrollback]
+# lines=1000
+# multiplier=3.0
+# indicator-position=relative
+# indicator-format=""
+
+[url]
+# launch=xdg-open ${url}
+# label-letters=sadfjklewcmpgh
+# osc8-underline=url-mode
+# protocols=http, https, ftp, ftps, file, gemini, gopher
+# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
+
+[cursor]
+# style=block
+# color=<inverse foreground/background>
+# blink=no
+# beam-thickness=1.5
+# underline-thickness=<font underline thickness>
+
+[mouse]
+# hide-when-typing=no
+# alternate-scroll-mode=yes
+
+[touch]
+# long-press-delay=400
+
+[colors]
+background=282828
+foreground=ebdbb2
+regular0=282828
+regular1=cc241d
+regular2=98971a
+regular3=d79921
+regular4=458588
+regular5=b16286
+regular6=689d6a
+regular7=a89984
+bright0=928374
+bright1=fb4934
+bright2=b8bb26
+bright3=fabd2f
+bright4=83a598
+bright5=d3869b
+bright6=8ec07c
+bright7=ebdbb2
+
+## dimmed colors (see foot.ini(5) man page)
+# dim0=<not set>
+# ...
+# dim7=<not-set>
+
+## The remaining 256-color palette
+# 16 = <256-color palette #16>
+# ...
+# 255 = <256-color palette #255>
+
+## Misc colors
+# selection-foreground=<inverse foreground/background>
+# selection-background=<inverse foreground/background>
+# jump-labels=<regular0> <regular3>          # black-on-yellow
+# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
+# search-box-no-match=<regular0> <regular1>  # black-on-red
+# search-box-match=<regular0> <regular3>     # black-on-yellow
+# urls=<regular3>
+
+[csd]
+# preferred=server
+# size=26
+# font=<primary font>
+# color=<foreground color>
+# hide-when-maximized=no
+# double-click-to-maximize=yes
+# border-width=0
+# border-color=<csd.color>
+# button-width=26
+# button-color=<background color>
+# button-minimize-color=<regular4>
+# button-maximize-color=<regular2>
+# button-close-color=<regular1>
+
+[key-bindings]
+# scrollback-up-page=Shift+Page_Up
+# scrollback-up-half-page=none
+# scrollback-up-line=none
+# scrollback-down-page=Shift+Page_Down
+# scrollback-down-half-page=none
+# scrollback-down-line=none
+# clipboard-copy=Control+Shift+c XF86Copy
+# clipboard-paste=Control+Shift+v XF86Paste
+# primary-paste=Shift+Insert
+# search-start=Control+Shift+r
+# font-increase=Control+plus Control+equal Control+KP_Add
+# font-decrease=Control+minus Control+KP_Subtract
+# font-reset=Control+0 Control+KP_0
+# spawn-terminal=Control+Shift+n
+# minimize=none
+# maximize=none
+# fullscreen=none
+# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-selected=[xargs -r firefox] none
+# show-urls-launch=Control+Shift+o
+# show-urls-copy=none
+# show-urls-persistent=none
+# prompt-prev=Control+Shift+z
+# prompt-next=Control+Shift+x
+# unicode-input=Control+Shift+u
+# noop=none
+
+[search-bindings]
+# cancel=Control+g Control+c Escape
+# commit=Return
+# find-prev=Control+r
+# find-next=Control+s
+# cursor-left=Left Control+b
+# cursor-left-word=Control+Left Mod1+b
+# cursor-right=Right Control+f
+# cursor-right-word=Control+Right Mod1+f
+# cursor-home=Home Control+a
+# cursor-end=End Control+e
+# delete-prev=BackSpace
+# delete-prev-word=Mod1+BackSpace Control+BackSpace
+# delete-next=Delete
+# delete-next-word=Mod1+d Control+Delete
+# extend-to-word-boundary=Control+w
+# extend-to-next-whitespace=Control+Shift+w
+# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
+# primary-paste=Shift+Insert
+# unicode-input=none
+
+[url-bindings]
+# cancel=Control+g Control+c Control+d Escape
+# toggle-url-visible=t
+
+[text-bindings]
+# \x03=Mod4+c  # Map Super+c -> Ctrl+c
+
+[mouse-bindings]
+# selection-override-modifiers=Shift
+# primary-paste=BTN_MIDDLE
+# select-begin=BTN_LEFT
+# select-begin-block=Control+BTN_LEFT
+# select-extend=BTN_RIGHT
+# select-extend-character-wise=Control+BTN_RIGHT
+# select-word=BTN_LEFT-2
+# select-word-whitespace=Control+BTN_LEFT-2
+# select-row=BTN_LEFT-3
+
+# vim: ft=dosini

desktop-gruvbox-sway/.config/rofi

@@ -1 +0,0 @@
-../../desktop-gruvbox/.config/rofi

desktop-gruvbox-sway/.config/rofi/config.rasi

@@ -0,0 +1,129 @@
+/*
+ * config.rasi
+ * Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
+ *
+ * Distributed under terms of the MIT License
+ *
+ * See rofi-theme(5) for documentation
+ */
+
+configuration {
+	matching: "normal";
+	show-icons: true;
+	icon-theme: "Papirus-Gruvbox-Dark";
+	modi: "drun,ssh,window";
+}
+
+* {
+	background: #282828;
+	background-alt: #32302f;
+	foreground: #ebdbb2;
+	foreground-alt: #fb4934;
+	yellow: #fabd2f;
+	blue: #83a598;
+	cyan: #8ec07c;
+
+	text-color: @foreground;
+	background-color: @background;
+	font: "IBM Plex Sans 10";
+}
+
+#window {
+	location: southwest;
+	anchor: southwest;
+
+	border-color: @background-alt;
+	background-color: @background;
+
+	border: 4px 4px 0 0;
+	height: 60%;
+	width: 30%;
+	padding: 0em;
+}
+	#inputbar {
+		background-color: @background-alt;
+		padding: 1em;
+	}
+		#case-indicator {
+			enabled: false;
+		}
+		#prompt {
+			enabled: false;
+		}
+		#textbox-prompt-colon {
+			enabled: false;
+		}
+		#entry {
+			background-color: inherit;
+			font: "IBM Plex Sans 12";
+			padding: 0.5em;
+		}
+		#num-filtered-rows {
+			background-color: inherit;
+			font: "IBM Plex Sans 12";
+			padding: 0.5em;
+		}
+		#textbox-num-sep {
+			background-color: inherit;
+			font: "IBM Plex Sans 12";
+			padding: 0.5em 0em;
+		}
+		#num-rows {
+			background-color: inherit;
+			font: "IBM Plex Sans 12";
+			padding: 0.5em;
+		}
+	#message {
+		padding: 4px;
+	}
+		#textbox {
+			padding: 4px 12px 4px 12px;
+			font-color: @foreground-alt;
+		}
+
+	#listview {
+		padding: 1em;
+		border: none;
+	}
+		#scrollbar {
+			handle-color: @background-alt;
+			enabled: false;
+		}
+		#element {
+			padding: 1em;
+		}
+		#element alternate.normal {
+			background-color: @background;
+		}
+		#element normal active {
+			text-color: @cyan;
+		}
+		#element normal urgent {
+			text-color: @yellow;
+		}
+		#element selected normal {
+			background-color: @blue;
+			text-color: @background;
+		}
+		#element selected active {
+			background-color: @cyan;
+			text-color: @background;
+		}
+		#element selected urgent {
+			background-color: @yellow;
+			text-color: @background;
+		}
+	
+	#sidebar {
+	}
+
+		#button {
+			padding: 8px;
+		}
+
+		#button selected {
+			background-color: @background-alt;
+		}
+
+/* vim:ft=css
+*/

desktop-gruvbox-sway/.config/sway/config

@@ -3,6 +3,9 @@
 # Licensed under the terms of the MIT License
 #
 
+# Configs
+set $term foot
+
 ## WORKSPACES
 set $w1 1
 set $w2 2
@@ -32,7 +35,7 @@ workspace $w9 output $monsec
 
 ## COSMETICS
 font pango:IBM Plex Sans 12
-default_border pixel 6
+default_border pixel 4
 focus_on_window_activation none
 gaps inner 8
 
@@ -65,7 +68,7 @@ set $shift Shift
 floating_modifier $mod
 
 # Program opening and closing
-bindsym $mod+Return exec "konsole"
+bindsym $mod+Return exec "$term"
 bindsym $mod+q kill
 bindsym $mod+space exec "rofi -show drun"
 bindsym $mod+backslash exec "rofi -show ssh"
@@ -161,6 +164,12 @@ bindsym $mod+$shift+8 move container to workspace $w8
 bindsym $mod+$shift+9 move container to workspace $w9
 bindsym $mod+$shift+0 move container to workspace $w10
 
+## BARS
+# Main bar
+bar {
+	swaybar_command waybar
+}
+
 ## INPUTS
 # Touchpad
 input "type:touchpad" {
@@ -172,6 +181,10 @@ input "type:touchpad" {
 	tap_button_map		lrm	# 1/2/3-finger tap (left, right, middle)
 }
 
+## OUTPUTS
+# Laptop display
+output eDP-1 scale 1.5
+
 ## MODES
 # Resize
 bindsym $mod+r mode "resize"
@@ -192,4 +205,4 @@ mode "resize" {
 }
 
 ## STARTUP APPLICATIONS
-# TODO: Waybar
+

desktop-gruvbox-sway/.config/waybar/config

@@ -29,7 +29,7 @@
 	},
 	"pulseaudio": {
 		"scroll-step": 0,
-		"format": "{volume}% {icon} {format_source}",
+		"format": "{icon} {volume}%",
 		"format-bluetooth": "{volume}% {icon} {format_source}",
 		"format-bluetooth-muted": " {icon} {format_source}",
 		"format-muted": " {format_source}",

desktop-gruvbox-sway/.config/waybar/style.css

@@ -13,7 +13,7 @@
 }
 
 window#waybar {
-	background: @theme_base_color;
+	background: #282828;
 	border-bottom: 4px solid #32302f;
 }
 
@@ -23,11 +23,12 @@ window#waybar {
 }
 #workspaces button {
 	background: transparent;
+	color: #ebdbb2;
 	padding: 0 0.9em;
 }
 #workspaces button.focused {
 	background: #83a598;
-	color: @theme_base_color;
+	color: #282828;
 }
 #mode {
 	background: #fb4934;
@@ -38,6 +39,7 @@ window#waybar {
 /* widgets */
 #pulseaudio {
 	padding: 0 1em;
+	color: #ebdbb2;
 }
 #battery {
 	padding: 0 1em;
@@ -54,5 +56,6 @@ window#waybar {
 }
 #clock {
 	border-left: 1px solid #32302f;
+	color: #ebdbb2;
 	padding: 0 1em;
 }