From 36e92813977fd8042f71df873931cb9d100bc633 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:09:33 +0200 Subject: [PATCH] Update --- home/programs/thunar/default.nix | 45 +++++++++++ home/system/gtk/default.nix | 135 ++++++++++++++++++++++++++++++- home/system/mime/default.nix | 16 ++++ hosts/laptop/home.nix | 2 +- 4 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 home/programs/thunar/default.nix diff --git a/home/programs/thunar/default.nix b/home/programs/thunar/default.nix new file mode 100644 index 0000000..350d7d7 --- /dev/null +++ b/home/programs/thunar/default.nix @@ -0,0 +1,45 @@ +{ pkgs, ... }: { + # ctrl + m to toggle the menubar + home.packages = with pkgs.xfce; [ + thunar + xfconf + tumbler + thunar-archive-plugin + thunar-volman + ]; + + home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = '' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ''; +} diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix index 8d008c2..a27f643 100644 --- a/home/system/gtk/default.nix +++ b/home/system/gtk/default.nix @@ -1,4 +1,28 @@ -{ pkgs, ... }: { +{ config, pkgs, lib, ... }: +let + accent = "#${config.lib.stylix.colors.base0D}"; + foreground = "#${config.lib.stylix.colors.base05}"; + background = "#${config.lib.stylix.colors.base00}"; + background-alt = "#${config.lib.stylix.colors.base01}"; + + c0 = "#${config.lib.stylix.colors.base00}"; + c1 = "#${config.lib.stylix.colors.base08}"; + c2 = "#${config.lib.stylix.colors.base0B}"; + c3 = "#${config.lib.stylix.colors.base0A}"; + c4 = "#${config.lib.stylix.colors.base0D}"; + c5 = "#${config.lib.stylix.colors.base0E}"; + c6 = "#${config.lib.stylix.colors.base0C}"; + c7 = "#${config.lib.stylix.colors.base05}"; + c8 = "#${config.lib.stylix.colors.base03}"; + c9 = "#${config.lib.stylix.colors.base08}"; + c10 = "#${config.lib.stylix.colors.base0B}"; + c11 = "#${config.lib.stylix.colors.base0A}"; + c12 = "#${config.lib.stylix.colors.base0D}"; + c13 = "#${config.lib.stylix.colors.base0E}"; + c14 = "#${config.lib.stylix.colors.base0C}"; + c15 = "#${config.lib.stylix.colors.base07}"; + +in { qt = { enable = true; @@ -8,9 +32,118 @@ gtk = { enable = true; + + theme = lib.mkForce { name = "FlatColor"; }; + iconTheme = { package = pkgs.kora-icon-theme; name = "Kora"; }; + + font = { name = config.stylix.fonts.serif.name; }; + + gtk3.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme=1 + ''; + }; + + gtk4.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme=1 + ''; + }; + }; + + home.file = { + ".local/share/themes/FlatColor" = { + recursive = true; + source = pkgs.stdenv.mkDerivation { + name = "FlatColor"; + + src = pkgs.fetchFromGitHub { + owner = "jasperro"; + repo = "FlatColor"; + rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074"; + hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18="; + }; + + buildPhase = '' + mkdir -p $out + # delete the default gtk-color-scheme: + file="./gtk-2.0/gtkrc" + sed -i '3,29d' $file + sed -i '3i include "../colors2"' $file + + file="./gtk-3.0/gtk.css" + sed -i '2,10d' $file + sed -i '2i @import url("../colors3");' $file + + file="./gtk-3.20/gtk.css" + sed -i '2,26d' $file + sed -i '2i @import url("../colors3");' $file + + cp -r . $out + ''; + }; + }; + + ".local/share/themes/FlatColor/colors2".text = '' + bg_color:${background} + color0:${c0} + color1:${c1} + color2:${c2} + color3:${c3} + color4:${c4} + color5:${c5} + color6:${c6} + color7:${c7} + color8:${c8} + color9:${c9} + color10:${c10} + color11:${c11} + color12:${c12} + color13:${c13} + color14:${c14} + color15:${c15} + text_color:${foreground} + selected_bg_color:${accent} + selected_fg_color:${foreground} + tooltip_bg_color:${background-alt} + tooltip_fg_color:${foreground} + titlebar_bg_color:${background} + titlebar_fg_color:${foreground} + menu_bg_color:${background-alt} + menu_fg_color:${foreground} + link_color:${accent} + ''; + + ".local/share/themes/FlatColor/colors3".text = '' + @define-color color0 ${c0}; + @define-color color1 ${c1}; + @define-color color2 ${c2}; + @define-color color3 ${c3}; + @define-color color4 ${c4}; + @define-color color5 ${c5}; + @define-color color6 ${c6}; + @define-color color7 ${c7}; + @define-color color8 ${c8}; + @define-color color9 ${c9}; + @define-color color10 ${c10}; + @define-color color11 ${c11}; + @define-color color12 ${c12}; + @define-color color13 ${c13}; + @define-color color14 ${c14}; + @define-color color15 ${c15}; + @define-color selected_bg_color ${accent}; + @define-color selected_fg_color ${foreground}; + @define-color bg_color ${background}; + @define-color fg_color ${foreground}; + @define-color base_color @bg_color; + @define-color text_color @fg_color; + @define-color text_color_disabled mix(@text_color, @base_color, 0.4); + @define-color tooltip_bg_color ${background-alt}; + @define-color tooltip_fg_color ${foreground}; + ''; }; } diff --git a/home/system/mime/default.nix b/home/system/mime/default.nix index 9da8e97..7248d0c 100644 --- a/home/system/mime/default.nix +++ b/home/system/mime/default.nix @@ -4,8 +4,24 @@ defaultApplications = { "text/markdown" = "nvim.desktop"; "text/plain" = "nvim.desktop"; + "text/x-shellscript" = "nvim.desktop"; + "text/x-python" = "nvim.desktop"; + "text/x-go" = "nvim.desktop"; + "text/css" = "nvim.desktop"; + "text/javascript" = "nvim.desktop"; + "text/x-c" = "nvim.desktop"; + "text/x-c++" = "nvim.desktop"; + "text/x-java" = "nvim.desktop"; + "text/x-rust" = "nvim.desktop"; + "text/x-yaml" = "nvim.desktop"; + "text/x-toml" = "nvim.desktop"; + "text/x-dockerfile" = "nvim.desktop"; + "text/x-xml" = "nvim.desktop"; + "text/x-php" = "nvim.desktop"; "image/png" = "imv.desktop"; "image/jpeg" = "imv.desktop"; + "image/jpg" = "imv.desktop"; + "image/webp" = "imv.desktop"; "image/gif" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 15f1b61..2fa7354 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -14,6 +14,7 @@ ../../home/programs/nextcloud ../../home/programs/yazi ../../home/programs/markdown + ../../home/programs/thunar # Scripts ../../home/scripts # All scripts @@ -42,7 +43,6 @@ packages = with pkgs; [ # Apps discord - xfce.thunar bitwarden vlc