feat: added user2 and refactored to accommodate

This commit is contained in:
Nick 2025-01-28 20:45:11 -06:00
parent c169f84dcc
commit 9cdcf4fec4
97 changed files with 1473 additions and 1052 deletions

View file

@ -1,17 +1,17 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
ui_font_family = font.name;
buffer_font_family = font.name;
ui_font_family = fonts.names.name0;
buffer_font_family = fonts.names.name0;
hour_format = "hour12";
vim_mode = false;
show_whitespaces = "none";
ui_font_size = font.size.applications;
buffer_font_size = font.size.applications;
ui_font_size = fonts.sizes.applications.size0;
buffer_font_size = fonts.sizes.applications.size0;
tab_size = 2;
cursor_blink = true;
theme = "Catppuccin Macchiato";

View file

@ -1,7 +1,7 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
font
fonts
;
in
{
@ -25,9 +25,9 @@ in
TERM = "ghostty";
};
font_family = font.name;
font_family = fonts.names.name0;
font_features = null;
font_size = font.size.terminal;
font_size = fonts.sizes.terminal.size0;
line_height = "comfortable";
option_as_meta = false;
button = false;

View file

@ -1,11 +1,11 @@
{ flake, ... }:
let
inherit (flake.config.aesthetics.themes)
currentTheme
currentThemes
palettes
;
el = palettes.${currentTheme}.colours;
el = palettes.${currentThemes.theme0}.colours;
in
{
accents = [

View file

@ -6,37 +6,14 @@
}:
let
configPath = ./config;
assistantPath = import (configPath + /assistant) {
inherit
flake
;
};
interfacePath = import (configPath + /interface) {
inherit
flake
;
};
assistantPath = import (configPath + /assistant) { inherit flake; };
interfacePath = import (configPath + /interface) { inherit flake; };
languagesPath = import (configPath + /languages);
lspPath = import (configPath + /lsp);
terminalPath = import (configPath + /terminal) {
inherit
flake
;
};
experimentalPath = import (configPath + /theme) {
inherit
flake
;
};
terminalPath = import (configPath + /terminal) { inherit flake; };
experimentalPath = import (configPath + /theme) { inherit flake; };
gitPath = import (configPath + /git);
miscPath = import (configPath + /misc) {
inherit
lib
pkgs
;
};
miscPath = import (configPath + /misc) { inherit lib pkgs; };
in
{
git = gitPath;