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

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