diff --git a/.gitmodules b/.gitmodules
index d43b906..e360d23 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,10 +3,13 @@
 	url = https://gitea.argentumcation.com/mira/nvim-config
 [submodule "private_dot_config/external_nvim"]
 	path = private_dot_config/external_nvim
-	url = ssh://git@ssh.argentumcation.com:2552/mira/nvim-config.git
+	url = https://gitea.argentumcation.com/mira/nvim-config.git
 [submodule "private_dot_config/sway/external_blocks"]
 	path = private_dot_config/sway/external_blocks
 	url = https://github.com/vivien/i3blocks-contrib
 [submodule "private_dot_config/external_i3blocks"]
 	path = private_dot_config/external_i3blocks
 	url = https://github.com/vivien/i3blocks-contrib
+[submodule "private_dot_config/nvim-config"]
+	path = private_dot_config/nvim-config
+	url = https://gitea.argentumcation.com/mira/nvim-config.git
diff --git a/executable_dot_aliasrc b/executable_dot_aliasrc
index 2d2ec84..7de6637 100644
--- a/executable_dot_aliasrc
+++ b/executable_dot_aliasrc
@@ -47,23 +47,23 @@ load_aliases() {
     fi
 
     # replaces gnu coreutils with the rust versions, cp and mv are worth
-    if checkCommand coreutils; then
-        alias cp="coreutils cp -g"
-        alias mv="coreutils mv -g"
-        alias hashsum="coreutils hashsum"
-        #alias more="coreutils more"
-        alias cut="coreutils cut"
-        alias chmod="coreutils chmod"
-        alias chown="coreutils chown"
-        alias chroot="coreutils chroot"
-        alias echo="coreutils echo"
-        alias head="coreutils head"
-        alias kill="coreutils kill"
-        alias ln="coreutils ln"
-        alias mkdir="coreutils mkdir"
-        alias nohup="coreutils nohup"
-        alias tail="coreutils tail"
-    fi
+    # if checkCommand coreutils; then
+    #     alias cp="coreutils cp -g"
+    #     alias mv="coreutils mv -g"
+    #     alias hashsum="coreutils hashsum"
+    #     #alias more="coreutils more"
+    #     alias cut="coreutils cut"
+    #     alias chmod="coreutils chmod"
+    #     alias chown="coreutils chown"
+    #     alias chroot="coreutils chroot"
+    #     alias echo="coreutils echo"
+    #     alias head="coreutils head"
+    #     alias kill="coreutils kill"
+    #     alias ln="coreutils ln"
+    #     alias mkdir="coreutils mkdir"
+    #     alias nohup="coreutils nohup"
+    #     alias tail="coreutils tail"
+    # fi
 
     # Replace find with fd
     if checkCommand fd; then
@@ -105,7 +105,6 @@ load_aliases() {
     if checkCommand nvim; then
         alias vim="nvim"
     fi
-
     # Replace ls with lsd, and other useful aliases
     if checkCommand lsd; then
         alias l="lsd -l"
diff --git a/private_dot_config/git/executable_config.tmpl b/private_dot_config/git/executable_config.tmpl
index 0565e77..4c11293 100644
--- a/private_dot_config/git/executable_config.tmpl
+++ b/private_dot_config/git/executable_config.tmpl
@@ -53,6 +53,9 @@ autocorrect = 50
 
 [safe]
 directory = /
+directory = /etc/nixos
+directory = /home/mira/docker/config/argentumcation.com
+directory = /home/mira/docker/Dockerfiles/argentumcation.com
 
 [rebase]
 autostash = true
diff --git a/private_dot_config/nvim-config b/private_dot_config/nvim-config
new file mode 160000
index 0000000..e3a99eb
--- /dev/null
+++ b/private_dot_config/nvim-config
@@ -0,0 +1 @@
+Subproject commit e3a99eb8f20c358f8376579594c0ebbf62c1db55