From 53376afaf1ee4eb5d8e0ffb1ace1ee8f48c71235 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 3 Mar 2024 14:20:46 +0300 Subject: 2024-03-03 --- modules/common/common/stylix.nix | 2 +- modules/common/emacs/doom/config.el | 2 +- modules/nixos/firefox/default.nix | 31 ++++++---- modules/nixos/firefox/userChrome.css | 106 +++++++++++------------------------ modules/nixos/thunderbird.nix | 18 ++++-- 5 files changed, 69 insertions(+), 90 deletions(-) diff --git a/modules/common/common/stylix.nix b/modules/common/common/stylix.nix index 46b1f52..27a9e35 100644 --- a/modules/common/common/stylix.nix +++ b/modules/common/common/stylix.nix @@ -33,7 +33,7 @@ with lib; { sha256 = "sha256-qWv52oT8cF9K4ZoeawmR3jgoGB2ARfjbKKc12IljUcM="; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/default-dark.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/default-light.yaml"; fonts = { serif = { diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el index 9e3d603..3b771ad 100644 --- a/modules/common/emacs/doom/config.el +++ b/modules/common/emacs/doom/config.el @@ -17,7 +17,7 @@ ;;; Doom-specific ;; -(setq doom-theme 'modus-vivendi +(setq doom-theme 'modus-operandi doom-modeline-icon nil doom-modeline-indent-info t doom-modeline-total-line-number t diff --git a/modules/nixos/firefox/default.nix b/modules/nixos/firefox/default.nix index d192ae1..6d1b31b 100644 --- a/modules/nixos/firefox/default.nix +++ b/modules/nixos/firefox/default.nix @@ -37,6 +37,7 @@ in { profiles.default = let mkCssWithRoot = css: mkMerge [ + # https://github.com/tinted-theming/base24/blob/master/styling.md (with config.colors.withHashtag; '' :root { --black: ${base01}; @@ -56,17 +57,23 @@ in { --bright-cyan: ${base15}; --bright-white: ${base07}; --background: ${base00}; - --foreground: ${base02}; - '') - (with config.stylix.fonts; '' - --sans-serif-font-family: "${sansSerif.name}", sans-serif; - --sans-serif-font-size: ${toString sizes.applications}; - --serif-font-family: "${serif.name}", serif; - --serif-font-size: ${toString sizes.applications}; - --monospace-font-family: "${monospace.name}", monospace; - --monospace-font-size: ${toString sizes.applications}; - } + --foreground: ${base05}; '') + ( + let + mapFonts = concatMapStringsSep ", " (font: ''"${font}"''); + size = toString config.stylix.fonts.sizes.applications; + in + with config.fonts.fontconfig.defaultFonts; '' + --serif-font-family: ${mapFonts serif}, serif; + --serif-font-size: ${size}; + --sans-serif-font-family: ${mapFonts sansSerif}, sans-serif; + --sans-serif-font-size: ${size}; + --monospace-font-family: ${mapFonts monospace}, monospace; + --monospace-font-size: ${size}; + } + '' + ) (builtins.readFile css) ]; in { @@ -565,6 +572,7 @@ in { "browser.disableResetPrompt" = true; "browser.download.autohideButton" = false; "browser.newtabpage.introShown" = true; + "browser.newtabpage.pinned" = ""; "browser.onboarding.enabled" = false; "browser.open.lastDir" = config.my.home; "browser.protections_panel.infoMessage.seen" = true; @@ -575,7 +583,8 @@ in { "browser.tabs.closeWindowWithLastTab" = true; "browser.tabs.firefox-view" = false; "browser.tabs.firefox-view-next" = false; - "browser.tabs.inTitlebar" = 1; + "browser.tabs.inTitlebar" = 0; + "browser.tabs.tabmanager.enabled" = false; "browser.tabs.warnOnClose" = false; "browser.tabs.warnOnCloseOtherTabs" = false; "browser.tabs.warnOnOpen" = false; diff --git a/modules/nixos/firefox/userChrome.css b/modules/nixos/firefox/userChrome.css index 4fd1d3f..80d1f7a 100644 --- a/modules/nixos/firefox/userChrome.css +++ b/modules/nixos/firefox/userChrome.css @@ -1,33 +1,5 @@ -@-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) +@-moz-document url(chrome://browser/content/browser.xhtml) { - /* :root { */ - /* /\* */ - /* * Helper colours. */ - /* *\/ */ - /* --background: var(--black) !important; */ - /* --foreground: var(--white) !important; */ - /* --background-alt: var(--bright-black) !important; */ - /* --foreground-alt: var(--bright-white) !important; */ - - /* /\* */ - /* * Various root values that can be redefined. */ - /* *\/ */ - /* --arrowpanel-border-radius: 0 !important; */ - /* --autocomplete-popup-highlight-background: var(--background) !important; */ - /* --autocomplete-popup-highlight-color: var(--foreground) !important; */ - /* --backbutton-background: transparent !important; */ - /* --backbutton-border-color: transparent !important; */ - /* --tab-block-margin: 0 !important; */ - /* --tab-border-radius: 0 !important; */ - /* --tabs-border-color: transparent !important; */ - /* --tabs-top-border-width: 0 !important; */ - /* --toolbar-field-focus-border-color: var(--background) !important; */ - /* --toolbar-non-lwt-bgcolor: var(--background) !important; */ - /* --toolbar-non-lwt-bgimage: none !important; */ - /* --toolbar-non-lwt-textcolor: var(--foreground) !important; */ - /* --toolbarbutton-border-radius: 0 !important; */ - /* } */ - /* *** * Tabbar @@ -37,15 +9,15 @@ /* * Apply colours and fonts. */ - /* .tabbrowser-tab { */ - /* color: var(--background-alt) !important; */ - /* font-family: var(--sans-serif-font-family) !important; */ - /* font-size: var(--sans-serif-font-size) !important; */ - /* } */ - /* .tabbrowser-tab[visuallyselected="true"] { */ - /* background: var(--background) !important; */ - /* color: var(--foreground) !important; */ - /* } */ + .tabbrowser-tab { + color: var(--background-alt) !important; + font-family: var(--sans-serif-font-family) !important; + font-size: var(--sans-serif-font-size) !important; + } + .tabbrowser-tab[visuallyselected="true"] { + background: var(--background) !important; + color: var(--foreground) !important; + } /* * Not sure why is this shit even exists... @@ -54,6 +26,13 @@ display: none !important; } + /* + * Disable the Firefox View button. + */ + #firefox-view-button { + display: none !important; + } + /* * Disable borders and margins. */ @@ -90,18 +69,18 @@ /* * Fix favicon location. */ - /* .tab-icon-image { */ - /* margin-inline-end: 10px !important; */ - /* margin-top: 0px !important; */ - /* } */ + .tab-icon-image { + margin-inline-end: 10px !important; + margin-top: 0px !important; + } /* * "C-t" exists. */ - /* #tabs-newtab-button, */ - /* #TabsToolbar #new-tab-button { */ - /* display: none !important; */ - /* } */ + #tabs-newtab-button, + #TabsToolbar #new-tab-button { + display: none !important; + } /* * "C-w" exists. @@ -116,16 +95,6 @@ *** */ - /* - * Remove useless buttons. - */ - /* #forward-button, */ - /* #back-button, */ - /* #reload-button, */ - /* #stop-button { */ - /* display: none !important; */ - /* } */ - /* * Remove padding between urlbar and side elements. */ @@ -134,13 +103,13 @@ display: none !important; } - /* #urlbar { */ - /* background: var(--background) !important; */ - /* color: var(--foreground) !important; */ - /* font-family: var(--sans-serif-font-family) !important; */ - /* font-size: var(--sans-serif-font-size) !important; */ - /* border-color: transparent !important; */ - /* } */ + #urlbar { + background: var(--background) !important; + color: var(--foreground) !important; + font-family: var(--sans-serif-font-family) !important; + font-size: var(--sans-serif-font-size) !important; + border-color: transparent !important; + } /* #urlbar:not(:-moz-lwtheme):not([focused="true"]) > #urlbar-background, */ /* #searchbar:not(:-moz-lwtheme):not(:focus-within) { */ @@ -180,8 +149,8 @@ */ /* - * Call indicator that some "designer" decided to make floating and - * impossible to hide. + * Call indicator that some "designer" decided to make floating and impossible + * to hide. */ #webrtcIndicator { display: none !important; @@ -194,13 +163,6 @@ display: none !important; } - /* - * Disable all animations. - */ - /* * { */ - /* transition: none !important; */ - /* } */ - /* * Remove dumb websites that Mozilla is forced to include. */ diff --git a/modules/nixos/thunderbird.nix b/modules/nixos/thunderbird.nix index d8ce4ad..c534271 100644 --- a/modules/nixos/thunderbird.nix +++ b/modules/nixos/thunderbird.nix @@ -20,15 +20,23 @@ in { isDefault = true; withExternalGnupg = true; # https://github.com/HorlogeSkynet/thunderbird-user.js/blob/master/user.js - settings = + settings = with config.colors.withHashtag; config.hm.programs.firefox.profiles.default.settings // { "app.donation.eoy.version.viewed" = 999; - "browser.display.background_color" = config.colors.withHashtag.base00; - "browser.display.background_color.dark" = config.colors.withHashtag.base00; + "browser.display.background_color" = base00; + "browser.display.background_color.dark" = base00; "browser.display.document_color_use" = 2; - "browser.display.foreground_color" = config.colors.withHashtag.base07; - "browser.display.foreground_color.dark" = config.colors.withHashtag.base07; + "browser.display.foreground_color" = base05; + "browser.display.foreground_color.dark" = base05; + "browser.display.use_system_colors" = false; + "editor.background_color" = base00; + "editor.editor.active_link_color" = base16; + "editor.followed_link_color" = base0E; + "editor.link_color" = base0D; + "editor.text_color" = base05; + "editor.use_custom_colors" = true; + "extensions.activeThemeID" = "default-theme@mozilla.org"; "javascript.enabled" = false; "mail.chat.enabled" = false; "mail.cloud_files.enabled" = false; -- cgit 1.4.1