Merge branch 'master' of git.uninsane.org:shelvacu/nix-stuff

triple-dezert/default.nix

@@ -43,9 +43,10 @@
       nvme-cli
       tshark
       cryptsetup
-      mkvmerge
+      mkvtoolnix-cli
     ])
     ++ [
+      "ffmpeg-allvrything"
       config.services.postgresql.package
       (pkgs.writeScriptBin "into-nix-cache" ''
               if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi

triple-dezert/sops.nix

@@ -5,17 +5,17 @@
   ...
 }:
 {
-  imports = [ inputs.sops-nix.nixosModules.sops ];
-
-  options.vacu.secretsFolder = lib.mkOption {
-    type = lib.types.path;
-    default = ../secrets;
-  };
-
-  config = {
-    sops.defaultSopsFile = config.vacu.secretsFolder + "/trip/main.yaml";
-    sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-    # sops.secrets.wireguard_key = {};
-    # sops.secrets.vacustore_smtp_key = {};
-  };
+  # imports = [ inputs.sops-nix.nixosModules.sops ];
+  #
+  # options.vacu.secretsFolder = lib.mkOption {
+  #   type = lib.types.path;
+  #   default = ../secrets;
+  # };
+  #
+  # config = {
+  #   sops.defaultSopsFile = config.vacu.secretsFolder + "/trip/main.yaml";
+  #   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+  #   # sops.secrets.wireguard_key = {};
+  #   # sops.secrets.vacustore_smtp_key = {};
+  # };
 }