ma automatic-diskmount: put into separate config

3 files changed, 45 insertions, 42 deletions

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 483fc81e5..93bb27efe 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -141,48 +141,6 @@ with import <stockholm/lib>;
         # connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
         hardware.bluetooth.enable = true;
       }
-      { # auto-mounting via polkit
-        services.udisks2.enable = true;
-        ## automount all disks:
-        # services.devmon.enable = true;
-        # services.gnome3.gvfs.enable = true;
-        users.groups.storage = {
-          gid = genid "storage";
-          members = [ "makefu" ];
-        };
-        users.users.makefu.packages = with pkgs;[
-          gvfs pcmanfm lxmenu-data
-        ];
-        environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
-
-        ## allow users in group "storage" to mount disk
-        # https://github.com/coldfix/udiskie/wiki/Permissions
-        security.polkit.extraConfig =
-        ''
-        polkit.addRule(function(action, subject) {
-            var YES = polkit.Result.YES;
-            var permission = {
-            "org.freedesktop.udisks.filesystem-mount": YES,
-            "org.freedesktop.udisks.luks-unlock": YES,
-            "org.freedesktop.udisks.drive-eject": YES,
-            "org.freedesktop.udisks.drive-detach": YES,
-            "org.freedesktop.udisks2.filesystem-mount": YES,
-            "org.freedesktop.udisks2.encrypted-unlock": YES,
-            "org.freedesktop.udisks2.eject-media": YES,
-            "org.freedesktop.udisks2.power-off-drive": YES,
-            "org.freedesktop.udisks2.filesystem-mount-other-seat": YES,
-            "org.freedesktop.udisks2.filesystem-unmount-others": YES,
-            "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES,
-            "org.freedesktop.udisks2.eject-media-other-seat": YES,
-            "org.freedesktop.udisks2.power-off-drive-other-seat": YES
-            };
-            if (subject.isInGroup("storage")) {
-              return permission[action.id];
-            }
-        });
-        '';
-
-      }
 
     ];
 
diff --git a/makefu/2configs/gui/automatic-diskmount.nix b/makefu/2configs/gui/automatic-diskmount.nix
new file mode 100644
index 000000000..19933111a
--- /dev/null
+++ b/makefu/2configs/gui/automatic-diskmount.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+with import <stockholm/lib>; #genid
+{ # auto-mounting via polkit
+  services.udisks2.enable = true;
+## automount all disks:
+# services.devmon.enable = true;
+# services.gnome3.gvfs.enable = true;
+  users.groups.storage = {
+    gid = genid "storage";
+    members = [ "makefu" ];
+  };
+  users.users.makefu.packages = with pkgs;[
+    gvfs pcmanfm lxmenu-data
+  ];
+  environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
+
+## allow users in group "storage" to mount disk
+# https://github.com/coldfix/udiskie/wiki/Permissions
+  security.polkit.extraConfig =
+    ''
+    polkit.addRule(function(action, subject) {
+        var YES = polkit.Result.YES;
+        var permission = {
+        "org.freedesktop.udisks.filesystem-mount": YES,
+        "org.freedesktop.udisks.luks-unlock": YES,
+        "org.freedesktop.udisks.drive-eject": YES,
+        "org.freedesktop.udisks.drive-detach": YES,
+        "org.freedesktop.udisks2.filesystem-mount": YES,
+        "org.freedesktop.udisks2.encrypted-unlock": YES,
+        "org.freedesktop.udisks2.eject-media": YES,
+        "org.freedesktop.udisks2.power-off-drive": YES,
+        "org.freedesktop.udisks2.filesystem-mount-other-seat": YES,
+        "org.freedesktop.udisks2.filesystem-unmount-others": YES,
+        "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES,
+        "org.freedesktop.udisks2.eject-media-other-seat": YES,
+        "org.freedesktop.udisks2.power-off-drive-other-seat": YES
+        };
+        if (subject.isInGroup("storage")) {
+        return permission[action.id];
+        }
+    });
+  '';
+
+}
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index 827da0c8d..315fc4706 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -16,6 +16,7 @@ in {
     ./zsh-user.nix
     ./tools/core.nix
     ./tools/core-gui.nix
+    ./gui/automatic-diskmount.nix
   ];
 
   users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];