diff --git a/config/default.nix b/config/default.nix index c52400b..0ed2362 100755 --- a/config/default.nix +++ b/config/default.nix @@ -1,4 +1,5 @@ -{lib, ...}: let +{ lib, ... }: +let stringType = lib.mkOption { type = lib.types.str; }; @@ -17,27 +18,29 @@ numOptions = 20; - genOptions = config: prefix: + genOptions = + config: prefix: builtins.listToAttrs ( - map - (i: { + map (i: { name = "${prefix}${toString i}"; value = config; - }) - (builtins.genList (i: i) numOptions) + }) (builtins.genList (i: i) numOptions) ); - mkOptionsFromDir = path: - builtins.listToAttrs (map - (name: { - name = builtins.substring 0 (builtins.stringLength name - 4) name; - value = stringType; - }) - ( - builtins.filter - (name: builtins.match ".*\\.nix$" name != null) - (builtins.attrNames (builtins.readDir path)) - )); + mkOptionsFromDir = + path: + builtins.listToAttrs ( + map + (name: { + name = builtins.substring 0 (builtins.stringLength name - 4) name; + value = stringType; + }) + ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) ( + builtins.attrNames (builtins.readDir path) + ) + ) + ); userSubmodule = lib.types.submodule { options = { @@ -71,13 +74,14 @@ }; deviceSubmodule = lib.types.submodule { - options = let - mountConfig = { - mount = stringType; - device = stringType; - options = listType; - }; - in + options = + let + mountConfig = { + mount = stringType; + device = stringType; + options = listType; + }; + in { boot = mountConfig; ip = genOptions stringType "address"; @@ -93,37 +97,48 @@ 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 = { + name = stringType; + size = { + applications = stringType; + desktop = stringType; + popups = stringType; + terminal = stringType; + + }; + + }; + palettes = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + colours = attrList; + font = stringType; + }; + } + ); }; }; }; -in { +in +{ options = { services = lib.mkOption { type = lib.types.submodule { - options = - mkOptionsFromDir ./instances/config - // { - instances = lib.mkOption { - type = lib.types.attrsOf instanceSubmodule; - }; + options = mkOptionsFromDir ./instances/config // { + instances = lib.mkOption { + type = lib.types.attrsOf instanceSubmodule; }; + }; }; }; machines = lib.mkOption { type = lib.types.submodule { - options = let - devicesPath = ./devices/config; - printerPath = devicesPath + /printers; - in + options = + let + devicesPath = ./devices/config; + printerPath = devicesPath + /printers; + in mkOptionsFromDir devicesPath // mkOptionsFromDir printerPath // { @@ -135,24 +150,20 @@ in { }; people = lib.mkOption { type = lib.types.submodule { - options = - mkOptionsFromDir ./users/config - // { - users = lib.mkOption { - type = lib.types.attrsOf userSubmodule; - }; + options = mkOptionsFromDir ./users/config // { + users = lib.mkOption { + type = lib.types.attrsOf userSubmodule; }; + }; }; }; aesthetics = lib.mkOption { type = lib.types.submodule { - options = - mkOptionsFromDir ./themes - // { - themes = lib.mkOption { - type = themesSubmodule; - }; + options = mkOptionsFromDir ./themes // { + themes = lib.mkOption { + type = themesSubmodule; }; + }; }; }; }; diff --git a/config/devices/config/synology.nix b/config/devices/config/synology.nix index 44b2000..5827d36 100755 --- a/config/devices/config/synology.nix +++ b/config/devices/config/synology.nix @@ -1,6 +1,6 @@ -{devicesFunctions}: let - inherit - (devicesFunctions) +{ devicesFunctions }: +let + inherit (devicesFunctions) sambaPermissions userIdForUser0 userIdForUser1 @@ -11,8 +11,9 @@ user0Name = "Nick"; user1Name = "Garnet"; synologyName = "synology"; - synologyIP = "192.168.50.210"; -in { + synologyIP = "192.168.50.209"; +in +{ label = "Synology"; sync = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX"; name = synologyName; diff --git a/config/themes/default.nix b/config/themes/default.nix index 58aded6..817dbd9 100755 --- a/config/themes/default.nix +++ b/config/themes/default.nix @@ -1,337 +1,30 @@ let - currentTheme = gruvbox-dark; - # Ayu - ayu-dark = "ayu-dark"; - ayu-light = "ayu-light"; - ayu-mirage = "ayu-mirage"; - # Catppuccin + currentTheme = catppuccin-mocha; + catppuccin-frappe = "catppuccin-frappe"; catppuccin-latte = "catppuccin-latte"; catppuccin-macchiato = "catppuccin-macchiato"; catppuccin-mocha = "catppuccin-mocha"; - # Dracula dracula = "dracula"; - # Gruvbox - gruvbox-dark = "gruvbox-dark"; - gruvbox-light = "gruvbox-light"; - # Houston - houston = "houston"; - # Kanagawa - kanagawa-dragon = "kanagawa-dragon"; - kanagawa-lotus = "kanagawa-lotus"; - kanagawa-wave = "kanagawa-wave"; - # Laserwave - laserwave = "laserwave"; - #Lunar - lunar = "lunar"; - # Material - material-darker = "material-darker"; - material-deep-ocean = "material-deep-ocean"; - material-forest = "material-forest"; - material-lighter = "material-lighter"; - material-oceanic = "material-oceanic"; - material-palenight = "material-palenight"; - material-sandy-beach = "material-sandy-beach"; - material-sky-blue = "material-sky-blue"; - material-space = "material-space"; - material-volcano = "material-volcano"; - # Monokai - monokai = "monokai"; - # Night Owl - night-owl = "night-owl"; - # Nord - nord = "nord"; - #Ocean Next - ocean-next = "ocean-next"; - # One Dark - one-dark = "one-dark"; - # Plastic - plastic = "plastic"; - # Poimandres - poimandres-base = "poimandres-base"; - poimandres-storm = "poimandres-storm"; - # Rosepine - rosepine-base = "rosepine"; - rosepine-moon = "rosepine-moon"; - rosepine-dawn = "rosepine-dawn"; - # Tokyo Night - tokyo-night-night = "tokyo-night-night"; - tokyo-night-storm = "tokyo-night-storm"; - tokyo-night-day = "tokyo-night-day"; - # Solorized - solorized-dark = "solorized-dark"; - solorized-light = "solorized-light"; - # Synthwave 84 - synthwave-84 = "synthwave-84"; - # Vesper - vesper = "vesper"; - # Wasp - wasp-dark = "wasp-dark"; - wasp-light = "wasp-light"; - errorMessage = "Unknown theme: ${currentTheme}"; - - mkThemeMap = - themes: themeColours: - if currentTheme == builtins.head themes then - builtins.head themeColours - else if themes == [ ] then - throw errorMessage - else - mkThemeMap (builtins.tail themes) (builtins.tail themeColours); - - mapColour = - # Ayu - ayu-darkColour: ayu-lightColour: ayu-mirageColour: - # Catppuccin - catppuccin-frappeColour: catppuccin-latteColour: catppuccin-macchiatoColour: catppuccin-mochaColour: - # Dracula - draculaColour: - # Gruvbox - gruvbox-darkColour: gruvbox-lightColour: - # Houston - houstonColour: - # Kanagawa - kanagawa-dragonColour: kanagawa-lotusColour: kanagawa-waveColour: - # Laserwave - laserwaveColour: - # Lunar - lunarColour: - # Material - material-darkerColour: material-deep-oceanColour: material-forestColour: material-lighterColour: material-oceanicColour: material-palenightColour: material-sandy-beachColour: material-sky-blueColour: material-spaceColour: material-volcanoColour: - # Monokai - monokaiColour: - # Night Owl - night-owlColour: - # Nord - nordColour: - # Ocean Next - ocean-nextColour: - # One Dark - one-darkColour: - # Plastic - plasticColour: - # Poimandres - poimandres-baseColour: poimandres-stormColour: - # Rosepine - 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 - wasp-darkColour: wasp-lightColour: - mkThemeMap - [ - # Ayu - ayu-dark - ayu-light - ayu-mirage - # Catppuccin - catppuccin-frappe - catppuccin-latte - catppuccin-macchiato - catppuccin-mocha - # Dracula - dracula - # Gruvbox - gruvbox-dark - gruvbox-light - # Houston - houston - # Kanagawa - kanagawa-dragon - kanagawa-lotus - kanagawa-wave - # Laserwave - laserwave - # Lunar - lunar - # Material - material-darker - material-deep-ocean - material-forest - material-lighter - material-oceanic - material-palenight - material-sandy-beach - material-sky-blue - material-space - material-volcano - # Monokai - monokai - # Night Owl - night-owl - # Nord - nord - # Ocean Next - ocean-next - # One Dark - one-dark - # Plastic - plastic - # Poimandres - poimandres-base - poimandres-storm - # Rosepine - rosepine-base - rosepine-dawn - 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-dark - wasp-light - ] - [ - # Ayu - ayu-darkColour - ayu-lightColour - ayu-mirageColour - # Catppuccin - catppuccin-frappeColour - catppuccin-latteColour - catppuccin-macchiatoColour - catppuccin-mochaColour - # Dracula - draculaColour - # Gruvbox - gruvbox-darkColour - gruvbox-lightColour - # Houston - houstonColour - # Kanagawa - kanagawa-dragonColour - kanagawa-lotusColour - kanagawa-waveColour - # Laserwave - laserwaveColour - # Lunar - lunarColour - # Material - material-darkerColour - material-deep-oceanColour - material-forestColour - material-lighterColour - material-oceanicColour - material-palenightColour - material-sandy-beachColour - material-sky-blueColour - material-spaceColour - material-volcanoColour - # Monokai - monokaiColour - # Night Owl - night-owlColour - # Nord - nordColour - # Ocean Next - ocean-nextColour - # One Dark - one-darkColour - # Plastic - plasticColour - # Poimandres - poimandres-baseColour - poimandres-stormColour - # Rosepine - 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 - wasp-darkColour - wasp-lightColour - ]; in { themes = { currentTheme = currentTheme; - font = "MonaspiceRn Nerd Font"; - schemes = + font = { + name = "MonaspiceRn Nerd Font"; + }; + palettes = let - schemePath = ./schemes; - ayuPath = /ayu; + palettePath = ./palettes; catppuccinPath = /catppuccin; - gruvboxPath = /gruvbox; - kanagawaPath = /kanagawa; - materialPath = /material; - poimandresPath = /poimandres; - rosepinePath = /rosepine; - toyko-nightPath = /tokyo-night; - solarizedPath = /solarized; - waspPath = /wasp; in { - ${ayu-dark} = import (schemePath + ayuPath + /dark); - ${ayu-light} = import (schemePath + ayuPath + /light); - ${ayu-mirage} = import (schemePath + ayuPath + /mirage); - ${catppuccin-frappe} = import (schemePath + catppuccinPath + /frappe); - ${catppuccin-latte} = import (schemePath + catppuccinPath + /latte); - ${catppuccin-macchiato} = import (schemePath + catppuccinPath + /macchiato); - ${catppuccin-mocha} = import (schemePath + catppuccinPath + /mocha); - ${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 + /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); - ${material-lighter} = import (schemePath + materialPath + /lighter); - ${material-oceanic} = import (schemePath + materialPath + /oceanic); - ${material-palenight} = import (schemePath + materialPath + /palenight); - ${material-deep-ocean} = import (schemePath + materialPath + /deep-ocean); - ${material-forest} = import (schemePath + materialPath + /forest); - ${material-sky-blue} = import (schemePath + materialPath + /sky-blue); - ${material-sandy-beach} = import (schemePath + materialPath + /sandy-beach); - ${material-volcano} = import (schemePath + materialPath + /volcano); - ${material-space} = import (schemePath + materialPath + /space); - ${monokai} = import (schemePath + /monokai); - ${night-owl} = import (schemePath + /night-owl); - ${nord} = import (schemePath + /nord); - ${ocean-next} = import (schemePath + /ocean-next); - ${one-dark} = import (schemePath + /one-dark); - ${poimandres-base} = import (schemePath + poimandresPath + /base); - ${poimandres-storm} = import (schemePath + poimandresPath + /storm); - ${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); - ${tokyo-night-storm} = import (schemePath + toyko-nightPath + /storm); - ${tokyo-night-day} = import (schemePath + toyko-nightPath + /day); - ${solorized-dark} = import (schemePath + solarizedPath + /dark); - ${solorized-light} = import (schemePath + solarizedPath + /light); - ${synthwave-84} = import (schemePath + /synthwave-84); - ${vesper} = import (schemePath + /vesper); - ${wasp-dark} = import (schemePath + waspPath + /dark); - ${wasp-light} = import (schemePath + waspPath + /light); + ${catppuccin-frappe} = import (palettePath + catppuccinPath + /frappe); + ${catppuccin-latte} = import (palettePath + catppuccinPath + /latte); + ${catppuccin-macchiato} = import (palettePath + catppuccinPath + /macchiato); + ${catppuccin-mocha} = import (palettePath + catppuccinPath + /mocha); + ${dracula} = import (palettePath + /dracula); }; - elements = import ./elements { inherit mapColour; }; }; } diff --git a/config/themes/elements/background0/default.nix b/config/themes/elements/background0/default.nix deleted file mode 100755 index 9cc5e17..0000000 --- a/config/themes/elements/background0/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background_hard" # gruvbox dark - "background_hard" # gruvbox light - "purple0" # 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 deleted file mode 100755 index 5abfe6a..0000000 --- a/config/themes/elements/background1/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background0" # gruvbox dark - "background0" # gruvbox light - "purple1" # 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 deleted file mode 100755 index fff793e..0000000 --- a/config/themes/elements/background2/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background1" # gruvbox dark - "background1" # gruvbox light - "purple2" # 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 deleted file mode 100755 index c44bfd5..0000000 --- a/config/themes/elements/character/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "foreground0" # gruvbox dark - "foreground0" # gruvbox light - "gray5" # 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 deleted file mode 100755 index f3dacb4..0000000 --- a/config/themes/elements/constant/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "purpleBright" # gruvbox dark - "purpleBright" # gruvbox light - "peach" # 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 deleted file mode 100755 index 9b04502..0000000 --- a/config/themes/elements/constructor/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "purpleBright" # gruvbox dark - "purpleBright" # gruvbox light - "blue5" # 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 deleted file mode 100755 index 0ee8c59..0000000 --- a/config/themes/elements/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -# 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 deleted file mode 100755 index 619a152..0000000 --- a/config/themes/elements/error/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "red" # gruvbox dark - "red" # gruvbox light - "red0" # 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 deleted file mode 100755 index 1b6ba63..0000000 --- a/config/themes/elements/function/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "greenBright" # gruvbox dark - "greenBright" # gruvbox light - "blue5" # 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 deleted file mode 100755 index ca0c8eb..0000000 --- a/config/themes/elements/keyword/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "aqua" # gruvbox dark - "aqua" # gruvbox light - "blue6" # 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 deleted file mode 100755 index 32584d0..0000000 --- a/config/themes/elements/label/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "blue" # gruvbox dark - "blue" # gruvbox light - "purple2" # 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 deleted file mode 100755 index 046c548..0000000 --- a/config/themes/elements/link/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "orange" # gruvbox dark - "orange" # gruvbox light - "blue6" # 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 deleted file mode 100755 index d85f342..0000000 --- a/config/themes/elements/noError/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "green" # gruvbox dark - "green" # gruvbox light - "green0" # 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 deleted file mode 100755 index e004e2f..0000000 --- a/config/themes/elements/operator/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "redBright" # gruvbox dark - "redBright" # gruvbox light - "grayBlue" # 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 deleted file mode 100755 index 8688984..0000000 --- a/config/themes/elements/overlay0/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background2" # gruvbox dark - "background2" # gruvbox light - "purple3" # 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 deleted file mode 100755 index b7b5048..0000000 --- a/config/themes/elements/overlay1/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background3" # gruvbox dark - "background3" # gruvbox light - "purple4" # 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 deleted file mode 100755 index efde868..0000000 --- a/config/themes/elements/overlay2/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background4" # gruvbox dark - "background4" # gruvbox light - "purple3" # 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 deleted file mode 100755 index ffc4bdd..0000000 --- a/config/themes/elements/parameter/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "gray" # gruvbox dark - "gray" # gruvbox light - "peach" # 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 deleted file mode 100755 index 7450fb7..0000000 --- a/config/themes/elements/regex/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "aqua" # gruvbox dark - "aqua" # gruvbox light - "blue6" # 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 deleted file mode 100755 index a5be2f4..0000000 --- a/config/themes/elements/selection/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "yellow" # gruvbox dark - "yellow" # gruvbox light - "purple2" # 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 deleted file mode 100755 index efe9411..0000000 --- a/config/themes/elements/subtext0/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "foreground1" # gruvbox dark - "foreground1" # gruvbox light - "grey0" # 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 deleted file mode 100755 index c2f9564..0000000 --- a/config/themes/elements/subtext1/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "foreground3" # gruvbox dark - "foreground3" # gruvbox light - "grey1" # 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 deleted file mode 100755 index 9e9ac8e..0000000 --- a/config/themes/elements/surface0/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background3" # gruvbox dark - "background3" # gruvbox light - "purple3" # 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 deleted file mode 100755 index f691d41..0000000 --- a/config/themes/elements/surface1/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background4" # gruvbox dark - "background4" # gruvbox light - "purple4" # 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 deleted file mode 100755 index 93ff3ed..0000000 --- a/config/themes/elements/surface2/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "background_soft" # gruvbox dark - "background_soft" # gruvbox light - "purple5" # 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 deleted file mode 100755 index 941b793..0000000 --- a/config/themes/elements/text/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "foreground0" # gruvbox dark - "foreground0" # gruvbox light - "white2" # 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 deleted file mode 100755 index aa8686a..0000000 --- a/config/themes/elements/warning/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ 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 - "orange" # gruvbox dark - "orange" # gruvbox light - "orange0" # 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/palettes/catppuccin/frappe/default.nix b/config/themes/palettes/catppuccin/frappe/default.nix new file mode 100755 index 0000000..596230a --- /dev/null +++ b/config/themes/palettes/catppuccin/frappe/default.nix @@ -0,0 +1,29 @@ +{ + font = ""; + colours = { + base00 = "303446"; # base + base01 = "292c3c"; # mantle + base02 = "414559"; # surface0 + base03 = "51576d"; # surface1 + base04 = "626880"; # surface2 + base05 = "c6d0f5"; # text + base06 = "f2d5cf"; # rosewater label + base07 = "babbf1"; # lavender + base08 = "e78284"; # red + base09 = "ef9f76"; # peach + base0A = "e5c890"; # yellow + base0B = "a6d189"; # green + base0C = "81c8be"; # teal character + base0D = "8caaee"; # blue function + base0E = "ca9ee6"; # mauve + base0F = "eebebe"; # flamingo + base10 = "292c3c"; # mantle - darker background + base11 = "232634"; # crust - darkest background + base12 = "ea999c"; # maroon - bright red parameter + base13 = "f2d5cf"; # rosewater - bright yellow + base14 = "a6d189"; # green - bright green + base15 = "99d1db"; # sky - bright cyan operator + base16 = "85c1dc"; # sapphire - bright blue constructor + base17 = "f4b8e4"; # pink - bright purple + }; +} diff --git a/config/themes/palettes/catppuccin/latte/default.nix b/config/themes/palettes/catppuccin/latte/default.nix new file mode 100755 index 0000000..ed5c979 --- /dev/null +++ b/config/themes/palettes/catppuccin/latte/default.nix @@ -0,0 +1,29 @@ +{ + font = ""; + colours = { + base00 = "eff1f5"; # base + base01 = "e6e9ef"; # mantle + base02 = "ccd0da"; # surface0 + base03 = "bcc0cc"; # surface1 + base04 = "acb0be"; # surface2 + base05 = "4c4f69"; # text + base06 = "dc8a78"; # rosewater + base07 = "7287fd"; # lavender + base08 = "d20f39"; # red + base09 = "fe640b"; # peach + base0A = "df8e1d"; # yellow + base0B = "40a02b"; # green + base0C = "179299"; # teal + base0D = "1e66f5"; # blue + base0E = "8839ef"; # mauve + base0F = "dd7878"; # flamingo + base10 = "e6e9ef"; # mantle - darker background + base11 = "dce0e8"; # crust - darkest background + base12 = "e64553"; # maroon - bright red + base13 = "dc8a78"; # rosewater - bright yellow + base14 = "40a02b"; # green - bright green + base15 = "04a5e5"; # sky - bright cyan + base16 = "209fb5"; # sapphire - bright blue + base17 = "ea76cb"; # pink - bright purple + }; +} diff --git a/config/themes/palettes/catppuccin/macchiato/default.nix b/config/themes/palettes/catppuccin/macchiato/default.nix new file mode 100755 index 0000000..22513a4 --- /dev/null +++ b/config/themes/palettes/catppuccin/macchiato/default.nix @@ -0,0 +1,29 @@ +{ + font = ""; + colours = { + base00 = "24273a"; # base + base01 = "1e2030"; # mantle + base02 = "363a4f"; # surface0 + base03 = "494d64"; # surface1 + base04 = "5b6078"; # surface2 + base05 = "cad3f5"; # text + base06 = "f4dbd6"; # rosewater + base07 = "b7bdf8"; # lavender + base08 = "ed8796"; # red + base09 = "f5a97f"; # peach + base0A = "eed49f"; # yellow + base0B = "a6da95"; # green + base0C = "8bd5ca"; # teal + base0D = "8aadf4"; # blue + base0E = "c6a0f6"; # mauve + base0F = "f0c6c6"; # flamingo + base10 = "1e2030"; # mantle - darker background + base11 = "181926"; # crust - darkest background + base12 = "ee99a0"; # maroon - bright red + base13 = "f4dbd6"; # rosewater - bright yellow + base14 = "a6da95"; # green - bright green + base15 = "91d7e3"; # sky - bright cyan + base16 = "7dc4e4"; # sapphire - bright blue + base17 = "f5bde6"; # pink - bright purple + }; +} diff --git a/config/themes/palettes/catppuccin/mocha/default.nix b/config/themes/palettes/catppuccin/mocha/default.nix new file mode 100755 index 0000000..3f0b04d --- /dev/null +++ b/config/themes/palettes/catppuccin/mocha/default.nix @@ -0,0 +1,29 @@ +{ + font = ""; + colours = { + base00 = "1e1e2e"; # base + base01 = "181825"; # mantle + base02 = "313244"; # surface0 + base03 = "45475a"; # surface1 + base04 = "585b70"; # surface2 + base05 = "cdd6f4"; # text + base06 = "f5e0dc"; # rosewater + base07 = "b4befe"; # lavender + base08 = "f38ba8"; # red + base09 = "fab387"; # peach + base0A = "f9e2af"; # yellow + base0B = "a6e3a1"; # green + base0C = "94e2d5"; # teal + base0D = "89b4fa"; # blue + base0E = "cba6f7"; # mauve + base0F = "f2cdcd"; # flamingo + base10 = "181825"; # mantle - darker background + base11 = "11111b"; # crust - darkest background + base12 = "eba0ac"; # maroon - bright red + base13 = "f5e0dc"; # rosewater - bright yellow + base14 = "a6e3a1"; # green - bright green + base15 = "89dceb"; # sky - bright cyan + base16 = "74c7ec"; # sapphire - bright blue + base17 = "f5c2e7"; # pink - bright purple + }; +} diff --git a/config/themes/palettes/dracula/default.nix b/config/themes/palettes/dracula/default.nix new file mode 100644 index 0000000..10ead0b --- /dev/null +++ b/config/themes/palettes/dracula/default.nix @@ -0,0 +1,29 @@ +{ + font = ""; + colours = { + base00 = "282a36"; + base01 = "363447"; + base02 = "44475a"; + base03 = "6272a4"; + base04 = "9ea8c7"; + base05 = "f8f8f2"; + base06 = "f0f1f4"; + base07 = "ffffff"; + base08 = "ff5555"; + base09 = "ffb86c"; + base0A = "f1fa8c"; + base0B = "50fa7b"; + base0C = "8be9fd"; + base0D = "80bfff"; + base0E = "ff79c6"; + base0F = "bd93f9"; + base10 = "1e2029"; + base11 = "16171d"; + base12 = "f28c8c"; + base13 = "eef5a3"; + base14 = "a3f5b8"; + base15 = "baedf7"; + base16 = "a3ccf5"; + base17 = "f5a3d2"; + }; +} diff --git a/config/themes/schemes/ayu/dark/default.nix b/config/themes/schemes/ayu/dark/default.nix deleted file mode 100755 index 7479774..0000000 --- a/config/themes/schemes/ayu/dark/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - font = ""; - colours = { - tag = "39BAE6"; - func = "FFB454"; - entity = "59C2FF"; - string = "AAD94C"; - regex = "95E6CB"; - markup = "F07178"; - keyword = "FF8F40"; - special = "E6B673"; - comment = "ACB6BF"; - constant = "D2A6FF"; - operator = "F29668"; - added = "7FD962"; - modified = "73B8FF"; - removed = "F26D78"; - editor_fg = "BFBDB6"; - editor_bg = "0D1017"; - editor_line = "131721"; - editor_selection = "409FFF"; - editor_match = "6C5980"; - editor_indent = "6C7380"; - ui_fg = "565B66"; - ui_bg = "0B0E14"; - ui_line = "11151C"; - ui_selection = "475266"; - ui_panel_bg = "0F131A"; - ui_panel_shadow = "000000"; - accent = "E6B450"; - error = "D95757"; - }; -} diff --git a/config/themes/schemes/ayu/light/default.nix b/config/themes/schemes/ayu/light/default.nix deleted file mode 100755 index e78488f..0000000 --- a/config/themes/schemes/ayu/light/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - font = ""; - colours = { - tag = "55B4D4"; - func = "F2AE49"; - entity = "399EE6"; - string = "86B300"; - regex = "4CBF99"; - markup = "F07171"; - keyword = "FA8D3E"; - special = "E6BA7E"; - comment = "787B80"; - constant = "A37ACC"; - operator = "ED9366"; - added = "6CBF43"; - modified = "478ACC"; - removed = "FF7383"; - editor_fg = "5C6166"; - editor_bg = "FCFCFC"; - editor_selection = "035BD6"; - editor_match = "9F40FF"; - ui_fg = "8A9199"; - ui_bg = "F8F9FA"; - ui_line = "6B7D8F"; - ui_selection_active = "56728F"; - ui_selection_normal = "6B7D8F"; - ui_panel_bg = "F3F4F5"; - ui_panel_shadow = "000000"; - accent = "FFAA33"; - error = "E65050"; - }; -} diff --git a/config/themes/schemes/ayu/mirage/default.nix b/config/themes/schemes/ayu/mirage/default.nix deleted file mode 100755 index bb75bfe..0000000 --- a/config/themes/schemes/ayu/mirage/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - font = ""; - colours = { - tag = "5CCFE6"; - func = "FFD173"; - entity = "73D0FF"; - string = "D5FF80"; - regex = "95E6CB"; - markup = "F28779"; - keyword = "FFAD66"; - special = "FFDFB3"; - comment = "B8CFE6"; - constant = "DFBFFF"; - operator = "F29E74"; - added = "87D96C"; - modified = "80BFFF"; - removed = "F27983"; - editor_fg = "CCCAC2"; - editor_bg = "242936"; - editor_line = "1A1F29"; - editor_selection = "409FFF"; - editor_match = "695380"; - editor_indent = "8A9199"; - ui_fg = "707A8C"; - ui_bg = "1F2430"; - ui_line = "171B24"; - ui_selection_active = "637599"; - ui_selection_normal = "69758C"; - ui_panel_bg = "1C212B"; - ui_panel_shadow = "12151C"; - accent = "FFCC66"; - error = "FF6666"; - }; -} diff --git a/config/themes/schemes/catppuccin/frappe/default.nix b/config/themes/schemes/catppuccin/frappe/default.nix deleted file mode 100755 index 00ca462..0000000 --- a/config/themes/schemes/catppuccin/frappe/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - font = ""; - colours = { - rosewater = "f2d5cf"; - flamingo = "eebebe"; - pink = "f4b8e4"; - mauve = "ca9ee6"; - red = "e78284"; - maroon = "ea999c"; - peach = "ef9f76"; - yellow = "e5c890"; - green = "a6d189"; - teal = "81c8be"; - sky = "99d1db"; - sapphire = "85c1dc"; - blue = "8caaee"; - lavender = "babbf1"; - text = "c6d0f5"; - subtext1 = "b5bfe2"; - subtext0 = "a5adce"; - overlay2 = "949cbb"; - overlay1 = "838ba7"; - overlay0 = "737994"; - surface2 = "626880"; - surface1 = "51576d"; - surface0 = "414559"; - base = "303446"; - mantle = "292c3c"; - crust = "232634"; - }; -} diff --git a/config/themes/schemes/catppuccin/latte/default.nix b/config/themes/schemes/catppuccin/latte/default.nix deleted file mode 100755 index 86c7855..0000000 --- a/config/themes/schemes/catppuccin/latte/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - font = ""; - colours = { - rosewater = "dc8a78"; - flamingo = "dd7878"; - pink = "ea76cb"; - mauve = "8839ef"; - red = "d20f39"; - maroon = "e64553"; - peach = "fe640b"; - yellow = "df8e1d"; - green = "40a02b"; - teal = "179299"; - sky = "04a5e5"; - sapphire = "209fb5"; - blue = "1e66f5"; - lavender = "7287fd"; - text = "4c4f69"; - subtext1 = "5c5f77"; - subtext0 = "6c6f85"; - overlay2 = "7c7f93"; - overlay1 = "8c8fa1"; - overlay0 = "9ca0b0"; - surface2 = "acb0be"; - surface1 = "bcc0cc"; - surface0 = "ccd0da"; - base = "eff1f5"; - mantle = "e6e9ef"; - crust = "dce0e8"; - }; -} diff --git a/config/themes/schemes/catppuccin/macchiato/default.nix b/config/themes/schemes/catppuccin/macchiato/default.nix deleted file mode 100755 index fa1e631..0000000 --- a/config/themes/schemes/catppuccin/macchiato/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - font = ""; - colours = { - rosewater = "f4dbd6"; - flamingo = "f0c6c6"; - pink = "f5bde6"; - mauve = "c6a0f6"; - red = "ed8796"; - maroon = "ee99a0"; - peach = "f5a97f"; - yellow = "eed49f"; - green = "a6da95"; - teal = "8bd5ca"; - sky = "91d7e3"; - sapphire = "7dc4e4"; - blue = "8aadf4"; - lavender = "b7bdf8"; - text = "cad3f5"; - subtext1 = "b8c0e0"; - subtext0 = "a5adcb"; - overlay2 = "939ab7"; - overlay1 = "8087a2"; - overlay0 = "6e738d"; - surface2 = "5b6078"; - surface1 = "494d64"; - surface0 = "363a4f"; - base = "24273a"; - mantle = "1e2030"; - crust = "181926"; - }; -} diff --git a/config/themes/schemes/catppuccin/mocha/default.nix b/config/themes/schemes/catppuccin/mocha/default.nix deleted file mode 100755 index 030333f..0000000 --- a/config/themes/schemes/catppuccin/mocha/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - font = ""; - colours = { - rosewater = "f5e0dc"; - flamingo = "f2cdcd"; - pink = "f5c2e7"; - mauve = "cba6f7"; - red = "f38ba8"; - maroon = "eba0ac"; - peach = "fab387"; - yellow = "f9e2af"; - green = "a6e3a1"; - teal = "94e2d5"; - sky = "89dceb"; - sapphire = "74c7ec"; - blue = "89b4fa"; - lavender = "b4befe"; - text = "cdd6f4"; - subtext1 = "bac2de"; - subtext0 = "a6adc8"; - overlay2 = "9399b2"; - overlay1 = "7f849c"; - overlay0 = "6c7086"; - surface2 = "585b70"; - surface1 = "45475a"; - surface0 = "313244"; - base = "1e1e2e"; - mantle = "181825"; - crust = "11111b"; - }; -} diff --git a/config/themes/schemes/dracula/default.nix b/config/themes/schemes/dracula/default.nix deleted file mode 100755 index 4810af1..0000000 --- a/config/themes/schemes/dracula/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - font = ""; - colours = { - background = "282a36"; - currentLine = "44475a"; - selection = "44475a"; - foreground = "f8f8f2"; - comment = "6272a4"; - cyan = "8be9fd"; - green = "50fa7b"; - orange = "ffb86c"; - pink = "ff79c6"; - purple = "bd93f9"; - red = "ff5555"; - yellow = "f1fa8c"; - }; -} diff --git a/config/themes/schemes/gruvbox/dark/default.nix b/config/themes/schemes/gruvbox/dark/default.nix deleted file mode 100755 index 2c10493..0000000 --- a/config/themes/schemes/gruvbox/dark/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - font = ""; - colours = { - background0 = "282828"; - background1 = "3c3836"; - background2 = "504945"; - background3 = "665c54"; - background4 = "7c6f64"; - background_hard = "1d2021"; - background_soft = "32302f"; - foreground0 = "fbf1c7"; - foreground1 = "ebdbb2"; - foreground2 = "d5c4a1"; - foreground3 = "bdae93"; - foreground4 = "a89984"; - gray = "928374"; - grayBright = "a89984"; - red = "cc241d"; - redBright = "fb4934"; - green = "98971a"; - greenBright = "b8bb26"; - yellow = "d79921"; - yellowBright = "fabd2f"; - blue = "458588"; - blueBright = "83a598"; - purple = "b16286"; - purpleBright = "d3869b"; - aqua = "689d6a"; - aquaBright = "8ec07c"; - orange = "d65d0e"; - orangeBright = "fe8019"; - }; -} diff --git a/config/themes/schemes/gruvbox/light/default.nix b/config/themes/schemes/gruvbox/light/default.nix deleted file mode 100755 index 1bb16c1..0000000 --- a/config/themes/schemes/gruvbox/light/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - font = ""; - colours = { - background0 = "fbf1c7"; - background1 = "ebdbb2"; - background2 = "d5c4a1"; - background3 = "bdae93"; - background4 = "a89984"; - background_hard = "f9f5d7"; - background_soft = "f2e5bc"; - foreground0 = "282828"; - foreground1 = "3c3836"; - foreground2 = "504945"; - foreground3 = "665c54"; - foreground4 = "7c6f64"; - gray = "7c6f64"; - grayBright = "928374"; - red = "9d0006"; - redBright = "cc241d"; - green = "79740e"; - greenBright = "98971a"; - yellow = "b57614"; - yellowBright = "d79921"; - blue = "076678"; - blueBright = "458588"; - purple = "8f3f71"; - purpleBright = "b16286"; - aqua = "427b58"; - aquaBright = "689d6a"; - orange = "af3a03"; - orangeBright = "d65d0e"; - }; -} diff --git a/config/themes/schemes/houston/default.nix b/config/themes/schemes/houston/default.nix deleted file mode 100755 index 3130305..0000000 --- a/config/themes/schemes/houston/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - font = ""; - colours = { - blue0 = "000000"; - blue1 = "17191e"; - blue2 = "343841"; - blue3 = "495f77"; - blue4 = "004972b8"; - blue5 = "00daef"; - blue6 = "54b9ff"; - blue7 = "007acc"; - blue8 = "2d4860"; - purple0 = "17191e"; - purple1 = "2a2d34"; - purple2 = "4bf3c8"; - purple3 = "ad5dca"; - purple4 = "b2434300"; - purple5 = "dc3657"; - red0 = "dc3657"; - red1 = "f4587e"; - red2 = "ea5c0055"; - red3 = "f06788"; - red4 = "c74e39"; - red5 = "ff8551"; - green0 = "2d4860"; - green1 = "23d18b"; - green2 = "24c0cf"; - yellow0 = "fbc23b"; - yellow1 = "ee931e"; - gray0 = "cccccc"; - gray1 = "bfc1c9"; - gray2 = "858b98"; - gray3 = "80808059"; - gray4 = "a9904000"; - gray5 = "aeafad"; - black0 = "000000"; - black1 = "ffffff"; - orange0 = "dc3657"; - orange1 = "fbc23b"; - white0 = "ffffff0b"; - white1 = "ffffff25"; - white2 = "ffffff1f"; - peach = "ffd493"; - grayBlue = "eef0f9"; - }; -} diff --git a/config/themes/schemes/kanagawa/dragon/default.nix b/config/themes/schemes/kanagawa/dragon/default.nix deleted file mode 100755 index ae14a57..0000000 --- a/config/themes/schemes/kanagawa/dragon/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - font = ""; - colours = { - dragonBlack0 = "0d0c0c"; - dragonBlack1 = "12120f"; - dragonBlack2 = "1D1C19"; - dragonBlack3 = "181616"; - dragonBlack4 = "282727"; - dragonBlack5 = "393836"; - dragonBlack6 = "625e5a"; - dragonWhite = "c5c9c5"; - dragonGreen = "87a987"; - dragonGreen2 = "8a9a7b"; - dragonPink = "a292a3"; - dragonOrange = "b6927b"; - dragonOrange2 = "b98d7b"; - dragonGray = "a6a69c"; - dragonGray2 = "9e9b93"; - dragonGray3 = "7a8382"; - dragonBlue2 = "8ba4b0"; - dragonViolet = "8992a7"; - dragonRed = "c4746e"; - dragonAqua = "8ea4a2"; - dragonAsh = "737c73"; - dragonTeal = "949fb5"; - dragonYellow = "c4b28a"; - waveBlue1 = "#223249"; - waveBlue2 = "#2D4F67"; - oldWhite = "#C8C093"; - fujiWhite = "#DCD7BA"; - sumiInk6 = "#54546D"; - katanaGray = "#717C7C"; - samuraiRed = "#E82424"; - springGreen = "#98BB6C"; - roninYellow = "#FF9E3B"; - dragonBlue = "#658594"; - waveAqua1 = "#6A9589"; - winterGreen = "#2B3328"; - winterYellow = "#49443C"; - winterRed = "#43242B"; - winterBlue = "#252535"; - autumnGreen = "#76946A"; - autumnRed = "#C34043"; - autumnYellow = "#DCA561"; - carpYellow = "#E6C384"; - springBlue = "#7FB4CA"; - springViolet1 = "#938AA9"; - }; -} diff --git a/config/themes/schemes/kanagawa/lotus/default.nix b/config/themes/schemes/kanagawa/lotus/default.nix deleted file mode 100755 index aef1b2e..0000000 --- a/config/themes/schemes/kanagawa/lotus/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - font = ""; - colours = { - lotusInk1 = "545464"; - lotusInk2 = "43436c"; - lotusGray = "dcd7ba"; - lotusGray2 = "716e61"; - lotusGray3 = "8a8980"; - lotusWhite0 = "d5cea3"; - lotusWhite1 = "dcd5ac"; - lotusWhite2 = "e5ddb0"; - lotusWhite3 = "f2ecbc"; - lotusWhite4 = "e7dba0"; - lotusWhite5 = "e4d794"; - lotusViolet1 = "a09cac"; - lotusViolet2 = "766b90"; - lotusViolet3 = "c9cbd1"; - lotusViolet4 = "624c83"; - lotusBlue1 = "c7d7e0"; - lotusBlue2 = "b5cbd2"; - lotusBlue3 = "9fb5c9"; - lotusBlue4 = "4d699b"; - lotusBlue5 = "5d57a3"; - lotusGreen = "6f894e"; - lotusGreen2 = "6e915f"; - lotusGreen3 = "b7d0ae"; - lotusPink = "b35b79"; - lotusOrange = "cc6d00"; - lotusOrange2 = "e98a00"; - lotusYellow = "77713f"; - lotusYellow2 = "836f4a"; - lotusYellow3 = "de9800"; - lotusYellow4 = "f9d791"; - lotusRed = "c84053"; - lotusRed2 = "d7474b"; - lotusRed3 = "e82424"; - lotusRed4 = "d9a594"; - lotusAqua = "597b75"; - lotusAqua2 = "5e857a"; - lotusTeal1 = "4e8ca2"; - lotusTeal2 = "6693bf"; - lotusTeal3 = "5a7785"; - lotusCyan = "d7e3d8"; - }; -} diff --git a/config/themes/schemes/kanagawa/wave/default.nix b/config/themes/schemes/kanagawa/wave/default.nix deleted file mode 100755 index 7344b5b..0000000 --- a/config/themes/schemes/kanagawa/wave/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - font = ""; - colours = { - sumiInk0 = "#16161D"; - sumiInk1 = "#181820"; - sumiInk2 = "#1a1a22"; - sumiInk3 = "#1F1F28"; - sumiInk4 = "#2A2A37"; - sumiInk5 = "#363646"; - sumiInk6 = "#54546D"; - waveBlue1 = "#223249"; - waveBlue2 = "#2D4F67"; - winterGreen = "#2B3328"; - winterYellow = "#49443C"; - winterRed = "#43242B"; - winterBlue = "#252535"; - autumnGreen = "#76946A"; - autumnRed = "#C34043"; - autumnYellow = "#DCA561"; - samuraiRed = "#E82424"; - roninYellow = "#FF9E3B"; - waveAqua1 = "#6A9589"; - dragonBlue = "#658594"; - oldWhite = "#C8C093"; - fujiWhite = "#DCD7BA"; - fujiGray = "#727169"; - oniViolet = "#957FB8"; - oniViolet2 = "#b8b4d0"; - crystalBlue = "#7E9CD8"; - springViolet1 = "#938AA9"; - springViolet2 = "#9CABCA"; - springBlue = "#7FB4CA"; - lightBlue = "#A3D4D5"; - waveAqua2 = "#7AA89F"; - springGreen = "#98BB6C"; - boatYellow1 = "#938056"; - boatYellow2 = "#C0A36E"; - carpYellow = "#E6C384"; - sakuraPink = "#D27E99"; - waveRed = "#E46876"; - peachRed = "#FF5D62"; - surimiOrange = "#FFA066"; - katanaGray = "#717C7C"; - }; -} diff --git a/config/themes/schemes/laserwave/default.nix b/config/themes/schemes/laserwave/default.nix deleted file mode 100755 index 47a298a..0000000 --- a/config/themes/schemes/laserwave/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - font = ""; - colours = { - keywords = "40b4c4"; - functions = "eb64B9"; - strings = "b4dce7"; - numbers = "b381c5"; - operators = "74dfc4"; - comments = "91889b"; - punctuation = "7b6995"; - builtins = "ffe261"; - variables = "ffffff"; - background = "27212e"; - }; -} diff --git a/config/themes/schemes/lunar/default.nix b/config/themes/schemes/lunar/default.nix deleted file mode 100755 index 8cca038..0000000 --- a/config/themes/schemes/lunar/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - font = ""; - colours = { - white0 = "ffffff"; - white1 = "fbfbfb"; - white2 = "ffffff1f"; - white3 = "ffffff80"; - white4 = "ffffff00"; - black0 = "000000"; - black1 = "100230"; - black2 = "0d0421"; - black3 = "00000033"; - black4 = "00000000"; - grey0 = "bfbfbf"; - grey1 = "adadad"; - grey2 = "cccccc"; - grey3 = "d4d4d4"; - grey4 = "e7e7e7"; - grey5 = "e8be00"; - grey6 = "808080"; - grey7 = "7d42de"; - grey8 = "646464b3"; - grey9 = "7f7f7f4d"; - purple0 = "4c00c7"; - purple1 = "7e57bc"; - purple2 = "4a1d94"; - purple3 = "634c96"; - purple4 = "8753dd"; - purple5 = "ab93e0"; - purple6 = "9580e2"; - purple7 = "bfa0f2"; - purple8 = "aa84ff"; - purple9 = "8468b2"; - blue0 = "0b0121"; - blue1 = "0d047d"; - blue2 = "395F8F"; - blue3 = "4490BF00"; - blue4 = "3f2871"; - blue5 = "6190ba"; - blue6 = "5fb1f9"; - blue7 = "8db9e2"; - blue8 = "367366"; - blue9 = "264f7840"; - red0 = "be1100"; - red1 = "ff000c"; - red2 = "f48771"; - red3 = "ff7c3b"; - red4 = "ff7b61"; - red5 = "ff9900"; - red6 = "ff000033"; - green0 = "45e07b"; - green1 = "5a5a5a"; - green2 = "73c991"; - green3 = "61b95544"; - green4 = "0064001a"; - green5 = "264f784d"; - brown0 = "794bc4"; - brown1 = "794bc42e"; - brown2 = "baa545"; - orange0 = "cca700"; - orange1 = "e2c08d"; - orange2 = "c74e39"; - yellow0 = "e8be00"; - yellow1 = "b3b3ff"; - cyan0 = "264f784d"; - cyan1 = "7f7f7f4d"; - cyan2 = "264f7840"; - pink0 = "b68bff"; - pink1 = "7e57bc"; - }; -} diff --git a/config/themes/schemes/material/darker/default.nix b/config/themes/schemes/material/darker/default.nix deleted file mode 100755 index 310537d..0000000 --- a/config/themes/schemes/material/darker/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "B0BEC5"; - text = "727272"; - background-selection = "404040"; - foreground-selection = "FFFFFF"; - buttons = "2A2A2A"; - disabled = "474747"; - contrast = "1A1A1A"; - active = "323232"; - border = "292929"; - highlight = "3F3F3F"; - tree = "323232C0"; - notifications = "1A1A1A"; - accent = "FF9800"; - excluded-files = "323232"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "616161"; - white = "eeffff"; - error = "ff5370"; - comments = "616161"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "212121"; - background1 = "292929"; - }; -} diff --git a/config/themes/schemes/material/deep-ocean/default.nix b/config/themes/schemes/material/deep-ocean/default.nix deleted file mode 100755 index 17fed10..0000000 --- a/config/themes/schemes/material/deep-ocean/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "8F93A2"; - text = "4B526D"; - background-selection = "717CB480"; - foreground-selection = "FFFFFF"; - buttons = "191A21"; - disabled = "464B5D"; - contrast = "090B10"; - active = "1A1C25"; - border = "0F111A"; - highlight = "1F2233"; - tree = "717CB430"; - notifications = "090B10"; - accent = "84ffff"; - excluded-files = "292D3E"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "717CB4"; - white = "eeffff"; - error = "ff5370"; - comments = "717CB4"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "0F111A"; - background1 = "181A1F"; - }; -} diff --git a/config/themes/schemes/material/forest/default.nix b/config/themes/schemes/material/forest/default.nix deleted file mode 100755 index 251a8ca..0000000 --- a/config/themes/schemes/material/forest/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "B2C2B0"; - text = "49694D"; - background-selection = "1E611E"; - foreground-selection = "FFFFFF"; - buttons = "003535"; - disabled = "005454"; - contrast = "002020"; - active = "104110"; - border = "003838"; - highlight = "003F3F"; - tree = "32CD3250"; - notifications = "002020"; - accent = "FFCC80"; - excluded-files = "113711"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "005454"; - white = "eeffff"; - error = "ff5370"; - comments = "005454"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "002626"; - background1 = "002E2E"; - }; -} diff --git a/config/themes/schemes/material/lighter/default.nix b/config/themes/schemes/material/lighter/default.nix deleted file mode 100755 index fbfd625..0000000 --- a/config/themes/schemes/material/lighter/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "546E7A"; - text = "94A7B0"; - background-selection = "80CBC440"; - foreground-selection = "546e7a"; - buttons = "F3F4F5"; - disabled = "D2D4D5"; - contrast = "EEEEEE"; - active = "E7E7E8"; - border = "d3e1e8"; - highlight = "E7E7E8"; - tree = "80CBC440"; - notifications = "eae8e8"; - accent = "00BCD4"; - excluded-files = "CCD7DA50"; - green = "91b859"; - yellow = "f6a434"; - blue = "6182b8"; - red = "e53935"; - purple = "7c4dff"; - orange = "f76d47"; - cyan = "39adb5"; - gray = "AABFC9"; - black = "272727"; - error = "e53935"; - comments = "AABFC9"; - variables = "272727"; - links = "39ADB5"; - functions = "6182B8"; - keywords = "7C4DFF"; - tags = "E53935"; - strings = "91B859"; - operators = "39ADB5"; - attributes = "F6A434"; - numbers = "F76D47"; - parameters = "F76D47"; - background0 = "FAFAFA"; - background1 = "FFFFFF"; - }; -} diff --git a/config/themes/schemes/material/oceanic/default.nix b/config/themes/schemes/material/oceanic/default.nix deleted file mode 100755 index 221bcbe..0000000 --- a/config/themes/schemes/material/oceanic/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "B0BEC5"; - text = "607D8B"; - background-selection = "546E7A"; - foreground-selection = "FFFFFF"; - buttons = "2E3C43"; - disabled = "415967"; - contrast = "1E272C"; - active = "314549"; - border = "2A373E"; - highlight = "425B67"; - tree = "546E7A70"; - notifications = "1E272C"; - accent = "009688"; - excluded-files = "2E3C43"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "546e7a"; - white = "eeffff"; - error = "ff5370"; - comments = "546e7a"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "263238"; - background1 = "32424A"; - }; -} diff --git a/config/themes/schemes/material/palenight/default.nix b/config/themes/schemes/material/palenight/default.nix deleted file mode 100755 index 674bf8a..0000000 --- a/config/themes/schemes/material/palenight/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "A6ACCD"; - text = "676E95"; - background-selection = "717CB470"; - foreground-selection = "FFFFFF"; - buttons = "303348"; - disabled = "515772"; - contrast = "202331"; - active = "414863"; - border = "2b2a3e"; - highlight = "444267"; - tree = "676E95"; - notifications = "202331"; - accent = "ab47bc"; - excluded-files = "2f2e43"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "676E95"; - white = "eeffff"; - error = "ff5370"; - comments = "676E95"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "292D3E"; - background1 = "34324a"; - }; -} diff --git a/config/themes/schemes/material/sandy-beach/default.nix b/config/themes/schemes/material/sandy-beach/default.nix deleted file mode 100755 index b0674c5..0000000 --- a/config/themes/schemes/material/sandy-beach/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "546E7A"; - text = "888477"; - background-selection = "e7c496"; - foreground-selection = "FFFFFF"; - buttons = "f6d7b0"; - disabled = "B8B6A5"; - contrast = "FFF3DB"; - active = "fef8ec"; - border = "f2edde"; - highlight = "fbf1df"; - tree = "e7c49680"; - notifications = "f6d7b0"; - accent = "53c7f0"; - excluded-files = "f2e7ca"; - green = "91b859"; - yellow = "f6a434"; - blue = "6182b8"; - red = "e53935"; - purple = "7c4dff"; - orange = "f76d47"; - cyan = "39adb5"; - gray = "888477"; - black = "272727"; - error = "e53935"; - comments = "888477"; - variables = "272727"; - links = "39ADB5"; - functions = "6182B8"; - keywords = "7C4DFF"; - tags = "E53935"; - strings = "91B859"; - operators = "39ADB5"; - attributes = "F6A434"; - numbers = "F76D47"; - parameters = "F76D47"; - background0 = "FFF8ED"; - background1 = "f6edda"; - }; -} diff --git a/config/themes/schemes/material/sky-blue/default.nix b/config/themes/schemes/material/sky-blue/default.nix deleted file mode 100755 index 02da430..0000000 --- a/config/themes/schemes/material/sky-blue/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "005761"; - text = "01579B"; - background-selection = "ade2eb"; - foreground-selection = "FFFFFF"; - buttons = "c9eef2"; - disabled = "e7f2f3"; - contrast = "E4F2F2"; - active = "caedf2"; - border = "d0edf1"; - highlight = "d1eafa"; - tree = "b6e1e780"; - notifications = "e0eff1"; - accent = "00c6e0"; - excluded-files = "c1def0"; - green = "91b859"; - yellow = "f6a434"; - blue = "6182b8"; - red = "e53935"; - purple = "7c4dff"; - orange = "f76d47"; - cyan = "39adb5"; - gray = "01579B"; - black = "272727"; - error = "e53935"; - comments = "01579B"; - variables = "272727"; - links = "39ADB5"; - functions = "6182B8"; - keywords = "7C4DFF"; - tags = "E53935"; - strings = "91B859"; - operators = "39ADB5"; - attributes = "F6A434"; - numbers = "F76D47"; - parameters = "F76D47"; - background0 = "F5F5F5"; - background1 = "e7f2f3"; - }; -} diff --git a/config/themes/schemes/material/space/default.nix b/config/themes/schemes/material/space/default.nix deleted file mode 100755 index ae60892..0000000 --- a/config/themes/schemes/material/space/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "efeff1"; - text = "959DAA"; - background-selection = "383f56"; - foreground-selection = "FFFFFF"; - buttons = "313852"; - disabled = "5A6270"; - contrast = "060F2F"; - active = "303c6a"; - border = "313852"; - highlight = "383f56"; - tree = "31385270"; - notifications = "080f30"; - accent = "ad9bf6"; - excluded-files = "2f1d76"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "959DAA"; - white = "eeffff"; - error = "ff5370"; - comments = "959DAA"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "1B2240"; - background1 = "292f4d"; - }; -} diff --git a/config/themes/schemes/material/volcano/default.nix b/config/themes/schemes/material/volcano/default.nix deleted file mode 100755 index 28e69f2..0000000 --- a/config/themes/schemes/material/volcano/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - font = ""; - colours = { - foreground = "ffeaea"; - text = "ffd0aa"; - background-selection = "750000"; - foreground-selection = "FFFFFF"; - buttons = "700000"; - disabled = "7f3c3c"; - contrast = "300000"; - active = "440000"; - border = "400000"; - highlight = "550000"; - tree = "77000050"; - notifications = "300a0a"; - accent = "00bcd4"; - excluded-files = "662222"; - green = "c3e88d"; - yellow = "ffcb6b"; - blue = "82aaff"; - red = "f07178"; - purple = "c792ea"; - orange = "f78c6c"; - cyan = "89ddff"; - gray = "7F6451"; - white = "eeffff"; - error = "ff5370"; - comments = "7F6451"; - variables = "eeffff"; - links = "80cbc4"; - functions = "82aaff"; - keywords = "c792ea"; - tags = "f07178"; - strings = "c3e88d"; - operators = "89ddff"; - attributes = "ffcb6b"; - numbers = "f78c6c"; - parameters = "f78c6c"; - background0 = "390000"; - background1 = "330000"; - }; -} diff --git a/config/themes/schemes/monokai/default.nix b/config/themes/schemes/monokai/default.nix deleted file mode 100755 index a9eed21..0000000 --- a/config/themes/schemes/monokai/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - font = ""; - colours = { - background = "2e2e2e"; - comments = "797979"; - white = "d6d6d6"; - yellow = "e5b567"; - green = "b4d273"; - orange = "e87d3e"; - purple = "9e86c8"; - pink = "b05279"; - blue = "6c99bb"; - }; -} diff --git a/config/themes/schemes/night-owl/default.nix b/config/themes/schemes/night-owl/default.nix deleted file mode 100755 index d814dde..0000000 --- a/config/themes/schemes/night-owl/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - font = ""; - colours = { - background = "011627"; - foreground = "D6DEEB"; - cursor = "80A4C2"; - selection0 = "1D3B53"; - selection1 = "7E57C25A"; - highlight = "5F7E97"; - comment = "637777"; - constant = "FF6363"; - numbers = "F78C6C"; - keywords = "C792EA"; - functions = "82AAFF"; - strings = "ECC48DFF"; - support = "ADDB67"; - variables = "7FDBCA"; - invalid = "FF2C83"; - }; -} diff --git a/config/themes/schemes/nord/default.nix b/config/themes/schemes/nord/default.nix deleted file mode 100755 index 632e886..0000000 --- a/config/themes/schemes/nord/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - font = ""; - colours = { - nord0 = "2e3440"; - nord1 = "3b4252"; - nord2 = "434c5e"; - nord3 = "4c566a"; - nord4 = "d8dee9"; - nord5 = "e5e9f0"; - nord6 = "eceff4"; - nord7 = "8fbcbb"; - nord8 = "88c0d0"; - nord9 = "81a1c1"; - nord10 = "5e81ac"; - nord11 = "bf616a"; - nord12 = "d08770"; - nord13 = "ebcb8b"; - nord14 = "a3be8c"; - nord15 = "b48ead"; - }; -} diff --git a/config/themes/schemes/ocean-next/default.nix b/config/themes/schemes/ocean-next/default.nix deleted file mode 100755 index dc1a66a..0000000 --- a/config/themes/schemes/ocean-next/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - font = ""; - colours = { - base00 = "1b2b34"; - base01 = "343d46"; - base02 = "4f5b66"; - base03 = "65737e"; - base04 = "a7adba"; - base05 = "c0c5ce"; - base06 = "cdd3de"; - base07 = "d8dee9"; - red = "ec5f67"; - orange = "f99157"; - yellow = "fac863"; - green = "99c794"; - cyan = "62b3b2"; - blue = "6699cc"; - purple = "c594c5"; - brown = "ab7967"; - white = "ffffff"; - }; -} diff --git a/config/themes/schemes/one-dark/default.nix b/config/themes/schemes/one-dark/default.nix deleted file mode 100755 index a0ecde4..0000000 --- a/config/themes/schemes/one-dark/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - font = ""; - colours = { - background = "282c34"; - red = "e06c75"; - green = "98c379"; - yellow = "e5c07b"; - blue = "61afef"; - pink = "c678dd"; - teal = "56b6c2"; - gray = "abb2bf"; - }; -} diff --git a/config/themes/schemes/plastic/default.nix b/config/themes/schemes/plastic/default.nix deleted file mode 100755 index 37a27e7..0000000 --- a/config/themes/schemes/plastic/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - font = ""; - colours = { - blue0 = "1085FF"; - blue1 = "61AFEF"; - blue2 = "56B6C2"; - black0 = "21252B"; - black1 = "0D1117"; - black2 = "181A1F"; - gray0 = "C6CCD7"; - gray1 = "A9B2C3"; - gray2 = "5F6672"; - gray3 = "A9B2C31A"; - gray4 = "E9D16C"; - red0 = "E06C75"; - red1 = "D74E42"; - red2 = "E48189"; - green0 = "98C379"; - green1 = "CBF6AC0D"; - yellow0 = "E5C07B"; - yellow1 = "FF9FA80D"; - yellow2 = "FF9FA81A"; - purple0 = "B57EDC"; - white0 = "ffffff"; - }; -} diff --git a/config/themes/schemes/poimandres/base/default.nix b/config/themes/schemes/poimandres/base/default.nix deleted file mode 100755 index ce43263..0000000 --- a/config/themes/schemes/poimandres/base/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - font = ""; - colours = { - primary-background = "1b1e28"; - primary-foreground = "a6accd"; - search-matches-foreground = "1b1e28"; - search-matches-background = "add7ff"; - search-focused-match-foreground = "1b1e28"; - search-focused-match-background = "add7ff"; - search-bar-foreground = "1b1e28"; - search-bar-background = "add7ff"; - selection-background = "303340"; - normal-black = "1b1e28"; - normal-red = "d0679d"; - normal-green = "5de4c7"; - normal-yellow = "fffac2"; - normal-blue = "89ddff"; - normal-magenta = "fcc5e9"; - normal-cyan = "add7ff"; - normal-white = "ffffff"; - bright-black = "a6accd"; - bright-red = "d0679d"; - bright-green = "5de4c7"; - bright-yellow = "fffac2"; - bright-blue = "add7ff"; - bright-magenta = "fae4fc"; - bright-cyan = "89ddff"; - bright-white = "ffffff"; - }; -} diff --git a/config/themes/schemes/poimandres/storm/default.nix b/config/themes/schemes/poimandres/storm/default.nix deleted file mode 100755 index d233543..0000000 --- a/config/themes/schemes/poimandres/storm/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - font = ""; - colours = { - primary-background = "252b37"; - primary-foreground = "a6accd"; - search-matches-foreground = "1b1e28"; - search-matches-background = "add7ff"; - search-focused-match-foreground = "1b1e28"; - search-focused-match-background = "add7ff"; - selection-background = "303340"; - normal-black = "252b37"; - normal-red = "d0679d"; - normal-green = "5de4c7"; - normal-yellow = "fffac2"; - normal-blue = "89ddff"; - normal-magenta = "fae4fc"; - normal-cyan = "add7ff"; - normal-white = "ffffff"; - bright-black = "a6accd"; - bright-red = "d0679d"; - bright-green = "5de4c7"; - bright-yellow = "fffac2"; - bright-blue = "add7ff"; - bright-cyan = "89ddff"; - bright-magenta = "fcc5e9"; - bright-white = "ffffff"; - }; -} diff --git a/config/themes/schemes/rosepine/base/default.nix b/config/themes/schemes/rosepine/base/default.nix deleted file mode 100755 index 45f1d89..0000000 --- a/config/themes/schemes/rosepine/base/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - font = ""; - colours = { - base = "191724"; - surface = "1f1d2e"; - overlay = "26233a"; - muted = "6e6a86"; - subtle = "908caa"; - text = "e0def4"; - love = "eb6f92"; - gold = "f6c177"; - rose = "ebbcba"; - pine = "31748f"; - foam = "9ccfd8"; - iris = "c4a7e7"; - highlight0 = "21202e"; - highlight1 = "403d52"; - highlight2 = "524f67"; - }; -} diff --git a/config/themes/schemes/rosepine/dawn/default.nix b/config/themes/schemes/rosepine/dawn/default.nix deleted file mode 100755 index 4ce456a..0000000 --- a/config/themes/schemes/rosepine/dawn/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - font = ""; - colours = { - base = "faf4ed"; - surface = "fffaf3"; - overlay = "f2e9e1"; - muted = "9893a5"; - subtle = "797593"; - text = "575279"; - love = "b4637a"; - gold = "ea9d34"; - rose = "d7827e"; - pine = "286983"; - foam = "56949f"; - iris = "907aa9"; - highlight0 = "f4ede8"; - highlight1 = "dfdad9"; - highlight2 = "cecacd"; - }; -} diff --git a/config/themes/schemes/rosepine/moon/default.nix b/config/themes/schemes/rosepine/moon/default.nix deleted file mode 100755 index 333e22b..0000000 --- a/config/themes/schemes/rosepine/moon/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - font = ""; - colours = { - base = "232136"; - surface = "2a273f"; - overlay = "393552"; - muted = "6e6a86"; - subtle = "908caa"; - text = "e0def4"; - love = "eb6f92"; - gold = "f6c177"; - rose = "ea9a97"; - pine = "3e8fb0"; - foam = "9ccfd8"; - iris = "c4a7e7"; - highlight0 = "2a283e"; - highlight1 = "44415a"; - highlight2 = "56526e"; - }; -} diff --git a/config/themes/schemes/solarized/dark/default.nix b/config/themes/schemes/solarized/dark/default.nix deleted file mode 100755 index 7c1b51b..0000000 --- a/config/themes/schemes/solarized/dark/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - font = ""; - colours = { - yellow = "b58900"; - orange = "cb4b16"; - red = "dc322f"; - magenta = "d33682"; - violet = "6c71c4"; - blue = "268bd2"; - cyan = "2aa198"; - green = "859900"; - base00 = "657b83"; - base01 = "586e75"; - base02 = "073642"; - base03 = "002b36"; - }; -} diff --git a/config/themes/schemes/solarized/light/default.nix b/config/themes/schemes/solarized/light/default.nix deleted file mode 100755 index d878b86..0000000 --- a/config/themes/schemes/solarized/light/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - font = ""; - colours = { - yellow = "b58900"; - orange = "cb4b16"; - red = "dc322f"; - magenta = "d33682"; - violet = "6c71c4"; - blue = "268bd2"; - cyan = "2aa198"; - green = "859900"; - base0 = "839496"; - base1 = "93a1a1"; - base2 = "eee8d5"; - base3 = "fdf6e3"; - }; -} diff --git a/config/themes/schemes/synthwave-84/default.nix b/config/themes/schemes/synthwave-84/default.nix deleted file mode 100755 index 6d72316..0000000 --- a/config/themes/schemes/synthwave-84/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - font = ""; - colours = { - blue0 = "1f212b"; - blue1 = "495495"; - blue2 = "614D85"; - blue3 = "7059AB"; - blue4 = "72f1b8"; - blue5 = "03edf9"; - blue6 = "09f7a0"; - purple0 = "2a2139"; - purple1 = "34294f66"; - purple2 = "37294d99"; - purple3 = "241b2f"; - purple4 = "463465"; - purple5 = "880088"; - purple6 = "A148AB"; - purple7 = "b893ce"; - red0 = "fe4450"; - red1 = "f97e72"; - red2 = "ff7edb"; - gray0 = "232530"; - gray1 = "444251"; - gray2 = "262335"; - yellow0 = "fede5d"; - yellow1 = "f3e70f"; - gold0 = "D18616"; - white0 = "ffffff"; - white1 = "ffffff7c"; - white2 = "ffffff59"; - black0 = "08080f"; - }; -} diff --git a/config/themes/schemes/tokyo-night/day/default.nix b/config/themes/schemes/tokyo-night/day/default.nix deleted file mode 100755 index 471d247..0000000 --- a/config/themes/schemes/tokyo-night/day/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - font = ""; - colours = { - keyword = "8c4351"; - integer = "965027"; - parameter0 = "8f5e15"; - parameter1 = "634f30"; - string0 = "385f0d"; - string1 = "33635c"; - property = "33635c"; - builtin = "006c86"; - object = "0f4b6e"; - function = "2959aa"; - control = "5a3e8e"; - variable = "343b58"; - markdown = "40434f"; - comments = "6c6e75"; - terminal = "343B58"; - foreground = "343b58"; - background = "e6e7ed"; - }; -} diff --git a/config/themes/schemes/tokyo-night/night/default.nix b/config/themes/schemes/tokyo-night/night/default.nix deleted file mode 100755 index cdfbd68..0000000 --- a/config/themes/schemes/tokyo-night/night/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - font = ""; - colours = { - keyword = "f7768e"; - integer = "ff9e64"; - parameter0 = "e0af68"; - parameter1 = "cfc9c2"; - string0 = "9ece6a"; - property = "73daca"; - string1 = "b4f9f8"; - builtin = "2ac3de"; - object = "7dcfff"; - function = "7aa2f7"; - control = "bb9af7"; - variable = "c0caf5"; - markdown = "9aa5ce"; - comments = "565f89"; - terminal = "414868"; - foreground = "a9b1d6"; - background = "1a1b26"; - }; -} diff --git a/config/themes/schemes/tokyo-night/storm/default.nix b/config/themes/schemes/tokyo-night/storm/default.nix deleted file mode 100755 index 24749d9..0000000 --- a/config/themes/schemes/tokyo-night/storm/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - font = ""; - colours = { - keyword = "f7768e"; - integer = "ff9e64"; - parameter0 = "e0af68"; - parameter1 = "cfc9c2"; - string0 = "9ece6a"; - property = "73daca"; - string1 = "b4f9f8"; - builtin = "2ac3de"; - object = "7dcfff"; - function = "7aa2f7"; - control = "bb9af7"; - variable = "c0caf5"; - markdown = "9aa5ce"; - comments = "565f89"; - terminal = "414868"; - foreground = "a9b1d6"; - background = "24283b"; - }; -} diff --git a/config/themes/schemes/vesper/default.nix b/config/themes/schemes/vesper/default.nix deleted file mode 100755 index 427164b..0000000 --- a/config/themes/schemes/vesper/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - font = ""; - colours = { - black0 = "000"; - black1 = "101010"; - black2 = "161616"; - black3 = "232323"; - black4 = "282828"; - black5 = "343434"; - black6 = "34343480"; - black7 = "505050"; - black8 = "666"; - white0 = "FFF"; - white1 = "FFFFFF25"; - red0 = "FF8080"; - red1 = "FF7300"; - red2 = "FFC799"; - red3 = "FFCFA8"; - green0 = "99FFE4"; - green1 = "99FFE415"; - gray0 = "A0A0A0"; - gray1 = "7E7E7E"; - gray2 = "707070"; - gray3 = "1C1C1C"; - gray4 = "505050"; - }; -} diff --git a/config/themes/schemes/wasp/dark/default.nix b/config/themes/schemes/wasp/dark/default.nix deleted file mode 100755 index e460984..0000000 --- a/config/themes/schemes/wasp/dark/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - font = ""; - colours = { - background0 = "242424"; - background1 = "191919"; - text0 = "faf2d6"; - text1 = "bdae93"; - text2 = "E0E0E0"; - highlight0 = "640211"; - highlight1 = "83a598"; - highlight2 = "D49335"; - accent = "f8c537"; - selection = "f8c537"; - }; -} diff --git a/config/themes/schemes/wasp/light/default.nix b/config/themes/schemes/wasp/light/default.nix deleted file mode 100755 index bc65d12..0000000 --- a/config/themes/schemes/wasp/light/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - font = ""; - colours = { - background0 = "EDEDED"; - background1 = "C4C4C4"; - text0 = "1A2023"; - text1 = "DEDEDE"; - text2 = "D49335"; - highlight0 = "458588"; - highlight1 = "a89984"; - highlight2 = "D49335"; - accent = "961327"; - selection = "EDC180"; - }; -} diff --git a/flake.lock b/flake.lock index cf3e106..21b68cf 100755 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,72 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1735953590, + "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "buildbot-nix": { "inputs": { "flake-parts": "flake-parts_2", @@ -202,6 +268,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -315,6 +397,22 @@ } }, "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -487,7 +585,28 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_12" + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_13" }, "locked": { "lastModified": 1726560853, @@ -518,6 +637,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "ghostty": { "inputs": { "flake-compat": "flake-compat", @@ -526,11 +661,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736911212, - "narHash": "sha256-OLly4X2kN1tDb2gMYcWeim6uJECPoc52ltJsz1iD5Ug=", + "lastModified": 1737085478, + "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "ff9414d9ea7b16a375d41cde8f6f193de7e5db72", + "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", "type": "github" }, "original": { @@ -539,6 +674,32 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_4", + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -604,6 +765,45 @@ "type": "github" } }, + "gitignore_4": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "47.2", + "repo": "gnome-shell", + "type": "github" + } + }, "gomod2nix": { "inputs": { "flake-utils": "flake-utils", @@ -636,11 +836,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1736956623, - "narHash": "sha256-EiXiH9achp3FT9awsI/Bx5brMjB/RQGZnSdLqD44BaA=", + "lastModified": 1737072630, + "narHash": "sha256-eAcGSaqAHCTtSW8Y1ipK9/KagOPjHvaHmeSKXjXk+Cw=", "owner": "helix-editor", "repo": "helix", - "rev": "3318953bf6b3f7c054e971aec61bf22fd2a05104", + "rev": "ffdfb59033a4a6a8d931618f4e685c90928bd931", "type": "github" }, "original": { @@ -682,6 +882,27 @@ "nixpkgs" ] }, + "locked": { + "lastModified": 1737075266, + "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, "locked": { "lastModified": 1736785676, "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", @@ -824,11 +1045,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1736873552, - "narHash": "sha256-VByeYPOu3I0a5r5Nn45loSaEV8M9fmZrTByUdu9sjfY=", + "lastModified": 1737038559, + "narHash": "sha256-irqN8zKwpQ0NFxEvV/wQRdopClwkyZXCQoF7mgX/Uss=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "25add26881d7b98d2b80eb7a95d3aee0449b72b9", + "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", "type": "github" }, "original": { @@ -1195,11 +1416,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1736986915, - "narHash": "sha256-kluqu772XQsChMIVFhMWLxCEFqoPsOYeSW4VoYtIxtY=", + "lastModified": 1737071825, + "narHash": "sha256-P9n4HP0XPlXTViw7g3lBRX3Eix0sgcnhanV0ddB08SA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "bd40b6e6c1c3e618da16adb4f622ce2c99377c1d", + "rev": "c92ead1ab77f8be697a44ca855d06c5957ee2a62", "type": "github" }, "original": { @@ -1290,11 +1511,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -1345,11 +1566,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1736986475, - "narHash": "sha256-dl140tp9EZRsNRHyx6gEMwOOtYjcwQRI2vdrg/Hr70c=", + "lastModified": 1737085947, + "narHash": "sha256-HuPSp3eBpfsOmyuP9AT1az5R1s6ygmbT11zVSb1xriE=", "owner": "nix-community", "repo": "NUR", - "rev": "3e37d73198bdfb0ec5899cc228904f45d615d2a5", + "rev": "44c5207494e7e52a3d213635bfdcf42aba402dda", "type": "github" }, "original": { @@ -1390,11 +1611,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737043064, + "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", "type": "github" }, "original": { @@ -1485,11 +1706,12 @@ "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_10", + "stylix": "stylix", + "systems": "systems_11", "waybar": "waybar", "wpaperd": "wpaperd", "yazi": "yazi", - "zed": "zed" + "zed-editor": "zed-editor" } }, "rust-overlay": { @@ -1558,7 +1780,7 @@ "rust-overlay_4": { "inputs": { "nixpkgs": [ - "zed", + "zed-editor", "nixpkgs" ] }, @@ -1640,6 +1862,41 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_6", + "git-hooks": "git-hooks", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_10", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1736993991, + "narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=", + "owner": "danth", + "repo": "stylix", + "rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1656,6 +1913,21 @@ } }, "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_11": { "locked": { "lastModified": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -1670,7 +1942,7 @@ "type": "github" } }, - "systems_11": { + "systems_12": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1685,7 +1957,7 @@ "type": "github" } }, - "systems_12": { + "systems_13": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1820,6 +2092,72 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1865,7 +2203,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "nixpkgs": [ "nixpkgs" ] @@ -1890,7 +2228,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_2", - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1734445299, @@ -1949,16 +2287,16 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1736948799, - "narHash": "sha256-1Ew0DPAy2eCKepMBruQHnKQdvjdwMdDYXFhK3UHopiU=", + "lastModified": 1737047842, + "narHash": "sha256-gVdbw3reThRxfwmx4MQ1gsq5waHthpg4e64crT2YXqg=", "owner": "sxyazi", "repo": "yazi", - "rev": "63eb82aa72ed43e84571418aaa56d90383358c28", + "rev": "6c94227d40b150cf5446ee5577bffc805d107e29", "type": "github" }, "original": { @@ -1967,21 +2305,21 @@ "type": "github" } }, - "zed": { + "zed-editor": { "inputs": { "crane": "crane_3", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_9", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1736985698, - "narHash": "sha256-afZIwV4AvJJnMpHl0tjbN0+eOYQJqAQ4ifVZ/in//ZY=", + "lastModified": 1737086077, + "narHash": "sha256-jLl+8zdU3yQKblyGqkBIKlrabOwI8XoNujOBxDEgLIs=", "owner": "zed-industries", "repo": "zed", - "rev": "a41d72ee81f1031c62a6b809be41b5a7a2c8325d", + "rev": "21e7765a482d8231906e67ff4cc997d1cabc6077", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 25c2172..8f37f55 100755 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lix-module = { - url = - "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; flake-parts = { @@ -16,7 +15,9 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty = { url = "github:ghostty-org/ghostty"; }; + ghostty = { + url = "github:ghostty-org/ghostty"; + }; nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; edgedb = { url = "github:edgedb/packages-nix"; @@ -66,13 +67,18 @@ url = "github:direnv/direnv"; inputs.nixpkgs.follows = "nixpkgs"; }; - zed = { + zed-editor = { url = "github:zed-industries/zed"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs: + outputs = + inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.pre-commit-hooks-nix.flakeModule @@ -83,56 +89,59 @@ ./config ]; - flake = { config, ... }: { - nixosConfigurations = { - desktop = inputs.self.lib.mkLinuxSystem [ - ./systems/desktop - ./profiles/user0 - ./profiles/user1 - config.nixosModules.personal - config.nixosModules.desktop - config.nixosModules.hyprland - config.nixosModules.shared - inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default - inputs.nur.modules.nixos.default - inputs.sops-nix.nixosModules.sops - inputs.nixos-cosmic.nixosModules.default - ]; - laptop = inputs.self.lib.mkLinuxSystem [ - ./systems/laptop - ./profiles/user0 - ./profiles/user1 - config.nixosModules.personal - config.nixosModules.shared - inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default - inputs.nur.modules.nixos.default - inputs.sops-nix.nixosModules.sops - ]; - server = inputs.self.lib.mkLinuxSystem [ - ./systems/server - ./profiles/user0 - config.nixosModules.server - config.nixosModules.shared - inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default - inputs.ngipkgs.nixosModules."services.peertube" - inputs.ngipkgs.nixosModules.default - inputs.sops-nix.nixosModules.sops - ]; - }; - templates = { - elm = { - path = ./templates/elm; - description = "Elm Environment"; + flake = + { config, ... }: + { + nixosConfigurations = { + desktop = inputs.self.lib.mkLinuxSystem [ + ./systems/desktop + ./profiles/user0 + ./profiles/user1 + config.nixosModules.personal + config.nixosModules.desktop + config.nixosModules.hyprland + config.nixosModules.shared + inputs.home-manager.nixosModules.home-manager + inputs.lix-module.nixosModules.default + inputs.nur.modules.nixos.default + inputs.sops-nix.nixosModules.sops + inputs.nixos-cosmic.nixosModules.default + inputs.stylix.nixosModules.stylix + ]; + laptop = inputs.self.lib.mkLinuxSystem [ + ./systems/laptop + ./profiles/user0 + ./profiles/user1 + config.nixosModules.personal + config.nixosModules.shared + inputs.home-manager.nixosModules.home-manager + inputs.lix-module.nixosModules.default + inputs.nur.modules.nixos.default + inputs.sops-nix.nixosModules.sops + ]; + server = inputs.self.lib.mkLinuxSystem [ + ./systems/server + ./profiles/user0 + config.nixosModules.server + config.nixosModules.shared + inputs.home-manager.nixosModules.home-manager + inputs.lix-module.nixosModules.default + inputs.ngipkgs.nixosModules."services.peertube" + inputs.ngipkgs.nixosModules.default + inputs.sops-nix.nixosModules.sops + ]; }; - haskell = { - path = ./templates/haskell; - description = "Haskell Environment"; + templates = { + elm = { + path = ./templates/elm; + description = "Elm Environment"; + }; + haskell = { + path = ./templates/haskell; + description = "Haskell Environment"; + }; }; }; - }; systems = import inputs.systems; }; diff --git a/home/default.nix b/home/default.nix index 2b1028a..e78c262 100755 --- a/home/default.nix +++ b/home/default.nix @@ -2,54 +2,69 @@ let modulesPath = ./modules; miscPath = modulesPath + "/misc"; - moduleImport = path: nameTransform: + moduleImport = + path: nameTransform: builtins.listToAttrs ( map - (name: { - name = nameTransform name; - value = import (path + "/${name}"); - }) - ( - builtins.filter - (name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null) - (builtins.attrNames (builtins.readDir path)) - ) - ); - - modules = - moduleImport modulesPath (name: - builtins.replaceStrings [ - ".nix" - ] [ - "" - ] - name) - // moduleImport miscPath (name: "misc-${builtins.replaceStrings [ - ".nix" - ] [ - "" - ] - name}") - // (path: - builtins.listToAttrs ( - map (name: { - name = name; + name = nameTransform name; value = import (path + "/${name}"); }) ( - builtins.filter - (name: (builtins.readDir path).${name} == "directory" && name != "misc") - (builtins.attrNames (builtins.readDir path)) + builtins.filter ( + name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null + ) (builtins.attrNames (builtins.readDir path)) ) - )) - modulesPath; -in { + ); + + modules = + moduleImport modulesPath ( + name: + builtins.replaceStrings + [ + ".nix" + ] + [ + "" + ] + name + ) + // moduleImport miscPath ( + name: + "misc-${ + builtins.replaceStrings + [ + ".nix" + ] + [ + "" + ] + name + }" + ) + // + ( + path: + builtins.listToAttrs ( + map + (name: { + name = name; + value = import (path + "/${name}"); + }) + ( + builtins.filter (name: (builtins.readDir path).${name} == "directory" && name != "misc") ( + builtins.attrNames (builtins.readDir path) + ) + ) + ) + ) + modulesPath; +in +{ flake.homeModules = { desktop = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) brave flameshot misc-android @@ -62,8 +77,7 @@ in { entertainment = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) freetube misc-entertainment mpv @@ -74,8 +88,7 @@ in { firefox = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) firefox ; }; @@ -83,8 +96,7 @@ in { hyprland = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) gtk dunst easyEffects @@ -100,8 +112,7 @@ in { }; productionArt = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) misc-productionArt ; }; @@ -109,8 +120,7 @@ in { productionAudio = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) misc-productionAudio ; }; @@ -118,8 +128,7 @@ in { productionCode = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) neovim vscode zed @@ -129,8 +138,7 @@ in { productionVideo = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) misc-productionVideo obs-studio yt-dlp @@ -140,8 +148,7 @@ in { productionWriting = { imports = builtins.attrValues { - inherit - (modules) + inherit (modules) misc-productionWriting ; }; @@ -149,9 +156,7 @@ in { shared = { imports = builtins.attrValues { - inherit - (modules) - bat + inherit (modules) bottom direnv fastfetch diff --git a/home/modules/bat/default.nix b/home/modules/bat/default.nix deleted file mode 100755 index f319b4a..0000000 --- a/home/modules/bat/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - programs.bat = { - enable = true; - config.theme = "catppuccin-macchiato"; - }; - home = { - file = { - "./.config/bat/themes/macchiato.tmTheme" = { - source = ./macchiato.tmTheme; - }; - }; - }; -} diff --git a/home/modules/bat/macchiato.tmTheme b/home/modules/bat/macchiato.tmTheme deleted file mode 100755 index 0beedb6..0000000 --- a/home/modules/bat/macchiato.tmTheme +++ /dev/null @@ -1,959 +0,0 @@ - - - - - name - Catppuccin - settings - - - settings - - foreground - #cad3f5 - background - #24273a - caret - #b8c0e0 - invisibles - #a5adcb - gutterForeground - #939ab7 - gutterForegroundHighlight - #a6da95 - lineHighlight - #5b6078 - selection - #6e738d - selectionBorder - #24273a - activeGuide - #f5a97f - findHighlightForeground - #1e2030 - findHighlight - #eed49f - bracketsForeground - #939ab7 - bracketContentsForeground - #939ab7 - - - - name - Comment - scope - comment - settings - - foreground - #6e738d - fontStyle - italic - - - - name - String - scope - string - settings - - foreground - #a6da95 - fontStyle - - - - - name - String regex - scope - string.regexp - settings - - foreground - #f5a97f - fontStyle - - - - - name - Number - scope - constant.numeric - settings - - foreground - #f5a97f - fontStyle - - - - - name - Boolean - scope - constant.language.boolean - settings - - foreground - #f5a97f - fontStyle - bold italic - - - - name - Built-in constant - scope - constant.language - settings - - foreground - #b7bdf8 - fontStyle - italic - - - - name - Built-in function - scope - support.function.builtin - settings - - foreground - #f5a97f - fontStyle - italic - - - - name - User-defined constant - scope - variable.other.constant - settings - - foreground - #f5a97f - fontStyle - - - - - name - Variable - scope - variable - settings - - - - name - Keyword - scope - keyword - settings - - foreground - #ed8796 - fontStyle - italic - - - - name - Conditional/loop - scope - keyword.control.loop, keyword.control.conditional, keyword.control.c++ - settings - - foreground - #c6a0f6 - fontStyle - bold - - - - name - Return - scope - keyword.control.return, keyword.control.flow.return - settings - - foreground - #f5bde6 - fontStyle - bold - - - - name - Exception - scope - support.type.exception - settings - - foreground - #f5a97f - fontStyle - italic - - - - name - Operator - scope - keyword.operator, punctuation.accessor - settings - - foreground - #91d7e3 - fontStyle - bold - - - - name - Punctuation separator - scope - punctuation.separator - settings - - foreground - #8bd5ca - fontStyle - - - - - name - Punctuation terminator - scope - punctuation.terminator - settings - - foreground - #8bd5ca - fontStyle - - - - - name - Punctuation bracket - scope - punctuation.section - settings - - foreground - #939ab7 - fontStyle - - - - - name - Include - scope - keyword.control.import.include - settings - - foreground - #8bd5ca - fontStyle - italic - - - - name - Storage - scope - storage - settings - - foreground - #ed8796 - fontStyle - - - - - name - Storage type - scope - storage.type - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Storage modifier - scope - storage.modifier - settings - - foreground - #ed8796 - fontStyle - - - - - name - Storage type namespace - scope - entity.name.namespace, meta.path - settings - - foreground - #f4dbd6 - fontStyle - italic - - - - name - Storage type class - scope - storage.type.class - settings - - foreground - #f4dbd6 - fontStyle - italic - - - - name - Label - scope - entity.name.label - settings - - foreground - #8aadf4 - fontStyle - - - - - name - Keyword class - scope - keyword.declaration.class - settings - - foreground - #ed8796 - fontStyle - italic - - - - name - Class name - scope - entity.name.class, meta.toc-list.full-identifier - settings - - foreground - #91d7e3 - fontStyle - - - - - name - Inherited class - scope - entity.other.inherited-class - settings - - foreground - #91d7e3 - fontStyle - italic - - - - name - Function name - scope - entity.name.function, variable.function - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Function macro - scope - entity.name.function.preprocessor - settings - - foreground - #ed8796 - fontStyle - - - - - name - Macro directive - ifdef - scope - keyword.control.import - settings - - foreground - #ed8796 - fontStyle - - - - - name - Constructor - scope - entity.name.function.constructor, entity.name.function.destructor - settings - - foreground - #b7bdf8 - fontStyle - - - - - name - Function argument - scope - variable.parameter.function - settings - - foreground - #f4dbd6 - fontStyle - italic - - - - name - Function declaration - scope - keyword.declaration.function - settings - - foreground - #ee99a0 - fontStyle - italic - - - - name - Library function - scope - support.function - settings - - foreground - #91d7e3 - fontStyle - - - - - name - Library constant - scope - support.constant - settings - - foreground - #8aadf4 - fontStyle - - - - - name - Library class/type - scope - support.type, support.class - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Library variable - scope - support.other.variable - settings - - fontStyle - - - - - name - Variable function - scope - variable.function - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Variable parameter - scope - variable.parameter - settings - - foreground - #f4dbd6 - fontStyle - italic - - - - name - Variable other - scope - variable.other - settings - - foreground - #cad3f5 - fontStyle - italic - - - - name - Variable field - scope - variable.other.member - settings - - foreground - #f4dbd6 - fontStyle - - - - - name - Variable language - scope - variable.language - settings - - foreground - #8bd5ca - fontStyle - - - - - name - Tag name - scope - entity.name.tag - settings - - foreground - #f5a97f - fontStyle - - - - - name - Tag attribute - scope - entity.other.attribute-name - settings - - foreground - #c6a0f6 - fontStyle - italic - - - - name - Tag delimiter - scope - punctuation.definition.tag - settings - - foreground - #ee99a0 - fontStyle - - - - - name - Markdown URL - scope - markup.underline.link.markdown - settings - - foreground - #f4dbd6 - fontStyle - italic underline - - - - name - Markdown reference - scope - meta.link.inline.description - settings - - foreground - #b7bdf8 - fontStyle - bold - - - - name - Markdown literal - scope - comment.block.markdown, meta.code-fence, markup.raw.code-fence, markup.raw.inline - settings - - foreground - #8bd5ca - fontStyle - italic - - - - name - Markdown title - scope - punctuation.definition.heading, entity.name.section - settings - - foreground - #8aadf4 - fontStyle - bold - - - - name - Markdown emphasis - scope - markup.italic - settings - - foreground - #ee99a0 - fontStyle - italic - - - - name - Markdown strong - scope - markup.bold - settings - - foreground - #ee99a0 - fontStyle - bold - - - - name - Escape - scope - constant.character.escape - settings - - foreground - #f5bde6 - fontStyle - - - - - name - Bash built-in function - scope - source.shell.bash meta.function.shell meta.compound.shell meta.function-call.identifier.shell - settings - - foreground - #f5bde6 - fontStyle - - - - - name - Bash parameter - scope - variable.language.shell - settings - - foreground - #ed8796 - fontStyle - italic - - - - name - Lua field - scope - source.lua meta.function.lua meta.block.lua meta.mapping.value.lua meta.mapping.key.lua string.unquoted.key.lua - settings - - foreground - #b7bdf8 - fontStyle - italic - - - - name - Lua constructor - scope - source.lua meta.function.lua meta.block.lua meta.mapping.key.lua string.unquoted.key.lua - settings - - foreground - #f0c6c6 - fontStyle - - - - - name - Java constant - scope - entity.name.constant.java - settings - - foreground - #8bd5ca - fontStyle - - - - - name - CSS property - scope - support.type.property-name.css - settings - - foreground - #f0c6c6 - fontStyle - italic - - - - name - CSS constant - scope - support.constant.property-value.css - settings - - foreground - #cad3f5 - fontStyle - - - - - name - CSS suffix - scope - constant.numeric.suffix.css, keyword.other.unit.css - settings - - foreground - #8bd5ca - fontStyle - italic - - - - name - CSS variable property - scope - variable.other.custom-property.name.css, support.type.custom-property.name.css, punctuation.definition.custom-property.css - settings - - foreground - #8bd5ca - fontStyle - - - - - name - SCSS tag - scope - entity.name.tag.css - settings - - foreground - #b7bdf8 - fontStyle - - - - - name - SASS variable - scope - variable.other.sass - settings - - foreground - #8bd5ca - fontStyle - - - - - name - Invalid - scope - invalid - settings - - foreground - #cad3f5 - background - #ed8796 - fontStyle - - - - - name - Invalid deprecated - scope - invalid.deprecated - settings - - foreground - #cad3f5 - background - #c6a0f6 - fontStyle - - - - - name - Diff header - scope - meta.diff, meta.diff.header - settings - - foreground - #6e738d - fontStyle - - - - - name - Diff deleted - scope - markup.deleted - settings - - foreground - #ed8796 - fontStyle - - - - - name - Diff inserted - scope - markup.inserted - settings - - foreground - #a6da95 - fontStyle - - - - - name - Diff changed - scope - markup.changed - settings - - foreground - #eed49f - fontStyle - - - - - name - Message error - scope - message.error - settings - - foreground - #ed8796 - fontStyle - - - - - uuid - 4d0379b5-ef82-467b-b8b8-365889420646 - colorSpaceName - sRGB - semanticClass - theme.dark.Catppuccin - author - BrunDerSchwarzmagier - - diff --git a/home/modules/bottom/config/settings.nix b/home/modules/bottom/config/settings.nix index 14f0474..ee77c7c 100755 --- a/home/modules/bottom/config/settings.nix +++ b/home/modules/bottom/config/settings.nix @@ -1,44 +1,49 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes.schemes.catppuccin-macchiato) - colours +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) + currentTheme + palettes ; -in { + + el = palettes.${currentTheme}.colours; +in +{ colors = { - tableHeaderColor = colours.rosewater; - allCpuColor = colours.rosewater; - avgCpuColor = colours.maroon; + tableHeaderColor = el.base06; + allCpuColor = el.base06; + avgCpuColor = el.base12; cpuCoreColors = [ - colours.sapphire - colours.peach - colours.yellow - colours.green - colours.sky - colours.mauve + el.base07 + el.base16 + el.base09 + el.base0A + el.base0B + el.base15 + el.base0E ]; - ramColor = colours.green; - swapColor = colours.peach; - rxColor = colours.green; - txColor = colours.red; - widgetTitleColor = colours.flamingo; - borderColor = colours.surface2; - highlightedBorderColor = colours.pink; - textColor = colours.text; - graphColor = colours.subtext0; - cursorColor = colours.pink; - selectedTextColor = colours.crust; - selectedBgColor = colours.mauve; - highBatteryColor = colours.green; - mediumBatteryColor = colours.yellow; - lowBatteryColor = colours.red; + ramColor = el.base0B; + swapColor = el.base09; + rxColor = el.base0B; + txColor = el.base08; + widgetTitleColor = el.base0F; + borderColor = el.base04; + highlightedBorderColor = el.base17; + textColor = el.base05; + graphColor = el.base05; + cursorColor = el.base17; + selectedTextColor = el.base11; + selectedBgColor = el.base0E; + highBatteryColor = el.base0B; + mediumBatteryColor = el.base0A; + lowBatteryColor = el.base08; gpuCoreColors = [ - colours.sky - colours.mauve - colours.red - colours.peach - colours.yellow - colours.green + el.base15 + el.base0E + el.base08 + el.base09 + el.base0A + el.base0B ]; - arcColor = colours.sky; + arcColor = el.base15; }; } diff --git a/home/modules/bottom/default.nix b/home/modules/bottom/default.nix index 0e82739..026cedb 100755 --- a/home/modules/bottom/default.nix +++ b/home/modules/bottom/default.nix @@ -1,13 +1,16 @@ -{flake, ...}: { - programs.bottom = let - configPath = ./config; - settingsPath = import (configPath + /settings.nix) { - inherit - flake - ; +{ flake, ... }: +{ + programs.bottom = + let + configPath = ./config; + settingsPath = import (configPath + /settings.nix) { + inherit + flake + ; + }; + in + { + enable = true; + settings = settingsPath; }; - in { - enable = true; - settings = settingsPath; - }; } diff --git a/home/modules/dunst/config/settings.nix b/home/modules/dunst/config/settings.nix index 17e5e73..d4054d2 100755 --- a/home/modules/dunst/config/settings.nix +++ b/home/modules/dunst/config/settings.nix @@ -1,22 +1,25 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes.schemes.catppuccin-macchiato) - colours - ; - inherit - (flake.config.aesthetics.themes) +{ flake, ... }: +let + + inherit (flake.config.aesthetics.themes) + currentTheme + palettes font ; + + el = palettes.${currentTheme}.colours; + makeColor = c: "#" + c; -in { +in +{ global = { - font = "${font} 10"; - background = makeColor colours.base; + font = "${font.name} 10"; + background = makeColor el.base01; + frame_color = makeColor el.base0E; + foreground = makeColor el.base05; corner_radius = 10; fade_in_duration = 1000; - foreground = makeColor colours.text; frame = 10000; - frame_color = makeColor colours.mauve; frame_width = 1; icon_corner_radius = 10; monitor = 1; @@ -28,7 +31,7 @@ in { }; urgency_critical = { - frame_color = makeColor colours.peach; + frame_color = makeColor el.base09; timeout = 0; }; } diff --git a/home/modules/ghostty/config/settings.nix b/home/modules/ghostty/config/settings.nix index 77e1967..610c7a4 100755 --- a/home/modules/ghostty/config/settings.nix +++ b/home/modules/ghostty/config/settings.nix @@ -2,16 +2,17 @@ flake, pkgs, ... -}: let - inherit - (flake.config.aesthetics.themes) +}: +let + inherit (flake.config.aesthetics.themes) font ; -in { +in +{ confirm-close-surface = false; window-decoration = false; font-size = 10; - font-family = font; + font-family = font.name; window-padding-x = 10; window-padding-y = 10; copy-on-select = true; diff --git a/home/modules/ghostty/config/themes.nix b/home/modules/ghostty/config/themes.nix index f148104..e66deb2 100755 --- a/home/modules/ghostty/config/themes.nix +++ b/home/modules/ghostty/config/themes.nix @@ -1,32 +1,36 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes.schemes.catppuccin-macchiato) - colours +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) + currentTheme + palettes ; -in { - catppuccin-macchiato = { - background = "${colours.base}"; - cursor-color = "${colours.rosewater}"; - foreground = "${colours.text}"; + + el = palettes.${currentTheme}.colours; +in +{ + theme = { + background = el.base01; + cursor-color = el.base06; + foreground = el.base05; palette = [ - "0=${colours.surface1}" - "1=${colours.red}" - "2=${colours.green}" - "3=${colours.yellow}" - "4=${colours.blue}" - "5=${colours.pink}" - "6=${colours.teal}" - "7=${colours.subtext0}" - "8=${colours.surface2}" - "9=${colours.red}" - "10=${colours.green}" - "11=${colours.yellow}" - "12=${colours.blue}" - "13=${colours.pink}" - "14=${colours.teal}" - "15=${colours.subtext1}" + "0=${el.base03}" + "1=${el.base08}" + "2=${el.base0B}" + "3=${el.base0A}" + "4=${el.base0D}" + "5=${el.base17}" + "6=${el.base0C}" + "7=${el.base05}" + "8=${el.base04}" + "9=${el.base08}" + "10=${el.base03}" + "11=${el.base0A}" + "12=${el.base0D}" + "13=${el.base17}" + "14=${el.base0C}" + "15=${el.base05}" ]; - selection-background = "${colours.surface2}"; - selection-foreground = "${colours.text}"; + selection-background = el.base04; + selection-foreground = el.base05; }; } diff --git a/home/modules/ghostty/default.nix b/home/modules/ghostty/default.nix index 978068e..f6f7fed 100755 --- a/home/modules/ghostty/default.nix +++ b/home/modules/ghostty/default.nix @@ -2,7 +2,8 @@ flake, pkgs, ... -}: let +}: +let configPath = ./config; settingsPath = import (configPath + /settings.nix) { inherit @@ -15,7 +16,8 @@ flake ; }; -in { +in +{ programs.ghostty = { enable = true; package = flake.inputs.ghostty.packages.${pkgs.system}.default; diff --git a/home/modules/hyprland/hyprland/config/decoration.nix b/home/modules/hyprland/hyprland/config/decoration.nix index 73d1d2e..0e08c0e 100755 --- a/home/modules/hyprland/hyprland/config/decoration.nix +++ b/home/modules/hyprland/hyprland/config/decoration.nix @@ -8,7 +8,7 @@ shadow = { enabled = true; - color = "rgba(00000055)"; + color = "rgba(00000000)"; ignore_window = true; offset = "0 2"; range = 20; diff --git a/home/modules/hyprland/hyprland/config/general.nix b/home/modules/hyprland/hyprland/config/general.nix index d6ed6f1..7d9746e 100755 --- a/home/modules/hyprland/hyprland/config/general.nix +++ b/home/modules/hyprland/hyprland/config/general.nix @@ -1,7 +1,18 @@ +{ flake, ... }: +let + + inherit (flake.config.aesthetics.themes) + currentTheme + palettes + ; + + el = palettes.${currentTheme}.colours; +in { gaps_in = 5; gaps_out = 5; border_size = 2; - "col.active_border" = "rgb(c6a0f6)"; - "col.inactive_border" = "0xff292a37"; + "col.active_border" = "rgb(${el.base0E})"; + "col.inactive_border" = "0xff${el.base02}"; + } diff --git a/home/modules/hyprland/hyprland/default.nix b/home/modules/hyprland/hyprland/default.nix index d32da0a..238d9dd 100755 --- a/home/modules/hyprland/hyprland/default.nix +++ b/home/modules/hyprland/hyprland/default.nix @@ -3,13 +3,19 @@ flake, config, ... -}: let +}: +let # hostname = config.networking.hostName; # inherit (flake.config.machines.devices) desktop laptop; configPath = ./config; configImports = { animations = import (configPath + /animations.nix); - bind = import (configPath + /bind.nix) {inherit flake config;}; + bind = import (configPath + /bind.nix) { + inherit + flake + config + ; + }; bindm = import (configPath + /bindm.nix); binds = import (configPath + /binds.nix); # bindl = @@ -19,12 +25,17 @@ decoration = import (configPath + /decoration.nix); dwindle = import (configPath + /dwindle.nix); exec-once = import (configPath + /exec-once.nix); - general = import (configPath + /general.nix); + general = import (configPath + /general.nix) { + inherit + flake + ; + }; input = import (configPath + /input.nix); misc = import (configPath + /misc.nix); windowrulev2 = import (configPath + /windowrulev2.nix); }; -in { +in +{ wayland.windowManager.hyprland = { enable = true; # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland; diff --git a/home/modules/starship/config/settings.nix b/home/modules/starship/config/settings.nix index 62221e5..7719708 100755 --- a/home/modules/starship/config/settings.nix +++ b/home/modules/starship/config/settings.nix @@ -2,23 +2,21 @@ flake, lib, ... -}: let - inherit - (flake.config.aesthetics.themes.schemes.catppuccin-macchiato) - colours +}: +let + inherit (flake.config.aesthetics.themes) + currentTheme + palettes ; - makeColor = c: - "#" - + c; - makeStyle = bg: fg: - "bg:" - + bg - + " fg:" - + fg - + " bold"; - surround = fg: text: + + el = palettes.${currentTheme}.colours; + + makeColor = c: "#" + c; + makeStyle = bg: fg: "bg:" + bg + " fg:" + fg + " bold"; + surround = + fg: text: "[](fg:" - + makeColor colours.base + + makeColor el.base00 + " bg:" + fg + ")" @@ -29,52 +27,52 @@ + "[█](fg:" + fg + ")"; -in { +in +{ add_newline = false; - character = let - makeChar = bg: c: - surround (makeColor bg) ("[" - + c - + "](" - + makeStyle (makeColor bg) (makeColor colours.crust) - + ")"); - in { - error_symbol = makeChar colours.maroon "⊥"; - format = "$symbol"; - success_symbol = makeChar colours.teal "λ"; - }; + character = + let + makeChar = + bg: c: + surround (makeColor bg) ("[" + c + "](" + makeStyle (makeColor bg) (makeColor el.base11) + ")"); + in + { + error_symbol = makeChar el.base12 "⊥"; + format = "$symbol"; + success_symbol = makeChar el.base0C "λ"; + }; cmd_duration = { - format = surround (makeColor colours.mauve) "[ $duration]($style)"; + format = surround (makeColor el.base0E) "[ $duration]($style)"; min_time = 0; show_milliseconds = true; - style = makeStyle (makeColor colours.mauve) (makeColor colours.crust); + style = makeStyle (makeColor el.base0E) (makeColor el.base11); }; directory = { - format = surround (makeColor colours.blue) "[󰉋 $path]($style)[$read_only]($read_only_style)"; + format = surround (makeColor el.base0D) "[󰉋 $path]($style)[$read_only]($read_only_style)"; read_only = "  "; - read_only_style = makeStyle (makeColor colours.blue) (makeColor colours.crust); - style = makeStyle (makeColor colours.blue) (makeColor colours.crust); + read_only_style = makeStyle (makeColor el.base0D) (makeColor el.base11); + style = makeStyle (makeColor el.base0D) (makeColor el.base11); truncation_length = 1; truncate_to_repo = false; }; git_branch = { - format = surround (makeColor colours.peach) "[$symbol $branch]($style)"; - style = makeStyle (makeColor colours.peach) (makeColor colours.crust); + format = surround (makeColor el.base09) "[$symbol $branch]($style)"; + style = makeStyle (makeColor el.base09) (makeColor el.base11); symbol = ""; }; git_status = { format = "[ \\[$all_status$ahead_behind\\]]($style)"; - style = makeStyle (makeColor colours.yellow) (makeColor colours.crust); + style = makeStyle (makeColor el.base0A) (makeColor el.base11); }; hostname = { - format = surround (makeColor colours.sapphire) "[$ssh_symbol$hostname]($style)"; + format = surround (makeColor el.base16) "[$ssh_symbol$hostname]($style)"; ssh_symbol = "󰖟 "; - style = makeStyle (makeColor colours.sapphire) (makeColor colours.crust); + style = makeStyle (makeColor el.base16) (makeColor el.base11); }; pijul_channel = { disabled = false; - format = surround (makeColor colours.peach) "[$symbol $channel]($style)"; - style = makeStyle (makeColor colours.peach) (makeColor colours.crust); + format = surround (makeColor el.base09) "[$symbol $channel]($style)"; + style = makeStyle (makeColor el.base09) (makeColor el.base11); symbol = ""; }; format = lib.concatStrings [ diff --git a/home/modules/starship/default.nix b/home/modules/starship/default.nix index 89e1871..3e6e54f 100755 --- a/home/modules/starship/default.nix +++ b/home/modules/starship/default.nix @@ -2,7 +2,8 @@ flake, lib, ... -}: let +}: +let configPath = ./config; settingsPath = import (configPath + /settings.nix) { inherit @@ -10,7 +11,8 @@ lib ; }; -in { +in +{ programs.starship = { enable = true; settings = settingsPath; diff --git a/home/modules/swaylock/config/settings.nix b/home/modules/swaylock/config/settings.nix index 9b37b99..60ddcc1 100755 --- a/home/modules/swaylock/config/settings.nix +++ b/home/modules/swaylock/config/settings.nix @@ -1,49 +1,50 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes.schemes.catppuccin-macchiato) - colours - ; - inherit - (flake.config.aesthetics.themes) +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) + currentTheme + palettes font ; -in { - font = font; + + el = palettes.${currentTheme}.colours; +in +{ + font = font.name; indicator-idle-visible = true; indicator-radius = 100; indicator-thickness = 20; show-failed-attempts = true; - bs-hl-color = colours.red; - color = colours.base; - key-hl-color = colours.mauve; + bs-hl-color = el.base08; + color = el.base01; + key-hl-color = el.base0E; - caps-lock-bs-hl-color = colours.red; - caps-lock-key-hl-color = colours.mauve; + caps-lock-bs-hl-color = el.base08; + caps-lock-key-hl-color = el.base0E; - inside-color = colours.base; - inside-clear-color = colours.base; - inside-caps-lock-color = colours.base; - inside-ver-color = colours.base; - inside-wrong-color = colours.base; + inside-color = el.base01; + inside-clear-color = el.base01; + inside-caps-lock-color = el.base01; + inside-ver-color = el.base01; + inside-wrong-color = el.base01; - line-color = colours.base; - line-clear-color = colours.base; - line-caps-lock-color = colours.base; - line-ver-color = colours.base; - line-wrong-color = colours.base; + line-color = el.base01; + line-clear-color = el.base01; + line-caps-lock-color = el.base01; + line-ver-color = el.base01; + line-wrong-color = el.base01; - ring-color = colours.crust; - ring-clear-color = colours.crust; - ring-caps-lock-color = colours.crust; - ring-ver-color = colours.crust; - ring-wrong-color = colours.crust; + ring-color = el.base00; + ring-clear-color = el.base00; + ring-caps-lock-color = el.base00; + ring-ver-color = el.base00; + ring-wrong-color = el.base00; separator-color = "00000000"; - text-color = colours.text; - text-clear-color = colours.text; - text-caps-lock-color = colours.text; - text-ver-color = colours.text; - text-wrong-color = colours.text; + text-color = el.base05; + text-clear-color = el.base05; + text-caps-lock-color = el.base05; + text-ver-color = el.base05; + text-wrong-color = el.base05; } diff --git a/home/modules/swaylock/default.nix b/home/modules/swaylock/default.nix index 9298b04..6514422 100755 --- a/home/modules/swaylock/default.nix +++ b/home/modules/swaylock/default.nix @@ -1,11 +1,13 @@ -{flake, ...}: let +{ flake, ... }: +let configPath = ./config; settingsPath = import (configPath + /settings.nix) { inherit flake ; }; -in { +in +{ programs.swaylock = { enable = true; settings = settingsPath; diff --git a/home/modules/tofi/config b/home/modules/tofi/config deleted file mode 100755 index 0f91169..0000000 --- a/home/modules/tofi/config +++ /dev/null @@ -1,26 +0,0 @@ -font-size = 12 -hint-font = true - -background-color = #363a4f -outline-color = #c6a0f6 -prompt-color = #8aadf4 -input-color = #cdd6f4 -default-result-color = #a6adc8 -selection-color = #8bd5ca - -prompt-text = "Summon: " - -width = 400 -height = 400 - -outline-width = 1 -border-width = 0 - -padding-top = 10 -padding-bottom = 10 -padding-left = 10 -padding-right = 10 - -corner-radius = 10 - -drun-launch = true \ No newline at end of file diff --git a/home/modules/tofi/config/settings.nix b/home/modules/tofi/config/settings.nix new file mode 100644 index 0000000..8910fe3 --- /dev/null +++ b/home/modules/tofi/config/settings.nix @@ -0,0 +1,35 @@ +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) + currentTheme + palettes + ; + + el = palettes.${currentTheme}.colours; +in +{ + font-size = 12; + hint-font = true; + background-color = "#${el.base02}"; + outline-color = "#${el.base0E}"; + prompt-color = "#${el.base0D}"; + input-color = "#${el.base07}"; + default-result-color = "#${el.base05}"; + selection-color = "#${el.base0C}"; + prompt-text = "Summon: "; + + width = 400; + height = 400; + + outline-width = 1; + border-width = 0; + + padding-top = 10; + padding-bottom = 10; + padding-left = 10; + padding-right = 10; + + corner-radius = 10; + + drun-launch = true; +} diff --git a/home/modules/tofi/default.nix b/home/modules/tofi/default.nix index ccda3be..2a3a94f 100755 --- a/home/modules/tofi/default.nix +++ b/home/modules/tofi/default.nix @@ -1,12 +1,16 @@ -{pkgs, ...}: { - home.packages = - builtins.attrValues - { - inherit - (pkgs) - tofi - ; - }; +{ + pkgs, + flake, + ... +}: +let + configPath = ./config; - xdg.configFile = {"tofi/config".source = ./config;}; + settingsPath = import (configPath + /settings.nix) { inherit flake; }; +in +{ + programs.tofi = { + enable = true; + settings = settingsPath; + }; } diff --git a/home/modules/vscode/config/userSettings.nix b/home/modules/vscode/config/userSettings.nix index 0e8eaae..3691b3c 100755 --- a/home/modules/vscode/config/userSettings.nix +++ b/home/modules/vscode/config/userSettings.nix @@ -3,12 +3,13 @@ pkgs, flake, ... -}: let - inherit - (flake.config.aesthetics.themes) +}: +let + inherit (flake.config.aesthetics.themes) font ; -in { +in +{ "git.confirmSync" = false; "editor.insertSpaces" = false; "files.autoSave" = "afterDelay"; @@ -26,8 +27,8 @@ in { "elmLS.elmReviewDiagnostics" = "warning"; "editor.wordWrap" = "on"; "editor.fontSize" = 14; - "editor.fontFamily" = "'${font}', 'monospace', monospace"; + "editor.fontFamily" = "'${font.name}', 'monospace', monospace"; "terminal.integrated.fontSize" = 14; - "terminal.integrated.fontFamily" = "'${font}', 'monospace', monospace"; + "terminal.integrated.fontFamily" = "'${font.name}', 'monospace', monospace"; "editor.fontLigatures" = true; } diff --git a/home/modules/waybar/config/style.nix b/home/modules/waybar/config/style.nix index c8e058b..633e208 100755 --- a/home/modules/waybar/config/style.nix +++ b/home/modules/waybar/config/style.nix @@ -1,33 +1,27 @@ { flake, ... }: let - inherit (flake.config.aesthetics.themes.schemes.catppuccin-macchiato) - colours - ; inherit (flake.config.aesthetics.themes) currentTheme - elements - schemes + palettes font ; - el = elements; - - theme = colour: schemes.${currentTheme}.colours.${colour}; + el = palettes.${currentTheme}.colours; custom = { - font = font; + font = font.name; font_size = "12px"; font_weight = "bold"; - 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; opacityBg = "0.90"; opacityBt = "1"; + text_color = el.base0E; + secondary_accent = el.base07; + tertiary_accent = el.base15; + button_color = el.base04; + background_1 = el.base01; + background_2 = el.base00; + background_3 = el.base04; }; in '' diff --git a/home/modules/wezterm/config/extraConfig.nix b/home/modules/wezterm/config/extraConfig.nix index 70714d0..15a9979 100755 --- a/home/modules/wezterm/config/extraConfig.nix +++ b/home/modules/wezterm/config/extraConfig.nix @@ -1,13 +1,14 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes) +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) font ; -in '' +in +'' return { color_scheme = "Catppuccin Macchiato", font_size = 11, - font = wezterm.font('${font}'), + font = wezterm.font('${font.name}'), enable_tab_bar = false, window_close_confirmation = 'NeverPrompt', term = 'wezterm', diff --git a/home/modules/zed/config/extensions/default.nix b/home/modules/zed/config/extensions/default.nix index d4cd316..50b8858 100755 --- a/home/modules/zed/config/extensions/default.nix +++ b/home/modules/zed/config/extensions/default.nix @@ -1,6 +1,9 @@ [ "catppuccin" "catppuccin-blur" + "cargo-appraiser" + "cargo-tom" + "markdown-oxide" "material-dark" "rose-pine-theme" "material-theme" diff --git a/home/modules/zed/config/userKeymaps/default.nix b/home/modules/zed/config/userKeymaps/default.nix index 0967ef4..723fab7 100755 --- a/home/modules/zed/config/userKeymaps/default.nix +++ b/home/modules/zed/config/userKeymaps/default.nix @@ -1 +1,25 @@ -{} +[ + { + context = "Editor"; + bindings = { + "ctrl-shift-d" = "editor::DeleteLine"; + "ctrl-shift-f" = "editor::Format"; + "ctrl-shift-c" = "editor::ToggleComments"; + "ctrl-shift-w" = "editor::AddSelectionAbove"; + "ctrl-shift-s" = "editor::AddSelectionBelow"; + }; + } + { + context = "Pane"; + bindings = { + "alt-w" = "editor::MoveLineUp"; + "alt-s" = "editor::MoveLineDown"; + }; + } + { + bindings = { + context = "Workspace"; + "ctrl-s" = "workspace::SaveAll"; + }; + } +] diff --git a/home/modules/zed/config/userSettings/config/assistant/default.nix b/home/modules/zed/config/userSettings/config/assistant/default.nix index 75dbef1..3f979b8 100755 --- a/home/modules/zed/config/userSettings/config/assistant/default.nix +++ b/home/modules/zed/config/userSettings/config/assistant/default.nix @@ -1,9 +1,8 @@ { enabled = true; + default_model = { + provider = "zed.dev"; + model = "claude-3-5-sonnet-latest"; + }; version = "2"; - # 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 38766b5..2a58888 100755 --- a/home/modules/zed/config/userSettings/config/interface/default.nix +++ b/home/modules/zed/config/userSettings/config/interface/default.nix @@ -1,11 +1,12 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes) +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) font ; -in { - ui_font_family = font; - buffer_font_family = font; +in +{ + ui_font_family = font.name; + buffer_font_family = font.name; hour_format = "hour12"; vim_mode = false; show_whitespaces = "none"; diff --git a/home/modules/zed/config/userSettings/config/terminal/default.nix b/home/modules/zed/config/userSettings/config/terminal/default.nix index 88b8266..c9dc5ac 100755 --- a/home/modules/zed/config/userSettings/config/terminal/default.nix +++ b/home/modules/zed/config/userSettings/config/terminal/default.nix @@ -1,13 +1,14 @@ -{flake, ...}: let - inherit - (flake.config.aesthetics.themes) +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) font ; -in { +in +{ alternate_scroll = "off"; blinking = "off"; copy_on_select = true; - dock = "bottom"; + dock = "right"; detect_venv = { on = { directories = [ @@ -24,9 +25,9 @@ in { TERM = "ghostty"; }; - font_family = font; + font_family = font.name; font_features = null; - font_size = 12; + font_size = 11; line_height = "comfortable"; option_as_meta = false; button = false; diff --git a/home/modules/zed/config/userSettings/config/theme/default.nix b/home/modules/zed/config/userSettings/config/theme/default.nix new file mode 100644 index 0000000..b7cb85e --- /dev/null +++ b/home/modules/zed/config/userSettings/config/theme/default.nix @@ -0,0 +1,801 @@ +{ flake, ... }: +let + inherit (flake.config.aesthetics.themes) + currentTheme + palettes + ; + + el = palettes.${currentTheme}.colours; +in +{ + accents = [ + "${el.base0E}66" + "${el.base07}66" + "${el.base16}66" + "${el.base0B}66" + "${el.base0A}66" + "${el.base09}66" + "${el.base08}66" + ]; + + border = { + value = "#${el.base02}"; + variant = "#${el.base0E}"; + focused = "#${el.base07}"; + selected = "#${el.base0E}"; + transparent = "#${el.base0B}"; + disabled = "#${el.base03}"; + }; + + elevated_surface.background = "#${el.base01}"; + surface.background = "#${el.base01}"; + background = { + value = "#${el.base00}"; + appearance = "opaque"; + }; + element = { + background = "#${el.base11}"; + hover = "#${el.base03}4d"; + active = "#${el.base04}4d"; + selected = "#${el.base02}4d"; + disabled = "#${el.base03}"; + }; + + drop_target.background = "#${el.base02}66"; + ghost_element = { + background = "#${el.base11}59"; + hover = "#${el.base03}4d"; + active = "#${el.base04}99"; + selected = "#${el.base05}1a"; + disabled = "#${el.base03}"; + }; + + text = { + value = "#${el.base05}"; + muted = "#${el.base05}"; + placeholder = "#${el.base04}"; + disabled = "#${el.base03}"; + accent = "#${el.base0E}"; + }; + + icon = { + value = "#${el.base05}"; + muted = "#${el.base04}"; + disabled = "#${el.base03}"; + placeholder = "#${el.base04}"; + accent = "#${el.base0E}"; + }; + + status_bar.background = "#${el.base11}"; + title_bar = { + background = "#${el.base11}"; + inactive_background = "#${el.base11}d9"; + }; + toolbar.background = "#${el.base00}"; + tab_bar.background = "#${el.base11}"; + tab = { + inactive_background = "#${el.base11}"; + active_background = "#${el.base00}"; + }; + + search.match_background = "#${el.base0C}33"; + panel = { + background = "#${el.base01}"; + focused_border = "#${el.base05}"; + indent_guide = "#${el.base02}99"; + indent_guide_active = "#${el.base04}"; + indent_guide_hover = "#${el.base0E}"; + }; + + pane.focused_border = "#${el.base05}"; + pane_group.border = "#${el.base02}"; + + scrollbar = { + thumb = { + background = "#${el.base0E}33"; + hover_background = "#${el.base03}"; + border = "#${el.base0E}"; + scrollbar.track.background = null; + }; + track.border = "#${el.base05}12"; + }; + + editor = { + foreground = "#${el.base05}"; + background = "#${el.base00}"; + gutter.background = "#${el.base00}"; + subheader.background = "#${el.base01}"; + active_line.background = "#${el.base05}0d"; + highlighted_line.background = null; + line_number = "#${el.base04}"; + active_line_number = "#${el.base0E}"; + invisible = "#${el.base05}66"; + wrap_guide = "#${el.base04}"; + active_wrap_guide = "#${el.base04}"; + document_highlight = { + bracket_background = "#${el.base06}40"; + read_background = "#${el.base05}29"; + write_background = "#${el.base05}29"; + }; + indent_guide = "#${el.base02}99"; + indent_guide_active = "#${el.base04}"; + }; + + terminal = { + background = "#${el.base00}"; + ansi.background = "#${el.base00}"; + foreground = "#${el.base05}"; + dim_foreground = "#${el.base04}"; + bright_foreground = "#${el.base05}"; + }; + + link_text.hover = "#${el.base15}"; + + conflict = { + value = "#${el.base0A}"; + border = "#${el.base0A}"; + background = "#${el.base01}"; + }; + + created = { + value = "#${el.base0B}"; + border = "#${el.base0B}"; + background = "#${el.base01}"; + }; + + deleted = { + value = "#${el.base08}"; + border = "#${el.base08}"; + background = "#${el.base01}"; + }; + + hidden = { + value = "#${el.base03}"; + border = "#${el.base03}"; + background = "#${el.base01}"; + }; + + hint = { + value = "#${el.base04}"; + border = "#${el.base04}"; + background = "#${el.base01}"; + }; + + ignored = { + value = "#${el.base03}"; + border = "#${el.base03}"; + background = "#${el.base01}"; + }; + + modified = { + value = "#${el.base0A}"; + border = "#${el.base0A}"; + background = "#${el.base01}"; + }; + + predictive = { + value = "#${el.base03}"; + border = "#${el.base07}"; + background = "#${el.base01}"; + }; + + renamed = { + value = "#${el.base16}"; + border = "#${el.base16}"; + background = "#${el.base01}"; + }; + + info = { + value = "#${el.base0C}"; + border = "#${el.base0C}"; + background = "#${el.base05}33"; + }; + + warning = { + value = "#${el.base0A}"; + border = "#${el.base0A}"; + background = "#${el.base0A}1f"; + }; + + error = { + value = "#${el.base08}"; + border = "#${el.base08}"; + background = "#${el.base08}1f"; + }; + + success = { + value = "#${el.base0B}"; + border = "#${el.base0B}"; + background = "#${el.base0B}1f"; + }; + + unreachable = { + value = "#${el.base08}"; + border = "#${el.base08}"; + background = "#${el.base08}1f"; + }; + + players = [ + { + cursor = "#${el.base06}"; + selection = "#${el.base04}80"; + background = "#${el.base06}"; + } + { + cursor = "#${el.base0E}"; + selection = "#${el.base0E}33"; + background = "#${el.base0E}"; + } + { + cursor = "#${el.base07}"; + selection = "#${el.base07}33"; + background = "#${el.base07}"; + } + { + cursor = "#${el.base16}"; + selection = "#${el.base16}33"; + background = "#${el.base16}"; + } + { + cursor = "#${el.base0B}"; + selection = "#${el.base0B}33"; + background = "#${el.base0B}"; + } + { + cursor = "#${el.base0A}"; + selection = "#${el.base0A}33"; + background = "#${el.base0A}"; + } + { + cursor = "#${el.base09}"; + selection = "#${el.base09}33"; + background = "#${el.base09}"; + } + { + cursor = "#${el.base08}"; + selection = "#${el.base08}33"; + background = "#${el.base08}"; + } + ]; + + syntax = { + variable = { + color = "#${el.base05}"; + font_style = null; + font_weight = null; + }; + variable.builtin = { + color = "#${el.base08}"; + font_style = null; + font_weight = null; + }; + variable.parameter = { + color = "#${el.base12}"; + font_style = null; + font_weight = null; + }; + variable.member = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + variable.special = { + color = "#${el.base17}"; + font_style = "italic"; + font_weight = null; + }; + + constant = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + constant.builtin = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + constant.macro = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + + module = { + color = "#${el.base0A}"; + font_style = "italic"; + font_weight = null; + }; + + label = { + color = "#${el.base16}"; + font_style = null; + font_weight = null; + }; + + string = { + color = "#${el.base0B}"; + font_style = null; + font_weight = null; + }; + string.documentation = { + color = "#${el.base0C}"; + font_style = null; + font_weight = null; + }; + string.regexp = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + string.escape = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + string.special = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + string.special.path = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + string.special.symbol = { + color = "#${el.base0F}"; + font_style = null; + font_weight = null; + }; + string.special.url = { + color = "#${el.base06}"; + font_style = "italic"; + font_weight = null; + }; + + character = { + color = "#${el.base0C}"; + font_style = null; + font_weight = null; + }; + character.special = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + + boolean = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + number = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + number.float = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + type = { + color = "#${el.base0A}"; + font_style = null; + font_weight = null; + }; + type.builtin = { + color = "#${el.base0E}"; + font_style = "italic"; + font_weight = null; + }; + type.definition = { + color = "#${el.base0A}"; + font_style = null; + font_weight = null; + }; + type.interface = { + color = "#${el.base0A}"; + font_style = "italic"; + font_weight = null; + }; + type.super = { + color = "#${el.base0A}"; + font_style = "italic"; + font_weight = null; + }; + + attribute = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + property = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + + function = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + function.builtin = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + function.call = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + function.macro = { + color = "#${el.base0C}"; + font_style = null; + font_weight = null; + }; + function.method = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + function.method.call = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + constructor = { + color = "#${el.base0F}"; + font_style = null; + font_weight = null; + }; + + operator = { + color = "#${el.base15}"; + font_style = null; + font_weight = null; + }; + + keyword = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.modifier = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.type = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.coroutine = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.function = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.operator = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.import = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.repeat = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.return = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.debug = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.exception = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.conditional = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.conditional.ternary = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + keyword.directive = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + keyword.directive.define = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + keyword.export = { + color = "#${el.base15}"; + font_style = null; + font_weight = null; + }; + + punctuation = { + color = "#${el.base05}"; + font_style = null; + font_weight = null; + }; + punctuation.delimiter = { + color = "#${el.base05}"; + font_style = null; + font_weight = null; + }; + punctuation.bracket = { + color = "#${el.base05}"; + font_style = null; + font_weight = null; + }; + punctuation.special = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + punctuation.special.symbol = { + color = "#${el.base0F}"; + font_style = null; + font_weight = null; + }; + punctuation.list_marker = { + color = "#${el.base0C}"; + font_style = null; + font_weight = null; + }; + + comment = { + color = "#${el.base05}"; + font_style = "italic"; + font_weight = null; + }; + comment.doc = { + color = "#${el.base05}"; + font_style = "italic"; + font_weight = null; + }; + comment.documentation = { + color = "#${el.base05}"; + font_style = "italic"; + font_weight = null; + }; + comment.error = { + color = "#${el.base08}"; + font_style = "italic"; + font_weight = null; + }; + comment.warning = { + color = "#${el.base0A}"; + font_style = "italic"; + font_weight = null; + }; + comment.hint = { + color = "#${el.base0D}"; + font_style = "italic"; + font_weight = null; + }; + comment.todo = { + color = "#${el.base0F}"; + font_style = "italic"; + font_weight = null; + }; + comment.note = { + color = "#${el.base06}"; + font_style = "italic"; + font_weight = null; + }; + + diff.plus = { + color = "#${el.base0B}"; + font_style = null; + font_weight = null; + }; + diff.minus = { + color = "#${el.base08}"; + font_style = null; + font_weight = null; + }; + tag = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + tag.attribute = { + color = "#${el.base0A}"; + font_style = "italic"; + font_weight = null; + }; + tag.delimiter = { + color = "#${el.base0C}"; + font_style = null; + font_weight = null; + }; + + parameter = { + color = "#${el.base12}"; + font_style = null; + font_weight = null; + }; + + field = { + color = "#${el.base07}"; + font_style = null; + font_weight = null; + }; + + namespace = { + color = "#${el.base0A}"; + font_style = "italic"; + font_weight = null; + }; + + float = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + symbol = { + color = "#${el.base17}"; + font_style = null; + font_weight = null; + }; + + string.regex = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + text = { + color = "#${el.base05}"; + font_style = null; + font_weight = null; + }; + + emphasis.strong = { + color = "#${el.base12}"; + font_style = null; + font_weight = 700; + }; + + emphasis = { + color = "#${el.base12}"; + font_style = "italic"; + font_weight = null; + }; + + embedded = { + color = "#${el.base12}"; + font_style = null; + font_weight = null; + }; + + text.literal = { + color = "#${el.base0B}"; + font_style = null; + font_weight = null; + }; + + concept = { + color = "#${el.base16}"; + font_style = null; + font_weight = null; + }; + + enum = { + color = "#${el.base0C}"; + font_style = null; + font_weight = 700; + }; + + function.decorator = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + type.class.definition = { + color = "#${el.base0A}"; + font_style = null; + font_weight = 700; + }; + + hint = { + color = "#${el.base04}"; + font_style = "italic"; + font_weight = null; + }; + + link_text = { + color = "#${el.base0D}"; + font_style = null; + font_weight = null; + }; + + link_uri = { + color = "#${el.base06}"; + font_style = "italic"; + font_weight = null; + }; + + parent = { + color = "#${el.base09}"; + font_style = null; + font_weight = null; + }; + + predictive = { + color = "#${el.base03}"; + font_style = null; + font_weight = null; + }; + + predoc = { + color = "#${el.base08}"; + font_style = null; + font_weight = null; + }; + + primary = { + color = "#${el.base12}"; + font_style = null; + font_weight = null; + }; + + tag.doctype = { + color = "#${el.base0E}"; + font_style = null; + font_weight = null; + }; + + string.doc = { + color = "#${el.base0C}"; + font_style = "italic"; + font_weight = null; + }; + + title = { + color = "#${el.base05}"; + font_style = null; + font_weight = 800; + }; + + variant = { + color = "#${el.base08}"; + font_style = null; + font_weight = null; + }; + }; + +} diff --git a/home/modules/zed/config/userSettings/default.nix b/home/modules/zed/config/userSettings/default.nix index ca82112..e52c2e7 100755 --- a/home/modules/zed/config/userSettings/default.nix +++ b/home/modules/zed/config/userSettings/default.nix @@ -3,7 +3,8 @@ lib, pkgs, ... -}: let +}: +let configPath = ./config; assistantPath = import (configPath + /assistant); @@ -19,23 +20,34 @@ flake ; }; + + experimentalPath = import (configPath + /theme) { + inherit + flake + ; + }; gitPath = import (configPath + /git); in - { - assistant = assistantPath; - git = gitPath; - languages = languagesPath; - lsp = lspPath; - terminal = terminalPath; +{ + assistant = assistantPath; + git = gitPath; + languages = languagesPath; + lsp = lspPath; + terminal = terminalPath; + experimental.theme_overrides = experimentalPath; - node = { - path = lib.getExe pkgs.nodejs; - npm_path = lib.getExe' pkgs.nodejs "npm"; - }; - auto_update = false; - autosave_after_delay = 20; - load_direnv = "shell_hook"; - base_keymap = "VSCode"; - restore_on_startup = "last_session"; - } - // interfacePath + node = { + path = lib.getExe pkgs.nodejs; + npm_path = lib.getExe' pkgs.nodejs "npm"; + }; + + soft_wrap = "editor_width"; + + auto_update = false; + autosave = "on_focus_change"; + load_direnv = "shell_hook"; + base_keymap = "VSCode"; + restore_on_startup = "last_session"; + show_wrap_guides = true; +} +// interfacePath diff --git a/home/modules/zed/default.nix b/home/modules/zed/default.nix index 2973b63..304dd6c 100755 --- a/home/modules/zed/default.nix +++ b/home/modules/zed/default.nix @@ -3,7 +3,8 @@ lib, pkgs, ... -}: let +}: +let configPath = ./config; extensionsPath = import (configPath + /extensions); userKeymapsPath = import (configPath + /userKeymaps); @@ -20,14 +21,14 @@ ; }; in - # packagePath = flake.inputs.zed.packages.${pkgs.system}.default; - { - programs.zed-editor = { - enable = true; - # package = packagePath; - extraPackages = extraPackagesPath; - extensions = extensionsPath; - userKeymaps = userKeymapsPath; - userSettings = userSettingsPath; - }; - } +# packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default; +{ + programs.zed-editor = { + enable = true; + # package = packagePath; + extraPackages = extraPackagesPath; + extensions = extensionsPath; + userKeymaps = userKeymapsPath; + userSettings = userSettingsPath; + }; +} diff --git a/nixos/default.nix b/nixos/default.nix index c2a6ac6..2b3ae79 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,37 +1,68 @@ let modulesPath = ./modules; - moduleImport = path: nameTransform: - builtins.listToAttrs (map (name: { - name = nameTransform name; - value = import (path + "/${name}"); - }) (builtins.filter (name: - (builtins.readDir path).${name} == "regular" - && builtins.match ".*\\.nix$" name != null) - (builtins.attrNames (builtins.readDir path)))); - modules = moduleImport modulesPath - (name: builtins.replaceStrings [ ".nix" ] [ "" ] name) // (path: - builtins.listToAttrs (map (name: { - name = name; - value = import (path + "/${name}"); - }) (builtins.filter (name: (builtins.readDir path).${name} == "directory") - (builtins.attrNames (builtins.readDir path))))) modulesPath; -in { + moduleImport = + path: nameTransform: + builtins.listToAttrs ( + map + (name: { + name = nameTransform name; + value = import (path + "/${name}"); + }) + ( + builtins.filter ( + name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null + ) (builtins.attrNames (builtins.readDir path)) + ) + ); + modules = + moduleImport modulesPath (name: builtins.replaceStrings [ ".nix" ] [ "" ] name) + // ( + path: + builtins.listToAttrs ( + map + (name: { + name = name; + value = import (path + "/${name}"); + }) + ( + builtins.filter (name: (builtins.readDir path).${name} == "directory") ( + builtins.attrNames (builtins.readDir path) + ) + ) + ) + ) + modulesPath; +in +{ flake.nixosModules = { personal = { imports = builtins.attrValues { inherit (modules) - android audio bluetooth corectrl dconf disks firejail flatpak fonts - printing steam sysstat virtualization; + android + audio + bluetooth + corectrl + dconf + disks + firejail + flatpak + fonts + printing + steam + sysstat + virtualization + ; }; }; desktop = { imports = builtins.attrValues { inherit (modules) - syncthing ollama + syncthing + ollama # plasma # sddm - ; + ; }; }; @@ -39,13 +70,27 @@ in { imports = builtins.attrValues { inherit (modules) hyprland; }; }; - server = { imports = builtins.attrValues { inherit (modules) services; }; }; + server = { + imports = builtins.attrValues { inherit (modules) services; }; + }; shared = { imports = builtins.attrValues { inherit (modules) - accounts doas environment gvfs home-manager locale nh nix rsyncd sops - ssh system xserver; + accounts + doas + environment + gvfs + home-manager + locale + nh + nix + rsyncd + sops + ssh + system + xserver + ; }; }; }; diff --git a/nixos/modules/environment.nix b/nixos/modules/environment.nix index 88282fc..d4202bc 100755 --- a/nixos/modules/environment.nix +++ b/nixos/modules/environment.nix @@ -2,12 +2,12 @@ pkgs, config, ... -}: { +}: +{ environment = { # enableAllTerminfo = true; systemPackages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) git grim pijul @@ -20,6 +20,7 @@ variables = { VIDEO_PLAYER = "mpv"; EDITOR = "hx"; + TERM = "ghostty"; WLR_NO_HARDWARE_CURSORS = "1"; WLR_DRM_NO_ATOMIC = "1"; NIXPKGS_ALLOW_INSECURE = "1"; diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 64fc39a..3f2a0c3 100755 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -2,24 +2,25 @@ pkgs, flake, ... -}: let - inherit - (flake.config.aesthetics.themes) +}: +let + inherit (flake.config.aesthetics.themes) font ; -in { +in +{ fonts = { fontconfig = { enable = true; defaultFonts = { serif = [ - font + font.name ]; monospace = [ - font + font.name ]; sansSerif = [ - font + font.name ]; emoji = [ "Noto Fonts Color Emoji" @@ -28,14 +29,12 @@ in { antialias = true; }; packages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) noto-fonts-color-emoji dosis iosevka ; - inherit - (pkgs.nerd-fonts) + inherit (pkgs.nerd-fonts) monaspace fantasque-sans-mono ; diff --git a/nixos/modules/hyprland/regreet.nix b/nixos/modules/hyprland/regreet.nix index 23b349e..7fd0bc5 100755 --- a/nixos/modules/hyprland/regreet.nix +++ b/nixos/modules/hyprland/regreet.nix @@ -3,12 +3,13 @@ flake, lib, ... -}: let - inherit - (flake.config.aesthetics.themes) +}: +let + inherit (flake.config.aesthetics.themes) font ; -in { +in +{ programs.regreet = { enable = true; package = pkgs.greetd.regreet; @@ -19,7 +20,7 @@ in { GTK = { application_prefer_dark_theme = true; cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors"; - font_name = lib.mkForce "${font} 11"; + font_name = lib.mkForce "${font.name} 11"; icon_theme_name = lib.mkForce "Papirus-Dark"; theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact"; }; diff --git a/parts/config/devshells.nix b/parts/config/devshells.nix index e0d0f03..2d851c0 100755 --- a/parts/config/devshells.nix +++ b/parts/config/devshells.nix @@ -1,9 +1,17 @@ -{ pkgs, config, ... }: { +{ pkgs, config, ... }: +{ devShells = { default = pkgs.mkShell { packages = builtins.attrValues { - inherit (pkgs) age just nil nixd sops ssh-to-age; - inherit (pkgs.haskellPackages) nixfmt; + inherit (pkgs) + age + just + nil + nixd + sops + ssh-to-age + nixfmt-rfc-style + ; }; shellHook = "${config.pre-commit.installationScript}"; }; diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 4d04546..9b65248 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -2,20 +2,21 @@ config, flake, pkgs, + lib, ... -}: let - inherit - (flake.config.people) +}: +let + inherit (flake.config.people) user0 ; - inherit - (flake.config.people.users.${user0}) + inherit (flake.config.people.users.${user0}) name paths ; hostname = config.networking.hostName; -in { +in +{ users = { users.${user0} = { description = name; @@ -65,6 +66,7 @@ in { }; }; sessionVariables = { + VISUAL = lib.getExe pkgs.zed-editor; GTK_THEME = "catppuccin-macchiato-mauve-compact"; }; }; @@ -72,9 +74,7 @@ in { { home.stateVersion = config.system.stateVersion; } - ( - import ./configs/${hostname}.nix {flake = flake;} - ) + (import ./configs/${hostname}.nix { flake = flake; }) ]; }; }; @@ -83,33 +83,29 @@ in { [ "d ${paths.path0} 0755 ${user0} users -" ] - ++ (map - (path: "d /home/${user0}/${path} 0755 ${user0} users -") - [ - "Downloads/Nicotine" - "Downloads/Nicotine/Downloads" - "Downloads/Nicotine/Incomplete" - "Downloads/Nicotine/Received" - "Downloads/Qbittorent" - "Downloads/Qbittorent/Movies" - "Downloads/Qbittorent/Music" - "Downloads/Qbittorent/Shows" - "Files" - "Files/Scripts" - "Files/Games" - "Files/Screenshots" - ]) - ++ (map - (path: "R /home/${user0}/${path} 0755 ${user0} users - -") - [ - "Desktop" - "Documents" - "Music" - "Pictures" - "Public" - "Templates" - "Videos" - ]); + ++ (map (path: "d /home/${user0}/${path} 0755 ${user0} users -") [ + "Downloads/Nicotine" + "Downloads/Nicotine/Downloads" + "Downloads/Nicotine/Incomplete" + "Downloads/Nicotine/Received" + "Downloads/Qbittorent" + "Downloads/Qbittorent/Movies" + "Downloads/Qbittorent/Music" + "Downloads/Qbittorent/Shows" + "Files" + "Files/Scripts" + "Files/Games" + "Files/Screenshots" + ]) + ++ (map (path: "R /home/${user0}/${path} 0755 ${user0} users - -") [ + "Desktop" + "Documents" + "Music" + "Pictures" + "Public" + "Templates" + "Videos" + ]); }; # system.activationScripts.zoxide = '' # z /home/nick/Files/Projects/dotfiles