merge users with home

home/vinzenz/default.nix

@@ -1,14 +1,48 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
-  imports = [
-    ./configuration.nix
-    ./editorconfig.nix
-    ./git.nix
-    ./gnome.nix
-    ./niri.nix
-    ./ssh.nix
-    ./vscode.nix
-    ./waybar.nix
-    ./zsh.nix
-  ];
+  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;
+    };
+
+    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}";