Gnome3 refactor stuff

This commit is contained in:
Alexander Bantyev 2020-12-27 10:16:20 +03:00
parent 63dfc72aa6
commit b75f5c82c0
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
3 changed files with 32 additions and 26 deletions

View File

@ -4,7 +4,7 @@
yt-token = config.secrets.yt-utilities.token; yt-token = config.secrets.yt-utilities.token;
user = config.secrets.yt-utilities.user; user = config.secrets.yt-utilities.user;
from = { from = {
org = "/home/balsoft/cloud/Google Drive/serokell.org"; org = "/home/balsoft/Documents/serokell.org";
full-file = true; full-file = true;
}; };
since = "1997-11-19"; since = "1997-11-19";

View File

@ -10,11 +10,6 @@
}; };
services.gvfs.enable = true; services.gvfs.enable = true;
home-manager.users.balsoft = { 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; xdg.userDirs.enable = true;
}; };
} }

View File

@ -27,23 +27,25 @@ let
''; '';
}; };
in { in {
nixpkgs.overlays = [(self: super: { nixpkgs.overlays = [
generated-gtk-theme = self.stdenv.mkDerivation rec { (self: super: {
name = "generated-gtk-theme"; generated-gtk-theme = self.stdenv.mkDerivation rec {
src = inputs.materia-theme; name = "generated-gtk-theme";
buildInputs = with self; [ sassc bc which inkscape optipng ]; src = inputs.materia-theme;
installPhase = '' buildInputs = with self; [ sassc bc which inkscape optipng ];
HOME=/build installPhase = ''
chmod 777 -R . HOME=/build
patchShebangs . chmod 777 -R .
mkdir -p $out/share/themes patchShebangs .
substituteInPlace change_color.sh --replace "\$HOME/.themes" "$out/share/themes" mkdir -p $out/share/themes
echo "Changing colours:" substituteInPlace change_color.sh --replace "\$HOME/.themes" "$out/share/themes"
./change_color.sh -o Generated ${materia_colors} echo "Changing colours:"
chmod 555 -R . ./change_color.sh -o Generated ${materia_colors}
''; chmod 555 -R .
}; '';
})]; };
})
];
services.dbus.packages = with pkgs; [ gnome3.dconf ]; services.dbus.packages = with pkgs; [ gnome3.dconf ];
home-manager.users.balsoft = { home-manager.users.balsoft = {
gtk = { gtk = {
@ -56,10 +58,19 @@ in {
name = "Generated"; name = "Generated";
package = pkgs.generated-gtk-theme; package = pkgs.generated-gtk-theme;
}; };
font = { font = { name = "IBM Plex 12"; };
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"; home.sessionVariables.GTK_THEME = "Generated";
}; };