feat(mixins/tailscale): use file syntax for auth key

gaelreyrol · Oct 27, 2024 · 16b637e · 16b637e
1 parent 3e30840
commit 16b637e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
@@ -27,9 +27,9 @@
     nvidiaBusId = "PCI:02:00:0";
   };
 
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "fr";
-    xkbVariant = "azerty";
+    variant = "azerty";
   };
 
   # P52s fingerprint sensor is not supported

diff --git a/mixins/tailscale.nix b/mixins/tailscale.nix
@@ -37,7 +37,7 @@
       fi
 
       # otherwise authenticate with tailscale
-      ${tailscale}/bin/tailscale up --reset --auth-key $(cat ${config.sops.secrets.tailscale_auth_key.path})
+      ${tailscale}/bin/tailscale up --reset --auth-key="file:${config.sops.secrets.tailscale_auth_key.path}"
     '';
   };
 

diff --git a/secrets/default.yaml b/secrets/default.yaml
@@ -1,5 +1,5 @@
 home_wifi_network_password: ENC[AES256_GCM,data:3r4jHN7rfyf4pu/PKh9z2xAQ,iv:MT9rrcVphnc7JCgwAKtMvW+NtETkx1F5Rs7h/xNXBB4=,tag:VgVSoGKJ7NbSNjRrwWfGEA==,type:str]
-tailscale_auth_key: ENC[AES256_GCM,data:Em4RptWk741x50rbhkSp0qNSIBYFjqlFmM4A0GsKvtAx5AInULbK8AxQS79RQbI+/uOdylZASc6ztORemQ==,iv:qzG2BXQirXT8ir+H8mtMdS+rui9y1G6OyEthiOYJtuM=,tag:6MimBHTJgOLGLpr/wlrobg==,type:str]
+tailscale_auth_key: ENC[AES256_GCM,data:tLf3d3IhOt/gnGs2wKXVCvkMO5/2pB2EuZ5sHNWwjiZ4CEelqnizJmE87aOkc4hMv7xnBqWMHC2JXk5xDaI=,iv:wPpfW6JCpqnhfdupvM08txhLvD5bDIj6S8MV4zNk6i4=,tag:BV/G5ZVfJnBcX3RTjDWSIg==,type:str]
 cellar_backups_key_id: ENC[AES256_GCM,data:L3bV9Ab8jTNe6OU20QZdAy1XfwM=,iv:Gnb8N3PRGlq/UxqnhMPyOjbG4oLTJbx9eSBsNlhSkG0=,tag:NO+h75E8DMuTq0unzY0n4A==,type:str]
 cellar_backups_key_secret: ENC[AES256_GCM,data:gddEMWnD+LlyO4/ZEvgcfeT6jR9AebFHps1Ql2gT4DUn5A3v+U+HGw==,iv:12mrAieKwmlQH2FU5/mVikL/G4WtBK554Hft3CIxogI=,tag:0oIGxAkHa9zwza0gu1wNhw==,type:str]
 github_personal_token: ENC[AES256_GCM,data:Ajofm2Roz2NdIsAYnD3PBSD2ENJaZLNewWrm1NlkyefnSk2k4qaGqQ==,iv:p2neATB+O9lc6yxSOu+UAYmSXF1u3266on+1cLVtuWw=,tag:25rxtqxAuu/77wsTGV4fdw==,type:str]
@@ -54,8 +54,8 @@ sops:
             TVQzVHhSU1R6bEU0cHZRZXFEbzlXWkUKtZ+gg5kaPTsj7l3g4PtjpOG/KBCzKGSU
             4CdCc0TZYQyupHOaK5uDwS47ntaZ4GbBif5lNximtnEIeSLdFxgxjw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-15T14:07:20Z"
-    mac: ENC[AES256_GCM,data:CGl8M2UPXAtWRlcjQbLt4J0BAOPkiK1NvntgkJmrf5TsKHuy0ArskeapDQprMRF1WUVJFC+NzPAwmxqDeHcShzGHV1ktUz3Cdd6seWeuAGvU29ovWiwLlj+hpZGS8Hhqt9LooApyQAP19/G7F+OEAmlmiDWJM607n7jyS+8TC+0=,iv:FT75F40gnWTVZvFOJOAReZ5d5q/Xp0B7QsrOaqn7Ts8=,tag:w1Q4hkSPQPi7+YwHZCgHxw==,type:str]
+    lastmodified: "2024-10-27T15:17:07Z"
+    mac: ENC[AES256_GCM,data:l/xbKDrVRSe+AkRNp3VILnFcaJ/vUyqnt70KyP/TrBh0bpCkNX9S5U1XIz/nuubl5mJzfnMHT2/wtrvnX5o6A+zNWfiDm5FEinOa8o1kTrULy81icH9nWDilm5ej1GZwm5z6B1NaN8dKAL8N/7j1BDrG3PtiSmi0PvLbhQcpAsc=,iv:MFDqqiOFKojWBNzD8t2olb/fn3UQYs0xnhO+RI0sM5Q=,tag:plGGwWHThhFroscKc+lzyg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ @@
           fi
           # otherwise authenticate with tailscale
-          ${tailscale}/bin/tailscale up --reset --auth-key $(cat ${config.sops.secrets.tailscale_auth_key.path})
+          ${tailscale}/bin/tailscale up --reset --auth-key="file:${config.sops.secrets.tailscale_auth_key.path}"
         '';
       };
@@ Expand Down @@