Add support for USB removable media

- Enable passthrough of USB drives to the GUIVM. - Add a new service to enable auto-mounting. - Add a simple file manager to the GUIVM. Signed-off-by: Yuri Nesterov <[email protected]>
mbssrc · Oct 1, 2024 · 34ade48 · 34ade48
1 parent 26f4f7b
commit 34ade48
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 2 deletions.
diff --git a/modules/common/services/default.nix b/modules/common/services/default.nix
@@ -11,5 +11,6 @@
     ./namespaces.nix
     ./yubikey.nix
     ./bluetooth.nix
+    ./disks.nix
   ];
 }
diff --git a/modules/common/services/desktop.nix b/modules/common/services/desktop.nix
@@ -154,6 +154,13 @@ in
               icon = "${pkgs.sticky-notes}/share/icons/hicolor/scalable/apps/com.vixalien.sticky.svg";
             }
 
+            {
+              name = "File Manager";
+              description = "File manager application";
+              path = "${pkgs.pcmanfm}/bin/pcmanfm";
+              icon = "${pkgs.icon-pack}/system-file-manager.svg";
+            }
+
             {
               name = "Network Settings";
               description = "Manage Network & Wi-Fi Settings";

diff --git a/modules/common/services/disks.nix b/modules/common/services/disks.nix
@@ -0,0 +1,52 @@
+# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.ghaf.services.disks;
+  yaml = pkgs.formats.yaml { };
+  inherit (lib)
+    mkIf
+    mkEnableOption
+    mkOption
+    types
+    ;
+in
+{
+  options.ghaf.services.disks = {
+    enable = mkEnableOption "Enable disk mount daemon";
+
+    fileManager = mkOption {
+      type = types.str;
+      default = "xdg-open";
+      description = "The program to open mounted directories";
+    };
+  };
+  config = mkIf cfg.enable {
+
+    services.udisks2.enable = true;
+
+    environment.etc."udiskie.yml".source = yaml.generate "udiskie.yml" {
+      program_options = {
+        automount = true;
+        tray = "auto";
+        notify = true;
+      };
+    };
+
+    systemd.user.services.udiskie = {
+      enable = true;
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.udiskie}/bin/udiskie -c /etc/udiskie.yml -f ${cfg.fileManager} --appindicator";
+      };
+      after = [ "ghaf-session.target" ];
+      partOf = [ "ghaf-session.target" ];
+      wantedBy = [ "ghaf-session.target" ];
+    };
+  };
+}
diff --git a/modules/desktop/graphics/ghaf-launcher.nix b/modules/desktop/graphics/ghaf-launcher.nix
@@ -52,6 +52,7 @@ pkgs.writeShellApplication {
   runtimeInputs = [
     pkgs.coreutils
     pkgs.nwg-drawer
+    pkgs.util-linux
   ];
   bashOptions = [ ];
   text = ''

diff --git a/modules/hardware/common/usb/vhotplug.nix b/modules/hardware/common/usb/vhotplug.nix
@@ -44,11 +44,9 @@ let
           disable = true;
         }
         {
-          # Currently disabled to leave USB drives connected to the host
           class = 8;
           sublass = 6;
           description = "Mass Storage - SCSI (USB drives)";
-          disable = true;
         }
       ];
       evdevPassthrough = {

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -82,6 +82,8 @@ let
                 "Videos"
               ];
             };
+            services.disks.enable = true;
+            services.disks.fileManager = "${pkgs.pcmanfm}/bin/pcmanfm";
           };
 
           systemd.services."waypipe-ssh-keygen" =

diff --git a/packages/icon-pack/default.nix b/packages/icon-pack/default.nix
@@ -32,6 +32,7 @@ let
     "thorium-browser.svg"
     "utilities-terminal.svg"
     "yast-vpn.svg"
+    "system-file-manager.svg"
   ];
 in
 runCommand "icon-pack"