From b75f5c82c0a3885bbb9b37659b572c797c0b3f51 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Sun, 27 Dec 2020 10:16:20 +0300
Subject: [PATCH] Gnome3 refactor stuff

---
 modules/applications/yt-utilities.nix |  2 +-
 modules/workspace/gnome3.nix          |  5 ---
 modules/workspace/gtk.nix             | 51 ++++++++++++++++-----------
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/modules/applications/yt-utilities.nix b/modules/applications/yt-utilities.nix
index 07d279e..bca926f 100644
--- a/modules/applications/yt-utilities.nix
+++ b/modules/applications/yt-utilities.nix
@@ -4,7 +4,7 @@
       yt-token = config.secrets.yt-utilities.token;
       user = config.secrets.yt-utilities.user;
       from = {
-        org = "/home/balsoft/cloud/Google Drive/serokell.org";
+        org = "/home/balsoft/Documents/serokell.org";
         full-file = true;
       };
       since = "1997-11-19";
diff --git a/modules/workspace/gnome3.nix b/modules/workspace/gnome3.nix
index a4dfa1e..307bca4 100644
--- a/modules/workspace/gnome3.nix
+++ b/modules/workspace/gnome3.nix
@@ -10,11 +10,6 @@
   };
   services.gvfs.enable = true;
   home-manager.users.balsoft = {
-    xdg.configFile."gtk-3.0/bookmarks".text = builtins.concatStringsSep "\n" ([
-      "file:///home/balsoft/projects Projects"
-      "davs://nextcloud.balsoft.ru/remote.php/dav/files/balsoft nextcloud.balsoft.ru"
-    ] ++ map (machine: "sftp://${machine}/home/balsoft ${machine}")
-      (builtins.attrNames config.devices));
     xdg.userDirs.enable = true;
   };
 }
diff --git a/modules/workspace/gtk.nix b/modules/workspace/gtk.nix
index 151a426..669e7f5 100644
--- a/modules/workspace/gtk.nix
+++ b/modules/workspace/gtk.nix
@@ -27,23 +27,25 @@ let
     '';
   };
 in {
-  nixpkgs.overlays = [(self: super: {
-    generated-gtk-theme = self.stdenv.mkDerivation rec {
-      name = "generated-gtk-theme";
-      src = inputs.materia-theme;
-      buildInputs = with self; [ sassc bc which inkscape optipng ];
-      installPhase = ''
-        HOME=/build
-        chmod 777 -R .
-        patchShebangs .
-        mkdir -p $out/share/themes
-        substituteInPlace change_color.sh --replace "\$HOME/.themes" "$out/share/themes"
-        echo "Changing colours:"
-        ./change_color.sh -o Generated ${materia_colors}
-        chmod 555 -R .
-      '';
-    };
-  })];
+  nixpkgs.overlays = [
+    (self: super: {
+      generated-gtk-theme = self.stdenv.mkDerivation rec {
+        name = "generated-gtk-theme";
+        src = inputs.materia-theme;
+        buildInputs = with self; [ sassc bc which inkscape optipng ];
+        installPhase = ''
+          HOME=/build
+          chmod 777 -R .
+          patchShebangs .
+          mkdir -p $out/share/themes
+          substituteInPlace change_color.sh --replace "\$HOME/.themes" "$out/share/themes"
+          echo "Changing colours:"
+          ./change_color.sh -o Generated ${materia_colors}
+          chmod 555 -R .
+        '';
+      };
+    })
+  ];
   services.dbus.packages = with pkgs; [ gnome3.dconf ];
   home-manager.users.balsoft = {
     gtk = {
@@ -56,10 +58,19 @@ in {
         name = "Generated";
         package = pkgs.generated-gtk-theme;
       };
-      font = {
-        name = "IBM Plex 12";
+      font = { name = "IBM Plex 12"; };
+      gtk3 = {
+        bookmarks = [
+          "file:///home/balsoft/projects Projects"
+          "davs://nextcloud.balsoft.ru/remote.php/dav/files/balsoft nextcloud.balsoft.ru"
+          "sftp://balsoft.ru/home/balsoft balsoft.ru"
+        ] ++ map (machine: "sftp://${machine}/home/balsoft ${machine}")
+          (builtins.attrNames config.devices);
+        extraConfig = {
+          gtk-cursor-theme-name = "breeze";
+        };
       };
-      gtk3.extraConfig.gtk-cursor-theme-name = "breeze";
+
     };
     home.sessionVariables.GTK_THEME = "Generated";
   };