From a72d9e63e003e1e3b60311077c0f23d4300ae698 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 16 Jan 2025 15:17:25 -0600 Subject: [PATCH] feat: fuck alejandra --- config/default.nix | 5 +- config/themes/default.nix | 77 ++- .../themes/elements/background0/default.nix | 49 ++ .../themes/elements/background1/default.nix | 49 ++ .../themes/elements/background2/default.nix | 49 ++ config/themes/elements/character/default.nix | 49 ++ config/themes/elements/constant/default.nix | 49 ++ .../themes/elements/constructor/default.nix | 49 ++ config/themes/elements/default.nix | 32 ++ config/themes/elements/error/default.nix | 49 ++ config/themes/elements/function/default.nix | 49 ++ config/themes/elements/keyword/default.nix | 49 ++ config/themes/elements/label/default.nix | 49 ++ config/themes/elements/link/default.nix | 49 ++ config/themes/elements/noError/default.nix | 49 ++ config/themes/elements/operator/default.nix | 49 ++ config/themes/elements/overlay0/default.nix | 49 ++ config/themes/elements/overlay1/default.nix | 49 ++ config/themes/elements/overlay2/default.nix | 49 ++ config/themes/elements/parameter/default.nix | 49 ++ config/themes/elements/regex/default.nix | 49 ++ config/themes/elements/selection/default.nix | 49 ++ config/themes/elements/subtext0/default.nix | 49 ++ config/themes/elements/subtext1/default.nix | 49 ++ config/themes/elements/surface0/default.nix | 49 ++ config/themes/elements/surface1/default.nix | 49 ++ config/themes/elements/surface2/default.nix | 49 ++ config/themes/elements/text/default.nix | 49 ++ config/themes/elements/warning/default.nix | 49 ++ config/themes/map/default.nix | 514 ------------------ config/themes/schemes/ayu/dark/default.nix | 1 + config/themes/schemes/ayu/light/default.nix | 1 + config/themes/schemes/ayu/mirage/default.nix | 1 + .../schemes/catppuccin/frappe/default.nix | 1 + .../schemes/catppuccin/latte/default.nix | 1 + .../schemes/catppuccin/macchiato/default.nix | 1 + .../schemes/catppuccin/mocha/default.nix | 1 + config/themes/schemes/cobalt2/default.nix | 15 - config/themes/schemes/dracula/default.nix | 1 + .../themes/schemes/gruvbox/dark/default.nix | 1 + .../themes/schemes/gruvbox/light/default.nix | 1 + config/themes/schemes/houston/default.nix | 1 + .../schemes/kanagawa/dragon/default.nix | 1 + .../themes/schemes/kanagawa/lotus/default.nix | 1 + .../themes/schemes/kanagawa/wave/default.nix | 1 + config/themes/schemes/laserwave/default.nix | 1 + config/themes/schemes/lunar/default.nix | 1 + .../schemes/material/darker/default.nix | 1 + .../schemes/material/deep-ocean/default.nix | 1 + .../schemes/material/forest/default.nix | 1 + .../schemes/material/lighter/default.nix | 1 + .../schemes/material/oceanic/default.nix | 1 + .../schemes/material/palenight/default.nix | 1 + .../schemes/material/sandy-beach/default.nix | 1 + .../schemes/material/sky-blue/default.nix | 1 + .../themes/schemes/material/space/default.nix | 1 + .../schemes/material/volcano/default.nix | 1 + config/themes/schemes/monokai/default.nix | 1 + config/themes/schemes/night-owl/default.nix | 1 + config/themes/schemes/nord/default.nix | 1 + config/themes/schemes/ocean-next/default.nix | 1 + config/themes/schemes/one-dark/default.nix | 1 + config/themes/schemes/plastic/default.nix | 1 + .../schemes/poimandres/base/default.nix | 1 + .../schemes/poimandres/storm/default.nix | 1 + .../themes/schemes/rosepine/base/default.nix | 1 + .../themes/schemes/rosepine/dawn/default.nix | 1 + .../themes/schemes/rosepine/moon/default.nix | 1 + .../themes/schemes/solarized/dark/default.nix | 1 + .../schemes/solarized/light/default.nix | 1 + .../themes/schemes/synthwave-84/default.nix | 1 + .../schemes/tokyo-night/day/default.nix | 1 + .../schemes/tokyo-night/night/default.nix | 1 + .../schemes/tokyo-night/storm/default.nix | 1 + config/themes/schemes/vesper/default.nix | 1 + config/themes/schemes/wasp/dark/default.nix | 1 + config/themes/schemes/wasp/light/default.nix | 1 + flake.lock | 18 +- flake.nix | 8 +- home/modules/helix/config/languages.nix | 2 +- .../hyprland/hyprland/config/exec-once.nix | 4 +- .../hyprland/hyprland/config/windowrulev2.nix | 2 +- home/modules/vscode/config/extensions.nix | 4 +- home/modules/vscode/config/userSettings.nix | 4 +- home/modules/waybar/config/style.nix | 18 +- .../userSettings/config/assistant/default.nix | 10 +- .../userSettings/config/interface/default.nix | 2 +- home/modules/zed/default.nix | 21 +- nixos/modules/environment.nix | 7 +- nixos/modules/sops.nix | 4 + parts/config/devshells.nix | 7 +- parts/config/pre-commit.nix | 10 +- secrets/secrets.yaml | 7 +- templates/elm/parts/config/devshells.nix | 6 +- templates/haskell/parts/config/devshells.nix | 6 +- templates/haskell/parts/config/pre-commit.nix | 2 +- 96 files changed, 1474 insertions(+), 631 deletions(-) create mode 100755 config/themes/elements/background0/default.nix create mode 100755 config/themes/elements/background1/default.nix create mode 100755 config/themes/elements/background2/default.nix create mode 100755 config/themes/elements/character/default.nix create mode 100755 config/themes/elements/constant/default.nix create mode 100755 config/themes/elements/constructor/default.nix create mode 100755 config/themes/elements/default.nix create mode 100755 config/themes/elements/error/default.nix create mode 100755 config/themes/elements/function/default.nix create mode 100755 config/themes/elements/keyword/default.nix create mode 100755 config/themes/elements/label/default.nix create mode 100755 config/themes/elements/link/default.nix create mode 100755 config/themes/elements/noError/default.nix create mode 100755 config/themes/elements/operator/default.nix create mode 100755 config/themes/elements/overlay0/default.nix create mode 100755 config/themes/elements/overlay1/default.nix create mode 100755 config/themes/elements/overlay2/default.nix create mode 100755 config/themes/elements/parameter/default.nix create mode 100755 config/themes/elements/regex/default.nix create mode 100755 config/themes/elements/selection/default.nix create mode 100755 config/themes/elements/subtext0/default.nix create mode 100755 config/themes/elements/subtext1/default.nix create mode 100755 config/themes/elements/surface0/default.nix create mode 100755 config/themes/elements/surface1/default.nix create mode 100755 config/themes/elements/surface2/default.nix create mode 100755 config/themes/elements/text/default.nix create mode 100755 config/themes/elements/warning/default.nix delete mode 100644 config/themes/map/default.nix mode change 100644 => 100755 config/themes/schemes/ayu/dark/default.nix mode change 100644 => 100755 config/themes/schemes/ayu/light/default.nix mode change 100644 => 100755 config/themes/schemes/ayu/mirage/default.nix mode change 100644 => 100755 config/themes/schemes/catppuccin/frappe/default.nix mode change 100644 => 100755 config/themes/schemes/catppuccin/latte/default.nix mode change 100644 => 100755 config/themes/schemes/catppuccin/macchiato/default.nix mode change 100644 => 100755 config/themes/schemes/catppuccin/mocha/default.nix delete mode 100644 config/themes/schemes/cobalt2/default.nix mode change 100644 => 100755 config/themes/schemes/dracula/default.nix mode change 100644 => 100755 config/themes/schemes/gruvbox/dark/default.nix mode change 100644 => 100755 config/themes/schemes/gruvbox/light/default.nix mode change 100644 => 100755 config/themes/schemes/houston/default.nix mode change 100644 => 100755 config/themes/schemes/kanagawa/dragon/default.nix mode change 100644 => 100755 config/themes/schemes/kanagawa/lotus/default.nix mode change 100644 => 100755 config/themes/schemes/kanagawa/wave/default.nix mode change 100644 => 100755 config/themes/schemes/laserwave/default.nix mode change 100644 => 100755 config/themes/schemes/lunar/default.nix mode change 100644 => 100755 config/themes/schemes/material/darker/default.nix mode change 100644 => 100755 config/themes/schemes/material/deep-ocean/default.nix mode change 100644 => 100755 config/themes/schemes/material/forest/default.nix mode change 100644 => 100755 config/themes/schemes/material/lighter/default.nix mode change 100644 => 100755 config/themes/schemes/material/oceanic/default.nix mode change 100644 => 100755 config/themes/schemes/material/palenight/default.nix mode change 100644 => 100755 config/themes/schemes/material/sandy-beach/default.nix mode change 100644 => 100755 config/themes/schemes/material/sky-blue/default.nix mode change 100644 => 100755 config/themes/schemes/material/space/default.nix mode change 100644 => 100755 config/themes/schemes/material/volcano/default.nix mode change 100644 => 100755 config/themes/schemes/monokai/default.nix mode change 100644 => 100755 config/themes/schemes/night-owl/default.nix mode change 100644 => 100755 config/themes/schemes/nord/default.nix mode change 100644 => 100755 config/themes/schemes/ocean-next/default.nix mode change 100644 => 100755 config/themes/schemes/one-dark/default.nix mode change 100644 => 100755 config/themes/schemes/plastic/default.nix mode change 100644 => 100755 config/themes/schemes/poimandres/base/default.nix mode change 100644 => 100755 config/themes/schemes/poimandres/storm/default.nix mode change 100644 => 100755 config/themes/schemes/rosepine/base/default.nix mode change 100644 => 100755 config/themes/schemes/rosepine/dawn/default.nix mode change 100644 => 100755 config/themes/schemes/rosepine/moon/default.nix mode change 100644 => 100755 config/themes/schemes/solarized/dark/default.nix mode change 100644 => 100755 config/themes/schemes/solarized/light/default.nix mode change 100644 => 100755 config/themes/schemes/synthwave-84/default.nix mode change 100644 => 100755 config/themes/schemes/tokyo-night/day/default.nix mode change 100644 => 100755 config/themes/schemes/tokyo-night/night/default.nix mode change 100644 => 100755 config/themes/schemes/tokyo-night/storm/default.nix mode change 100644 => 100755 config/themes/schemes/vesper/default.nix mode change 100644 => 100755 config/themes/schemes/wasp/dark/default.nix mode change 100644 => 100755 config/themes/schemes/wasp/light/default.nix diff --git a/config/default.nix b/config/default.nix index aa87e8c..c52400b 100755 --- a/config/default.nix +++ b/config/default.nix @@ -93,15 +93,16 @@ themesSubmodule = lib.types.submodule { options = { currentTheme = stringType; + elements = attrList; + font = stringType; schemes = lib.mkOption { type = lib.types.attrsOf (lib.types.submodule { options = { colours = attrList; + font = stringType; }; }); }; - font = stringType; - currentColours = attrList; }; }; in { diff --git a/config/themes/default.nix b/config/themes/default.nix index 75fdbb7..230e936 100755 --- a/config/themes/default.nix +++ b/config/themes/default.nix @@ -5,12 +5,10 @@ let ayu-light = "ayu-light"; ayu-mirage = "ayu-mirage"; # Catppuccin - catppuccin-latte = "catppuccin-latte"; catppuccin-frappe = "catppuccin-frappe"; + catppuccin-latte = "catppuccin-latte"; catppuccin-macchiato = "catppuccin-macchiato"; catppuccin-mocha = "catppuccin-mocha"; - # Cobalt - cobalt2 = "cobalt2"; # Dracula dracula = "dracula"; # Gruvbox @@ -53,7 +51,7 @@ let poimandres-base = "poimandres-base"; poimandres-storm = "poimandres-storm"; # Rosepine - rosepine = "rosepine"; + rosepine-base = "rosepine"; rosepine-moon = "rosepine-moon"; rosepine-dawn = "rosepine-dawn"; # Tokyo Night @@ -68,12 +66,11 @@ let # Vesper vesper = "vesper"; # Wasp - wasp = "wasp"; + wasp-dark = "wasp-dark"; + wasp-light = "wasp-light"; errorMessage = "Unknown theme: ${currentTheme}"; - schemePath = ./schemes; - mkThemeMap = themes: themeColours: if currentTheme == builtins.head themes then builtins.head themeColours @@ -86,8 +83,6 @@ let ayu-darkColour: ayu-lightColour: ayu-mirageColour: # Catppuccin catppuccin-frappeColour: catppuccin-latteColour: catppuccin-macchiatoColour: catppuccin-mochaColour: - # Cobalt2 - cobalt2Colour: # Dracula draculaColour: # Gruvbox @@ -117,18 +112,19 @@ let # Poimandres poimandres-baseColour: poimandres-stormColour: # Rosepine - rosepineColour: rosepine-moonColour: rosepine-dawnColour: - # Tokyo Night - tokyo-night-nightColor: tokyo-night-stormColor: tokyo-night-dayColor: + rosepine-baseColour: rosepine-dawnColour: rosepine-moonColour: # Solorized solorized-darkColour: solorized-lightColour: # Synthwave 84 synthwave-84Colour: + # Tokyo Night + tokyo-night-dayColour: tokyo-night-nightColour: tokyo-night-stormColour: # Vesper vesperColour: # Wasp - waspColour: - mkThemeMap [ + wasp-darkColour: wasp-lightColour: + mkThemeMap + [ # Ayu ayu-dark ayu-light @@ -138,8 +134,6 @@ let catppuccin-latte catppuccin-macchiato catppuccin-mocha - # Cobalt2 - cobalt2 # Dracula dracula # Gruvbox @@ -182,23 +176,25 @@ let poimandres-base poimandres-storm # Rosepine - rosepine - rosepine-moon + rosepine-base rosepine-dawn - # Tokyo Night - tokyo-night-night - tokyo-night-storm - tokyo-night-day + rosepine-moon # Solorized solorized-dark solorized-light # Synthwave 84 synthwave-84 + # Tokyo Night + tokyo-night-day + tokyo-night-night + tokyo-night-storm # Vesper vesper # Wasp - wasp - ] [ + wasp-dark + wasp-light + ] + [ # Ayu ayu-darkColour ayu-lightColour @@ -208,8 +204,6 @@ let catppuccin-latteColour catppuccin-macchiatoColour catppuccin-mochaColour - # Cobalt2 - cobalt2Colour # Dracula draculaColour # Gruvbox @@ -252,28 +246,30 @@ let poimandres-baseColour poimandres-stormColour # Rosepine - rosepineColour - rosepine-moonColour + rosepine-baseColour rosepine-dawnColour - # Tokyo Night - tokyo-night-nightColor - tokyo-night-stormColor - tokyo-night-dayColor + rosepine-moonColour # Solorized solorized-darkColour solorized-lightColour # Synthwave 84 synthwave-84Colour + # Tokyo Night + tokyo-night-dayColour + tokyo-night-nightColour + tokyo-night-stormColour # Vesper vesperColour # Wasp - waspColour + wasp-darkColour + wasp-lightColour ]; in { themes = { currentTheme = currentTheme; font = "MonaspiceRn Nerd Font"; schemes = let + schemePath = ./schemes; ayuPath = /ayu; catppuccinPath = /catppuccin; gruvboxPath = /gruvbox; @@ -283,6 +279,7 @@ in { rosepinePath = /rosepine; toyko-nightPath = /tokyo-night; solarizedPath = /solarized; + waspPath = /wasp; in { ${ayu-dark} = import (schemePath + ayuPath + /dark); ${ayu-light} = import (schemePath + ayuPath + /light); @@ -291,14 +288,13 @@ in { ${catppuccin-latte} = import (schemePath + catppuccinPath + /latte); ${catppuccin-macchiato} = import (schemePath + catppuccinPath + /macchiato); ${catppuccin-mocha} = import (schemePath + catppuccinPath + /mocha); - ${cobalt2} = import (schemePath + /cobalt2); ${dracula} = import (schemePath + /dracula); ${gruvbox-dark} = import (schemePath + gruvboxPath + /dark); ${gruvbox-light} = import (schemePath + gruvboxPath + /light); ${houston} = import (schemePath + /houston); - ${kanagawa-dragon} = import (schemePath + kanagawaPath + /kanagawa); - ${kanagawa-lotus} = import (schemePath + kanagawaPath + /kanagawa); - ${kanagawa-wave} = import (schemePath + kanagawaPath + /kanagawa); + ${kanagawa-dragon} = import (schemePath + kanagawaPath + /dragon); + ${kanagawa-lotus} = import (schemePath + kanagawaPath + /lotus); + ${kanagawa-wave} = import (schemePath + kanagawaPath + /wave); ${laserwave} = import (schemePath + /laserwave); ${lunar} = import (schemePath + /lunar); ${material-darker} = import (schemePath + materialPath + /darker); @@ -318,7 +314,7 @@ in { ${one-dark} = import (schemePath + /one-dark); ${poimandres-base} = import (schemePath + poimandresPath + /base); ${poimandres-storm} = import (schemePath + poimandresPath + /storm); - ${rosepine} = import (schemePath + rosepinePath + /base); + ${rosepine-base} = import (schemePath + rosepinePath + /base); ${rosepine-dawn} = import (schemePath + rosepinePath + /dawn); ${rosepine-moon} = import (schemePath + rosepinePath + /moon); ${tokyo-night-night} = import (schemePath + toyko-nightPath + /night); @@ -328,8 +324,9 @@ in { ${solorized-light} = import (schemePath + solarizedPath + /light); ${synthwave-84} = import (schemePath + /synthwave-84); ${vesper} = import (schemePath + /vesper); - ${wasp} = import (schemePath + /wasp); + ${wasp-dark} = import (schemePath + waspPath + /dark); + ${wasp-light} = import (schemePath + waspPath + /light); }; - currentColours = import ./map {inherit mapColour;}; + elements = import ./elements {inherit mapColour;}; }; } diff --git a/config/themes/elements/background0/default.nix b/config/themes/elements/background0/default.nix new file mode 100755 index 0000000..8eb7f81 --- /dev/null +++ b/config/themes/elements/background0/default.nix @@ -0,0 +1,49 @@ +{mapColour, ...}: { + # background0 = + # mapColour "editor_bg" # ayu dark + # "editor_bg" # ayu light + # "editor_bg" # ayu mirage + # "crust" # catppuccin-frappe + # "crust" # catppuccin-latte + # "crust" # catppuccin-macchiato + # "crust" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "highlight0" # rosepine base + # "highlight0" # rosepine dawn + # "highlight0" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/background1/default.nix b/config/themes/elements/background1/default.nix new file mode 100755 index 0000000..4756ece --- /dev/null +++ b/config/themes/elements/background1/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # background1 = + # mapColour "editor_bg" # ayu dark + # "editor_bg" # ayu light + # "editor_bg" # ayu mirage + # "base" # catppuccin-frappe + # "base" # catppuccin-latte + # "base" # catppuccin-macchiato + # "base" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "base" # rosepine base + # "base" # rosepine dawn + # "base" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/background2/default.nix b/config/themes/elements/background2/default.nix new file mode 100755 index 0000000..4197020 --- /dev/null +++ b/config/themes/elements/background2/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # background2 = + # mapColour "editor_bg" # ayu dark + # "editor_bg" # ayu light + # "editor_bg" # ayu mirage + # "mantle" # catppuccin-frappe + # "mantle" # catppuccin-latte + # "mantle" # catppuccin-macchiato + # "mantle" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "surface" # rosepine base + # "surface" # rosepine dawn + # "surface" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/character/default.nix b/config/themes/elements/character/default.nix new file mode 100755 index 0000000..fcb8ee3 --- /dev/null +++ b/config/themes/elements/character/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # character = + # mapColour "special" # ayu dark + # "special" # ayu light + # "special" # ayu mirage + # "teal" # catppuccin-frappe + # "teal" # catppuccin-latte + # "teal" # catppuccin-macchiato + # "teal" # catppuccin-mocha + # "comment" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "foam" # rosepine base + # "foam" # rosepine dawn + # "foam" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/constant/default.nix b/config/themes/elements/constant/default.nix new file mode 100755 index 0000000..7c11d33 --- /dev/null +++ b/config/themes/elements/constant/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # constant = + # mapColour "cosntant" # ayu dark + # "cosntant" # ayu light + # "cosntant" # ayu mirage + # "peach" # catppuccin-frappe + # "peach" # catppuccin-latte + # "peach" # catppuccin-macchiato + # "peach" # catppuccin-mocha + # "orange" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "gold" # rosepine base + # "gold" # rosepine dawn + # "gold" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/constructor/default.nix b/config/themes/elements/constructor/default.nix new file mode 100755 index 0000000..256b5d0 --- /dev/null +++ b/config/themes/elements/constructor/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # constructor = + # mapColour "constant" # ayu dark + # "constant" # ayu light + # "constant" # ayu mirage + # "sapphire" # catppuccin-frappe + # "sapphire" # catppuccin-latte + # "sapphire" # catppuccin-macchiato + # "sapphire" # catppuccin-mocha + # "cyan" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "foam" # rosepine base + # "foam" # rosepine dawn + # "foam" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/default.nix b/config/themes/elements/default.nix new file mode 100755 index 0000000..0ee8c59 --- /dev/null +++ b/config/themes/elements/default.nix @@ -0,0 +1,32 @@ +# themes/elements/default.nix +{mapColour, ...}: let + importElement = name: import (./. + "/${name}") {inherit mapColour;}; + elementList = [ + "background0" + "background1" + "background2" + "character" + "constant" + "constructor" + "error" + "function" + "keyword" + "label" + "link" + "noError" + "operator" + "overlay0" + "overlay1" + "overlay2" + "parameter" + "selection" + "subtext0" + "subtext1" + "surface0" + "surface1" + "surface2" + "text" + "warning" + ]; +in + builtins.foldl' (acc: name: acc // (importElement name)) {} elementList diff --git a/config/themes/elements/error/default.nix b/config/themes/elements/error/default.nix new file mode 100755 index 0000000..b79d36b --- /dev/null +++ b/config/themes/elements/error/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # error = + # mapColour "error" # ayu dark + # "error" # ayu light + # "error" # ayu mirage + # "red" # catppuccin-frappe + # "red" # catppuccin-latte + # "red" # catppuccin-macchiato + # "red" # catppuccin-mocha + # "red" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "love" # rosepine base + # "love" # rosepine dawn + # "love" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/function/default.nix b/config/themes/elements/function/default.nix new file mode 100755 index 0000000..e27e97c --- /dev/null +++ b/config/themes/elements/function/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # function = + # mapColour "func" # ayu dark + # "func" # ayu light + # "func" # ayu mirage + # "blue" # catppuccin-frappe + # "blue" # catppuccin-latte + # "blue" # catppuccin-macchiato + # "blue" # catppuccin-mocha + # "comment" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "pine" # rosepine base + # "pine" # rosepine dawn + # "pine" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/keyword/default.nix b/config/themes/elements/keyword/default.nix new file mode 100755 index 0000000..06c9097 --- /dev/null +++ b/config/themes/elements/keyword/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # keyword = + # mapColour "keyword" # ayu dark + # "keyword" # ayu light + # "keyword" # ayu mirage + # "mauve" # catppuccin-frappe + # "mauve" # catppuccin-latte + # "mauve" # catppuccin-macchiato + # "mauve" # catppuccin-mocha + # "purple" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "iris" # rosepine base + # "iris" # rosepine dawn + # "iris" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/label/default.nix b/config/themes/elements/label/default.nix new file mode 100755 index 0000000..e5b1305 --- /dev/null +++ b/config/themes/elements/label/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # label = + # mapColour "tag" # ayu dark + # "tag" # ayu light + # "tag" # ayu mirage + # "rosewater" # catppuccin-frappe + # "rosewater" # catppuccin-latte + # "rosewater" # catppuccin-macchiato + # "rosewater" # catppuccin-mocha + # "pink" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "rose" # rosepine base + # "rose" # rosepine dawn + # "rose" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/link/default.nix b/config/themes/elements/link/default.nix new file mode 100755 index 0000000..5da7286 --- /dev/null +++ b/config/themes/elements/link/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # link = + # mapColour "string" # ayu dark + # "string" # ayu light + # "string" # ayu mirage + # "lavender" # catppuccin-frappe + # "lavender" # catppuccin-latte + # "lavender" # catppuccin-macchiato + # "lavender" # catppuccin-mocha + # "cyan" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "iris" # rosepine base + # "iris" # rosepine dawn + # "iris" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/noError/default.nix b/config/themes/elements/noError/default.nix new file mode 100755 index 0000000..cd6c87e --- /dev/null +++ b/config/themes/elements/noError/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # noError = + # mapColour "regex" # ayu dark + # "regex" # ayu light + # "regex" # ayu mirage + # "green" # catppuccin-frappe + # "green" # catppuccin-latte + # "green" # catppuccin-macchiato + # "green" # catppuccin-mocha + # "green" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "pine" # rosepine base + # "pine" # rosepine dawn + # "pine" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/operator/default.nix b/config/themes/elements/operator/default.nix new file mode 100755 index 0000000..4070fad --- /dev/null +++ b/config/themes/elements/operator/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # operator = + # mapColour "operator" # ayu dark + # "operator" # ayu light + # "operator" # ayu mirage + # "sky" # catppuccin-frappe + # "sky" # catppuccin-latte + # "sky" # catppuccin-macchiato + # "sky" # catppuccin-mocha + # "cyan" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "foam" # rosefoam base + # "foam" # rosefoam dawn + # "foam" # rosefoam moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/overlay0/default.nix b/config/themes/elements/overlay0/default.nix new file mode 100755 index 0000000..d634a92 --- /dev/null +++ b/config/themes/elements/overlay0/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # overlay0 = + # mapColour "ui_selection" # ayu dark + # "ui_selection_active" # ayu light + # "ui_selection_active" # ayu mirage + # "overlay0" # catppuccin-frappe + # "overlay0" # catppuccin-latte + # "overlay0" # catppuccin-macchiato + # "overlay0" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "muted" # rosepine base + # "muted" # rosepine dawn + # "muted" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/overlay1/default.nix b/config/themes/elements/overlay1/default.nix new file mode 100755 index 0000000..72ab9eb --- /dev/null +++ b/config/themes/elements/overlay1/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # overlay1 = + # mapColour "ui_selection" # ayu dark + # "ui_selection_active" # ayu light + # "ui_selection_active" # ayu mirage + # "overlay1" # catppuccin-latte + # "overlay1" # catppuccin-frappe + # "overlay1" # catppuccin-macchiato + # "overlay1" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "subtle" # rosepine base + # "subtle" # rosepine dawn + # "subtle" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/overlay2/default.nix b/config/themes/elements/overlay2/default.nix new file mode 100755 index 0000000..de3989e --- /dev/null +++ b/config/themes/elements/overlay2/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # overlay2 = + # mapColour "ui_selection" # ayu dark + # "ui_selection_active" # ayu light + # "ui_selection_active" # ayu mirage + # "overlay2" # catppuccin-latte + # "overlay2" # catppuccin-frappe + # "overlay2" # catppuccin-macchiato + # "overlay2" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "subtle" # rosepine base + # "subtle" # rosepine dawn + # "subtle" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/parameter/default.nix b/config/themes/elements/parameter/default.nix new file mode 100755 index 0000000..f199c7d --- /dev/null +++ b/config/themes/elements/parameter/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # parameter = + # mapColour "entity" # ayu dark + # "entity" # ayu light + # "entity" # ayu mirage + # "maroon" # catppuccin-frappe + # "maroon" # catppuccin-latte + # "maroon" # catppuccin-macchiato + # "maroon" # catppuccin-mocha + # "orange" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "love" # roselove base + # "love" # roselove dawn + # "love" # roselove moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/regex/default.nix b/config/themes/elements/regex/default.nix new file mode 100755 index 0000000..d664ddf --- /dev/null +++ b/config/themes/elements/regex/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # regex = + # mapColour "regex" # ayu dark + # "regex" # ayu light + # "regex" # ayu mirage + # "pink" # catppuccin-frappe + # "pink" # catppuccin-latte + # "pink" # catppuccin-macchiato + # "pink" # catppuccin-mocha + # "purple" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "love" # roselove base + # "love" # roselove dawn + # "love" # roselove moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/selection/default.nix b/config/themes/elements/selection/default.nix new file mode 100755 index 0000000..effdf4c --- /dev/null +++ b/config/themes/elements/selection/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # selection = + # mapColour "editor_selection" # ayu dark + # "editor_selection" # ayu light + # "editor_selection" # ayu mirage + # "flamingo" # catppuccin-latte + # "flamingo" # catppuccin-frappe + # "flamingo" # catppuccin-macchiato + # "flamingo" # catppuccin-mocha + # "pink" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "rose" # roserose base + # "rose" # roserose dawn + # "rose" # roserose moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/subtext0/default.nix b/config/themes/elements/subtext0/default.nix new file mode 100755 index 0000000..19d4fee --- /dev/null +++ b/config/themes/elements/subtext0/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # subtext0 = + # mapColour "editor_fg" # ayu dark + # "editor_fg" # ayu light + # "editor_fg" # ayu mirage + # "subtext0" # catppuccin-frappe + # "subtext0" # catppuccin-latte + # "subtext0" # catppuccin-macchiato + # "subtext0" # catppuccin-mocha + # "foreground" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "muted" # rosepine base + # "muted" # rosepine dawn + # "muted" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/subtext1/default.nix b/config/themes/elements/subtext1/default.nix new file mode 100755 index 0000000..f97600d --- /dev/null +++ b/config/themes/elements/subtext1/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # subtext1 = + # mapColour "editor_fg" # ayu dark + # "editor_fg" # ayu light + # "editor_fg" # ayu mirage + # "subtext1" # catppuccin-frappe + # "subtext1" # catppuccin-latte + # "subtext1" # catppuccin-macchiato + # "subtext1" # catppuccin-mocha + # "foreground" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "subtle" # rosepine base + # "subtle" # rosepine dawn + # "subtle" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/surface0/default.nix b/config/themes/elements/surface0/default.nix new file mode 100755 index 0000000..f6519ba --- /dev/null +++ b/config/themes/elements/surface0/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # surface0 = + # mapColour "ui_fg" # ayu dark + # "ui_fg" # ayu light + # "ui_fg" # ayu mirage + # "surface0" # catppuccin-frappe + # "surface0" # catppuccin-latte + # "surface0" # catppuccin-macchiato + # "surface0" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "highlight0" # rosepine base + # "highlight0" # rosepine dawn + # "highlight0" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/surface1/default.nix b/config/themes/elements/surface1/default.nix new file mode 100755 index 0000000..db81751 --- /dev/null +++ b/config/themes/elements/surface1/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # surface1 = + # mapColour "ui_fg" # ayu dark + # "ui_fg" # ayu light + # "ui_fg" # ayu mirage + # "surface1" # catppuccin-frappe + # "surface1" # catppuccin-latte + # "surface1" # catppuccin-macchiato + # "surface1" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "highlight1" # rosepine base + # "highlight1" # rosepine dawn + # "highlight1" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/surface2/default.nix b/config/themes/elements/surface2/default.nix new file mode 100755 index 0000000..701f65a --- /dev/null +++ b/config/themes/elements/surface2/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # surface2 = + # mapColour "ui_fg" # ayu dark + # "ui_fg" # ayu light + # "ui_fg" # ayu mirage + # "surface2" # catppuccin-frappe + # "surface2" # catppuccin-latte + # "surface2" # catppuccin-macchiato + # "surface2" # catppuccin-mocha + # "background" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "highlight2" # rosepine base + # "highlight2" # rosepine dawn + # "highlight2" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/text/default.nix b/config/themes/elements/text/default.nix new file mode 100755 index 0000000..5d9514f --- /dev/null +++ b/config/themes/elements/text/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # text = + # mapColour "editor_fg" # ayu dark + # "editor_fg" # ayu light + # "editor_fg" # ayu mirage + # "text" # catppuccin-frappe + # "text" # catppuccin-latte + # "text" # catppuccin-macchiato + # "text" # catppuccin-mocha + # "foreground" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "text" # rosepine base + # "text" # rosepine dawn + # "text" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/elements/warning/default.nix b/config/themes/elements/warning/default.nix new file mode 100755 index 0000000..1707c45 --- /dev/null +++ b/config/themes/elements/warning/default.nix @@ -0,0 +1,49 @@ +{mapColour}: { + # warning = + # mapColour "accent" # ayu dark + # "accent" # ayu light + # "accent" # ayu mirage + # "yellow" # catppuccin-frappe + # "yellow" # catppuccin-latte + # "yellow" # catppuccin-macchiato + # "yellow" # catppuccin-mocha + # "yellow" # dracula + # "" # gruvbox dark + # "" # gruvbox light + # "" # houston + # "" # kanagawa dragon + # "" # kanagawa lotus + # "" # kanagawa wave + # "" # laserwave + # "" # lunar + # "" # material darker + # "" # material deep ocean + # "" # material forest + # "" # material lighter + # "" # material oceanic + # "" # material palenight + # "" # material sandy beach + # "" # material sky blue + # "" # material space + # "" # material volcano + # "" # monokai + # "" # night owl + # "" # nord + # "" # ocean next + # "" # one dark + # "" # plastic + # "" # poimandres base + # "" # poimandres storm + # "gold" # rosepine base + # "gold" # rosepine dawn + # "gold" # rosepine moon + # "" # solarized dark + # "" # solarized light + # "" # synthwave 84 + # "" # tokyo night day + # "" # tokyo night night + # "" # tokyo night storm + # "" # vesper + # "" # wasp dark + # ""; # wasp light +} diff --git a/config/themes/map/default.nix b/config/themes/map/default.nix deleted file mode 100644 index baa15ef..0000000 --- a/config/themes/map/default.nix +++ /dev/null @@ -1,514 +0,0 @@ -{mapColour}: { - # Core Text Colours - text = - mapColour - "editor_fg" # ayu dark - - "editor_fg" # ayu light - - "editor_fg" # ayu mirage - - "text" # catppuccin-frappe - - "text" # catppuccin-latte - - "text" # catppuccin-macchiato - - "text" # catppuccin-mocha - - "text" # rosepine - - "foreground"; # dracula - - subtext0 = - mapColour - "editor_fg" # ayu dark - - "editor_fg" # ayu light - - "editor_fg" # ayu mirage - - "subtext0" # catppuccin-frappe - - "subtext0" # catppuccin-latte - - "subtext0" # catppuccin-macchiato - - "subtext0" # catppuccin-mocha - - "muted" # rosepine - - "foreground"; # dracula - - subtext1 = - mapColour - "editor_fg" # ayu dark - - "editor_fg" # ayu light - - "editor_fg" # ayu mirage - - "subtext1" # catppuccin-frappe - - "subtext1" # catppuccin-latte - - "subtext1" # catppuccin-macchiato - - "subtext1" # catppuccin-mocha - - "subtle" # rosepine - - "foreground"; # dracula - - # Background Colours - background0 = - mapColour - "editor_bg" # ayu dark - - "editor_bg" #ayu light - - "editor_bg" # ayu mirage - - "crust" # catppuccin-frappe - - "crust" # catppuccin-latte - - "crust" # catppuccin-macchiato - - "crust" # catppuccin-mocha - - "highlight0" # rosepine - - "background"; # dracula - background1 = - mapColour - "editor_bg" # ayu dark - - "editor_bg" #ayu light - - "editor_bg" # ayu mirage - - "base" # catppuccin-frappe - - "base" # catppuccin-latte - - "base" # catppuccin-macchiato - - "base" # catppuccin-mocha - - "base" # rosepine - - "background"; # dracula - - background2 = - mapColour - "editor_bg" # ayu dark - - "editor_bg" #ayu light - - "editor_bg" # ayu mirage - - "mantle" # catppuccin-frappe - - "mantle" # catppuccin-latte - - "mantle" # catppuccin-macchiato - - "mantle" # catppuccin-mocha - - "surface" # rosepine - - "background"; # dracula - - # Surface Colours - surface0 = - mapColour - "ui_fg" # ayu dark - - "ui_fg" #ayu light - - "ui_fg" # ayu mirage - - "surface0" # catppuccin-frappe - - "surface0" # catppuccin-latte - - "surface0" # catppuccin-macchiato - - "surface0" # catppuccin-mocha - - "highlight0" # rosepine - - "background"; # dracula - - surface1 = - mapColour - "ui_fg" # ayu dark - - "ui_fg" #ayu light - - "ui_fg" # ayu mirage - - "surface1" # catppuccin-frappe - - "surface1" # catppuccin-latte - - "surface1" # catppuccin-macchiato - - "surface1" # catppuccin-mocha - - "highlight1" # rosepine - - "background"; # dracula - - surface2 = - mapColour - "ui_fg" # ayu dark - - "ui_fg" #ayu light - - "ui_fg" # ayu mirage - - "surface2" # catppuccin-frappe - - "surface2" # catppuccin-latte - - "surface2" # catppuccin-macchiato - - "surface2" # catppuccin-mocha - - "highlight2" # rosepine - - "background"; # dracula - - # Overlay Colours - overlay0 = - mapColour - "ui_selection" # ayu dark - - "ui_selection_active" #ayu light - - "ui_selection_active" # ayu mirage - - "overlay0" # catppuccin-frappe - - "overlay0" # catppuccin-latte - - "overlay0" # catppuccin-macchiato - - "overlay0" # catppuccin-mocha - - "muted" # rosepine - - "background"; # dracula - overlay1 = - mapColour - "ui_selection" # ayu dark - - "ui_selection_active" #ayu light - - "ui_selection_active" # ayu mirage - - "overlay1" # catppuccin-latte - - "overlay1" # catppuccin-frappe - - "overlay1" # catppuccin-macchiato - - "overlay1" # catppuccin-mocha - - "subtle" # rosepine - - "background"; # dracula - - overlay2 = - # and comments - mapColour - "ui_selection" # ayu dark - - "ui_selection_active" #ayu light - - "ui_selection_active" # ayu mirage - - "overlay2" # catppuccin-latte - - "overlay2" # catppuccin-frappe - - "overlay2" # catppuccin-macchiato - - "overlay2" # catppuccin-mocha - - "subtle" # rosepine - - "background"; # dracula - # Diagnostic Colours - error = - mapColour - "error" # ayu dark - - "error" #ayu light - - "error" # ayu mirage - - "red" # catppuccin-frappe - - "red" # catppuccin-latte - - "red" # catppuccin-macchiato - - "red" # catppuccin-mocha - - "love" # rosepine - - "red"; # dracula - warning = - mapColour - "accent" # ayu dark - - "accent" #ayu light - - "accent" # ayu mirage - - "yellow" # catppuccin-frappe - - "yellow" # catppuccin-latte - - "yellow" # catppuccin-macchiato - - "yellow" # catppuccin-mocha - - "gold" # rosepine - - "yellow"; # dracula - noError = - mapColour - "regex" # ayu dark - - "regex" #ayu light - - "regex" # ayu mirage - - "green" # catppuccin-frappe - - "green" # catppuccin-latte - - "green" # catppuccin-macchiato - - "green" # catppuccin-mocha - - "pine" # rosepine - - "green"; # dracula - - label = - mapColour - "tag" # ayu dark - - "tag" #ayu light - - "tag" # ayu mirage - - "rosewater" # catppuccin-frappe - - "rosewater" # catppuccin-latte - - "rosewater" # catppuccin-macchiato - - "rosewater" # catppuccin-mocha - - "rose" # rosepine - - "pink"; # dracula - selection = - mapColour - "editor_selection" # ayu dark - - "editor_selection" #ayu light - - "editor_selection" # ayu mirage - - "flamingo" # catppuccin-latte - - "flamingo" # catppuccin-frappe - - "flamingo" # catppuccin-macchiato - - "flamingo" # catppuccin-mocha - - "rose" # rosepine - - "pink"; # dracula - keyword = - mapColour - "keyword" # ayu dark - - "keyword" #ayu light - - "keyword" # ayu mirage - - "mauve" # catppuccin-frappe - - "mauve" # catppuccin-latte - - "mauve" # catppuccin-macchiato - - "mauve" # catppuccin-mocha - - "iris" # rosepine - - "purple"; # dracula - parameter = - mapColour - "entity" # ayu dark - - "entity" #ayu light - - "entity" # ayu mirage - - "maroon" # catppuccin-frappe - - "maroon" # catppuccin-latte - - "maroon" # catppuccin-macchiato - - "maroon" # catppuccin-mocha - - "love" # rosepine - - "orange"; # dracula - constant = - mapColour - "cosntant" # ayu dark - - "cosntant" #ayu light - - "cosntant" # ayu mirage - - "peach" # catppuccin-frappe - - "peach" # catppuccin-latte - - "peach" # catppuccin-macchiato - - "peach" # catppuccin-mocha - - "gold" # rosepine - - "orange"; # dracula - regex = - mapColour - "regex" # ayu dark - - "regex" #ayu light - - "regex" # ayu mirage - - "pink" # catppuccin-frappe - - "pink" # catppuccin-latte - - "pink" # catppuccin-macchiato - - "pink" # catppuccin-mocha - - "love" # rosepine - - "purple"; # dracula - - character = - mapColour - "special" # ayu dark - - "special" #ayu light - - "special" # ayu mirage - - "teal" # catppuccin-frappe - - "teal" # catppuccin-latte - - "teal" # catppuccin-macchiato - - "teal" # catppuccin-mocha - - "foam" # rosepine - - "comment"; # dracula - # Cool Accent Colours - operator = - mapColour - "operator" # ayu dark - - "operator" #ayu light - - "operator" # ayu mirage - - "sky" # catppuccin-frappe - - "sky" # catppuccin-latte - - "sky" # catppuccin-macchiato - - "sky" # catppuccin-mocha - - "foam" # rosepine - - "cyan"; # dracula - constructor = - mapColour - "constant" # ayu dark - - "constant" #ayu light - - "constant" # ayu mirage - - "sapphire" # catppuccin-frappe - - "sapphire" # catppuccin-latte - - "sapphire" # catppuccin-macchiato - - "sapphire" # catppuccin-mocha - - "foam" # rosepine - - "cyan"; # dracula - function = - mapColour - "func" # ayu dark - - "func" #ayu light - - "func" # ayu mirage - - "blue" # catppuccin-frappe - - "blue" # catppuccin-latte - - "blue" # catppuccin-macchiato - - "blue" # catppuccin-mocha - - "pine" # rosepine - - "comment"; # dracula - link = - mapColour - "string" # ayu dark - - "string" #ayu light - - "string" # ayu mirage - - "lavender" # catppuccin-frappe - - "lavender" # catppuccin-latte - - "lavender" # catppuccin-macchiato - - "lavender" # catppuccin-mocha - - "iris" # rosepine - - "cyan"; # dracula -} diff --git a/config/themes/schemes/ayu/dark/default.nix b/config/themes/schemes/ayu/dark/default.nix old mode 100644 new mode 100755 index 1cb730f..7479774 --- a/config/themes/schemes/ayu/dark/default.nix +++ b/config/themes/schemes/ayu/dark/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { tag = "39BAE6"; func = "FFB454"; diff --git a/config/themes/schemes/ayu/light/default.nix b/config/themes/schemes/ayu/light/default.nix old mode 100644 new mode 100755 index d859a97..e78488f --- a/config/themes/schemes/ayu/light/default.nix +++ b/config/themes/schemes/ayu/light/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { tag = "55B4D4"; func = "F2AE49"; diff --git a/config/themes/schemes/ayu/mirage/default.nix b/config/themes/schemes/ayu/mirage/default.nix old mode 100644 new mode 100755 index fd81daf..bb75bfe --- a/config/themes/schemes/ayu/mirage/default.nix +++ b/config/themes/schemes/ayu/mirage/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { tag = "5CCFE6"; func = "FFD173"; diff --git a/config/themes/schemes/catppuccin/frappe/default.nix b/config/themes/schemes/catppuccin/frappe/default.nix old mode 100644 new mode 100755 index 8bfd4dd..00ca462 --- a/config/themes/schemes/catppuccin/frappe/default.nix +++ b/config/themes/schemes/catppuccin/frappe/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { rosewater = "f2d5cf"; flamingo = "eebebe"; diff --git a/config/themes/schemes/catppuccin/latte/default.nix b/config/themes/schemes/catppuccin/latte/default.nix old mode 100644 new mode 100755 index e0f84af..86c7855 --- a/config/themes/schemes/catppuccin/latte/default.nix +++ b/config/themes/schemes/catppuccin/latte/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { rosewater = "dc8a78"; flamingo = "dd7878"; diff --git a/config/themes/schemes/catppuccin/macchiato/default.nix b/config/themes/schemes/catppuccin/macchiato/default.nix old mode 100644 new mode 100755 index f4f2d6b..fa1e631 --- a/config/themes/schemes/catppuccin/macchiato/default.nix +++ b/config/themes/schemes/catppuccin/macchiato/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { rosewater = "f4dbd6"; flamingo = "f0c6c6"; diff --git a/config/themes/schemes/catppuccin/mocha/default.nix b/config/themes/schemes/catppuccin/mocha/default.nix old mode 100644 new mode 100755 index 880d55a..030333f --- a/config/themes/schemes/catppuccin/mocha/default.nix +++ b/config/themes/schemes/catppuccin/mocha/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { rosewater = "f5e0dc"; flamingo = "f2cdcd"; diff --git a/config/themes/schemes/cobalt2/default.nix b/config/themes/schemes/cobalt2/default.nix deleted file mode 100644 index fe40d69..0000000 --- a/config/themes/schemes/cobalt2/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - colours = { - background0 = "193549"; - background1 = "122738"; - background2 = "15232d"; - border = "122738"; - hue0 = "003854"; - hue1 = "003f5e"; - hue2 = "267DA2"; - contrast0 = "ffc600"; - contrast1 = "ff9d00"; - text = "E1EFFF"; - blue = "0088ff"; - }; -} diff --git a/config/themes/schemes/dracula/default.nix b/config/themes/schemes/dracula/default.nix old mode 100644 new mode 100755 index 77ecbeb..4810af1 --- a/config/themes/schemes/dracula/default.nix +++ b/config/themes/schemes/dracula/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background = "282a36"; currentLine = "44475a"; diff --git a/config/themes/schemes/gruvbox/dark/default.nix b/config/themes/schemes/gruvbox/dark/default.nix old mode 100644 new mode 100755 index e440e77..8010d54 --- a/config/themes/schemes/gruvbox/dark/default.nix +++ b/config/themes/schemes/gruvbox/dark/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background0 = "282828"; background1 = "3c3836"; diff --git a/config/themes/schemes/gruvbox/light/default.nix b/config/themes/schemes/gruvbox/light/default.nix old mode 100644 new mode 100755 index fcc562f..b781be6 --- a/config/themes/schemes/gruvbox/light/default.nix +++ b/config/themes/schemes/gruvbox/light/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background0 = "fbf1c7"; background1 = "ebdbb2"; diff --git a/config/themes/schemes/houston/default.nix b/config/themes/schemes/houston/default.nix old mode 100644 new mode 100755 index d143e7f..8ac80bd --- a/config/themes/schemes/houston/default.nix +++ b/config/themes/schemes/houston/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { blue0 = "000000"; blue1 = "17191e"; diff --git a/config/themes/schemes/kanagawa/dragon/default.nix b/config/themes/schemes/kanagawa/dragon/default.nix old mode 100644 new mode 100755 index 1d3a40b..ae14a57 --- a/config/themes/schemes/kanagawa/dragon/default.nix +++ b/config/themes/schemes/kanagawa/dragon/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { dragonBlack0 = "0d0c0c"; dragonBlack1 = "12120f"; diff --git a/config/themes/schemes/kanagawa/lotus/default.nix b/config/themes/schemes/kanagawa/lotus/default.nix old mode 100644 new mode 100755 index cf414cb..aef1b2e --- a/config/themes/schemes/kanagawa/lotus/default.nix +++ b/config/themes/schemes/kanagawa/lotus/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { lotusInk1 = "545464"; lotusInk2 = "43436c"; diff --git a/config/themes/schemes/kanagawa/wave/default.nix b/config/themes/schemes/kanagawa/wave/default.nix old mode 100644 new mode 100755 index 8ba0af9..7344b5b --- a/config/themes/schemes/kanagawa/wave/default.nix +++ b/config/themes/schemes/kanagawa/wave/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { sumiInk0 = "#16161D"; sumiInk1 = "#181820"; diff --git a/config/themes/schemes/laserwave/default.nix b/config/themes/schemes/laserwave/default.nix old mode 100644 new mode 100755 index 0d31813..47a298a --- a/config/themes/schemes/laserwave/default.nix +++ b/config/themes/schemes/laserwave/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { keywords = "40b4c4"; functions = "eb64B9"; diff --git a/config/themes/schemes/lunar/default.nix b/config/themes/schemes/lunar/default.nix old mode 100644 new mode 100755 index 4a6da82..8cca038 --- a/config/themes/schemes/lunar/default.nix +++ b/config/themes/schemes/lunar/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { white0 = "ffffff"; white1 = "fbfbfb"; diff --git a/config/themes/schemes/material/darker/default.nix b/config/themes/schemes/material/darker/default.nix old mode 100644 new mode 100755 index ca822c6..310537d --- a/config/themes/schemes/material/darker/default.nix +++ b/config/themes/schemes/material/darker/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "B0BEC5"; text = "727272"; diff --git a/config/themes/schemes/material/deep-ocean/default.nix b/config/themes/schemes/material/deep-ocean/default.nix old mode 100644 new mode 100755 index 1cfe2d1..17fed10 --- a/config/themes/schemes/material/deep-ocean/default.nix +++ b/config/themes/schemes/material/deep-ocean/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "8F93A2"; text = "4B526D"; diff --git a/config/themes/schemes/material/forest/default.nix b/config/themes/schemes/material/forest/default.nix old mode 100644 new mode 100755 index 06c1d31..251a8ca --- a/config/themes/schemes/material/forest/default.nix +++ b/config/themes/schemes/material/forest/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "B2C2B0"; text = "49694D"; diff --git a/config/themes/schemes/material/lighter/default.nix b/config/themes/schemes/material/lighter/default.nix old mode 100644 new mode 100755 index 7ba6b92..fbfd625 --- a/config/themes/schemes/material/lighter/default.nix +++ b/config/themes/schemes/material/lighter/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "546E7A"; text = "94A7B0"; diff --git a/config/themes/schemes/material/oceanic/default.nix b/config/themes/schemes/material/oceanic/default.nix old mode 100644 new mode 100755 index 2f77696..221bcbe --- a/config/themes/schemes/material/oceanic/default.nix +++ b/config/themes/schemes/material/oceanic/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "B0BEC5"; text = "607D8B"; diff --git a/config/themes/schemes/material/palenight/default.nix b/config/themes/schemes/material/palenight/default.nix old mode 100644 new mode 100755 index 797452e..674bf8a --- a/config/themes/schemes/material/palenight/default.nix +++ b/config/themes/schemes/material/palenight/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "A6ACCD"; text = "676E95"; diff --git a/config/themes/schemes/material/sandy-beach/default.nix b/config/themes/schemes/material/sandy-beach/default.nix old mode 100644 new mode 100755 index 58bff33..b0674c5 --- a/config/themes/schemes/material/sandy-beach/default.nix +++ b/config/themes/schemes/material/sandy-beach/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "546E7A"; text = "888477"; diff --git a/config/themes/schemes/material/sky-blue/default.nix b/config/themes/schemes/material/sky-blue/default.nix old mode 100644 new mode 100755 index 5d28046..02da430 --- a/config/themes/schemes/material/sky-blue/default.nix +++ b/config/themes/schemes/material/sky-blue/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "005761"; text = "01579B"; diff --git a/config/themes/schemes/material/space/default.nix b/config/themes/schemes/material/space/default.nix old mode 100644 new mode 100755 index 90685de..ae60892 --- a/config/themes/schemes/material/space/default.nix +++ b/config/themes/schemes/material/space/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "efeff1"; text = "959DAA"; diff --git a/config/themes/schemes/material/volcano/default.nix b/config/themes/schemes/material/volcano/default.nix old mode 100644 new mode 100755 index 90b8f62..28e69f2 --- a/config/themes/schemes/material/volcano/default.nix +++ b/config/themes/schemes/material/volcano/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { foreground = "ffeaea"; text = "ffd0aa"; diff --git a/config/themes/schemes/monokai/default.nix b/config/themes/schemes/monokai/default.nix old mode 100644 new mode 100755 index bbb4c88..a9eed21 --- a/config/themes/schemes/monokai/default.nix +++ b/config/themes/schemes/monokai/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background = "2e2e2e"; comments = "797979"; diff --git a/config/themes/schemes/night-owl/default.nix b/config/themes/schemes/night-owl/default.nix old mode 100644 new mode 100755 index 9984235..d814dde --- a/config/themes/schemes/night-owl/default.nix +++ b/config/themes/schemes/night-owl/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background = "011627"; foreground = "D6DEEB"; diff --git a/config/themes/schemes/nord/default.nix b/config/themes/schemes/nord/default.nix old mode 100644 new mode 100755 index cc2c025..632e886 --- a/config/themes/schemes/nord/default.nix +++ b/config/themes/schemes/nord/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { nord0 = "2e3440"; nord1 = "3b4252"; diff --git a/config/themes/schemes/ocean-next/default.nix b/config/themes/schemes/ocean-next/default.nix old mode 100644 new mode 100755 index ad87bab..dc1a66a --- a/config/themes/schemes/ocean-next/default.nix +++ b/config/themes/schemes/ocean-next/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { base00 = "1b2b34"; base01 = "343d46"; diff --git a/config/themes/schemes/one-dark/default.nix b/config/themes/schemes/one-dark/default.nix old mode 100644 new mode 100755 index ee3d504..a0ecde4 --- a/config/themes/schemes/one-dark/default.nix +++ b/config/themes/schemes/one-dark/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background = "282c34"; red = "e06c75"; diff --git a/config/themes/schemes/plastic/default.nix b/config/themes/schemes/plastic/default.nix old mode 100644 new mode 100755 index 9b26523..37a27e7 --- a/config/themes/schemes/plastic/default.nix +++ b/config/themes/schemes/plastic/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { blue0 = "1085FF"; blue1 = "61AFEF"; diff --git a/config/themes/schemes/poimandres/base/default.nix b/config/themes/schemes/poimandres/base/default.nix old mode 100644 new mode 100755 index 4e8ad8e..ce43263 --- a/config/themes/schemes/poimandres/base/default.nix +++ b/config/themes/schemes/poimandres/base/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { primary-background = "1b1e28"; primary-foreground = "a6accd"; diff --git a/config/themes/schemes/poimandres/storm/default.nix b/config/themes/schemes/poimandres/storm/default.nix old mode 100644 new mode 100755 index 299facd..d233543 --- a/config/themes/schemes/poimandres/storm/default.nix +++ b/config/themes/schemes/poimandres/storm/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { primary-background = "252b37"; primary-foreground = "a6accd"; diff --git a/config/themes/schemes/rosepine/base/default.nix b/config/themes/schemes/rosepine/base/default.nix old mode 100644 new mode 100755 index 07d3b40..45f1d89 --- a/config/themes/schemes/rosepine/base/default.nix +++ b/config/themes/schemes/rosepine/base/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { base = "191724"; surface = "1f1d2e"; diff --git a/config/themes/schemes/rosepine/dawn/default.nix b/config/themes/schemes/rosepine/dawn/default.nix old mode 100644 new mode 100755 index 50a1ea8..4ce456a --- a/config/themes/schemes/rosepine/dawn/default.nix +++ b/config/themes/schemes/rosepine/dawn/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { base = "faf4ed"; surface = "fffaf3"; diff --git a/config/themes/schemes/rosepine/moon/default.nix b/config/themes/schemes/rosepine/moon/default.nix old mode 100644 new mode 100755 index 39228d1..333e22b --- a/config/themes/schemes/rosepine/moon/default.nix +++ b/config/themes/schemes/rosepine/moon/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { base = "232136"; surface = "2a273f"; diff --git a/config/themes/schemes/solarized/dark/default.nix b/config/themes/schemes/solarized/dark/default.nix old mode 100644 new mode 100755 index af6e538..7c1b51b --- a/config/themes/schemes/solarized/dark/default.nix +++ b/config/themes/schemes/solarized/dark/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { yellow = "b58900"; orange = "cb4b16"; diff --git a/config/themes/schemes/solarized/light/default.nix b/config/themes/schemes/solarized/light/default.nix old mode 100644 new mode 100755 index 9c709d2..d878b86 --- a/config/themes/schemes/solarized/light/default.nix +++ b/config/themes/schemes/solarized/light/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { yellow = "b58900"; orange = "cb4b16"; diff --git a/config/themes/schemes/synthwave-84/default.nix b/config/themes/schemes/synthwave-84/default.nix old mode 100644 new mode 100755 index dc12761..6d72316 --- a/config/themes/schemes/synthwave-84/default.nix +++ b/config/themes/schemes/synthwave-84/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { blue0 = "1f212b"; blue1 = "495495"; diff --git a/config/themes/schemes/tokyo-night/day/default.nix b/config/themes/schemes/tokyo-night/day/default.nix old mode 100644 new mode 100755 index d65b8f7..471d247 --- a/config/themes/schemes/tokyo-night/day/default.nix +++ b/config/themes/schemes/tokyo-night/day/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { keyword = "8c4351"; integer = "965027"; diff --git a/config/themes/schemes/tokyo-night/night/default.nix b/config/themes/schemes/tokyo-night/night/default.nix old mode 100644 new mode 100755 index 7ba1b0c..cdfbd68 --- a/config/themes/schemes/tokyo-night/night/default.nix +++ b/config/themes/schemes/tokyo-night/night/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { keyword = "f7768e"; integer = "ff9e64"; diff --git a/config/themes/schemes/tokyo-night/storm/default.nix b/config/themes/schemes/tokyo-night/storm/default.nix old mode 100644 new mode 100755 index c85d05d..24749d9 --- a/config/themes/schemes/tokyo-night/storm/default.nix +++ b/config/themes/schemes/tokyo-night/storm/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { keyword = "f7768e"; integer = "ff9e64"; diff --git a/config/themes/schemes/vesper/default.nix b/config/themes/schemes/vesper/default.nix old mode 100644 new mode 100755 index 1e92af8..427164b --- a/config/themes/schemes/vesper/default.nix +++ b/config/themes/schemes/vesper/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { black0 = "000"; black1 = "101010"; diff --git a/config/themes/schemes/wasp/dark/default.nix b/config/themes/schemes/wasp/dark/default.nix old mode 100644 new mode 100755 index 4e93e78..e460984 --- a/config/themes/schemes/wasp/dark/default.nix +++ b/config/themes/schemes/wasp/dark/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background0 = "242424"; background1 = "191919"; diff --git a/config/themes/schemes/wasp/light/default.nix b/config/themes/schemes/wasp/light/default.nix old mode 100644 new mode 100755 index 5f67dce..bc65d12 --- a/config/themes/schemes/wasp/light/default.nix +++ b/config/themes/schemes/wasp/light/default.nix @@ -1,4 +1,5 @@ { + font = ""; colours = { background0 = "EDEDED"; background1 = "C4C4C4"; diff --git a/flake.lock b/flake.lock index de36c75..cf3e106 100755 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1736997002, - "narHash": "sha256-EPbAFUXgu3agihgA+MJlQe6J18SIEZ4cRm+zhNRbGfo=", + "lastModified": 1736986915, + "narHash": "sha256-kluqu772XQsChMIVFhMWLxCEFqoPsOYeSW4VoYtIxtY=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "40534c1bc524aa8c433a7a30318d7e20bddb33fb", + "rev": "bd40b6e6c1c3e618da16adb4f622ce2c99377c1d", "type": "github" }, "original": { @@ -1290,11 +1290,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { @@ -1345,11 +1345,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737002123, - "narHash": "sha256-lp6gZa49+N9fT7PmZRY75X3BxhzYI0l4VUU5nW3Uf8s=", + "lastModified": 1736986475, + "narHash": "sha256-dl140tp9EZRsNRHyx6gEMwOOtYjcwQRI2vdrg/Hr70c=", "owner": "nix-community", "repo": "NUR", - "rev": "991d8efa0971905cb3f88600ae05057aa1ff51fe", + "rev": "3e37d73198bdfb0ec5899cc228904f45d615d2a5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 018b4c9..1a44437 100755 --- a/flake.nix +++ b/flake.nix @@ -74,13 +74,15 @@ }; outputs = inputs: - inputs.flake-parts.lib.mkFlake { + inputs.flake-parts.lib.mkFlake + { inherit inputs ; - } { + } + { imports = [ - inputs.pre-commit-hooks-nix.flakeModule + # inputs.pre-commit-hooks-nix.flakeModule ./home ./lib ./nixos diff --git a/home/modules/helix/config/languages.nix b/home/modules/helix/config/languages.nix index f22b576..b0bc3d0 100755 --- a/home/modules/helix/config/languages.nix +++ b/home/modules/helix/config/languages.nix @@ -2,7 +2,7 @@ language = [ { auto-format = true; - formatter.command = "alejandra"; + formatter.command = "nixfmt"; name = "nix"; } { diff --git a/home/modules/hyprland/hyprland/config/exec-once.nix b/home/modules/hyprland/hyprland/config/exec-once.nix index 66a5608..66f74e2 100755 --- a/home/modules/hyprland/hyprland/config/exec-once.nix +++ b/home/modules/hyprland/hyprland/config/exec-once.nix @@ -8,11 +8,9 @@ "waybar" "nm-applet" "blueman-applet" - "easyeffects" - "pkill easyeffects" + "easyeffects -r" "emote" "flameshot" - "protonvpn c -cc CA" "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'" diff --git a/home/modules/hyprland/hyprland/config/windowrulev2.nix b/home/modules/hyprland/hyprland/config/windowrulev2.nix index e74d0c1..39bcb7b 100755 --- a/home/modules/hyprland/hyprland/config/windowrulev2.nix +++ b/home/modules/hyprland/hyprland/config/windowrulev2.nix @@ -61,7 +61,7 @@ let workspaceInit2 = builtins.map (x: "workspace 2 silent, " + x) [ "class:^${code}$" - "class:^${firefox}$" + # "class:^${firefox}$" ]; workspaceInit3 = builtins.map (x: "workspace 3 silent, " + x) [ diff --git a/home/modules/vscode/config/extensions.nix b/home/modules/vscode/config/extensions.nix index ab73640..afb9ed4 100755 --- a/home/modules/vscode/config/extensions.nix +++ b/home/modules/vscode/config/extensions.nix @@ -6,11 +6,11 @@ with pkgs.vscode-extensions; [ esbenp.prettier-vscode haskell.haskell james-yu.latex-workshop - jnoortheen.nix-ide - kamadorueda.alejandra + # jnoortheen.nix-ide mattn.lisp mkhl.direnv pkief.material-icon-theme streetsidesoftware.code-spell-checker tamasfe.even-better-toml + brettm12345.nixfmt-vscode ] diff --git a/home/modules/vscode/config/userSettings.nix b/home/modules/vscode/config/userSettings.nix index 5f9491a..0e8eaae 100755 --- a/home/modules/vscode/config/userSettings.nix +++ b/home/modules/vscode/config/userSettings.nix @@ -15,11 +15,11 @@ in { "git.enableSmartCommit" = true; "nix.enableLanguageServer" = true; "nix.serverPath" = lib.getExe pkgs.nil; - "nix.formatterPath" = lib.getExe pkgs.alejandra; + "nix.formatterPath" = lib.getExe pkgs.haskellPackages.nixfmt; "window.menuBarVisibility" = "toggle"; "workbench.iconTheme" = "material-icon-theme"; "workbench.startupEditor" = "none"; - "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.colorTheme" = "Catppuccin Macchiato"; "workbench.statusBar.visible" = false; "editor.multiCursorLimit" = 700000; "elmLS.disableElmLSDiagnostics" = true; diff --git a/home/modules/waybar/config/style.nix b/home/modules/waybar/config/style.nix index 93dd135..59c13b8 100755 --- a/home/modules/waybar/config/style.nix +++ b/home/modules/waybar/config/style.nix @@ -6,24 +6,24 @@ inherit (flake.config.aesthetics.themes) - currentTheme - currentColours - schemes + # currentTheme + # elements + # schemes font ; - cc = currentColours; + # el = elements; - theme = colour: schemes.${currentTheme}.colours.${colour}; + # theme = colour: schemes.${currentTheme}.colours.${colour}; custom = { font = font; font_size = "12px"; font_weight = "bold"; - text_color = theme cc.warmAccent2; - secondary_accent = theme cc.coolAccent4; - tertiary_accent = theme cc.coolAccent1; - button_color = theme cc.overlay2; + # text_color = theme el.keyword; + # secondary_accent = theme el.link; + # tertiary_accent = theme el.operator; + # button_color = theme el.overlay2; background_1 = colours.base; background_2 = colours.crust; background_3 = colours.surface2; diff --git a/home/modules/zed/config/userSettings/config/assistant/default.nix b/home/modules/zed/config/userSettings/config/assistant/default.nix index 62ee7d8..75dbef1 100755 --- a/home/modules/zed/config/userSettings/config/assistant/default.nix +++ b/home/modules/zed/config/userSettings/config/assistant/default.nix @@ -1,9 +1,9 @@ { enabled = true; version = "2"; - default_open_ai_model = null; - default_model = { - provider = "zed.dev"; - model = "claude-3-5-sonnet-latest"; - }; + # default_open_ai_model = null; + # default_model = { + # provider = "zed.dev"; + # model = "claude-3-5-sonnet-latest"; + # }; } diff --git a/home/modules/zed/config/userSettings/config/interface/default.nix b/home/modules/zed/config/userSettings/config/interface/default.nix index e38d679..38766b5 100755 --- a/home/modules/zed/config/userSettings/config/interface/default.nix +++ b/home/modules/zed/config/userSettings/config/interface/default.nix @@ -13,7 +13,7 @@ in { buffer_font_size = 14; tab_size = 2; cursor_blink = true; - theme = "Rosé Pine"; + theme = "Catppuccin Macchiato"; show_copilot_suggestions = true; bracket_pairing = "always"; relative_line_numbers = true; diff --git a/home/modules/zed/default.nix b/home/modules/zed/default.nix index 9e3029a..2973b63 100755 --- a/home/modules/zed/default.nix +++ b/home/modules/zed/default.nix @@ -19,14 +19,15 @@ pkgs ; }; +in # packagePath = flake.inputs.zed.packages.${pkgs.system}.default; -in { - programs.zed-editor = { - enable = true; - # package = packagePath; - extraPackages = extraPackagesPath; - extensions = extensionsPath; - userKeymaps = userKeymapsPath; - userSettings = userSettingsPath; - }; -} + { + programs.zed-editor = { + enable = true; + # package = packagePath; + extraPackages = extraPackagesPath; + extensions = extensionsPath; + userKeymaps = userKeymapsPath; + userSettings = userSettingsPath; + }; + } diff --git a/nixos/modules/environment.nix b/nixos/modules/environment.nix index adb1f3d..88282fc 100755 --- a/nixos/modules/environment.nix +++ b/nixos/modules/environment.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { environment = { # enableAllTerminfo = true; systemPackages = builtins.attrValues { @@ -24,6 +28,7 @@ USE_WAYLAND_GRIM = "1"; USE_WAYLAND_CLIPBOARD = "1"; GTK_THEME = "catppuccin-macchiato-mauve-compact"; + ANTHROPIC_API_KEY = config.sops.secrets.claude-api-key.path; }; }; } diff --git a/nixos/modules/sops.nix b/nixos/modules/sops.nix index 6e05f68..1b72bd0 100755 --- a/nixos/modules/sops.nix +++ b/nixos/modules/sops.nix @@ -24,6 +24,10 @@ in { path = "/home/${user0}/.ssh/known_hosts"; owner = user0; }; + "claude-api-key" = { + path = "/home/${user0}/.config/zed/claude-api-key"; + owner = user0; + }; }; }; } diff --git a/parts/config/devshells.nix b/parts/config/devshells.nix index aa8b1a3..8154fd6 100755 --- a/parts/config/devshells.nix +++ b/parts/config/devshells.nix @@ -9,15 +9,18 @@ inherit (pkgs) age - alejandra just nil nixd sops ssh-to-age ; + inherit + (pkgs.haskellPackages) + nixfmt + ; }; - shellHook = "${config.pre-commit.installationScript}"; + # shellHook = "${config.pre-commit.installationScript}"; }; }; } diff --git a/parts/config/pre-commit.nix b/parts/config/pre-commit.nix index ce0586b..94446ee 100755 --- a/parts/config/pre-commit.nix +++ b/parts/config/pre-commit.nix @@ -1,7 +1,7 @@ { - pre-commit.settings.hooks = { - alejandra.enable = true; - commitizen.enable = true; - # statix.enable = true; - }; + # pre-commit.settings.hooks = { + # nixfmt.enable = true; + # commitizen.enable = true; + # # statix.enable = true; + # }; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index bb48e76..313cc22 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,7 +1,7 @@ ssh: private: ENC[AES256_GCM,data:XJk/gjPkFeSZtPkKYS2vRHqMY/X5zRaDlS4UwzUvjm9MvTgdhoXUlqvFC0Dl5SZhRlY+XXAuG7gIIUESzCFWQKdOoUcto3r0WSuIm9EwLKXnnaHemeFVHYgZU9Rz45PK6yFWUC06+n56b2A1dFXftjeXcCqaQrT/jk3RDSHmhW9u7QgDmhhaybxXOrzkup2U8kjhrMmRBcf4xP//nihuzHcyYX75ONr56bgkjl6gpZTfZrn2ad8b+4iGn+rElzf7RHAG0mwTeEX2kYRyafaanGuc2xTnZubBAYDnc1eM6T99PXC0iWh/lUKc1zG1l18UchWzgvl3sPK0Cb2/5aaFMUk2ET6kVOlpKyGc94MRpyv3iUi8soFjh34sWH3mFtec2OWfIxDhoVfZoc2hmP2Hflfjp7acwaMskFBHaCSO2DGtNmN3hSUhAAeLx8OZupSIJmDVpq00qKUbN+5z4K78AdGuUOP07cE889evNniCHLP6yPav7tIulnBS9lD2U+CbqF7vMtdZx/eYFwJjmMtE,iv:JxSytvXKWLHDedlE0Wq5YpPUnfb0HoQgKJ2bt1Z8yqk=,tag:MjOoUSWsHWHgxp0yu9YQFA==,type:str] public: ENC[AES256_GCM,data:Cn4hutHHeptbefHOKK7zv5TmveGOqfHAwGHogDq9sRmeb+b1lzHwj7qvg8lcnlJtIo4qS+TrKtSj5ZCsPNXOhWG1rkk97gTfPMbcxj5f1O3WJigL2wsrB2cQgc5UsA==,iv:ID4zRdr/efClOAHbXzxG1bNuJR0A2qbydzGlMhvEcRE=,tag:qbIoaGb+RXxRRkkQtuX7/A==,type:str] - hosts: ENC[AES256_GCM,data:p7rHBv9Q5WJhffSEz7tNCT5DSjfeYJK3PZ3zyDNhxubyjX2bBa5NoA39UZHFEA57qLGNl+u3Jrkfl5wdb1ueYRFasN4INbZfeP5U1ms6qmdr56DmQmE6twkZFqMbAy8BHVG6WaUG97Iv3Zsq8XAQxkyfj20Vs2/HEuEn9Q2NnHKwbX882xok9AaTqOO+lJII9veDMMpLHxikK0wsi6k05K/uI7OAB6twRnUvC0/yQv03hhKq8jaeOfVOzWTzOJ2/UOs27GvFkzAC86Vu43r4OWoSPh5fZFWB8q4Oex8x62nQwMhqzdg/5dvJsMKO7Kqe7f+qzH5AGBQ4FYh6WcAc47zNz6TRDrER2tPL6CDfZBdCuwFXwTq5ThqY5EdamhNxm7/ClHx28mTzuJwsGV0FZQfaTmhRsYHXmB4U6s+mDaJpZc6cGPuSZ3552JGITKP66KwiDcUd6yyPrC0rSQMXX+bZt71OWu+edYtoHBE6yeOTojDD7VMOiHopZoM/2V1nE7GKI00XtC8Kk6Otemy5FL9KpY8NUtge/VkV6RQpTI0BWGfz/GShukCxwyw7krj1v77LiDp0plEXOwkHjilSId1/ERNYnDgK8DaORvBa/Em0ZIo/hb9YelCczjiErXBhFxirAUZjNosCau2x3KgP7xzFHQxqVMSH4SvxiciiilkE6fM0qfx7hSerpa5A9LcDb/sJZZ0NYPTVKucz4FVBqwSB3twW1+tk0gS/2Ia5dwX5RHh4AJtZca+czwe5nX6O9NM43D1NfHIDqyDrJoR6UPsTp030JEvjLc5w8uaFXV+A3gSYC6PF+6zTPvLyh7B6tmKtk0wjMDAuZpmU647aRDo1BEek9f97blNywR2PCJXe/A/oH85P8hVCtJj43QDt5PQJv8TT4SE+bwFKpePi436mdFJwyG8jsjlA0AUjjLonAwvOtYnqIZ9z09bWmxG+Wx8Bk++fqqThNZ/8w3MhdR9Fv+b1L4HQLfzHp1tYcJ9BziLxNG6z7AZZUw/K0f+D+BoFsESDUH+SD5CQ0Q41BSrafiZCnJqtzpmoFv5qw1kjtU/1U6oydx9qKyCiluM5LWJRUKzLUYekpC7huNSp7LW7nvE18/0qqauGAE9eO+DmWPpbN2mgrSg12hW4Uslk/mMlyBob4WvPJimhQJRElqDus36FpCRBBPQCtSuEiL2ZGK08cLavKEZszFORLBeF7ia1p5mjt1N/pvwo+kCy2Q==,iv:vXAHFieMvrkGH4u/6DffmT/Fki2yAdior/RaYQmDUHM=,tag:PdLLYblraMWEjM8GngwQXQ==,type:str] + hosts: ENC[AES256_GCM,data:trhzR1gQvSFsI0AdGlestwFU4HbocBjLS5b8Vmlv5tOHR47JlMCVekDEtkQ9DTl/OGXB/5AynGtd2vUkso37noPiqhPXCNwGfhc3np6IKGYA5vYd3xxZdH3XCJDTjG046VhYX5MA/d6kbReX9PtOxfnglGFLIxwPB0GZ7WZdPDqGf97HHb0ivdRho8UzC3ea2IcDpUwkRo30r+wMzCO2oKB7A3alcXHRi5UuYQ5mW1zDhUC/NS7Q9xkyOztZ++E6pH77crnPI5Z41M96mWkbVu65/kW4NOAp1t7B5VL6qi8XBt6QL9pM/u3a93QuCOZ6uN+JwbEYQt87Y7vPrvcO8711OyMyyNJKm+0Rr8Li+Lp/X5dS++at5eP3NXJhCBpG0cNa1DM/2PwQbs+5shslDfkssR8RAdIgigWQeIVSsUBZcAwU+YwFtPC5sXO1Julmey+KBv/+9dOmlJ3pmRLoGa0KkQixzZZzfRErXfMSn+DJpsZtMzBFzd0AwULw6opAOWCdlk9rWMd4JInDusf7p3PdpCm2Sv31zlBCGWUNxWv59+PdTZoLuL6yAxj+qdNpqzJdLSSKEcPB1whrxwiVlR44B6Ws0vuqhPxuEhd/BIcwPzrD9u7i2hYR+Ox4FItBmwuysiyNqfPs8/FgOOwpB4WjhbxwVr95W9o5N3QZGoTqGKYLEcmOwcYo7b86GLbwpxB0PPgVFWoZUqBZDC6nBIkCCGv/4xWBrQlzftyfcDOE+qlZARPdssixo4BZ4q6KJ+hbcwXGNnJub2t043LVuoOOM/OazcNe3T2eftvFM2TKJEHO6VdJ0G3foxwtGvysMp4R08ysgcr/VZ/tjcRp8FO/2LIR68f+ZtY4nIQBLTis+5JVqbUbMMZAjNSWuj2MNfcE6DWAcj8P4druqA0539KXtc4xDCqZu30IzfAkyOWvHnTaNHLw1xhv5gF/07sHqk+QxhpDKJrwUwQfZVYCrsBAJjBDAGwEfyQKlZBchI4zFAJ3Xs43WbwXQR35+5HTF1ZTwakJ9MqwQxD+jN24wNm9XAPKzvRoy/LAAtLpoH/spylBF7+CjZpGxXkO/Y8vhzPnw7WB7BnNsn4mqP7gFltNL6dHNA3i+mfZSCJkqieqIhKa1LoWgbvdVcQAs7VGVvNPaRsjZVYFvezxvem7AAsIxa/imQ6r17Tmcy3/50FjeoAlE8+Lxp4wDyLZjtX8rTfOjS4B1O3vfa4q6wnbOeuep+AWnA4U4qyr+KrzJnmGCnVpnbqKoy5k26odvU29sM7m1ZWE+uEAatUfSu432vLbzj6jct5wzyKJFIylpPXj3IeojrmISbPB9P8/l2I5au5zyQWW6nAZ5E6c7w23i8X6/Kc9u2XR9BQTg/eznzwKhExLnR9HOWiE4lqQkXPzTWqzfDDt3Fxya+Lu7YbrYVfAN/pf963kKjw1T5LTcLWBmR0WZTMnLprtBAI1LoBQaxE9pkfIx4NMTfWBP23IppkM11HBktvzmR3sM/F0lX7aAPLCA75nmSoa1BdC5dPFZRmFqxRI9TtHeh26PBXugZ7Bgemr7QBh1+dqgWyTjkw/FB100/yVtqvnb5qoTUyidd5oH9331TS2YXkNAB2jjfBytpfw5ReMfmXxYon5XS56J5/ghl6ZmV5XhoZZ56H9xrDFYrsVvoAHv6o77Ojh3IxXEFaJ9Wx2D/bzX0zks1LTIM4lkrRT9gwjx/WF2YEfhcx8s8XjjAPOR6uCxvlc4GxQ4rWbdTIq,iv:l4WIY3l7UBTY3Dkt2lLJ8DLf2f8zWFGtq/3IXj5rfdo=,tag:Ni6q4YAzd+Y/BPM8tKL2HA==,type:str] network: synology: ENC[AES256_GCM,data:r0Aor25K6IuywAq5Px9JasWpnYzAA87ffA1k/97GEqMRkb6V6VYW1Q1EoEGNnBoa5o6KBtHk0WY=,iv:IeZMBwKGOevgB3bgnSsF6JJ6ntcJa5fe5irVUuMOGwY=,tag:9JWqeKa0g7YzqpKy1VLFEA==,type:str] server: ENC[AES256_GCM,data:EFsmXNkuf5OAMh8hjfZTixmmdjqBNIME9JjQC8azeCwcMVInm8bWdxE4OqFmxOk9MAU=,iv:pI6WeM2aQC+7vx1Xmp5O2rikqNLgzuEOg+Lo7TqFQxU=,tag:ElcA8mn9dx+IjIf38nKT5A==,type:str] @@ -33,6 +33,7 @@ nextcloud-user3: ENC[AES256_GCM,data:g6ldEdtBuEmPAQYAQfaO,iv:6fElE2vZh9l/KgJuNev wiki-js: pass: ENC[AES256_GCM,data:O7m5SAnwbzq/GIKxNBtDCUVpccsaE1pOs6o+quZCe/EFMElNy019J7w=,iv:bMlBND1IQ5Lxu/7lwURZfcLx4tL+7st2xZh/ne/HH7Q=,tag:/589ca3f1Y+EjKd7sJLsJQ==,type:str] ssh: ENC[AES256_GCM,data:bhOQ2Cr9NZuCAPZttbRyEbzk08AOnxTF/5OsPkb4NNvO43X+ulIjM84pynTzeONnaBPQrq+XTXkL6jmtHzkBeZQMKeg110rWagWZfspQGOm1xT4SRgbqGjmz9pkgwlDPG2s8C/7NhPY0zPArnTJOosT3bmCANerg/WgFxv/aOqDEVzqZfqQK9t7PgFpTg2IFSIulYTys1Pwj4CA3RD9pUdW/QIUuUgAOkbHQQ2Ibo3bRR5k8nuOZe23PXt0VeT/aQ+SoK/OkkJ88+hzz2aphq3EPV/O8UeZqqcVQcVtUeG1/89eSOxwsrmiO940rh2fp3LjLTzNmpXTSjf/rxzMibKavx84TlO47FJXc0pEXJbJHdvDFta61DfQezy7pogN6ivrsE5jdL5ysJmYSePlM6z447sMZFJsRAT8QyzOA+QUvAAirY0aQfp4eBLv1XUkiXaaSb+ghP1+MqN2k9zglGXAUG5Yt6e5TLKXfDynqiVSMqywDfT8W2FrbZDSmTIVF2Bf6g1KNIv+VwJ+oeuJh,iv:EGtjs6C68rIRlOA8k0szd50zXWnL3CmEHZ4BalscqZk=,tag:LzJARDpS1N010Bskz3E4WQ==,type:str] +claude-api-key: ENC[AES256_GCM,data:QzGJPBnqx4PrDjNvGeyjl0B/W9pkBS4YWK/lrDK4sx0/eBbwMk2qvi03wOhVfvz71UVRpDIZ0F3eVtB8h8Nr94Ha/8IlFQtKxrh60XIzUs/GLB2jKZursZny8IjqZMrt9YHFOphqAWawB33g,iv:XKPqQ0sGukhy0bPXATYwjJMAfSkXdeanc4kULb5TWmA=,tag:vmH+pzU5qoOF5W0fhVfhDA==,type:str] sops: kms: [] gcp_kms: [] @@ -48,8 +49,8 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-24T23:19:10Z" - mac: ENC[AES256_GCM,data:56MEPBKQyF4eLm3gr37j1Ka0w+hln+loomiHHbh4BW7d+YWiekpHPGKtz6URpFqS3r1zctPP9Q6hh0mCgdpLWR91u/NTAB6galJt0+Tz6Y4PdbgFUevnWIc3aWl8/HmJXj9RU6vpH7l516sGqPW7x2JnJVenEU6DNFPVArj4tTs=,iv:+K6UaY3WsuAGhejTkEdeQc30klq/Zs0DU5/zAN98CNc=,tag:/NULIaD5pjRRC0BU4vuacA==,type:str] + lastmodified: "2025-01-16T09:06:48Z" + mac: ENC[AES256_GCM,data:slXuk7bq+TbygmCTZ7XFFjw5Y11a+ezpRLA5333H25E/qz9eABZR7WiJE1VJ6kRFQf8Oz6Od5/JDsSF743cC4dgLWsIWBBxKdARM/lvQWIpNn7GIGFV96nFTsz0MTLMDfx6lAFPlbGnU8TYbsiMmGeUlcAh0Lqmkfc5MN2JPXjo=,iv:oovhE2b7+ozZnjV06VLUdlqftBDoZDEHITLx1BVu8/E=,tag:979Rr3eiMn8Gle9mGqfsQw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.2 diff --git a/templates/elm/parts/config/devshells.nix b/templates/elm/parts/config/devshells.nix index d192f84..8ebc22b 100755 --- a/templates/elm/parts/config/devshells.nix +++ b/templates/elm/parts/config/devshells.nix @@ -8,8 +8,8 @@ packages = builtins.attrValues { inherit (pkgs) - alejandra just + nixd nil ; inherit @@ -21,6 +21,10 @@ elm-review elm-test ; + inherit + (pkgs.haskellPackages) + nixfmt + ; }; }; }; diff --git a/templates/haskell/parts/config/devshells.nix b/templates/haskell/parts/config/devshells.nix index 9504ec8..f3c519c 100755 --- a/templates/haskell/parts/config/devshells.nix +++ b/templates/haskell/parts/config/devshells.nix @@ -16,11 +16,11 @@ inherit (pkgs) - alejandra dhall dhall-json dhall-lsp-server helix-gpt + nixd just libz ngrep @@ -51,6 +51,10 @@ npm typescript-language-server ; + inherit + (pkgs.haskellPackages) + nixfmt + ; }; hlsCheck.enable = true; diff --git a/templates/haskell/parts/config/pre-commit.nix b/templates/haskell/parts/config/pre-commit.nix index ba63cc6..a41ffa6 100755 --- a/templates/haskell/parts/config/pre-commit.nix +++ b/templates/haskell/parts/config/pre-commit.nix @@ -1,6 +1,6 @@ { pre-commit.settings.hooks = { - alejandra.enable = true; + nixfmt.enable = true; commitizen.enable = true; statix.enable = true; };