feat: themes module is sick now

This commit is contained in:
Nick 2025-01-18 17:05:54 -06:00
parent a5ec879db0
commit 00cc80e9e4
31 changed files with 460 additions and 48 deletions

1
asdasd.css Normal file

File diff suppressed because one or more lines are too long

View file

@ -100,13 +100,15 @@ let
font = {
name = stringType;
size = {
applications = stringType;
desktop = stringType;
popups = stringType;
terminal = stringType;
applications = intType;
desktop = intType;
popups = intType;
terminal = intType;
};
};
cursor = {
name = stringType;
size = intType;
};
palettes = lib.mkOption {
type = lib.types.attrsOf (
@ -118,6 +120,7 @@ let
}
);
};
};
};
in

View file

@ -1,30 +1,68 @@
let
currentTheme = catppuccin-mocha;
brogrammer = "brogrammer";
catppuccin-frappe = "catppuccin-frappe";
catppuccin-latte = "catppuccin-latte";
catppuccin-macchiato = "catppuccin-macchiato";
catppuccin-mocha = "catppuccin-mocha";
chalk = "chalk";
deep-oceanic-next = "deep-oceanic-next";
dracula = "dracula";
espresso = "espresso";
flat = "flat";
framer = "framer";
github = "github";
hardcore = "hardcore";
one-black = "one-black";
one-dark = "one-dark";
one-light = "one light";
sparky = "sparky";
in
{
themes = {
currentTheme = currentTheme;
cursor = {
name = "";
size = 18;
};
font = {
name = "MonaspiceRn Nerd Font";
size = {
applications = 14;
desktop = 12;
popups = 10;
terminal = 10;
};
};
palettes =
let
palettePath = ./palettes;
catppuccinPath = /catppuccin;
onePath = /one;
in
{
${brogrammer} = import (palettePath + /brogrammer);
${catppuccin-frappe} = import (palettePath + catppuccinPath + /frappe);
${catppuccin-latte} = import (palettePath + catppuccinPath + /latte);
${catppuccin-macchiato} = import (palettePath + catppuccinPath + /macchiato);
${catppuccin-mocha} = import (palettePath + catppuccinPath + /mocha);
${chalk} = import (palettePath + /chalk);
${deep-oceanic-next} = import (palettePath + /deep-oceanic-next);
${dracula} = import (palettePath + /dracula);
${espresso} = import (palettePath + /espresso);
${flat} = import (palettePath + /flat);
${framer} = import (palettePath + /framer);
${github} = import (palettePath + /github);
${hardcore} = import (palettePath + /hardcore);
${one-black} = import (palettePath + onePath + /black);
${one-dark} = import (palettePath + onePath + /dark);
${one-light} = import (palettePath + onePath + /light);
${sparky} = import (palettePath + /sparky);
};
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "131313";
base01 = "1f1f1f";
base02 = "2a3141";
base03 = "343d50";
base04 = "d6dae4";
base05 = "c1c8d7";
base06 = "e3e6ed";
base07 = "ffffff";
base08 = "f71118";
base09 = "ecb90f";
base0A = "0f80d5";
base0B = "2cc55d";
base0C = "0f80d5";
base0D = "2a84d2";
base0E = "4e59b7";
base0F = "7b080c";
base10 = "0a0a0a";
base11 = "020202";
base12 = "de342e";
base13 = "f2bd09";
base14 = "1dd260";
base15 = "289af0";
base16 = "509bdc";
base17 = "524fb9";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "151515";
base01 = "202020";
base02 = "303030";
base03 = "505050";
base04 = "b0b0b0";
base05 = "d0d0d0";
base06 = "e0e0e0";
base07 = "f5f5f5";
base08 = "fa859c";
base09 = "ea9971";
base0A = "ddb26f";
base0B = "a1bb54";
base0C = "10bcad";
base0D = "5ab9ed";
base0E = "db8fea";
base0F = "deaf8f";
base10 = "0b0b0b";
base11 = "060606";
base12 = "fb9fb1";
base13 = "eda987";
base14 = "acc267";
base15 = "12cfc0";
base16 = "6fc2ef";
base17 = "e1a3ee";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "001c1f";
base01 = "002931";
base02 = "003640";
base03 = "004852";
base04 = "0093a3";
base05 = "d4e1e8";
base06 = "e0e9ef";
base07 = "f2f7f9";
base08 = "d3464d";
base09 = "e37552";
base0A = "f3b863";
base0B = "63b784";
base0C = "4fb7ae";
base0D = "568ccf";
base0E = "8b66d6";
base0F = "d0658e";
base10 = "1f2628";
base11 = "2a2f30";
base12 = "ff6670";
base13 = "ffe08a";
base14 = "72e1a6";
base15 = "4de3e3";
base16 = "5caeff";
base17 = "b788ff";
};
}

0
config/themes/palettes/dracula/default.nix Normal file → Executable file
View file

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "262626";
base01 = "343434";
base02 = "535353";
base03 = "797979";
base04 = "a0a09f";
base05 = "c7c7c5";
base06 = "eeeeec";
base07 = "ffffff";
base08 = "d25151";
base09 = "ffc66d";
base0A = "8ab7d9";
base0B = "a5c261";
base0C = "bed6ff";
base0D = "6c99bb";
base0E = "d197d9";
base0F = "692828";
base10 = "373737";
base11 = "1b1b1b";
base12 = "f00c0c";
base13 = "e1e38b";
base14 = "c2e075";
base15 = "dcf3ff";
base16 = "8ab7d9";
base17 = "efb5f7";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "082845";
base01 = "1d2845";
base02 = "2e2e45";
base03 = "444e5b";
base04 = "68717b";
base05 = "8c939a";
base06 = "b0b6ba";
base07 = "e7eced";
base08 = "a82320";
base09 = "e58d11";
base0A = "3c7dd2";
base0B = "2d9440";
base0C = "2c9370";
base0D = "3167ac";
base0E = "781aa0";
base0F = "541110";
base10 = "002240";
base11 = "001629";
base12 = "d4312e";
base13 = "e5be0c";
base14 = "32a548";
base15 = "35b387";
base16 = "3c7dd2";
base17 = "8230a7";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "111111";
base01 = "141414";
base02 = "414141";
base03 = "636363";
base04 = "868686";
base05 = "a9a9a9";
base06 = "cccccc";
base07 = "ffffff";
base08 = "ff5555";
base09 = "ffcc33";
base0A = "33bbff";
base0B = "98ec65";
base0C = "88ddff";
base0D = "00aaff";
base0E = "aa88ff";
base0F = "7f2a2a";
base10 = "2b2b2b";
base11 = "151515";
base12 = "ff8888";
base13 = "ffd966";
base14 = "b6f292";
base15 = "bbecff";
base16 = "33bbff";
base17 = "cebbff";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "f4f4f4";
base01 = "3e3e3e";
base02 = "666666";
base03 = "8c8c8c";
base04 = "b2b2b2";
base05 = "d8d8d8";
base06 = "ffffff";
base07 = "ffffff";
base08 = "970b16";
base09 = "f8eec7";
base0A = "2e6cba";
base0B = "07962a";
base0C = "89d1ec";
base0D = "003e8a";
base0E = "e94691";
base0F = "4b050b";
base10 = "444444";
base11 = "222222";
base12 = "de0000";
base13 = "f1d007";
base14 = "87d5a2";
base15 = "1cfafe";
base16 = "2e6cba";
base17 = "ffa29f";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "111111";
base01 = "141414";
base02 = "414141";
base03 = "636363";
base04 = "868686";
base05 = "a9a9a9";
base06 = "cccccc";
base07 = "ffffff";
base08 = "ff5555";
base09 = "ffcc33";
base0A = "33bbff";
base0B = "98ec65";
base0C = "88ddff";
base0D = "00aaff";
base0E = "aa88ff";
base0F = "7f2a2a";
base10 = "0a0a0a";
base11 = "060606";
base12 = "ff8888";
base13 = "ffd966";
base14 = "b6f292";
base15 = "bbecff";
base16 = "33bbff";
base17 = "cebbff";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "000000";
base01 = "000000";
base02 = "4f5666";
base03 = "545862";
base04 = "9196a1";
base05 = "abb2bf";
base06 = "e6e6e6";
base07 = "ffffff";
base08 = "e05561";
base09 = "d18f52";
base0A = "e6b965";
base0B = "8cc265";
base0C = "42b3c2";
base0D = "4aa5f0";
base0E = "c162de";
base0F = "bf4034";
base10 = "000000";
base11 = "000000";
base12 = "ff616e";
base13 = "f0a45d";
base14 = "a5e075";
base15 = "4cd1e0";
base16 = "4dc4ff";
base17 = "de73ff";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "282c34";
base01 = "3f4451";
base02 = "4f5666";
base03 = "545862";
base04 = "9196a1";
base05 = "abb2bf";
base06 = "e6e6e6";
base07 = "ffffff";
base08 = "e05561";
base09 = "d18f52";
base0A = "e6b965";
base0B = "8cc265";
base0C = "42b3c2";
base0D = "4aa5f0";
base0E = "c162de";
base0F = "bf4034";
base10 = "21252b";
base11 = "181a1f";
base12 = "ff616e";
base13 = "f0a45d";
base14 = "a5e075";
base15 = "4cd1e0";
base16 = "4dc4ff";
base17 = "de73ff";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "e7e7e9";
base01 = "dfdfe1";
base02 = "cacace";
base03 = "a0a1a7";
base04 = "696c77";
base05 = "383a42";
base06 = "202227";
base07 = "090a0b";
base08 = "ca1243";
base09 = "c18401";
base0A = "febb2a";
base0B = "50a14f";
base0C = "0184bc";
base0D = "4078f2";
base0E = "a626a4";
base0F = "986801";
base10 = "f0f0f1";
base11 = "fafafa";
base12 = "ec2258";
base13 = "f4a701";
base14 = "6db76c";
base15 = "01a7ef";
base16 = "709af5";
base17 = "d02fcd";
};
}

View file

@ -0,0 +1,29 @@
{
font = "";
colours = {
base00 = "072B31";
base01 = "00313C";
base02 = "003C46";
base03 = "003B49";
base04 = "00778B";
base05 = "F4F5F0";
base06 = "F5F5F1";
base07 = "FFFFFF";
base08 = "FF585D";
base09 = "FF8F1C";
base0A = "FBDD40";
base0B = "78D64B";
base0C = "2DCCD3";
base0D = "4698CB";
base0E = "D59ED7";
base0F = "9B704D";
base10 = "4B4F54";
base11 = "212322";
base12 = "FF7276";
base13 = "F6EB61";
base14 = "8EDD65";
base15 = "00C1D5";
base16 = "69B3E7";
base17 = "F99FC9";
};
}

View file

@ -13,7 +13,7 @@ let
in
{
global = {
font = "${font.name} 10";
font = "${font.name} ${builtins.toString font.size.popups}";
background = makeColor el.base01;
frame_color = makeColor el.base0E;
foreground = makeColor el.base05;

View file

@ -11,7 +11,7 @@ in
{
confirm-close-surface = false;
window-decoration = false;
font-size = 10;
font-size = font.size.terminal;
font-family = font.name;
window-padding-x = 10;
window-padding-y = 10;

View file

@ -1,7 +1,13 @@
{pkgs, ...}: {
{ pkgs, flake, ... }:
let
inherit (flake.config.aesthetics.themes)
cursor
;
in
{
gtk.enable = true;
# x11.enable = true;
name = "catppuccin-mocha-dark-cursors";
package = pkgs.catppuccin-cursors.macchiatoDark;
size = 18;
size = cursor.size;
}

View file

@ -1,4 +1,5 @@
{pkgs, ...}: let
{ pkgs, flake, ... }:
let
configPath = ./config;
cursorThemePath = import (configPath + /cursorTheme.nix) {
inherit
@ -17,11 +18,13 @@
};
homeCursorPath = import (configPath + /homeCursor.nix) {
inherit
flake
pkgs
;
};
gtk3Path = import (configPath + /gtk3.nix);
in {
in
{
gtk = {
enable = true;
gtk3 = gtk3Path;

View file

@ -1,3 +1,9 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
cursor
;
in
[
"swaylock"
"wl-clipboard"
@ -14,5 +20,5 @@
"pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink"
"pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
"gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
"gsettings set org.gnome.desktop.interface cursor-size 18"
"gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
]

View file

@ -24,7 +24,11 @@ let
# else null;
decoration = import (configPath + /decoration.nix);
dwindle = import (configPath + /dwindle.nix);
exec-once = import (configPath + /exec-once.nix);
exec-once = import (configPath + /exec-once.nix) {
inherit
flake
;
};
general = import (configPath + /general.nix) {
inherit
flake

3
home/modules/tofi/config/settings.nix Normal file → Executable file
View file

@ -3,12 +3,13 @@ let
inherit (flake.config.aesthetics.themes)
currentTheme
palettes
font
;
el = palettes.${currentTheme}.colours;
in
{
font-size = 12;
font-size = font.size.desktop;
hint-font = true;
background-color = "#${el.base02}";
outline-color = "#${el.base0E}";

View file

@ -26,9 +26,9 @@ in
"elmLS.disableElmLSDiagnostics" = true;
"elmLS.elmReviewDiagnostics" = "warning";
"editor.wordWrap" = "on";
"editor.fontSize" = 14;
"editor.fontSize" = font.size.applications;
"editor.fontFamily" = "'${font.name}', 'monospace', monospace";
"terminal.integrated.fontSize" = 14;
"terminal.integrated.fontSize" = font.size.applications;
"terminal.integrated.fontFamily" = "'${font.name}', 'monospace', monospace";
"editor.fontLigatures" = true;
}

View file

@ -11,7 +11,7 @@ let
custom = {
font = font.name;
font_size = "12px";
font_size = "${builtins.toString font.size.desktop}px";
font_weight = "bold";
opacityBg = "0.90";
opacityBt = "1";

View file

@ -7,7 +7,7 @@ in
''
return {
color_scheme = "Catppuccin Macchiato",
font_size = 11,
font_size = ${font.size.terminal},
font = wezterm.font('${font.name}'),
enable_tab_bar = false,
window_close_confirmation = 'NeverPrompt',

View file

@ -10,8 +10,8 @@ in
hour_format = "hour12";
vim_mode = false;
show_whitespaces = "none";
ui_font_size = 14;
buffer_font_size = 14;
ui_font_size = font.size.applications;
buffer_font_size = font.size.applications;
tab_size = 2;
cursor_blink = true;
theme = "Catppuccin Macchiato";

View file

@ -27,7 +27,7 @@ in
font_family = font.name;
font_features = null;
font_size = 11;
font_size = font.size.terminal;
line_height = "comfortable";
option_as_meta = false;
button = false;

View file

View file

@ -20,7 +20,7 @@ in
GTK = {
application_prefer_dark_theme = true;
cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors";
font_name = lib.mkForce "${font.name} 11";
font_name = lib.mkForce "${font.name} ${font.size.desktop}";
icon_theme_name = lib.mkForce "Papirus-Dark";
theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact";
};

View file

@ -2,20 +2,20 @@
flake,
config,
...
}: let
inherit
(flake.config.machines.devices)
}:
let
inherit (flake.config.machines.devices)
server
;
inherit
(flake.config.services.instances)
inherit (flake.config.services.instances)
forgejo
web
;
service = forgejo;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url1}";
in {
host = "${service.subdomain}.${web.domains.url3}";
in
{
services = {
forgejo = {
enable = true;
@ -70,25 +70,27 @@ in {
};
};
};
sops = let
sopsPath = secret: {
path = "${service.sops.path0}/${service.name}-${secret}";
owner = service.name;
mode = "600";
sops =
let
sopsPath = secret: {
path = "${service.sops.path0}/${service.name}-${secret}";
owner = service.name;
mode = "600";
};
in
{
secrets = builtins.listToAttrs (
map
(secret: {
name = "${service.name}-${secret}";
value = sopsPath secret;
})
[
"smtp"
"database"
]
);
};
in {
secrets = builtins.listToAttrs (
map
(secret: {
name = "${service.name}-${secret}";
value = sopsPath secret;
})
[
"smtp"
"database"
]
);
};
fileSystems."/var/lib/${service.name}" = {
device = service.paths.path0;