diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 8c9c453..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-[*]
-indent_style = tab
-indent_size = 2
-trim_trailing_whitespaces = true
-insert_final_newline = true
diff --git a/flake.lock b/flake.lock
index 782e687..1a862b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,11 +30,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1764821331,
-        "narHash": "sha256-Q6ePRWpunc2WRFyQ72TRx7qDqyCfadpe1IFNRHoE6K0=",
+        "lastModified": 1764389080,
+        "narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "9d6adaef3c5648eaa0979bc9e84b906daa2f4797",
+        "rev": "897437c09bf22ce59efb3370f0783d0c662dba31",
         "type": "gitlab"
       },
       "original": {
@@ -141,11 +141,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764865999,
-        "narHash": "sha256-NqCzP0XJQqMih88AUQK215URHdTHktmi/P2dKXYfn1c=",
+        "lastModified": 1764361670,
+        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9379fbf4f53f04cd9f8cae9b5f4a25ce5aa29b5f",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764440730,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "lastModified": 1764328224,
+        "narHash": "sha256-hFyF1XQd+XrRx7WZCrGJp544dykexD8Q5SrJJZpEQYg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "d62603a997438e19182af69d3ce7be07565ecad4",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764667669,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {
@@ -218,11 +218,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1764445028,
-        "narHash": "sha256-ik6H/0Zl+qHYDKTXFPpzuVHSZE+uvVz2XQuQd1IVXzo=",
+        "lastModified": 1763618868,
+        "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a09378c0108815dbf3961a0e085936f4146ec415",
+        "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
         "type": "github"
       },
       "original": {
@@ -351,11 +351,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1764483358,
-        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
+        "lastModified": 1764021963,
+        "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
+        "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 13a2f36..0ab4d3e 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -13,28 +13,24 @@ let
   user = config.${namespace}.user;
 in
 {
-  options.${namespace} = {
-    tools.git = {
-      enable = mkEnableOption "Git";
-      signingKey = mkOpt types.str "0F21E3C3" "The key ID to sign commits with.";
-      signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
-    };
-    user = {
-      name = mkOpt types.str "Philipp" "The name to configure git with.";
-      email = mkOpt types.str "philipp@boehm.sh" "The email to configure git with.";
-    };
+  options.${namespace}.tools.git = {
+    enable = mkEnableOption "Git";
+    userName = mkOpt types.str "Philipp" "The name to configure git with.";
+    userEmail = mkOpt types.str "philipp@boehm.sh" "The email to configure git with.";
+    signingKey = mkOpt types.str "0F21E3C3" "The key ID to sign commits with.";
+    signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
   };
 
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
+      inherit (cfg) userName userEmail;
       lfs = enabled;
       signing = {
         key = cfg.signingKey;
         inherit (cfg) signByDefault;
       };
-      settings = {
-        inherit user;
+      extraConfig = {
         init = {
           defaultBranch = "main";
         };
diff --git a/modules/nixos/cli/neovim/default.nix b/modules/nixos/cli/neovim/default.nix
index 2a929a1..27ecafc 100644
--- a/modules/nixos/cli/neovim/default.nix
+++ b/modules/nixos/cli/neovim/default.nix
@@ -28,7 +28,6 @@ in
           options = {
             tabstop = 2;
             shiftwidth = 2;
-            expandtab = false;
             cursorlineopt = "screenline";
           };
 
diff --git a/modules/nixos/cli/neovim/editorconfig/default.nix b/modules/nixos/cli/neovim/editorconfig/default.nix
deleted file mode 100644
index 0567c7a..0000000
--- a/modules/nixos/cli/neovim/editorconfig/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.nvf.settings.vim.editorconfig.enable = true;
-}