autosave (pavel-am5 / Linux)

Author: pshirshov

modules/nixos/virt-manager.nix

@@ -123,10 +123,20 @@ in
       # --with-key=host-only. If migrating from a TPM host, delete the old key:
       #   rm /var/lib/libvirt/secrets/secrets-encryption-key
       #   systemctl restart virt-secret-init-encryption
-      systemd.services.virt-secret-init-encryption.serviceConfig.ExecStart = lib.mkForce [
-        ""
-        "${pkgs.runtimeShell} -c 'umask 0077 && (${pkgs.coreutils}/bin/dd if=/dev/random status=none bs=32 count=1 | ${pkgs.systemd}/bin/systemd-creds encrypt --with-key=host-only --name=secrets-encryption-key - /var/lib/libvirt/secrets/secrets-encryption-key)'"
-      ];
+      systemd.services.virt-secret-init-encryption = {
+        description = "Initialize libvirt secrets encryption key";
+        wantedBy = [ "multi-user.target" ];
+        before = [ "libvirtd.service" ];
+        unitConfig.ConditionPathExists = "!/var/lib/libvirt/secrets/secrets-encryption-key";
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = [
+            ""
+            "${pkgs.runtimeShell} -c '${pkgs.coreutils}/bin/mkdir -p /var/lib/libvirt/secrets && umask 0077 && (${pkgs.coreutils}/bin/dd if=/dev/random status=none bs=32 count=1 | ${pkgs.systemd}/bin/systemd-creds encrypt --with-key=host-only --name=secrets-encryption-key - /var/lib/libvirt/secrets/secrets-encryption-key)'"
+          ];
+        };
+      };
     }
 
     (lib.mkIf cfg.iommu.enable {

users/pavel/hm/home-pavel-generic-linux.nix

@@ -8,10 +8,12 @@
       [ ];
 
   home.activation.jetbrains-keymaps = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    ${pkgs.findutils}/bin/find ${config.home.homeDirectory}/.config/JetBrains \
-      -type d \
-      -wholename '*/JetBrains/*/keymaps' '!' -path '*/settingsSync/*' \
-      -exec cp -f "${cfg-meta.paths.users}/pavel/hm/keymap-idea-linux.xml" {}/Magen.xml \;
+    if [ -d "${config.home.homeDirectory}/.config/JetBrains" ]; then
+      ${pkgs.findutils}/bin/find ${config.home.homeDirectory}/.config/JetBrains \
+        -type d \
+        -wholename '*/JetBrains/*/keymaps' '!' -path '*/settingsSync/*' \
+        -exec cp -f "${cfg-meta.paths.users}/pavel/hm/keymap-idea-linux.xml" {}/Magen.xml \;
+    fi
   '';