Refactor configs

common/secrets.yaml

@@ -1,4 +1,5 @@
 aria2: ENC[AES256_GCM,data:wXS/Qgbu3bc9YDwVLCz+EIm8yMl8Un8XPwMv,iv:6j/mRhbA+Ps/8pvfmx0CYH2/iqxcG+roi50Gr6hC3SI=,tag:TK6D/9nmM76ODPH1irbREg==,type:str]
+coturn: ENC[AES256_GCM,data:JvywrYxRl9QM4+WXH3xhkl4HZwGZurVYRX+S,iv:x6qmAS+11djd2w6pRr5KZYOy7vNtaC6rIw+XXDuu2aY=,tag:fT202mZDyRknuZK27RzgbA==,type:str]
 users:
     macronova:
         password: ENC[AES256_GCM,data:b1ct21IrepupexfV5CZV31/HRLRbhPY8EZDAA5rkYisSkke5Z6K8IlFePkbRAEre08qastLPr8FARal+s/co6kfR+aFcqD55hMcLaXvthg4xI6K4NRX0Ifp28JaEy0c515qLbvDLiyMsHQ==,iv:uK96mBa7ewu6SjPWb5aJDPKKASSqWFNGfRt88jWhbP8=,tag:eeVXcr3JOOpqO35y0wcXIQ==,type:str]
@@ -35,8 +36,8 @@ sops:
             TG5mYWd3MnI5TlZiNXBjb0JJY3BvN0EKUd0ldQPe0/zdHjsmKEUhH7xkpO4nLfd5
             fnTk1jGonJg+t+TqLLg/YYKlcNkgExWaIZ7wrd0RVKXOeC2BtM/wzQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-23T18:57:00Z"
-    mac: ENC[AES256_GCM,data:Oc4Ull2Hk/wU+eSjqIYVuVTLIoHj9PMc+tk4V9lzKBLgkL4mNdvtrWu9Cy1mv+SVVW5l0OXngtvVyo9yAA8kTKdkIDDUHX3R1PDZ8VZQDJuN+XmilH/6EdR3JdkofYNZmFiXzmfiIK376XoLWlSUkOJaIv3cFI9ARtAQSddEwFA=,iv:pzm68rC5VTqC2zfIlqbdcPwBe4ZtE0EwFdxwR8D1FnE=,tag:cDKkcxujot7mv6ZvpcCyRQ==,type:str]
+    lastmodified: "2024-09-01T04:16:17Z"
+    mac: ENC[AES256_GCM,data:eGWeRIt35PZ09tYOFwSm5OMC/cehI8Y2W6x2zd4PXLDxZpJi1I7wdvQ1ch/sHabD9Q9SLA4YbisHdCCNEXUc2y0sjfjK9CMvQjsOKhkvtDVPtPvlpK99CthNT2EGER22FxCOr2Ozp95Xji1NQrtxEozZF1IhI2HlZ9a8hZvcue8=,iv:rtnEIZetXDS9QSlOwjWfSFWH56e1C2He0qxQjWjiYxA=,tag:rTQSKM7erUfHscW4dsJJHQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0

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;
     };
   };