diff --git a/home/config/i3/config b/home/config/nixpkgs/conf/i3/config
similarity index 100%
rename from home/config/i3/config
rename to home/config/nixpkgs/conf/i3/config
diff --git a/home/config/i3/fill_workspace4.zsh b/home/config/nixpkgs/conf/i3/fill_workspace4.zsh
similarity index 100%
rename from home/config/i3/fill_workspace4.zsh
rename to home/config/nixpkgs/conf/i3/fill_workspace4.zsh
diff --git a/home/config/i3/keepassxc.sh b/home/config/nixpkgs/conf/i3/keepassxc.sh
similarity index 100%
rename from home/config/i3/keepassxc.sh
rename to home/config/nixpkgs/conf/i3/keepassxc.sh
diff --git a/home/config/i3/keyboard_layout_toggle.sh b/home/config/nixpkgs/conf/i3/keyboard_layout_toggle.sh
similarity index 100%
rename from home/config/i3/keyboard_layout_toggle.sh
rename to home/config/nixpkgs/conf/i3/keyboard_layout_toggle.sh
diff --git a/home/config/i3/workspace4.json b/home/config/nixpkgs/conf/i3/workspace4.json
similarity index 100%
rename from home/config/i3/workspace4.json
rename to home/config/nixpkgs/conf/i3/workspace4.json
diff --git a/home/config/nixpkgs/home.nix b/home/config/nixpkgs/home.nix
index 62ff32c..1a32b61 100644
--- a/home/config/nixpkgs/home.nix
+++ b/home/config/nixpkgs/home.nix
@@ -5,6 +5,7 @@
       ./polybar.nix
       ./dunst.nix
       ./zsh.nix
+      ./i3.nix
       ./nextcloud.nix
       ./autorandr.nix
       ./git.nix
@@ -16,7 +17,11 @@
 
     pkgs.jabref
     pkgs.libreoffice-fresh
-    
+
+    pkgs.nixfmt
+    pkgs.nixpkgs-fmt
+
+    pkgs.neofetch
     
     pkgs.jitsi-meet-electron
     pkgs.skypeforlinux
diff --git a/home/config/nixpkgs/i3.nix b/home/config/nixpkgs/i3.nix
new file mode 100644
index 0000000..db3a25c
--- /dev/null
+++ b/home/config/nixpkgs/i3.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ...}:
+{
+  xdg = {
+    configFile."i3" = {
+      source = conf/i3;
+      recursive = true;
+    };
+  };
+}
diff --git a/to_git.sh b/to_git.sh
index fde3717..afc0e9b 100755
--- a/to_git.sh
+++ b/to_git.sh
@@ -4,7 +4,6 @@
 cp /etc/nixos/configuration.nix .
 cp -r /etc/nixos/machine .
 cp -r /etc/nixos/programs .
-cp -r $HOME/.config/i3 ./home/config/.
 cp -r $HOME/.config/nixpkgs ./home/config/.
 mkdir -p ./home/config/Nextcloud
 cp -r $HOME/.config/Nextcloud/nextcloud.cfg ./home/config/Nextcloud/.