more reorganizing

flake.nix

@@ -37,6 +37,7 @@
       modules = [
         ### User specific ###
         ./users/anon.nix
+        ./users/option.nix
         ### System sepecific ###
         ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         ./systems/server/configuration.nix
@@ -99,7 +100,10 @@
           inherit inputs ;
         };
         modules = [
+          ### User specific ###
+          ./users/option.nix
           ./users/kopatz.nix
+          ### System modules ###
           ./modules/graphical/plasma.nix
           ./modules/graphical/hyprland.nix
           ./modules/graphical/emulators.nix
@@ -138,6 +142,8 @@
           inherit inputs;
         };
         modules = [
+          ### User specific ###
+          ./users/option.nix
           ./users/kopatz.nix
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           # Todo: refactor file layout
@@ -168,6 +174,8 @@
           inherit inputs ;
         };
         modules = [
+          ### User specific ###
+          ./users/option.nix
           ./users/kopatz.nix
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           ./laptop/configuration.nix

home-manager/hyprland-settings.nix

@@ -1,4 +1,4 @@
-{ user, pkgs, vars, ... }:
+{ user, pkgs, layout, variant, ... }:
 {
   home-manager.users.${user} = {
     programs.swaylock.enable = true;
@@ -33,8 +33,8 @@
         
         # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
         input = {
-            kb_layout = vars.layout;
+            kb_layout = layout;
-            kb_variant = vars.variant;
+            kb_variant = variant;
             kb_model = "";
             kb_options = "";
             kb_rules = "";

modules/graphical/hyprland.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, vars, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 let
   patchedWaybar = pkgs.waybar.overrideAttrs (oldAttrs: {
@@ -11,12 +11,12 @@ let
 in
 {
   imports = [
-    (import ../../home-manager/hyprland-settings.nix ({ user="${vars.user}"; pkgs = pkgs; inherit vars; }))
+    (import ../../home-manager/hyprland-settings.nix ({ user="${config.mainUser.name}"; pkgs = pkgs; layout = config.mainUser.layout; variant = config.mainUser.variant; }))
   ];
 
   services.xserver = {
-    layout = vars.layout;
+    layout = config.mainUser.layout;
-    xkbVariant = vars.variant;
+    xkbVariant = config.mainUser.variant;
     enable = true;
     displayManager = lib.mkIf (!config.services.xserver.displayManager.gdm.enable) {
       sddm.enable = true;

systems/laptop/userdata.nix

@@ -3,5 +3,4 @@
   ipv4 = "192.168.0.4";
   dns = "192.168.0.6";
   wm = "gnome-shell";
-  user = "kopatz";
 }

systems/pc/configuration.nix

@@ -10,6 +10,9 @@
       ./hardware-configuration.nix
     ];
 
+  mainUser.layout = "de";
+  mainUser.variant = "us";
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

systems/pc/userdata.nix

@@ -1,6 +1,4 @@
 
 {
-  layout = "de";
+
-  variant = "us";
-  user = "kopatz";
 }

systems/server/userdata.nix

@@ -4,7 +4,6 @@
   dns = "127.0.0.1";
   wireguardIp = "192.168.2.1";
   wm = "startplasma-x11";
-  user = "anon";
   udpRanges = [
     #{
     #  from = 52000;

systems/userdata-default.nix

@@ -1,5 +1,3 @@
 {
-  layout = "de";
+
-  variant = "";
-  user = "kopatz";
 }

users/anon.nix

@@ -8,7 +8,7 @@ in
     (import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
     (import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
   ];
-  vars.user = user;
+  mainUser.name = user;
 
   home-manager = {
     useGlobalPkgs = true;

users/kopatz.nix

@@ -12,6 +12,7 @@ in
     (import ../home-manager/lf.nix ({ user="${user}"; pkgs = pkgs; }))
   ];
 
+  mainUser.name = user;
   home-manager = {
     useGlobalPkgs = true;
     extraSpecialArgs = {

users/option.nix

@@ -0,0 +1,19 @@
+{lib, config, pkgs, ...}:
+{
+  options.mainUser = {
+    name = lib.mkOption {
+      default = "mainuser";
+      description = ''
+        username
+      '';
+    };
+    layout = lib.mkOption {
+      default = "de";
+      description = "keyboard layout";
+    };
+    variant = lib.mkOption {
+      default = "";
+      description = "keyboard variant";
+    };
+  };
+}