Refactor configs

common/users.nix

@@ -2,10 +2,9 @@
   config,
   pkgs,
   ...
-}: let
-  home = config.constants.homeDir;
-  usr = config.constants.userName;
-  usrPwdFile = "users/${usr}/password";
+}:
+with config.constants; let
+  usrPwdFile = "users/${userName}/password";
 in {
   console.enable = false;
 
@@ -25,7 +24,7 @@ in {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    users.${usr} = {
+    users.${userName} = {
       config,
       osConfig,
       pkgs,
@@ -87,8 +86,8 @@ in {
             ".direnv"
             ".envrc"
           ];
-          userEmail = osConfig.constants.postMaster;
-          userName = osConfig.constants.userName;
+          userEmail = postMaster;
+          userName = userName;
         };
         helix = {
           enable = true;
@@ -110,6 +109,7 @@ in {
           theme = "Tokyo Night Moon";
         };
         plasma = {
+          enable = osConfig.services.desktopManager.plasma6.enable;
           configFile = {
             baloofilerc = {
               "Basic Settings".Indexing-Enabled = true;
@@ -121,14 +121,16 @@ in {
               TerminalService = "kitty.desktop";
             };
           };
-          input.touchpads = [
-            {
-              enable = false;
-              name = "ASUE120A:00 04F3:319B Touchpad";
-              productId = "319B";
-              vendorId = "04F3";
-            }
-          ];
+          desktop.icons = {
+            alignment = "left";
+            arrangement = "leftToRight";
+            lockInPlace = true;
+            sorting = {
+              foldersFirst = true;
+              mode = "type";
+            };
+          };
+          immutableByDefault = true;
           kscreenlocker = {
             autoLock = true;
             lockOnResume = true;
@@ -194,15 +196,6 @@ in {
           spectacle.shortcuts.captureRectangularRegion = "Meta+Shift+S";
           workspace = {
             colorScheme = "SweetAmbarBlue";
-            desktop.icons = {
-              alignment = "left";
-              arrangement = "leftToRight";
-              lockInPlace = true;
-              sorting = {
-                foldersFirst = true;
-                mode = "type";
-              };
-            };
             iconTheme = "Sweet-Rainbow";
             lookAndFeel = "Sweet-Ambar-Blue";
             soundTheme = "yorha";
@@ -249,13 +242,13 @@ in {
     };
     resolved.enable = true;
     syncthing = {
-      configDir = "${home}/.config/syncthing";
-      dataDir = "${home}/.local/share/syncthing";
+      configDir = "${homeDir}/.config/syncthing";
+      dataDir = "${homeDir}/.local/share/syncthing";
       openDefaultPorts = true;
       overrideDevices = true;
       overrideFolders = true;
-      settings.devices = config.constants.syncthingDevices;
-      user = usr;
+      settings.devices = syncthingDevices;
+      user = userName;
     };
   };
 
@@ -263,7 +256,7 @@ in {
 
   users = {
     mutableUsers = false;
-    users.${usr} = {
+    users.${userName} = {
       description = "Sicheng Pan";
       extraGroups = [
         "audio"
@@ -273,9 +266,9 @@ in {
         "wheel"
       ];
       hashedPasswordFile = config.sops.secrets.${usrPwdFile}.path;
-      home = config.constants.homeDir;
+      home = homeDir;
       isNormalUser = true;
-      openssh.authorizedKeys.keys = config.constants.publicKeys;
+      openssh.authorizedKeys.keys = publicKeys;
       shell = pkgs.fish;
     };
   };