Switch to a slightly better modularized config

configuration.nix

@@ -51,11 +51,11 @@ in {
         owner = config.users.users.knazarov.name;
         group = config.users.users.knazarov.group;
       };
-      syncthing_key = {
+      "${config.networking.hostName}_syncthing_key" = {
         owner = config.users.users.knazarov.name;
         group = config.users.users.knazarov.group;
       };
-      syncthing_cert = {
+      "${config.networking.hostName}_syncthing_cert" = {
         owner = config.users.users.knazarov.name;
         group = config.users.users.knazarov.group;
       };
@@ -451,8 +451,8 @@ in {
     enable = true;
     user = "knazarov";
     configDir = "/home/knazarov/.config/syncthing";
-    key = config.sops.secrets.syncthing_key.path;
+    key = config.sops.secrets."${config.networking.hostName}_syncthing_key".path;
-    cert = config.sops.secrets.syncthing_cert.path;
+    cert = config.sops.secrets."${config.networking.hostName}_syncthing_cert".path;
   };
 
   home-manager.users.knazarov = {

flake.nix

@@ -41,8 +41,7 @@
 
       hostAttrs = dir: {
         settings = import "${dir}/host-metadata.nix";
-        config = import "${dir}/configuration.nix";
+        #config = import "${dir}/configuration.nix";
-        hw-config = import "${dir}/hardware-configuration.nix";
       };
 
       node = dir:
@@ -58,9 +57,7 @@
           })
           sops-nix.nixosModules.sops
           home-manager.nixosModule
-          config
+          dir
-          hw-config
-          ./configuration.nix
         ] settings.system;
 
       server = dir:
@@ -76,9 +73,7 @@
           })
           sops-nix.nixosModules.sops
           home-manager.nixosModule
-          config
+          dir
-          hw-config
-          #(dir + "/configuration.nix")
         ] settings.system;
     in {
       nixosConfigurations = {

nodes/framework/default.nix

@@ -4,6 +4,11 @@ let
 
 in
 {
+  imports = [
+    ./hardware-configuration.nix
+    ./../../configuration.nix
+  ];
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

nodes/mira/default.nix

@@ -4,6 +4,11 @@ let
 
 in
 {
+  imports = [
+    ./hardware-configuration.nix
+    ./../../configuration.nix
+  ];
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

secrets.yaml

@@ -4,8 +4,10 @@ github_token: ENC[AES256_GCM,data:efFL5w0dAqHM0L35bfr4PMF/0Uys3Pe9s/pqDJUA0rBdRS
 mullvad_account: ENC[AES256_GCM,data:CO4wl2vNAMEC9oy37nIrpw==,iv:a3w64u8XQ/tihIDxIPPtdZ6F7dldLPvRzGUs1MpVe4M=,tag:HQxJVuGEvI0fVj8yGptbdA==,type:str]
 git_plan_config: ENC[AES256_GCM,data:7K4R9OcFq+hWPKwkng6huppcInASpjUSgRpYX++voPHXJ6lMv2/JydPuQsxUPZMVBmn2o7DgTRzKzaXzwa5DV+92bvsS9LL/oL/qeoTqdci4lCRyushntgfwdZttMeVjbxybyutqO/daoEpT0Er2lTVgzyrGR7bU6RUyhVjl6VI2phgrMkzHfmIx5/FOma3q26WzGQtl1b7m2ptKYxrwWrYWqZqy80ITOYFbRQF2CQHUj/rfQrl5nv5AWUafDWglfFBlX4T+WiPsHPcAg0Fnt6gjbcirDLPMFTrqsI5T0BVqRJW1qDzAavFHJn2SZPgfZGgonzAil/RS+z/4xsSJ1G4EO7KCCeS24lU9VoWzHlBRL/+4jnQoL8S5qsOyILiFLSckRp0WCcJ54nSf88CuBKRGgabBzKX7PPut1Q/QvWN60KrhIiN0vFlK9M9gLKDwzXo366HN9rrjMNKWtKFqcwuP+oh5MgfpP3tru7ExGp83RPAx0Ol2pnaRs8TxWRMEcwgDkIQODrmPM/EBNr1vQNST7mMVuN1vl9I7fCzVhqp+0Hxlzf9lb1zkCscjlX0Kc4zVvjPxl2cw7e1/nOSrMBV9Ex4c2CAi31LHF39n8krIk2p9IR/hwZWNEErX68rAD8aSaU5ozgMChKgblXiaBb2zk7BPYr/vHYkM64VD8NGd5BbNseLz8SiEL8SBdD2ZsKf5eCYEghI2qMyYhuDdbrcpfBv9xUapwQxG58hZSw==,iv:XD03VsphTGx2f+bXTWQy1sgY1k5TFs4H2XFj/KyTBe4=,tag:1LlsaX/SLv3QdqJ6mt96mA==,type:str]
 git_plan_credentials: ENC[AES256_GCM,data:d4egK2w4TGIDNaI2Wc3ViOBnH7/WpdeS1EoYe4/oaM4iayBXOEQMvT9qIgu/Hml34gvbBN9lRmlNkESVh7YpwO5wACkkRcO/0ZTyP8XzFUUo0IfUh1iHPjEQOF7vygW/woqBiQgFPRws9F+g6BW8aSQrBgvBF5IeNLhFBvSJUvTft1xEsNwFnkWnfZ2JWmYqLjEggoUEqtXMRw9KKcqm4DNXIzxmA8wSzDriIzeCVuSEV8sJD21saFPPaLw/jupLTLdWp5F8rAxLGa6e9coCNu8vSuqUgfv0jFET71bNw28xPrN38A/PIlUcR9MXe1SGqKAFxEv134ZkJr78g1PIWNoVDrmIlMpV6dYRLKM1FOcpAhJorIXooIl6quCdg2/U5onP8cQ7lt2LsEG5APKj7pz7huatdwM/CgxrcqPVb0E2Lk5c+wi3Rf9/Jz3BqcWQm3bwkHwivWyCD1Nw+qRXLFSfXGTovSBsxX0j4LbdP0o4iPuj068DGawpYC/AfcKfOCmh8aInQhGCQtIq14QGffU9GbW37gHu,iv:ZzOUYu3s+kfwbKajA+6fdu2EysipjoKD49muLNFBZ58=,tag:e0RI7rA8eLQI8h5L4pvS1A==,type:str]
-syncthing_cert: ENC[AES256_GCM,data:F70URFwG+nYKaM2aIgQ+T3E1IXEcsB+SczzpJ4jD4Pbxc9no0lbmyFtAGIkyLWAJVeoOyWETkvA4N+7WCtHQBH7KUKQXcyxzSC0EQlejQGzKvy/+4Tay0Qakz+iKCKEoS9LCXu8gAbGzvFGo7XDckE3RKtgqh+eisTKNDusptJMz3UwB/3crXz3M0XgNd3JQWKRTvxif1JRD6e+a7fnvWfxU1z15jdnSJ9Yl6OSLuRBeZYdPVzzWwOWHWtshM8KVHB91P1BDr8c5Fpo3F9HIDWWaQQV35fGiIi+9w44ao9+BK/8iYHE7gWjOOsfC/e/32VVwtrzZfnt2a2pguUunT+bVossaSAw0MHldQtrW/je1Y3mCUzEJyVsmW1YJ8EaVnWSsbCQOVBFAJYDtiVxidMVY+hUJSTcpdxNbMzhxgdiK4wiAGrmh8EstNZNUtStPXrWl6wJImbmwOncNvbjDG7MLNrVnsHIW4ZX8qx74iVv9n72OJKQoHBxczTlvk/V4hmBZHCIDrc7h1O4iG+UCZAroUVm1H9k+pzLxe2l8YnsSI1yNX2Foqq5+8qwb0p/g6uP++bTD4Ze2RdJY9U75eRSPDfano6SFy4HCPfw5wGTjzAH61SftYH/Aks60KCz2JsviUrz67rBRp06Vf5dY9H1ndI30OHZAz9+EmGJxPhF1shL82AeYABrbZKs7fZLYgj0P4MvpNg6DelFug+ZkUsM/VNsJIumEEijOxWqMG/RkYsiRLr8g1N7mH869aIvNQbUX1iGNHC8K4XAY72ol/zqeb3hJImFqqLO0X8lnc7niiPDlU+DrXaxb7erg4ViKRTvwd7jmnFOdHssGsOtqir7TEd+tfcLjmP2VOMBlvJZaIEPXcLKzCWg7vAyRcVZjePVzJ7R4vKoqcI4IpOe8dyXcQa/SD5FLJi5bnGUfr9E9m0eTU5fLWEBblMDi2GVDDbuIB9WyI0VyptgctpKUbIzw+Tsx9gCYaJO0IggwkmRMd/0sijNdTNo0rQDkzWdZBQNFOxW8MvA0NbM/mk8CwICfdBPWq1fjRoI=,iv:13xEhm9JVOVh6rBZtItcEQd62FMIlFKo80JmxQtyIi4=,tag:zuGER4fW2Gy1edzsBPMWIQ==,type:str]
+mira_syncthing_cert: ENC[AES256_GCM,data:UjQr7q5QmIF/2jjwzNL59zZ/qlP6oJX3M56mxX5OOtqN2K9gqtQpbEPQAFfCtl3R17Jt1tHmr5aW/tc6zAQFD4LaxupwzpCxpMnpLLZDxROFv3pgqft6ANUsGBIIXtoQsG3YcMkekFF+bFMLkrxldOiv83nUc+nsLHU/ab2JFAmxGFpnFdvmzbqlemZb3T0SCoTgyhv7n6W84t3s1Ox/sCiB6DtZddKzBSoK7ERQb8Vuvi7xkJ3l9NGrYa6pPAS+GOo2EaO5s5VezpEbQJ0rWbovXYaneyiwAKUA8F+BzvjBpm7HYssbHU7oOFdUji7Fwhb7PSp1gkxXGN9OiWkHMqXFU3dqbLHOru2ubs1R22uHafFzJAQDybsETfWSX01+24UtJYJsF0qimbkGs7/WnwP+dU2w8jS/TsDQU9SEu1cEWCnIZv+2s3xJZtEKxiFFfAvtsvN3QpuBz9co9j04bOHSqv51A2N4ACRgLQUEs2HM8K2Nn/vRB6JN+GG8uRHf12N3LCz+vIse0LQkItp4WgHSMPoergFF3SCl85ngbsHuMW0kkyopZH4msIFGlM4Rqx/yNVSSjlaGWudPU5FgMwyIZ0auBtRwodm+32XVjnBdBdcPFu7azMyaRMrtk2BfhEYZrLgioPyKDYpNmBe09ExFRsg5VDQD7ealkUzLDcSTYXbMHUduciibJ/MRNrtJSd9QCP2ymdRd065/uDRShAHpLvJHHociwKBCzGywoV8pAwQpxoGmBZsoRPZV9Gk6m7/tGvsLx6hC70v2ss0bfbMn886sSFm+EXLz4gwMUS8Yeq7BjdSBINvYr5t3qP+F6R61z8s396Fv1iogzmWrQGxQMcAt9skDhZiK+Au79+sQIlHvjbCt6lsyopkiYmWwjl4YBOb6IDZwm5LA1I0gWu8Y6+Gm/7fZ2i7w0n4UlPcoSWbvTAJEQvEN3KWnVKA56hIsXmdv6oCOHjdhZkM8i7EbYln/d1XsUdvHvKms/8u3phDjxdbECGESzYPY9ckPrcv1GPxz5QFg9ITtfG/J7fgi2oWcIAm+FIE=,iv:sDlKHflxv/w4Kk/UMkjazHFFLrTm8zBuRztq5fDlAnE=,tag:7aw9stLdAQvJwjxSawZunQ==,type:str]
-syncthing_key: ENC[AES256_GCM,data:2oLPKt3X867NqP79YZgvMglAQ3K9reTyeDIgQT3deHmg+RzawWh8fk8NidU5y9ailSGfdddB2r5WkgfH1fhHOBXCHpot5fR3+4TfSTMSX3V05E6GZNn51ue4Defjc3SQmCZBUKegtusJ5QBxqDBTuzWjb+QtlO0ZUzC7ZwV4GGXDP6fvPaoUfOzkX3vV5iowo43SM5gnask/KcgNN0EDprsRQ5vRTRA+vs5miwxrdCnU5O3RuJXrtTfiX61qQ1ei0Iw05lXTXFJQuJ4Cijvag00SZymWZIvSBq/DcSswcW+3Tme9CuScJ1KNA3vRYLatAln5buSg/htRb0haQUJNQPAbAL6tnJSvXLF3VaEm1Ja+njfeVJJlbBEzOYDdfgim,iv:+5BWkeWwVNgHB5BXItu69+HoFac8q67yz1oct7u4Hoo=,tag:hCGaQTG70sYoQnoVW2s5vw==,type:str]
+mira_syncthing_key: ENC[AES256_GCM,data:nUEctak0gNO+5Iw7dzBC4hkYQpWYDtqZpdzS8tGadqRNXCnxEvg+g5UKVN9X9RN4rIQhfedPMQrNbv8UrDKMygA5HaECJwO5KBz42VTCmnIqTysle09y8hW3zL9Lxaw6DZFNvoALCo7Wj4jLhDZY8DWvjCONIdjpYv0pElOjhyY9oBEonF0ZBpzGFr8zHMcCdt7o+o192Ho357NzBDHMo+3RkTU4GiPpdlZN71Pk902IFHa9hYuYDePPur7TGiyGITYP/EA8b+Rb6AfhLDzv6PzDfjiOpllOX50R3pw5tEEWdJsQx5nwUUFLJOWcKkzTDBOW1WDiWQv+yicWox1e2KXROBdHHiorIvTU0/nM8YVwH9eyOf6rUyrW7wQArBXz,iv:zMmYiA1xlykeTHu16idG2uQ76KBsC8c2a4JfGVwdp9I=,tag:nmqagNRnuBWOJ1p9FdE85g==,type:str]
+framework_syncthing_cert: ENC[AES256_GCM,data:ctuJCImoIaRkbJt7CFuew66uOvI9tWBIzw+WsgtKbq757wZke7Eqiy1TOoKmaEhWRzw5pD71y4Uk9rgcsdmRr0+2w9iC6o3joii5KU/dIextbiTYzqBpB88CjESKITzAj57bGWP22RSM156OaGgL7UDpZAyRt8Ys2LlfmnbU6rQ3hpwgHKWkegqluIGjMdl+LW0ShxzEIqSxwkxhyYHW0GVLBAK2jTYtqar8MgPogZ16YRtwmDlK1Me712qvap39RMsB1xMsXvfduKhWjjtY3Ajhq2RF3dLKffCpMFhomMnCuPx62aVJEvnGUb/h99F4d0bLpThvF7hldkuDbiln3n8WehqhoM3A5q/42P0XoSrafvCH43WT6SSpvOASMdTxn7qSlCNB3uXiKNh3X4rgvCEmsdjVEXhBwLi7SZ5k73iVa8oEpaYP+60l9XFd4PEd844Y/wBRXN4Ch+imuCZwNlYMiN7uCyd3/lqr2t7xgIc1E9DqcJloohfJMfTXhl/88GITVqL+3IfwPabTMbYLFwxjr3gBPyPtyEUpgAANSVJNj5h25WnrN2q+muoTiGdk1Z6wk2z/2Obo1LSde1daNVGi+i/CmFyIYFJhmpP53faXi48MqLtF1ix7YP6q/rjyTH26mDPg5ZYKkuWZg2XaNnHegQ/fOfOVG+Q+88yWo/dLwMkMhFqJVrLkli6Ogu9kcgzteD2DgEnE9UVH4Di07UaKOG2qVL2g2V7R2rH4pgxHE75z8D12VQVYVX4Or6ASKsG8b6Rm1Bwtf3dURO053B+Rmf9cnRrz724YOjV/RrC5Mvu0kN0Oim+B69uSk0APXX3sxR361tNODEe2zQrVv2GlT7OUCut12+SIv8vG0aQTqyJt0J1D7IpWpQjSplcO9vaEahI3MXasl8HyvEJBZUwY0G3YZOdLuIU9XfF3HRqx1333v7RcurK7asIdMO0r3ZKxuXYZhaFbCxMRFvAZIw3g47oVoc6QML5Mu4pEP6djcfq7HflTfX/p2031HMZvNu4jOqV6PFptMtSDwb7uuFAKbl1FIQ==,iv:1jr2/aIeRQJ9km/2pglIjbwGjVdKYGwX+ES3hT3AQm4=,tag:E7RVpD1JUYscIt529eBBBg==,type:str]
+framework_syncthing_key: ENC[AES256_GCM,data:TqpBYg/XLZPcsUvrLzG2UMSFlZ6DkJ9j8NnWbQOP5C6CWVWL+rOORbMVYuZx7AwP7sz7XLK3ae+M1w5xMjPcE+OkXUxiRY0PIKemylaaitv6EWaY/xqEQZeirmuS+8zzzAJGUpbjyRP+DioqqHAZTuErAuhNa+ElNVrpkv52X0divLux2ESG48gr9NcyJywLruuGinqxk+7/HnoHgYDqo/AAp1xFTUfUYpqEFa2nfP/hSw2kecX6biUGNPQcfQ4+Yz0LmaspfP1bz3+Hsl5jJUHR1gGlfrR5KJPtohI2nVVJw82aoJd+m2NlHKK5x0oCktDATsb0iMeS0uxx1emlxWVFnB9QWAKsnUfo7pWWjqPTzXNB2RlNCtSEHEvZ+cig,iv:TlBQa1dj8WGuyJDF+M3odWkis+wmHY3l01z3bfszKTQ=,tag:D6k/sBlT0HxxjZy4LDqLeA==,type:str]
 kagi_api_key: ENC[AES256_GCM,data:L26RZzBVo9mAxP7VgeFgmc/kpvYWrLsa1ElGzpfvwuaBvpoRGF4hLJMzI5huJ50lQ73KfvgZQw==,iv:lIMEe0u6ZE62SPWjpbwL3QJot5g2lbjuoxVcFPg51Go=,tag:WB05eEi6Lx1A3gyu1M9x4Q==,type:str]
 sops:
     kms: []
@@ -31,8 +33,8 @@ sops:
             U3loV2xDMkM5SWNXRDJobDloL0FVUUkK3OP7KvcKkE8mJ880dm6LMFZUxELjl8/P
             6+q8qAYiAvl0Cbd4GzkNpUuBbLlFFWfFmC0vbgg8gyZ6xI5AFhHAPw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-10-30T20:16:29Z"
+    lastmodified: "2024-11-23T22:23:34Z"
-    mac: ENC[AES256_GCM,data:f3dHbjLgqJmjTpKObGlrzUh2HwbaaJrKoitQuBvL1gwg7byD7lkzFk48NaO79tBm8mzFM0qNR6ZuMCezWIi/MqeKtTKhsf4e89///uSVB2EVbBDR/SDvfiZYwg1l0WEoUt5bjJIQyvmP8wRTVKBCMWNlbona/FGUlngswNXT1DM=,iv:IyUTsfYvIYh6X0RTB+yHlFRCwL0D+MF9A+HOQUjbJLY=,tag:YHaeO9iYM8Ze6koG8tjvOw==,type:str]
+    mac: ENC[AES256_GCM,data:tQjqm7UFbJtGVM8viWdqwwpP15su8LQbk/eIKEES09QovXQYioB3AMeDUxNltP5d/whRBqXGdng4e/PeddBHKl/FunpjnhaN1FUvYfmQPHDjte6pBaJLnJwtnxMh7oyUn0Bab74GDYHOxTUSOR5zIkLOrUQqB0xrcvSSyuF8lwA=,iv:Q7jEKUFIdXY4nq38VzKyrVpHXBt3sCKMotTJLnNLhoQ=,tag:du3BwNT8lim5P9NwO3Dqqg==,type:str]
     pgp:
         - created_at: "2023-06-10T01:03:11Z"
           enc: |-
@@ -55,4 +57,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: DDB4423999505236CF585F9B0560020C9C577C1B
     unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.9.1