diff --git a/.config/conky/i3lock.conf b/.config/conky/i3lock.conf
new file mode 100644
index 00000000..b5f6b2da
--- /dev/null
+++ b/.config/conky/i3lock.conf
@@ -0,0 +1,53 @@
+-- vim: ts=4 sw=4 noet ai cindent syntax=lua
+
+conky.config = {
+	own_window = true,
+	own_window_title = 'Conky - i3lock',
+	own_window_class = 'Conky_i3lock',
+	own_window_type = 'override',
+	own_window_hints = 'undecorated,above,sticky,skip_taskbar,skip_pager',
+	own_window_colour = '282828',
+
+	double_buffer = true,
+	cpu_avg_samples = 2,
+	no_buffers = true,
+	update_interval = 1,
+
+	use_xft = true,
+	font = 'Inconsolata:style=Medium:size=10',
+	default_color = '#ebdbb2',
+	color1 = '282828', -- Background
+	color2 = 'ebdbb2', -- Foreground
+	color3 = '3c3836', -- Background-alt
+	color4 = 'b8bb26', -- Green (Battery)
+	color6 = '8ec07c', -- Cyan (Network)
+	color7 = 'fabd2f', -- Yellow (Disk)
+	color8 = '83a598', -- Blue (CPU)
+	color9 = 'd3869b', -- Magenta (Memory)
+
+	alignment = 'middle_middle',
+	xinerama_head = 2,
+	minimum_height = 0,
+	minimum_width = 400,
+	gap_x = 350,
+	gap_y = 0,
+
+	format_human_readable = true,
+
+	default_bar_height = 10,
+	default_bar_width = 300,
+	draw_outline = false,
+	draw_graph_borders = false,
+	draw_shades = false
+}
+
+conky.text = [[
+${font Inconsolata:style=Medium:size=64}$alignr${time %I:%M %p}$font
+${font Inconsolata:style=Medium:size=24}$alignr${time %A, %B %d}$font
+${if_existing /sys/class/power_supply/BAT0}
+${alignr}BAT: $color4${battery_bar}$color$endif
+${alignr}CPU: $color8${cpubar}$color
+${alignr}MEM: $color9${membar}$color
+${alignr}SWP: $color9${swapbar}$color
+]]
+
diff --git a/.local/bin b/.local/bin
index 9b4c6006..d973044e 160000
--- a/.local/bin
+++ b/.local/bin
@@ -1 +1 @@
-Subproject commit 9b4c60069e88608121ea436bebd58cf170472fc7
+Subproject commit d973044ee87c6b02b203133d2750676c06a6044c