Merge remote-tracking branch 'gum/22.05'

4 files changed, 5 insertions, 6 deletions

diff --git a/makefu/2configs/tools/consoles.nix b/makefu/2configs/tools/consoles.nix
index f213a9b0e..427ea38a9 100644
--- a/makefu/2configs/tools/consoles.nix
+++ b/makefu/2configs/tools/consoles.nix
@@ -17,6 +17,6 @@
     nsrenamer
     ns-usbloader
     sfo
-    exfatprogs exfat-utils exfat
+    exfatprogs exfat
   ];
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 65393264f..57c8c96f1 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -2,7 +2,7 @@
 
 {
   users.users.makefu.packages = with pkgs; [
-    at_spi2_core
+    at-spi2-core
     chromium
     feh
     clipit
@@ -12,7 +12,7 @@
     evince
     # replacement for mirage:
     sxiv
-    gnome3.dconf
+    dconf
     xdotool
     xorg.xbacklight
     scrot
diff --git a/makefu/2configs/tools/pcmanfm-extra.nix b/makefu/2configs/tools/pcmanfm-extra.nix
index f28f9a91a..4e8246a42 100644
--- a/makefu/2configs/tools/pcmanfm-extra.nix
+++ b/makefu/2configs/tools/pcmanfm-extra.nix
@@ -3,9 +3,8 @@
   users.users.makefu.packages = with pkgs; [
     pcmanfm
     lxqt.lxqt-policykit
-    shared_mime_info
+    shared-mime-info
     lxmenu-data
   ];
-  environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
   services.gvfs.enable = true;
 }
diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index 0998a695e..2786be408 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -8,7 +8,7 @@
     obs-studio
     studio-link
     audacity
-    darkice
+    #darkice
     # owncloudclient
     (pkgs.writeScriptBin "prepare-pulseaudio" ''
       pactl load-module module-null-sink sink_name=stream sink_properties=device.description="Streaming"