Enable permanent storage for use fixes

This is for storing some of the user common directories that are under the users home directory. Signed-off-by: Brian McGillion <[email protected]>
tiiuae · Sep 20, 2024 · ca4e6b3 · ca4e6b3
1 parent 67edf00
commit ca4e6b3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/modules/microvm/virtualization/microvm/appvm.nix b/modules/microvm/virtualization/microvm/appvm.nix
@@ -72,6 +72,20 @@ let
                   withDebug = configHost.ghaf.profiles.debug.enable;
                   withHardenedConfigs = true;
                 };
+
+                storagevm = {
+                  enable = true;
+                  name = "${vm.name}";
+                  users.${config.ghaf.users.accounts.user}.directories = [
+                    ".config/"
+                    "Downloads"
+                    "Music"
+                    "Pictures"
+                    "Documents"
+                    "Videos"
+                  ];
+                };
+
                 # Logging client configuration
                 logging.client.enable = configHost.ghaf.logging.client.enable;
                 logging.client.endpoint = configHost.ghaf.logging.client.endpoint;

diff --git a/modules/reference/appvms/business.nix b/modules/reference/appvms/business.nix
@@ -87,11 +87,6 @@ in
       };
 
       ghaf.reference.programs.chromium.enable = true;
-      ghaf.storagevm = {
-        enable = true;
-        name = "${name}";
-        users.${config.ghaf.users.accounts.user}.directories = [ ".config" ];
-      };
 
       # Set default PDF XDG handler
       xdg.mime.defaultApplications."application/pdf" = "ghaf-pdf.desktop";

diff --git a/modules/reference/appvms/chromium.nix b/modules/reference/appvms/chromium.nix
@@ -78,11 +78,6 @@ in
       };
 
       ghaf.reference.programs.chromium.enable = true;
-      ghaf.storagevm = {
-        enable = true;
-        name = "${name}";
-        users.${config.ghaf.users.accounts.user}.directories = [ ".config" ];
-      };
 
       # Set default PDF XDG handler
       xdg.mime.defaultApplications."application/pdf" = "ghaf-pdf.desktop";

diff --git a/modules/reference/appvms/comms.nix b/modules/reference/appvms/comms.nix
@@ -107,11 +107,6 @@ in
           "slack":   "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://app.slack.com/client ${config.ghaf.givc.idsExtraArgs}"
           }'';
       };
-      ghaf.storagevm = {
-        enable = true;
-        name = "${name}";
-        users.${config.ghaf.users.accounts.user}.directories = [ ".config/" ];
-      };
     }
   ];
   borderColor = "#337aff";

diff --git a/modules/reference/appvms/zathura.nix b/modules/reference/appvms/zathura.nix
@@ -17,11 +17,17 @@
     {
       imports = [ ../programs/zathura.nix ];
       time.timeZone = config.time.timeZone;
-      ghaf.reference.programs.zathura.enable = true;
-      ghaf.givc.appvm = {
-        enable = true;
-        name = lib.mkForce "zathura-vm";
-        applications = lib.mkForce ''{"zathura": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/zathura"}'';
+      ghaf = {
+        reference.programs.zathura.enable = true;
+
+        givc.appvm = {
+          enable = true;
+          name = lib.mkForce "zathura-vm";
+          applications = lib.mkForce ''{"zathura": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/zathura"}'';
+        };
+
+        #this vm should be stateless so nothing stored between boots.
+        storagevm.enable = lib.mkForce false;
       };
     }
   ];