merge users with home

home/ronja/configuration.nix

@@ -0,0 +1,56 @@
+{ config, pkgs, ... }:
+{
+  config = {
+    home.packages = with pkgs; [
+      ## Apps
+      telegram-desktop
+      kdiff3
+    ];
+
+    programs = {
+      home-manager.enable = true;
+
+      zsh = {
+        history = {
+          size = 10000;
+          path = "${config.xdg.dataHome}/zsh/history";
+          expireDuplicatesFirst = true;
+        };
+
+        oh-my-zsh = {
+          enable = true;
+          theme = "agnoster";
+          plugins = [
+            "git"
+            "sudo"
+            "systemadmin"
+          ];
+        };
+      };
+
+      git = {
+        userName = "Ronja Spiegelberg";
+        userEmail = "ronja.spiegelberg@gmail.com";
+
+        extraConfig = {
+          pull.ff = "only";
+          merge.tool = "kdiff3";
+        };
+      };
+
+      chromium = {
+        enable = true;
+        extensions = [
+          {
+            # ublock origin
+            id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
+          }
+          {
+            id = "dcpihecpambacapedldabdbpakmachpb";
+            updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
+          }
+        ];
+      };
+    };
+  };
+}

home/ronja/default.nix

@@ -1,57 +1,28 @@
-inputs@{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
-  imports = [ ./vscode.nix ];
+  config = {
-  config.home-manager.users.ronja = {
+    # Define user account
-    home.packages = with pkgs; [
+    users.users.ronja = {
-      ## Apps
+      isNormalUser = true;
-      telegram-desktop
+      name = "ronja";
-      kdiff3
+      description = "Ronja";
+      home = "/home/ronja";
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "games"
+        "podman"
+      ];
+      shell = pkgs.zsh;
+    };
+
+    home-manager.users.ronja.imports = [
+      ./configuration.nix
+      ./vscode.nix
     ];
 
-    programs = {
+    allowedUnfreePackages = [
-      home-manager.enable = true;
+      "vscode-extension-ms-vscode-remote-remote-ssh"
-
+    ];
-      zsh = {
-        history = {
-          size = 10000;
-          path = "${config.xdg.dataHome}/zsh/history";
-          expireDuplicatesFirst = true;
-        };
-
-        oh-my-zsh = {
-          enable = true;
-          theme = "agnoster";
-          plugins = [
-            "git"
-            "sudo"
-            "systemadmin"
-          ];
-        };
-      };
-
-      git = {
-        userName = "Ronja Spiegelberg";
-        userEmail = "ronja.spiegelberg@gmail.com";
-
-        extraConfig = {
-          pull.ff = "only";
-          merge.tool = "kdiff3";
-        };
-      };
-
-      chromium = {
-        enable = true;
-        extensions = [
-          {
-            # ublock origin
-            id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-          }
-          {
-            id = "dcpihecpambacapedldabdbpakmachpb";
-            updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
-          }
-        ];
-      };
-    };
   };
 }

home/vinzenz/default.nix

@@ -1,14 +1,48 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
-  imports = [
+  config = {
-    ./configuration.nix
+    users.users.vinzenz = {
-    ./editorconfig.nix
+      isNormalUser = true;
-    ./git.nix
+      name = "vinzenz";
-    ./gnome.nix
+      description = "Vinzenz";
-    ./niri.nix
+      home = "/home/vinzenz";
-    ./ssh.nix
+      extraGroups = [
-    ./vscode.nix
+        "networkmanager"
-    ./waybar.nix
+        "wheel"
-    ./zsh.nix
+        "games"
-  ];
+        "dialout"
+        "podman"
+        "nginx"
+        "adbusers"
+        "kvm"
+        "input"
+      ];
+      shell = pkgs.zsh;
+      autoSubUidGidRange = true;
+    };
+
+    home-manager.users.vinzenz.imports = [
+      ./configuration.nix
+      ./editorconfig.nix
+      ./git.nix
+      ./gnome.nix
+      ./niri.nix
+      ./ssh.nix
+      ./vscode.nix
+      ./waybar.nix
+      ./zsh.nix
+    ];
+
+    allowedUnfreePackages = [
+      "vscode-extension-ms-vscode-remote-remote-ssh"
+      "insync"
+      "insync-pkg"
+
+      "rider"
+      "pycharm-professional"
+      "jetbrains-toolbox"
+
+      "anydesk"
+    ];
+  };
 }

home/vinzenz/waybar.nix

@@ -97,7 +97,7 @@
         cpu = {
           "interval" = 1;
           "format" =
-            "{usage}%@{avg_frequency} "
+            "{usage:3}%@{avg_frequency:4} "
             + (builtins.getAttr device {
               "vinzenz-lpt2" =
                 "{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}{icon16}{icon17}{icon18}{icon19}";

hosts/vinzenz-lpt2/configuration.nix

@@ -18,8 +18,6 @@
     # Configure console keymap
     console.keyMap = "de";
 
-    home-manager.users.vinzenz = import ../../home/vinzenz;
-
     users.users.vinzenz.openssh.authorizedKeys.keys = [
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
       ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''

hosts/vinzenz-lpt2/imports.nix

@@ -1,7 +1,5 @@
 {
   imports = [
-    ../../users/vinzenz.nix
-
     ../../modules/gnome.nix
     ../../modules/gaming.nix
     ../../modules/printing.nix
@@ -9,5 +7,8 @@
     ../../modules/niri.nix
     ../../modules/desktop-environment.nix
     ../../modules/desktop-hardware.nix
+
+    ../../home/vinzenz
+    ../../home/ronja
   ];
 }

hosts/vinzenz-pc2/imports.nix

@@ -1,7 +1,5 @@
 {
   imports = [
-    ../../users/vinzenz.nix
-
     ../../modules/gnome.nix
     ../../modules/gaming.nix
     ../../modules/printing.nix
@@ -9,5 +7,7 @@
     ../../modules/niri.nix
     ../../modules/desktop-environment.nix
     ../../modules/desktop-hardware.nix
+
+    ../../home/vinzenz
   ];
 }

users/ronja.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  config = {
-    # Define user account
-    users.users.ronja = {
-      isNormalUser = true;
-      name = "ronja";
-      description = "Ronja";
-      home = "/home/ronja";
-      extraGroups = [
-        "networkmanager"
-        "wheel"
-        "games"
-        "podman"
-      ];
-      shell = pkgs.zsh;
-    };
-
-    allowedUnfreePackages = [
-      "vscode-extension-ms-vscode-remote-remote-ssh"
-    ];
-  };
-}

users/vinzenz.nix

@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-{
-  config = {
-    users.users.vinzenz = {
-      isNormalUser = true;
-      name = "vinzenz";
-      description = "Vinzenz";
-      home = "/home/vinzenz";
-      extraGroups = [
-        "networkmanager"
-        "wheel"
-        "games"
-        "dialout"
-        "podman"
-        "nginx"
-        "adbusers"
-        "kvm"
-        "input"
-      ];
-      shell = pkgs.zsh;
-      autoSubUidGidRange = true;
-    };
-
-    allowedUnfreePackages = [
-      "vscode-extension-ms-vscode-remote-remote-ssh"
-      "insync"
-      "insync-pkg"
-
-      "rider"
-      "pycharm-professional"
-      "jetbrains-toolbox"
-
-      "anydesk"
-    ];
-  };
-}