qrencode: isntall in office profile

[julm/julm-nix.git] / hosts / oignon.nix

diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index 7a1dcf7942e4a39833ea28d92171f97de71411ef..713974c23dc0e1877331583d937fdec7cff2f23f 100644 (file)
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -69,7 +69,7 @@
         "ssh://nix-ssh@losurdo.wg?priority=30"
       ];
       trusted-public-keys = map lib.readFile [
-        ../hosts/losurdo/nix/key.pub
+        ../users/nix/ssh/losurdo.pub
       ];
     };
     nixPath = lib.mkForce [ "nixpkgs=${inputs.nixpkgs}" ];
@@ -99,26 +99,30 @@
 
   services.davfs2.enable = true;
 
+  systemd.automounts = [
+    { where = "/mnt/aubergine"; automountConfig.TimeoutIdleSec = "5 min"; }
+  ];
   fileSystems =
-    # Use the user's gpg-agent session to query
-    # for the password of the SSH key when auto-mounting.
     let
-      sshAsUser = user:
-        pkgs.writeScript "sshAsUser-${user}" ''
-          exec ${pkgs.sudo}/bin/sudo -i -u ${user} \
+      # Use the user's gpg-agent session to query
+      # for the password of the SSH key when auto-mounting.
+      sshAsUser =
+        pkgs.writeScript "sshAsUser" ''
+          user="$1"; shift
+          exec ${pkgs.sudo}/bin/sudo -i -u "$user" \
             ${pkgs.openssh}/bin/ssh "$@"
         '';
       options =
         [
-          "noatime"
-          "noexec"
-          "nosuid"
           "user"
           "uid=julm"
           "gid=users"
           "allow_other"
+          "exec" # Override "user"'s noexec
+          "noatime"
+          "nosuid"
           "_netdev"
-          "ssh_command=${sshAsUser "julm"}" #  "reconnect"
+          "ssh_command=${sshAsUser}\\040julm"
           "noauto"
           "x-gvfs-hide"
           "x-systemd.automount"
@@ -126,6 +130,8 @@
           # Disconnect approximately 2*15=30 seconds after a network failure
           "ServerAliveCountMax=1"
           "ServerAliveInterval=15"
+          "dir_cache=no"
+          #"reconnect"
         ];
     in
     {
@@ -198,6 +204,7 @@
   ];
 
   services.xserver = {
+    layout = "fr,us(altgr-intl)";
     desktopManager = {
       session = [
         # Let the session be generated by home-manager