diff --git a/SwarselSystems.org b/SwarselSystems.org
index 4d41b2a..637b326 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -1825,7 +1825,7 @@ My old laptop, replaced by a new one, since most basic functions have stopped to
   gpgconf --launch gpg-agent
         ";
 
-    home-manager.users.swarsel.swarselsystems = {
+    swarselsystems = {
       isLaptop = true;
       isNixos = false;
       wallpaper = ../../wallpaper/surfacewp.png;
@@ -5611,15 +5611,13 @@ This section sets up all the imports that are used in the home-manager section.
       };
     };
 
-    programs = {
-      git.enable = true;
-    };
+    programs.home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
 
     home = {
       username = lib.mkDefault "swarsel";
       homeDirectory = lib.mkDefault "/home/${config.home.username}";
       stateVersion = lib.mkDefault "23.05";
-      keyboard.layout = "us"; # TEMPLATE
+      keyboard.layout = "us";
       sessionVariables = {
         FLAKE = "$HOME/.dotfiles";
       };
diff --git a/profiles/common/home/default.nix b/profiles/common/home/default.nix
index 27723af..d750a8a 100644
--- a/profiles/common/home/default.nix
+++ b/profiles/common/home/default.nix
@@ -41,15 +41,13 @@
     };
   };
 
-  programs = {
-    git.enable = true;
-  };
+  programs.home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
 
   home = {
     username = lib.mkDefault "swarsel";
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
     stateVersion = lib.mkDefault "23.05";
-    keyboard.layout = "us"; # TEMPLATE
+    keyboard.layout = "us";
     sessionVariables = {
       FLAKE = "$HOME/.dotfiles";
     };
diff --git a/profiles/home-manager/default.nix b/profiles/home-manager/default.nix
index 67abaa7..a258dfb 100644
--- a/profiles/home-manager/default.nix
+++ b/profiles/home-manager/default.nix
@@ -23,7 +23,7 @@ export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 gpgconf --launch gpg-agent
       ";
 
-  home-manager.users.swarsel.swarselsystems = {
+  swarselsystems = {
     isLaptop = true;
     isNixos = false;
     wallpaper = ../../wallpaper/surfacewp.png;