diff --git a/.gitignore b/.gitignore
index 1716e1b..6c7ce9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,4 +278,5 @@ nvim/lua/plugins/example.lua
 cvim/
 !cvim/vimrc
 tailscale/
-X11/init.d/
+X11/xinit/xinitrc.d/
+*.bak
diff --git a/X11/xinitrc b/X11/xinit/xinitrc
similarity index 81%
rename from X11/xinitrc
rename to X11/xinit/xinitrc
index 9c78739..4fca507 100644
--- a/X11/xinitrc
+++ b/X11/xinit/xinitrc
@@ -2,8 +2,8 @@
 # `/etc/X11/xinit/xinitrc`:
 #
 # #!/bin/sh
-# if [ -f ~/.config/X11/xinitrc ] ; then
-#     . ~/.config/X11/xinitrc
+# if [ -f ~/.config/X11/xinit/xinitrc ] ; then
+#     . ~/.config/X11/xinit/xinitrc
 # else
 #     . /etc/X11/Xsession
 # fi
@@ -37,8 +37,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
     unset f
 fi
 
-if [ -d ~/.config/X11/init.d ] ; then
-    for f in ~/.config/X11/init.d/?*.sh ; do
+if [ -d ~/.config/X11/xinit/xinitrc.d ] ; then
+    for f in ~/.config/X11/xinit/xinitrc.d/?*.sh ; do
         [ -x "$f" ] && . "$f"
     done
     unset f
diff --git a/X11/init.d/.gitignore b/X11/xinit/xinitrc.d/.gitignore
similarity index 100%
rename from X11/init.d/.gitignore
rename to X11/xinit/xinitrc.d/.gitignore
diff --git a/X11/init.d/default.sh b/X11/xinit/xinitrc.d/default.sh
similarity index 100%
rename from X11/init.d/default.sh
rename to X11/xinit/xinitrc.d/default.sh
diff --git a/X11/init.d/example.sh b/X11/xinit/xinitrc.d/example.sh
similarity index 100%
rename from X11/init.d/example.sh
rename to X11/xinit/xinitrc.d/example.sh
diff --git a/packages/flatpak/list.yml b/packages/flatpak/list.yml
index 1fb6cc3..4835b4b 100644
--- a/packages/flatpak/list.yml
+++ b/packages/flatpak/list.yml
@@ -9,3 +9,5 @@ rnote: com.github.flxzt.rnote
 kalgebra: org.kde.kalgebra
 steam: com.valvesoftware.Steam
 flatseal: com.github.tchx84.Flatseal
+loupe: org.gnome.Loupe
+citations: org.gnome.World.Citations
diff --git a/packages/system/apt/list b/packages/system/apt/list
index a4ff7d2..d5736b2 100644
--- a/packages/system/apt/list
+++ b/packages/system/apt/list
@@ -51,6 +51,8 @@ zbar-tools
 trash-cli
 xdotool
 unzip
+imagemagick
+tmux
 
 # Appearance
 gnome-themes-extra
@@ -59,6 +61,7 @@ gnome-themes-extra
 build-essential
 git
 lazygit
+golang
 
 # Extra
 flatpak
diff --git a/scripts/setup/setup-docker-debian b/scripts/setup/setup-docker-debian
new file mode 100755
index 0000000..cfdd185
--- /dev/null
+++ b/scripts/setup/setup-docker-debian
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# See:
+# https://docs.docker.com/engine/install/debian/
+
+for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove -y $pkg; done
+
+# Add Docker's official GPG key:
+sudo apt-get update -y
+sudo apt-get install -y ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
diff --git a/scripts/setup/setup-lazyvim b/scripts/setup/setup-lazyvim
new file mode 100755
index 0000000..380bd90
--- /dev/null
+++ b/scripts/setup/setup-lazyvim
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# required
+mv ~/.config/nvim{,.bak}
+
+# optional but recommended
+mv ~/.local/share/nvim{,.bak}
+mv ~/.local/state/nvim{,.bak}
+mv ~/.cache/nvim{,.bak}
+
+git clone https://github.com/LazyVim/starter ~/.config/nvim
+rm -rf ~/.config/nvim/.git
+
+git -C ~/.config restore nvim
diff --git a/shell/profile.d/xdgspec.sh b/shell/profile.d/xdgspec.sh
index 852fb1e..465ca70 100644
--- a/shell/profile.d/xdgspec.sh
+++ b/shell/profile.d/xdgspec.sh
@@ -17,7 +17,7 @@ export \
     XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" \
     MBSYNCRC="$XDG_CONFIG_HOME/isync/mbsyncrc" \
     XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \
-    XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" \
+    XINITRC="$XDG_CONFIG_HOME/X11/xinit/xinitrc" \
     LESSHISTFILE="$XDG_DATA_HOME/lesshst" \
     ELECTRUMDIR="$XDG_DATA_HOME/electrum" \
     CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" \