diff --git a/configuration.nix b/configuration.nix
index 0fcd86f..f879a82 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -18,7 +18,7 @@
   '';
   environment.systemPackages = with pkgs; [
     raspberrypi-tools
-    vim
+    (import ./vim.nix)
   ];
 
   # File systems configuration for using the installer's partition layout
@@ -42,6 +42,7 @@
   # Set hostname
   networking.hostName = "zion";
 
+  # Create coolneng user
   users.users.coolneng = {
     isNormalUser = true;
     home = "/home/coolneng";
@@ -49,9 +50,8 @@
     openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDG7JtfAqcbZV28wkNTfSWSqTOo5buH+dyT0w6SlTqq+KFh5DxREB0yGuM1UfjLpyLQ0XI7UbhCwNG28Li4yv/hwPGq63TF1kl+w4sjQKFn4bOUv1NvsfSN3oTamjfYoVsrapCiXqOvZkzEKMF47MSwOfPkqZ6ihU5V3INA0IZbl1Ri+r9MsIzvY76ZHBiF6rVqQJjdXVDbcLMViOrM56FpyK+ICo+uTkErsEbYFwevVTv9memOh778RRPesBobpZjggWOI4HXXxqk35myInYjHve9K4ox6YZMjwnwnEftONr2HyoBBcBNT+wWd1jtYxCoCWQ3vVkn4LGBDOQ3+HKb4rT3JxI66VfFyQWGJPdgJL5/ZNRlBqA7CpAtE7JaR6l7d3mCCoGW2B0atWiEXecwb8dz4CzzYm1r9Wz27L74OtPzUqcV7mQjCVDcnRsY/MtfhzyWzhB3tujVqnRtF3VrFSrm0YXS1ZWG4dltX1cfgud8s8XwwBKcFw5NdCrVxq3nRMNlGcSqbXC+RnrkK/i6ciAriZdXgFrmnBl+6qEmqIO15u2IPvDhnQs18DzRkHnPQegphhHhHix5aaqNbLfSRZNCTQaqE774X+0kuU/RWylI4muIyf4k9x+et4txeU2OC6l0W0LMpbsELzXIRr/ZBFrGHbE7/KLi8HNiAJ0KmAQ== coolneng@monolith" ];
   };
 
+  # Set vim as default editor
+  programs.vim.defaultEditor = true;
+
   # Import other configuration modules
-  imports =
-        [
-          ./vim.nix
-        ];
 }
diff --git a/vim.nix b/vim.nix
index 84013c4..e768f7f 100644
--- a/vim.nix
+++ b/vim.nix
@@ -1,6 +1,4 @@
 # Vim configuration
-programs.vim.defaultEditor = true;
-
 with import <nixpkgs> {};
 
 vim_configurable.customize {