thinkpad configuration finalization

1 files changed, 9 insertions, 20 deletions

diff --git a/os/srv/files.nix b/os/srv/files.nix
index b4130b0..875a825 100644
--- a/os/srv/files.nix
+++ b/os/srv/files.nix
@@ -9,16 +9,11 @@ let
 in
 {
   options.os.srv.files = {
-    thunar.enable = lib.mkEnableOption "enables the thunar file manager";
+    enable = lib.mkEnableOption "enables general file management stuff";
     krusader.enable = lib.mkEnableOption "enables krusader for easier file moving using ssh";
-    utils.enable = lib.mkEnableOption "enables compression and trash utilities";
   };
   config = lib.mkMerge [
     {
-      os.srv.files.utils.enable = lib.mkDefault cfg.thunar.enable;
-    }
-
-    (lib.mkIf cfg.thunar.enable {
       programs.thunar = {
         enable = true;
         plugins = with pkgs; [
@@ -28,10 +23,15 @@ in
       };
       services = {
         tumbler.enable = true;
-        gnome.gnome-keyring.enable = true;
+        gvfs.enable = true;
       };
-      environment.systemPackages = with pkgs; [ file-roller ];
-    })
+      environment.systemPackages = with pkgs; [
+        file-roller
+        gdu
+        pxz
+        pigz
+      ];
+    }
 
     (lib.mkIf cfg.krusader.enable {
       environment.systemPackages = with pkgs; [
@@ -39,16 +39,5 @@ in
         kdePackages.kio-extras
       ];
     })
-
-    (lib.mkIf cfg.utils.enable {
-      services.gvfs.enable = true;
-
-      environment.systemPackages = with pkgs; [
-        trashy
-        gdu
-        pxz
-        pigz
-      ];
-    })
   ];
 }