ma gui: pull out stuff which is not related to gnome

2 files changed, 41 insertions, 37 deletions

diff --git a/2configs/gui/not-gnome.nix b/2configs/gui/not-gnome.nix
new file mode 100644
index 000000000..2e22c66cd
--- /dev/null
+++ b/2configs/gui/not-gnome.nix
@@ -0,0 +1,40 @@
+{ pkgs, ... }:
+{
+    # not used with gnome:
+     services.network-manager-applet.enable = true;
+     systemd.user.services.network-manager-applet.Service.Environment = ''XDG_DATA_DIRS=/run/current-system/sw/share:${pkgs.networkmanagerapplet}/share GDK_PIXBUF_MODULE_FILE=${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'';
+    services.blueman-applet.enable = true;
+    services.pasystray.enable = true;
+
+    services.flameshot.enable = true;
+    systemd.user.services.flameshot.Service.Environment = lib.mkForce [
+      "IMGUR_CREATE_URL=https://p.krebsco.de/image"
+      "IMGUR_DELETE_URL=https://p.krebsco.de/image/delete/%%1"
+      "PATH=${config.home-manager.users.makefu.home.profileDirectory}/bin"
+    ];
+
+    home.file.".config/Dharkael/flameshot.ini".text = ''
+      [General]
+      disabledTrayIcon=false
+      drawColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\xff\xff\0\0)
+      drawThickness=0
+      filenamePattern=%F_%T_shot
+    '';
+    systemd.user.services.clipit = {
+      Unit = {
+        Description = "clipboard manager";
+        After = [ "graphical-session-pre.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        Environment = ''XDG_DATA_DIRS=/run/current-system/sw/share:${pkgs.clipit}/share GDK_PIXBUF_MODULE_FILE=${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'';
+        ExecStart = "${pkgs.clipit}/bin/clipit";
+        Restart = "on-abort";
+      };
+    };
+}
diff --git a/2configs/home-manager/desktop.nix b/2configs/home-manager/desktop.nix
index cca15468c..7442ab618 100644
--- a/2configs/home-manager/desktop.nix
+++ b/2configs/home-manager/desktop.nix
@@ -4,29 +4,12 @@
 
   users.users.makefu.packages = with pkgs;[ bat direnv clipit ];
   home-manager.users.makefu = {
-    systemd.user.services.flameshot.Service.Environment = lib.mkForce [
-      "IMGUR_CREATE_URL=https://p.krebsco.de/image"
-      "IMGUR_DELETE_URL=https://p.krebsco.de/image/delete/%%1"
-      "PATH=${config.home-manager.users.makefu.home.profileDirectory}/bin"
-    ];
-    systemd.user.services.network-manager-applet.Service.Environment = ''XDG_DATA_DIRS=/run/current-system/sw/share:${pkgs.networkmanagerapplet}/share GDK_PIXBUF_MODULE_FILE=${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'';
-    programs.browserpass = { browsers = [ "firefox" ] ; enable = true; };
+    programs.beets.enable = true;
     programs.firefox = {
       enable = true;
     };
     programs.obs-studio.enable = true;
     xdg.enable = true;
-    services.network-manager-applet.enable = true;
-    services.blueman-applet.enable = true;
-    services.pasystray.enable = true;
-    services.flameshot.enable = true;
-    home.file.".config/Dharkael/flameshot.ini".text = ''
-      [General]
-      disabledTrayIcon=false
-      drawColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\xff\xff\0\0)
-      drawThickness=0
-      filenamePattern=%F_%T_shot
-    '';
 
     programs.chromium = {
       enable = true;
@@ -41,23 +24,4 @@
       ];
     };
 
-    systemd.user.services.clipit = {
-      Unit = {
-        Description = "clipboard manager";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-
-      Service = {
-        Environment = ''XDG_DATA_DIRS=/run/current-system/sw/share:${pkgs.clipit}/share GDK_PIXBUF_MODULE_FILE=${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'';
-        ExecStart = "${pkgs.clipit}/bin/clipit";
-        Restart = "on-abort";
-      };
-    };
-    programs.beets.enable = true;
-  };
 }