diff --git a/cliphist/.config/cliphist/config b/cliphist/.config/cliphist/config
new file mode 100644
index 000000000..c260fd94a
--- /dev/null
+++ b/cliphist/.config/cliphist/config
@@ -0,0 +1 @@
+max-items 50
diff --git a/cliphist/.config/config b/cliphist/.config/config
deleted file mode 100644
index 033b4b9a3..000000000
--- a/cliphist/.config/config
+++ /dev/null
@@ -1,3 +0,0 @@
-max-items 50
-max-size 100000
-
diff --git a/uwsm/.config/uwsm/default-id b/uwsm/.config/uwsm/default-id
new file mode 100644
index 000000000..44cb7dc09
--- /dev/null
+++ b/uwsm/.config/uwsm/default-id
@@ -0,0 +1 @@
+sway.desktop
diff --git a/zsh/.zprofile b/zsh/.zprofile
new file mode 100644
index 000000000..dba4f5083
--- /dev/null
+++ b/zsh/.zprofile
@@ -0,0 +1,6 @@
+if uwsm check may-start && uwsm select; then
+    exec uwsm start default
+fi
+
+# Keep user-local launchers available before the interactive shell starts.
+export PATH="$HOME/.local/bin:$PATH"
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 000000000..38b969f61
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,2 @@
+# The user ssh-agent unit owns this socket for every shell.
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.sock"