The big variable overhaul

This commit is contained in:
Jimbo 2024-09-23 16:22:01 -04:00
parent 3f0a235dc8
commit 6dab8fc029
36 changed files with 269 additions and 326 deletions

View file

@ -1,23 +1,19 @@
{
{outputs, ...}: {
# Enable a terminal emulator
programs.foot = {
enable = true;
server.enable = false;
settings = {
main = let
fonts = import ../common/fonts.nix;
in {
main = {
term = "xterm-256color";
font = "${fonts.nerd}:size=14.7";
font = "${outputs.look.fonts.nerd}:size=14.7";
};
cursor = {
style = "beam";
};
colors = let
colors = import ../common/colors.nix;
in {
colors = {
alpha = "0.65";
background = "${colors.dark}";
background = "${outputs.look.colors.dark}";
regular0 = "3f3f3f";
regular1 = "cc0000";
regular2 = "4e9a06";

View file

@ -1,11 +1,9 @@
{pkgs, ...}: {
{pkgs, outputs, ...}: {
# Define GTK theme settings
gtk = {
enable = true;
font = let
fonts = import ../common/fonts.nix;
in {
name = "${fonts.main}";
font = {
name = "${outputs.look.fonts.main}";
size = 11;
};
theme = {

View file

@ -1,34 +1,30 @@
{pkgs, config, ...}: let
# Import variables
colors = import ../common/colors.nix;
fonts = import ../common/fonts.nix;
{pkgs, config, outputs, ...}: let
# FireFox colors
themeJim = ''
:root {
--tab-active-bg-color: #${colors.prime};
--tab-hover-bg-color: #${colors.accent};
--tab-inactive-bg-color: #${colors.dark};
--tab-active-bg-color: #${outputs.look.colors.prime};
--tab-hover-bg-color: #${outputs.look.colors.accent};
--tab-inactive-bg-color: #${outputs.look.colors.dark};
--tab-active-fg-fallback-color: #FFFFFF;
--tab-inactive-fg-fallback-color: #${colors.text};
--urlbar-focused-bg-color: #${colors.dark};
--urlbar-not-focused-bg-color: #${colors.dark};
--toolbar-bgcolor: #${colors.dark} !important;
--tab-inactive-fg-fallback-color: #${outputs.look.colors.text};
--urlbar-focused-bg-color: #${outputs.look.colors.dark};
--urlbar-not-focused-bg-color: #${outputs.look.colors.dark};
--toolbar-bgcolor: #${outputs.look.colors.dark} !important;
'';
themeAlt = ''
:root {
--tab-active-bg-color: #${colors.dark};
--tab-hover-bg-color: #${colors.accent};
--tab-inactive-bg-color: #${colors.prime};
--tab-active-fg-fallback-color: #${colors.text};
--tab-active-bg-color: #${outputs.look.colors.dark};
--tab-hover-bg-color: #${outputs.look.colors.accent};
--tab-inactive-bg-color: #${outputs.look.colors.prime};
--tab-active-fg-fallback-color: #${outputs.look.colors.text};
--tab-inactive-fg-fallback-color: #FFFFFF;
--urlbar-focused-bg-color: #${colors.prime};
--urlbar-not-focused-bg-color: #${colors.prime};
--toolbar-bgcolor: #${colors.prime} !important;
--urlbar-focused-bg-color: #${outputs.look.colors.prime};
--urlbar-not-focused-bg-color: #${outputs.look.colors.prime};
--toolbar-bgcolor: #${outputs.look.colors.prime} !important;
'';
quteFoxCSS = ''
--tab-font: '${fonts.main}';
--urlbar-font: '${fonts.main}';
--tab-font: '${outputs.look.fonts.main}';
--urlbar-font: '${outputs.look.fonts.main}';
/* try increasing if you encounter problems */
--urlbar-height-setting: 24px;
@ -339,9 +335,9 @@ in {
};
};
commonSettings = {
"font.name.serif.x-western" = "${fonts.main}";
"font.name.sans-serif.x-western" = "${fonts.main}";
"font.name.monospace.x-western" = "${fonts.nerd}";
"font.name.serif.x-western" = "${outputs.look.fonts.main}";
"font.name.sans-serif.x-western" = "${outputs.look.fonts.main}";
"font.name.monospace.x-western" = "${outputs.look.fonts.nerd}";
"general.autoScroll" = true;
"browser.compactmode.show" = true;
"browser.uidensity" = 1;

View file

@ -1,16 +1,12 @@
{pkgs, config, ...}: {
{pkgs, config, outputs, ...}: {
# Enable Rofi
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
terminal = "foot";
font = let
fonts = import ../common/fonts.nix;
in "${fonts.main} 14";
font = "${outputs.look.fonts.main} 14";
theme = let
inherit (config.lib.formats.rasi) mkLiteral;
border = import ../common/border.nix;
colors = import ../common/colors.nix;
in {
"*" = {
lightbg = mkLiteral "#EEE8D5";
@ -19,24 +15,24 @@
red = mkLiteral "#DC322F";
background-color = mkLiteral "#00000000";
separatorcolor = mkLiteral "#00000000";
normal-foreground = mkLiteral "#${colors.text}";
normal-background = mkLiteral "#${colors.dark}1A";
urgent-foreground = mkLiteral "#${colors.urgent}";
active-foreground = mkLiteral "#${colors.split}";
selected-active-foreground = mkLiteral "#${colors.prime}";
background = mkLiteral "#${colors.dark}B3";
bordercolor = mkLiteral "#${colors.prime}";
normal-foreground = mkLiteral "#${outputs.look.colors.text}";
normal-background = mkLiteral "#${outputs.look.colors.dark}1A";
urgent-foreground = mkLiteral "#${outputs.look.colors.urgent}";
active-foreground = mkLiteral "#${outputs.look.colors.split}";
selected-active-foreground = mkLiteral "#${outputs.look.colors.prime}";
background = mkLiteral "#${outputs.look.colors.dark}B3";
bordercolor = mkLiteral "#${outputs.look.colors.prime}";
selected-normal-foreground = mkLiteral "#FFFFFF";
selected-normal-background = mkLiteral "#${colors.prime}80";
border-color = mkLiteral "#${colors.prime}";
urgent-background = mkLiteral "#${colors.accent}26";
active-background = mkLiteral "#${colors.accent}26";
selected-active-background = mkLiteral "#${colors.split}54";
selected-normal-background = mkLiteral "#${outputs.look.colors.prime}80";
border-color = mkLiteral "#${outputs.look.colors.prime}";
urgent-background = mkLiteral "#${outputs.look.colors.accent}26";
active-background = mkLiteral "#${outputs.look.colors.accent}26";
selected-active-background = mkLiteral "#${outputs.look.colors.split}54";
};
"#window" = {
background-color = mkLiteral "@background";
width = 500;
border = mkLiteral "${border.weight}";
border = mkLiteral "${outputs.look.border.string}";
padding = 5;
};
"#message" = {
@ -161,13 +157,13 @@
case $RET in
Default) swaymsg reload ;;
Wide) swaymsg "
output ${displays.d1} enable pos 1680 0 mode 1680x1050@59.954Hz
output ${displays.d2} enable pos 0 0 mode 1680x1050@59.954Hz
output ${displays.d3} enable pos 3360 0 transform 0
output ${outputs.displays.d1} enable pos 1680 0 mode 1680x1050@59.954Hz
output ${outputs.displays.d2} enable pos 0 0 mode 1680x1050@59.954Hz
output ${outputs.displays.d3} enable pos 3360 0 transform 0
";;
GPU2) swaymsg "
output ${displays.d2} enable pos 1680 0 mode 1920x1080@60Hz
output ${displays.d3} enable pos 0 0 transform 0
output ${outputs.displays.d2} enable pos 1680 0 mode 1920x1080@60Hz
output ${outputs.displays.d3} enable pos 0 0 transform 0
";;
esac
}