diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 0af3193..dd9894f 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -40,7 +40,8 @@ colors:
   search:
     matches:
       foreground: '#44475a'
-      background: '#50fa7b'
+        #background: '#50fa7b'
+      background: '#11aa7b'
     focused_match:
       foreground: '#44475a'
       background: '#ffb86c'
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c13031a..5da97ac 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -192,7 +192,10 @@ require("block").setup({
 -- onedark
 require('onedark').setup {
     colors = {
-      blue = "#247ba3"
+      blue = "#247ba3",
+      green = "#6fa11a",
+      white = "#ecf0f0",
+      gray = "#c3d3d3",
     },
     style = 'darker'
 }
diff --git a/.config/password-store b/.config/password-store
index bb03525..ffde3d6 160000
--- a/.config/password-store
+++ b/.config/password-store
@@ -1 +1 @@
-Subproject commit bb03525a84aedd1f113e881f2e1cede6dda59b86
+Subproject commit ffde3d6a5fa4ec163abf5923c1aba6c28ac6d47b
diff --git a/.config/shell/aliases b/.config/shell/aliases
index 7e4aef9..56a61ab 100644
--- a/.config/shell/aliases
+++ b/.config/shell/aliases
@@ -53,10 +53,12 @@ alias run-envreboot='(cd ~/src/ansible-playbooks-prod; ansible-playbook -i inven
 
 # configs
 alias zshconfig="$EDITOR ~/.zshrc"
+alias zshrc="$EDITOR ~/.zshrc"
 alias i3config="$EDITOR ~/.config/i3/config"
 alias sshconfig="$EDITOR ~/.ssh/config"
 alias edithosts="sudoedit /etc/hosts"
 alias vimrc="(cd ~/.config/nvim/; $EDITOR)"
+alias tigrc="$EDITOR $HOME/.config/tig/config"
 
 # yadm
 alias yap="yadm add -p"
diff --git a/.config/swaylock/config b/.config/swaylock/config
new file mode 100644
index 0000000..00277c3
--- /dev/null
+++ b/.config/swaylock/config
@@ -0,0 +1,7 @@
+ignore-empty-password
+daemonize
+line-uses-ring
+indicator-radius=100
+indicator-thickness=15
+inside-color=00000033
+effect-blur=5x3
diff --git a/.config/waybar/config b/.config/waybar/config
new file mode 100644
index 0000000..8acf9ed
--- /dev/null
+++ b/.config/waybar/config
@@ -0,0 +1,121 @@
+{
+	"layer": "top",
+	"position": "bottom",
+
+	"modules-left": [
+		"sway/workspaces",
+		"custom/right-arrow-dark"
+	],
+	"modules-center": [
+		"custom/left-arrow-dark",
+		"clock#1",
+		"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		"clock#2",
+		"custom/right-arrow-dark",
+		"custom/right-arrow-light",
+		"clock#3",
+		"custom/right-arrow-dark"
+	],
+	"modules-right": [
+		"custom/left-arrow-dark",
+		"pulseaudio",
+		"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		"memory",
+		"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		"cpu",
+		"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		"battery",
+		"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		"disk",
+		"custom/left-arrow-light",
+		"custom/left-arrow-dark",
+		"tray"
+	],
+
+	"custom/left-arrow-dark": {
+		"format": "",
+		"tooltip": false
+	},
+	"custom/left-arrow-light": {
+		"format": "",
+		"tooltip": false
+	},
+	"custom/right-arrow-dark": {
+		"format": "",
+		"tooltip": false
+	},
+	"custom/right-arrow-light": {
+		"format": "",
+		"tooltip": false
+	},
+
+	"sway/workspaces": {
+		"disable-scroll": true,
+		"format": "{name}"
+	},
+
+	"clock#1": {
+		"format": "{:%a}",
+		"tooltip": false
+	},
+	"clock#2": {
+		"format": "{:%H:%M}",
+		"tooltip": false
+	},
+	"clock#3": {
+		"format": "{:%m-%d}",
+		"tooltip": false
+	},
+
+	"pulseaudio": {
+		"format": "{icon} {volume:2}%",
+		"format-bluetooth": "{icon}  {volume}%",
+		"format-muted": "MUTE",
+		"format-icons": {
+			"headphones": "",
+			"default": [
+				"",
+				""
+			]
+		},
+		"scroll-step": 5,
+		"on-click": "pamixer -t",
+		"on-click-right": "pavucontrol"
+	},
+	"memory": {
+		"interval": 5,
+		"format": "Mem {}%"
+	},
+	"cpu": {
+		"interval": 5,
+		"format": "CPU {usage:2}%"
+	},
+	"battery": {
+		"states": {
+			"good": 95,
+			"warning": 30,
+			"critical": 15
+		},
+		"format": "{icon} {capacity}%",
+		"format-icons": [
+			"",
+			"",
+			"",
+			"",
+			""
+		]
+	},
+	"disk": {
+		"interval": 5,
+		"format": "Disk {percentage_used:2}%",
+		"path": "/"
+	},
+	"tray": {
+		"icon-size": 20
+	}
+}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
new file mode 100644
index 0000000..7454ecf
--- /dev/null
+++ b/.config/waybar/style.css
@@ -0,0 +1,74 @@
+* {
+	font-size: 20px;
+	font-family: monospace;
+}
+
+window#waybar {
+	background: #292b2e;
+	color: #fdf6e3;
+}
+
+#custom-right-arrow-dark,
+#custom-left-arrow-dark {
+	color: #1a1a1a;
+}
+#custom-right-arrow-light,
+#custom-left-arrow-light {
+	color: #292b2e;
+	background: #1a1a1a;
+}
+
+#workspaces,
+#clock.1,
+#clock.2,
+#clock.3,
+#pulseaudio,
+#memory,
+#cpu,
+#battery,
+#disk,
+#tray {
+	background: #1a1a1a;
+}
+
+#workspaces button {
+	padding: 0 2px;
+	color: #fdf6e3;
+}
+#workspaces button.focused {
+	color: #268bd2;
+}
+#workspaces button:hover {
+	box-shadow: inherit;
+	text-shadow: inherit;
+}
+#workspaces button:hover {
+	background: #1a1a1a;
+	border: #1a1a1a;
+	padding: 0 3px;
+}
+
+#pulseaudio {
+	color: #268bd2;
+}
+#memory {
+	color: #2aa198;
+}
+#cpu {
+	color: #6c71c4;
+}
+#battery {
+	color: #859900;
+}
+#disk {
+	color: #b58900;
+}
+
+#clock,
+#pulseaudio,
+#memory,
+#cpu,
+#battery,
+#disk {
+	padding: 0 10px;
+}
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 1a2e343..4677746 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -30,4 +30,5 @@ sudo dnf install -y firefox chromium gimp libreoffice dia shotwell thunderbird i
   mutt pass pass-otp lxd lxc python-lxc pdftk-java podman pwgen python3-img2pdf python3-devel python3-neovim \
   python3-netaddr shorewall shorewall6 systemd-oomd-defaults rxvt-unicode sshpass telnet terraform tig tldr \
   tmux udiskie upower vifm virt-manager libvirt jpegoptim poppler-utils qpdf alacritty dunst feh i3 i3blocks \
-  maim network-manager-applet pavucontrol sway polybar mpc mpd mpv ncmpcpp openvpn
+  maim network-manager-applet pavucontrol sway swaylock waybar wl-clipboard grim slurp polybar mpc mpd mpv \
+  ncmpcpp openvpn