diff --git a/flake.nix b/flake.nix
index d3601ba..0813616 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,16 +38,5 @@
         ];
       };
     };
-
-    # Standalone home-manager configuration entrypoint
-    # Available through 'home-manager --flake .#nils@nixos'
-    /*homeConfigurations = {
-      "nils@nixos" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-        extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
-        # > Our main home-manager configuration file <
-        modules = [ ./home-manager/home.nix ];
-      };
-    };*/
   };
 }
diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
index 9d8fc9b..dfa4c25 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/firefox.nix
@@ -1,36 +1,38 @@
-{ pkgs }: {
-  enable = true;
-  profiles = {
-    nils = {
-      id = 0;
-      name = "nils";
+{ pkgs, ... }: {
+  programs.firefox = {
+    enable = true;
+    profiles = {
+      nils = {
+        id = 0;
+        name = "nils";
 
-      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-        ublock-origin
-        bitwarden
-        tampermonkey
-      ];
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          ublock-origin
+          bitwarden
+          tampermonkey
+        ];
 
-      bookmarks = [
-        {
-          name = "Nix sites";
-          toolbar = true;
-          bookmarks = [
-            {
-              name = "NixOS options";
-              url = "https://search.nixos.org/options";
-            }
-            {
-              name = "home-manager options";
-              url = "https://rycee.gitlab.io/home-manager/options.html";
-            }
-            {
-              name = "nixpkgs search";
-              url = "https://search.nixos.org/packages";
-            }
-          ];
-        }
-      ];
+        bookmarks = [
+          {
+            name = "Nix sites";
+            toolbar = true;
+            bookmarks = [
+              {
+                name = "NixOS options";
+                url = "https://search.nixos.org/options";
+              }
+              {
+                name = "home-manager options";
+                url = "https://rycee.gitlab.io/home-manager/options.html";
+              }
+              {
+                name = "nixpkgs search";
+                url = "https://search.nixos.org/packages";
+              }
+            ];
+          }
+        ];
+      };
     };
   };
 }
diff --git a/home-manager/git.nix b/home-manager/git.nix
index a5cf081..0fff1e2 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -1,23 +1,25 @@
-{ pkgs }: {
-  enable = true;
-
-  userEmail = "48135649+Nilstrieb@users.noreply.github.com";
-  userName = "Nilstrieb";
-
-  aliases = {
-    hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
-    fpush = "push --force-with-lease";
-    resq = "rebase --autosquash -i";
-    pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
-  };
-  difftastic = {
+{ pkgs, ... }: {
+  programs.git = {
     enable = true;
-  };
-  extraConfig = {
-    core.autocrlf = false;
-    core.editor = "nvim";
-    pull.ff = "only";
-    push.autoSetupRemote = true;
-    init.defaultBranch = "main";
+
+    userEmail = "48135649+Nilstrieb@users.noreply.github.com";
+    userName = "Nilstrieb";
+
+    aliases = {
+      hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
+      fpush = "push --force-with-lease";
+      resq = "rebase --autosquash -i";
+      pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
+    };
+    difftastic = {
+      enable = true;
+    };
+    extraConfig = {
+      core.autocrlf = false;
+      core.editor = "nvim";
+      pull.ff = "only";
+      push.autoSetupRemote = true;
+      init.defaultBranch = "main";
+    };
   };
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 17209e6..964a8ce 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -18,29 +18,11 @@ in
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
+    ./git.nix
+    ./firefox.nix
+    ./vscode.nix
   ];
 
-  /*nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # If you want to use overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
-    ];
-    # Configure your nixpkgs instance
-    config = {
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = (_: true);
-    };
-  };*/
-
   home = {
     username = "nils";
     homeDirectory = "/home/nils";
@@ -80,10 +62,6 @@ in
 
   programs.home-manager.enable = true;
 
-  programs.git = import ./git.nix { inherit pkgs; };
-  programs.firefox = import ./firefox.nix { inherit pkgs; };
-  programs.vscode = import ./vscode.nix { inherit pkgs; };
-
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 776ce9f..09d9f82 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -1,55 +1,57 @@
-{ pkgs }: {
-  enable = true;
-  package = pkgs.vscode;
-  extensions = with pkgs.vscode-extensions; [
-    jnoortheen.nix-ide
-    usernamehw.errorlens
-    ms-vscode.cmake-tools
-    ms-vscode.cpptools
-    eamodio.gitlens
-    tamasfe.even-better-toml
-    ms-vscode-remote.remote-ssh
-    esbenp.prettier-vscode
-    dbaeumer.vscode-eslint
-    ms-python.python
-    redhat.vscode-yaml
-    mads-hartmann.bash-ide-vscode
-    ms-azuretools.vscode-docker
-  ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-    {
-      publisher = "dtsvet";
-      name = "vscode-wasm";
-      version = "1.4.1";
-      sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
-    }
-    {
-      publisher = "redhat";
-      name = "ansible";
-      version = "2.7.98";
-      sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
-    }
-    {
-      publisher = "matthewpi";
-      name = "caddyfile-support";
-      version = "0.3.0";
-      sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
-    }
-  ] ++ [
-    (pkgs.vscode-utils.buildVscodeExtension {
-      name = "riverdelta";
-      version = "0.1.0";
-      src = builtins.fetchGit {
-        url = "https://github.com/Nilstrieb/riverdelta";
-        rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
-      };
-      vscodeExtPublisher = "Nilstrieb";
-      vscodeExtName = "riverdelta";
-      vscodeExtUniqueId = "Nilstrieb.riverdelta";
-      buildPhase = ''
-        runHook preBuild;
-        cd ./vscode
-        runHook postBuild;
-      '';
-    })
-  ];
+{ pkgs, ... }: {
+  programs.vscode = {
+    enable = true;
+    package = pkgs.vscode;
+    extensions = with pkgs.vscode-extensions; [
+      jnoortheen.nix-ide
+      usernamehw.errorlens
+      ms-vscode.cmake-tools
+      ms-vscode.cpptools
+      eamodio.gitlens
+      tamasfe.even-better-toml
+      ms-vscode-remote.remote-ssh
+      esbenp.prettier-vscode
+      dbaeumer.vscode-eslint
+      ms-python.python
+      redhat.vscode-yaml
+      mads-hartmann.bash-ide-vscode
+      ms-azuretools.vscode-docker
+    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+      {
+        publisher = "dtsvet";
+        name = "vscode-wasm";
+        version = "1.4.1";
+        sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
+      }
+      {
+        publisher = "redhat";
+        name = "ansible";
+        version = "2.7.98";
+        sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
+      }
+      {
+        publisher = "matthewpi";
+        name = "caddyfile-support";
+        version = "0.3.0";
+        sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
+      }
+    ] ++ [
+      (pkgs.vscode-utils.buildVscodeExtension {
+        name = "riverdelta";
+        version = "0.1.0";
+        src = builtins.fetchGit {
+          url = "https://github.com/Nilstrieb/riverdelta";
+          rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
+        };
+        vscodeExtPublisher = "Nilstrieb";
+        vscodeExtName = "riverdelta";
+        vscodeExtUniqueId = "Nilstrieb.riverdelta";
+        buildPhase = ''
+          runHook preBuild;
+          cd ./vscode
+          runHook postBuild;
+        '';
+      })
+    ];
+  };
 }