home submodule

my/default.nix

@@ -9,13 +9,9 @@ with lib; let
   cfg = config.my;
 in {
   imports = [
+    ./home/default.nix
     ./gnome.nix
-    ./home-vinzenz.nix
-    ./home-ronja.nix
     ./kde.nix
-
-    # enable home manager
-    <home-manager/nixos>
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 

my/gnome.nix

@@ -54,8 +54,8 @@ in {
     ];
 
     home-manager.users = {
-      vinzenz = lib.mkIf config.my.users.vinzenz.enable applyGnomeUserSettings;
+      vinzenz = lib.mkIf config.my.home.vinzenz.enable applyGnomeUserSettings;
-      ronja = lib.mkIf config.my.users.ronja.enable applyGnomeUserSettings;
+      ronja = lib.mkIf config.my.home.ronja.enable applyGnomeUserSettings;
     };
   };
 }

my/home/default.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.my.home;
+in {
+  imports = [
+    ./vinzenz.nix
+    ./ronja.nix
+    # enable home manager
+    <home-manager/nixos>
+  ];
+
+  options.my.home = {
+    enable = lib.mkEnableOption "my home management";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home-manager.useUserPackages = true;
+    home-manager.useGlobalPkgs = true;
+  };
+}

my/home/ronja.nix

@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.my.users.ronja;
+  cfg = config.my.home.ronja;
 in {
-  options.my.users.ronja = {
+  options.my.home.ronja = {
     enable = lib.mkEnableOption "user ronja";
   };
 
@@ -21,8 +21,7 @@ in {
     };
 
     # home manager
-    home-manager.useUserPackages = true;
+    my.home.enable = true;
-    home-manager.useGlobalPkgs = true;
     home-manager.users.ronja = {
       config,
       pkgs,

my/home/vinzenz.nix

@@ -4,9 +4,9 @@
   lib,
   ...
 }: let
-  cfg = config.my.users.vinzenz;
+  cfg = config.my.home.vinzenz;
 in {
-  options.my.users.vinzenz = {
+  options.my.home.vinzenz = {
     enable = lib.mkEnableOption "user vinzenz";
   };
 
@@ -20,8 +20,7 @@ in {
     };
 
     # home manager
-    home-manager.useUserPackages = true;
+    my.home.enable = true;
-    home-manager.useGlobalPkgs = true;
     home-manager.users.vinzenz = {
       config,
       pkgs,

my/kde.nix

@@ -5,6 +5,18 @@
   ...
 }: let
   cfg = config.my.kde;
+
+  applyKdeUserSettings = {
+    home = {
+      packages = with pkgs; [
+      ];
+    };
+
+    services.kdeconnect = {
+      enable = true;
+      indicator = true;
+    };
+  };
 in {
   options.my.kde = {
     enable = lib.mkEnableOption "KDE desktop";
@@ -40,20 +52,9 @@ in {
       partition-manager.enable = true;
     };
 
-    home-manager.users.vinzenz = {
+    home-manager.users = {
-      config,
+      vinzenz = lib.mkIf config.my.home.vinzenz.enable applyKdeUserSettings;
-      pkgs,
+      ronja = lib.mkIf config.my.home.ronja.enable applyKdeUserSettings;
-      ...
-    }: {
-      home = {
-        packages = with pkgs; [
-        ];
-      };
-
-      services.kdeconnect = {
-        enable = true;
-        indicator = true;
-      };
     };
   };
 }

vinzenz-lpt.nix

@@ -10,7 +10,7 @@
     networking.hostName = "vinzenz-lpt";
 
     my.gnome.enable = true;
-    my.users.vinzenz.enable = true;
+    my.home.vinzenz.enable = true;
 
     services.flatpak.enable = true;
 

vinzenz-pc3.nix

@@ -10,7 +10,7 @@
     networking.hostName = "vinzenz-pc3";
 
     my.kde.enable = true;
-    my.users = {
+    my.home = {
       vinzenz.enable = true;
       ronja.enable = true;
     };