diff --git a/README.md b/README.md
index d8a78f5..2ccd727 100644
--- a/README.md
+++ b/README.md
@@ -68,5 +68,8 @@ The scripts will take it from there, asking you for information and downloading
   - `grub-config`: custom grub config generator (probably not necessary but at this point I don’t wanna dig into the default one)
   - `backup-fs`: helper script to rebuild the squashfs
 - `kernel.d/`: kernel hooks to be installed in /etc/kernel.d
+- `skel/`: files to be added to /etc/skel
+  - `bashrc`: my custom .bashrc
+  - `user-readme.txt`: will be displayed on first login
+  - `xinitrc`: what dis look like?
 - `notes_to_self.txt`: will disappear once finished
-- `bashrc`: just a custom bashrc
diff --git a/bashrc b/bashrc
deleted file mode 100644
index e69de29..0000000
diff --git a/skel/bashrc b/skel/bashrc
new file mode 100644
index 0000000..66d1c19
--- /dev/null
+++ b/skel/bashrc
@@ -0,0 +1,83 @@
+# ALWAYS RUN
+# ==========
+# things to always set up, even for non-interactive shells
+
+# Fuck vi!
+EDITOR=nano
+# On FreeBSD this is being set for whatever reason in the other shell rc files. I'll leave it here for compatibility.
+PAGER=less
+# add a user-specific bin directory to PATH
+PATH=$HOME/.local/bin:$PATH
+export EDITOR PAGER PATH
+
+# CHECK INTERACTIVE
+# =================
+# Don't do anything after this if not running an interactive shell.
+case $- in
+    *i*) ;;
+      *) return ;;
+esac
+
+# ALIASES
+# =======
+alias aliases="nano $HOME/.bashrc_aliases && source $HOME/.bashrc_aliases"
+[ -f $HOME/.bashrc_aliases ] && source $HOME/.bashrc_aliases
+
+# BASH COMPLETION
+# ===============
+# include bash completions if they exist
+# (may need to be adjusted to where the bash completions are stored on the current system)
+
+# Default for FreeBSD:
+if [ -f /usr/local/share/bash-completion/bash_completion.sh ]; then
+    source /usr/local/share/bash-completion/bash_completion.sh
+# Default for Linux:
+elif [ -f /usr/share/bash-completion/bash_completion ]; then
+    source /usr/share/bash-completion/bash_completion
+fi
+
+# VARIABLES
+# =========
+
+# don't put duplicate lines or lines starting with a space in history
+HISTCONTROL=ingnoreboth
+# unlimited history
+HISTSIZE=-1
+HISTFILESIZE=-1
+# set a fancy prompt
+PROMPT_COMMAND="PS1=\"[\[\e[03$(
+    if [ $EUID -eq 0 ]
+    then
+        echo -n '1;02m'
+    else
+        if [ -n "$(groups | grep 'wheel\|sudo')" ];
+        then
+            echo -n '2;01m'
+        else
+            echo -n '6;01m'
+       fi
+    fi
+)\]\u@\h\[\e[0m\]]:\$(
+    PROMPT_ERRORLEVEL=\$?
+    if [ \$PROMPT_ERRORLEVEL -eq 0 ]
+    then
+        echo -n '\[\e[032;02m\]'
+    else
+        echo -n '\[\e[031;02m\]'
+    fi
+    echo -n \$PROMPT_ERRORLEVEL
+    echo -n '\[\e[00m\]'
+):\[\e[034;01m\]\$(pwd)\[\e[0m\]:$(
+    if [ $EUID -eq 0 ]
+    then
+        echo -n '\[\e[02m\]#\[\e[0m\]'
+    else
+        echo -n '\[\e[02m\]$\[\e[0m\]'
+    fi
+)> \""
+
+# SHELL OPTIONS
+# =============
+shopt -s histappend
+shopt -s checkwinsize
+shopt -s globstar
diff --git a/skel/user-readme.txt b/skel/user-readme.txt
new file mode 100644
index 0000000..1333ed7
--- /dev/null
+++ b/skel/user-readme.txt
@@ -0,0 +1 @@
+TODO
diff --git a/skel/xinitrc b/skel/xinitrc
new file mode 100644
index 0000000..ed83006
--- /dev/null
+++ b/skel/xinitrc
@@ -0,0 +1,2 @@
+#TODO: open user-readme once and then never again
+#TODO: check which software selection of Void-USB has been installed and start the appropriate things
diff --git a/user-readme.txt b/user-readme.txt
deleted file mode 100644
index e69de29..0000000