This commit is contained in:
joy 2024-11-27 16:14:50 +01:00
parent 3630f4585d
commit 22e412a239
3 changed files with 322 additions and 282 deletions

View file

@ -26,7 +26,7 @@
inherit nixpath; inherit nixpath;
inherit pkgs-stable; inherit pkgs-stable;
}; };
modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops]; modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops stylix.nixosModules.stylix];
}; };
in { in {
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {

View file

@ -14,16 +14,26 @@
@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
:root { :root {
--background: #${config.home-manager.users.${username}.stylix.base16Scheme.base00}; --background: #1d2021;
--secondary: #${config.home-manager.users.${username}.stylix.base16Scheme.base01}; --secondary: #282828;
--foreground: #${config.home-manager.users.${username}.stylix.base16Scheme.base05}; --foreground: #EBDBB2;
--blue-highlight: #${config.home-manager.users.${username}.stylix.base16Scheme.base0D}; --orange-highlight: #fe8019;
--separator: #${config.home-manager.users.${username}.stylix.base16Scheme.base03}; --sound-border: #68217A;
--separator: #665e54;
--toolbar-bgcolor: var(--secondary) !important; --toolbar-bgcolor: var(--secondary) !important;
--tab: var(--background); --tab: var(--background);
--tab-btn: var(--tab-inactive);
--tab-inactive: var(--secondary); --tab-inactive: var(--secondary);
--tab-hover: #${config.home-manager.users.${username}.stylix.base16Scheme.base02}; --tab-btn-inactive: var(--tab-inactive);
--url-bar: #${config.home-manager.users.${username}.stylix.base16Scheme.base01}; --tab-hover: #32302f;
--tab-btn-hover: #3C3836;
--toolbar-btn-hover: #49463f;
--url-bar: #3C3836; /* Updated color */
--url-focus: #3C3836;
--url-bar-item-hover: #6a6257;
--sidebar: #3C3836;
--sidebar-button-hover: #5A544B;
--sidebar-highlight: #458588;
} }
.titlebar-buttonbox-container { .titlebar-buttonbox-container {
@ -36,17 +46,17 @@
#PopupAutoComplete, #PopupAutoComplete,
#PopupSearchAutoComplete { #PopupSearchAutoComplete {
background-color: var(--url-bar) !important; background-color: var(--url-focus) !important;
color: var(--foreground) !important; color: var(--foreground) !important;
} }
panelview { panelview {
background-color: var(--secondary) !important; background-color: var(--sidebar) !important;
color: var(--foreground) !important; color: var(--foreground) !important;
} }
panel[type="autocomplete-richlistbox"] { panel[type="autocomplete-richlistbox"] {
background-color: transparent !important; --panel-background: none !important;
border-radius: 4px !important; border-radius: 4px !important;
color: var(--foreground) !important; color: var(--foreground) !important;
} }
@ -76,6 +86,14 @@
border: none !important; border: none !important;
} }
#navigator-toolbox {
--tabs-border-color: var(--orange-highlight) !important;
}
#navigator-toolbox::after {
border-bottom: 0px !important;
}
#navigator-toolbox { #navigator-toolbox {
border: none !important; border: none !important;
} }
@ -87,6 +105,7 @@
border-radius: 4px; border-radius: 4px;
color: var(--foreground) !important; color: var(--foreground) !important;
background-color: var(--url-bar) !important; background-color: var(--url-bar) !important;
--autocomplete-popup-separator-color: var(--separator) !important;
} }
#urlbar-input, #urlbar-input,
@ -97,7 +116,7 @@
#urlbar:not([open]) #urlbar-input-container:focus-within, #urlbar:not([open]) #urlbar-input-container:focus-within,
#searchbar:focus-within { #searchbar:focus-within {
border: 2px solid var(--blue-highlight) !important; border: 2px solid var(--orange-highlight) !important;
} }
#urlbar:focus-within, #urlbar:focus-within,
@ -106,8 +125,15 @@
#urlbar[open] #urlbar-input, #urlbar[open] #urlbar-input,
#urlbar-input-container:focus-within, #urlbar-input-container:focus-within,
#urlbar-input:focus, #urlbar-input:focus,
#urlbar-background,
.urlbarView,
#searchbar:focus-within,
menupop { menupop {
background-color: var(--url-bar) !important; background-color: var(--url-focus) !important;
}
#searchbar:focus-within {
outline: none !important;
} }
:is(panel, menupopup)::part(content) { :is(panel, menupopup)::part(content) {
@ -118,11 +144,11 @@
#searchbar button:hover, #searchbar button:hover,
.urlbarView-row:hover .urlbarView-row-inner, .urlbarView-row:hover .urlbarView-row-inner,
.search-autocomplete-richlistbox-popup .autocomplete-richlistitem:hover { .search-autocomplete-richlistbox-popup .autocomplete-richlistitem:hover {
background-color :var(--blue-highlight)!important; background-color: var(--url-bar-item-hover) !important;
} }
.urlbarView-row[type="switchtab"] > span { .urlbarView-row[type="switchtab"] > span {
color :var(--blue-highlight)!important; color: var(--orange-highlight) !important;
} }
#PopupSearchAutoComplete .autocomplete-richlistitem[selected], #PopupSearchAutoComplete .autocomplete-richlistitem[selected],
@ -132,7 +158,7 @@
.urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner, .urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner,
.urlbarView-row-inner[selected] { .urlbarView-row-inner[selected] {
color: var(--foreground) !important; color: var(--foreground) !important;
background-color :var(--blue-highlight)!important; background-color: var(--sidebar-highlight) !important;
border-radius: 4px !important; border-radius: 4px !important;
} }
@ -150,11 +176,12 @@
} }
.tabbrowser-tab[soundplaying="true"] { .tabbrowser-tab[soundplaying="true"] {
border-bottom-color :var(--blue-highlight)!important; --lwt-tab-line-color: var(--sound-border) !important;
} }
.tab-content[selected="true"] { .tab-content[selected="true"] {
border-color :var(--blue-highlight)!important; border-color: var(--orange-highlight) !important;
--sound-border: var(--orange-highlight) !important;
} }
.tab-text { .tab-text {
@ -190,7 +217,7 @@
.tab-content[selected="true"] { .tab-content[selected="true"] {
background-color: var(--secondary) !important; background-color: var(--secondary) !important;
color: var(--foreground) !important; color: var(--foreground) !important;
border :1px solid var(--blue-highlight)!important; border: 1px solid var(--orange-highlight) !important;
} }
.tab-content:not([selected="true"]):hover { .tab-content:not([selected="true"]):hover {
@ -215,7 +242,7 @@
#alltabs-button:hover > .toolbarbutton-badge-stack, #alltabs-button:hover > .toolbarbutton-badge-stack,
#tabs-newtab-button:hover > .toolbarbutton-icon { #tabs-newtab-button:hover > .toolbarbutton-icon {
background-color :var(--blue-highlight)!important; background-color: var(--tab-btn-hover) !important;
} }
#TabsToolbar #firefox-view-button > .toolbarbutton-icon { #TabsToolbar #firefox-view-button > .toolbarbutton-icon {
@ -227,39 +254,45 @@
background-color: var(--secondary) !important; background-color: var(--secondary) !important;
color: var(--foreground) !important; color: var(--foreground) !important;
padding: 9px !important; padding: 9px !important;
border :1px solid var(--blue-highlight)!important; border: 1px solid var(--orange-highlight) !important;
} }
/* Hover effect for Firefox view button */
#TabsToolbar #firefox-view-button:not([open]):hover > .toolbarbutton-icon { #TabsToolbar #firefox-view-button:not([open]):hover > .toolbarbutton-icon {
background-color: var(--tab-hover) !important; background-color: var(--tab-hover) !important;
} }
/* Nav bar button styles */
#nav-bar toolbarbutton > .toolbarbutton-icon, #nav-bar toolbarbutton > .toolbarbutton-icon,
#nav-bar toolbarbutton > .toolbarbutton-badge-stack { #nav-bar toolbarbutton > .toolbarbutton-badge-stack {
border-radius: 6px; border-radius: 6px;
} }
/* Nav bar button hover effect */
#nav-bar toolbarbutton:hover > .toolbarbutton-icon, #nav-bar toolbarbutton:hover > .toolbarbutton-icon,
#nav-bar toolbarbutton:hover > .toolbarbutton-badge-stack { #nav-bar toolbarbutton:hover > .toolbarbutton-badge-stack {
background-color :var(--blue-highlight)!important; background-color: var(--toolbar-btn-hover) !important;
} }
/* Back button padding */
#back-button { #back-button {
padding-right: 2px !important; padding-right: 2px !important;
padding-left: 2px !important; padding-left: 2px !important;
margin-left: 6px !important; margin-left: 6px !important;
} }
/* Panel UI menu button styles */
#PanelUI-menu-button { #PanelUI-menu-button {
background-color: var(--secondary) !important; background-color: var(--secondary) !important;
padding-right: 2px !important; padding-right: 2px !important;
margin-right: 6px !important; margin-right: 6px !important;
} }
#PersonalToolbar toolbarbutton {
margin: 3px 0px 3px 3px !important;
border-radius: 4px;
}
#PersonalToolbar toolbarbutton:hover {
background-color: var(--toolbar-btn-hover) !important;
}
''; '';
}; };
}; };

View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
inputs,
username, username,
lib, lib,
config, config,
@ -13,18 +12,13 @@ in {
theme.enable = lib.mkEnableOption ""; theme.enable = lib.mkEnableOption "";
}; };
config = lib.mkIf config.theme.enable { config = lib.mkIf config.theme.enable {
home-manager.users.${username} = {
imports = [inputs.stylix.homeManagerModules.stylix];
stylix = { stylix = {
enable = true; enable = true;
polarity = "dark"; polarity = "dark";
targets = { image = pkgs.fetchurl {
rofi.enable = false; url = backgroundUrl;
dunst.enable = false; sha256 = backgroundSha256;
helix.enable = false;
}; };
base16Scheme = { base16Scheme = {
base00 = "282828"; # ---- base00 = "282828"; # ----
base01 = "3c3836"; # --- base01 = "3c3836"; # ---
@ -43,12 +37,6 @@ in {
base0E = "b16286"; # purple base0E = "b16286"; # purple
base0F = "a89984"; # brown base0F = "a89984"; # brown
}; };
image = pkgs.fetchurl {
url = backgroundUrl;
sha256 = backgroundSha256;
};
cursor = { cursor = {
name = "Bibata-Modern-Ice"; name = "Bibata-Modern-Ice";
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
@ -68,7 +56,26 @@ in {
}; };
}; };
}; };
home-manager.users.${username} = {
stylix = {
enable = true;
targets = {
rofi.enable = false;
dunst.enable = false;
helix.enable = false;
};
};
xresources.path = ".config/.Xresources"; xresources.path = ".config/.Xresources";
}; };
home-manager.users.root = {
stylix = {
enable = true;
targets = {
rofi.enable = false;
dunst.enable = false;
helix.enable = false;
};
};
};
}; };
} }