diff --git a/configuration.nix b/configuration.nix
index 899249d..77368ff 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -26,22 +26,25 @@
 
   # Bootloader.
   boot.loader = {
-  	systemd-boot.enable = false;
-  	efi.canTouchEfiVariables = true;
-  	#boot.loader.efi.efiSysMountPoint = "/boot/efi";
+    systemd-boot.enable = false;
+    efi.canTouchEfiVariables = true;
+    #boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
     grub = {
-  		enable = true;
-  		device = "/dev/sda";		#Needs to be changed when using a new computer! (Make grub partition - look below!)
-  		#devices = [ "nodev" ];
-  		efiSupport = true;
-  		useOSProber = true;
-  	};
-  	grub2-theme = {
-  		enable = true;
-  		theme = "whitesur";
-  		footer = true;
-  	};
-  	timeout = 10;
+      enable = true;
+      device = "/dev/sda";		#Needs to be changed when using a new computer! (Make grub partition - look below!)
+      #devices = [ "nodev" ];
+      efiSupport = true;
+      useOSProber = true;
+    };
+
+    grub2-theme = {
+	    enable = true;
+	    theme = "whitesur";
+	    footer = true;
+    };
+
+    timeout = 10;
   };
   
   #Ensure there is a grub_bios partition: (gparted)
@@ -81,22 +84,45 @@
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
+  
+  # List services that you want to enable:
+  services = {
+    ollama = {
+      enable = true;
+      # Optional: load models on startup
+      #loadModels = [ ... ];
+    };
 
-  services.ollama = {
-    enable = true;
-    # Optional: load models on startup
-    #loadModels = [ ... ];
-  };
-
-  services.locate = {
+    locate = {
       enable = true;
       package = pkgs.plocate;
-      #To get rid of warning
-      #Depricated:
-      #localuser = null;
-  };
+    };
 
-  services.tailscale.enable = true;
+    tailscale.enable = true;
+    
+    #Enable CUPS to print documents.
+    printing.enable = true;
+    
+    xserver = {
+      enable = true;
+      xkb = {
+	    layout = "de";
+	    variant = "";
+      };
+
+    ## Enable sound with pipewire.
+    #services.pulseaudio.enable = false;
+    };
+
+    displayManager.sddm = {
+      enable = true;
+      theme = "breeze";
+      wayland.enable = true;
+    };
+
+    # Enable the OpenSSH daemon.
+    openssh.enable = true;
+  };
 
   fonts.packages = with pkgs; [
     font-awesome
@@ -111,11 +137,6 @@
   # Configure console keymap
   console.keyMap = "de";
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-#  # Enable sound with pipewire.
-#  services.pulseaudio.enable = false;
 #  security.rtkit.enable = true;
 #  services.pipewire = {
 #    enable = true;
@@ -146,6 +167,8 @@
   environment.etc."gitconfig".text = ''
     [init]
       defaultBranch = main
+    [credentials]
+      helper = store --file /etc/git-credentials
   '';
 
 
@@ -173,30 +196,8 @@
   #   enableSSHSupport = true;
   # };
   
-  services = {
-  	xserver = {
-  	  enable = true;
-  	  xkb = {
-  	  	layout = "de";
-  	  	variant = "";
-  	  };
-  	};
-
-  	displayManager.sddm = {
-  		enable = true;
-  		theme = "breeze";
-  		wayland.enable = true;
-  	};
-  };
-  
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  
   environment.variables = {
-  	EDITOR = "micro";
+  	EDITOR = "nvim";
   	# XKB_DEFAULT_LAYOUT = "de";
   };
 
diff --git a/flake.nix b/flake.nix
index e52f654..d81669a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
             ./configuration.nix
             ./firefox.nix
             ./zsh.nix
-            #./neovim.nix
+            ./neovim.nix
             ./packages.nix
             grub2-themes.nixosModules.default
             home-manager.nixosModules.home-manager
diff --git a/neovim.nix b/neovim.nix
index 84c353f..46dfd55 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -7,11 +7,12 @@
   ];
 
   programs.neovim = {
+    enable = true;
     # ...
-    plugins = with pkgs.vimPlugins; [
-    	
-        LazyVim
-    ];
+    #extraPackages = with pkgs.vimPlugins; [
+    #	
+    #    LazyVim
+    #];
    
     #extraLuaConfig = 
     ## lua
diff --git a/other/aliases b/other/aliases
index c225906..b6113e8 100644
--- a/other/aliases
+++ b/other/aliases
@@ -5,7 +5,8 @@
 # Common commands
 #-----
 alias py="python3"
-alias mcrow="sudo micro"
+#alias mcrow="sudo micro"
+alias mcrow="echo 'you better try to use nvim you little shit! :3'"
 alias srcals="source /etc/nixos/other/aliases && echo 'Sourced Aliases ... successful!'"