diff --git a/.bash_profile b/.bash_profile
index 01919d4..ab2af98 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,11 +1,3 @@
 if [[ -f "$HOME/.bashrc" ]]; then
     . "$HOME/.bashrc"
 fi
-
-if [[ -f "$HOME/.cargo/env" ]]; then
-    . "$HOME/.cargo/env"
-fi
-
-if [[ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]]; then
-    . "$HOME/.nix-profile/etc/profile.d/nix.sh"
-fi
diff --git a/.bashrc b/.bashrc
index 734447c..ba83f57 100644
--- a/.bashrc
+++ b/.bashrc
@@ -40,17 +40,11 @@ export EDITOR=vim
 
 case $( uname -s ) in
 Darwin)
-    echo "Using OSX bash settings."
     alias ls="ls -G"
     ;;
 Linux)
     # for some reason I find this welcome string more annoying on Linux
     ;;
-MSYS_NT-10.0-22000)
-    # I don't actually have any MSYS-specific settings yet but probably will at
-    # some point
-    echo "Using MSYS bash settings."
-    ;;
 *)
     echo "No platform-specific bash settings are enabled."
     ;;
@@ -94,3 +88,11 @@ fi
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+if [[ -f "$HOME/.cargo/env" ]]; then
+    . "$HOME/.cargo/env"
+fi
+
+if [[ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]]; then
+    . "$HOME/.nix-profile/etc/profile.d/nix.sh"
+fi
diff --git a/config.ini b/config.ini
index 5e6452a..da609a3 100644
--- a/config.ini
+++ b/config.ini
@@ -17,7 +17,7 @@ files:
 [home kitty]
 when: host.has('kitty')
 files:
-  kitty.conf > .config/kitty/kitty.conf
+  kitty/kitty.conf > .config/kitty/kitty.conf
 
 # [run vim-plugins]
 # when: host.has('vim')
diff --git a/kitty.conf b/kitty/kitty.conf
similarity index 100%
rename from kitty.conf
rename to kitty/kitty.conf