refactor(treewide): format with alejandra
This commit is contained in:
parent
7fefb94400
commit
61cef505da
216 changed files with 5995 additions and 3969 deletions
|
|
@ -1,17 +1,19 @@
|
|||
{ inputs, config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (config) colorscheme;
|
||||
inherit (lib) mkIf;
|
||||
cfg = config.ooknet.editor.helix;
|
||||
console = config.ooknet.console;
|
||||
in
|
||||
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./languages.nix
|
||||
];
|
||||
|
||||
|
||||
config = mkIf (cfg.enable || console.editor == "helix") {
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
|
|
@ -49,9 +51,9 @@ in
|
|||
select = "underline";
|
||||
};
|
||||
statusline = {
|
||||
left = [ "mode" "spinner" ];
|
||||
center = [ "file-name" ];
|
||||
right = [ "diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" ];
|
||||
left = ["mode" "spinner"];
|
||||
center = ["file-name"];
|
||||
right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type"];
|
||||
};
|
||||
lsp = {
|
||||
display-messages = true;
|
||||
|
|
@ -64,7 +66,7 @@ in
|
|||
W = ":set whitespace.render none";
|
||||
};
|
||||
};
|
||||
themes = import ./theme.nix { inherit colorscheme; };
|
||||
themes = import ./theme.nix {inherit colorscheme;};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf getExe;
|
||||
cfg = config.ooknet.editor.helix;
|
||||
console = config.ooknet.console;
|
||||
in
|
||||
|
||||
{
|
||||
in {
|
||||
config = mkIf (cfg.enable || console.editor == "helix") {
|
||||
programs.helix.languages = {
|
||||
language = let
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
|
||||
{ colorscheme }: {
|
||||
{colorscheme}: {
|
||||
"${colorscheme.slug}" = {
|
||||
palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#'
|
||||
"attributes" = "base09";
|
||||
"comment" = { fg = "base03"; modifiers = [ "italic" ]; };
|
||||
"comment" = {
|
||||
fg = "base03";
|
||||
modifiers = ["italic"];
|
||||
};
|
||||
"constant" = "base09";
|
||||
"constant.character.escape" = "base0C";
|
||||
"constant.numeric" = "base09";
|
||||
"constructor" = "base0D";
|
||||
"debug" = "base03";
|
||||
"diagnostic" = { modifiers = [ "underlined" ]; };
|
||||
"diagnostic.error" = { underline = { style = "curl"; }; };
|
||||
"diagnostic.hint" = { underline = { style = "curl"; }; };
|
||||
"diagnostic.info" = { underline = { style = "curl"; }; };
|
||||
"diagnostic.warning" = { underline = { style = "curl"; }; };
|
||||
"diagnostic" = {modifiers = ["underlined"];};
|
||||
"diagnostic.error" = {underline = {style = "curl";};};
|
||||
"diagnostic.hint" = {underline = {style = "curl";};};
|
||||
"diagnostic.info" = {underline = {style = "curl";};};
|
||||
"diagnostic.warning" = {underline = {style = "curl";};};
|
||||
"diff.delta" = "base09";
|
||||
"diff.minus" = "base08";
|
||||
"diff.plus" = "base0B";
|
||||
|
|
@ -23,49 +25,114 @@
|
|||
"info" = "base0D";
|
||||
"keyword" = "base0E";
|
||||
"label" = "base0E";
|
||||
"markup.bold" = { fg = "base0A"; modifiers = [ "bold" ]; };
|
||||
"markup.bold" = {
|
||||
fg = "base0A";
|
||||
modifiers = ["bold"];
|
||||
};
|
||||
"markup.heading" = "base0D";
|
||||
"markup.italic" = { fg = "base0E"; modifiers = [ "italic" ]; };
|
||||
"markup.italic" = {
|
||||
fg = "base0E";
|
||||
modifiers = ["italic"];
|
||||
};
|
||||
"markup.link.text" = "base08";
|
||||
"markup.link.url" = { fg = "base09"; modifiers = [ "underlined" ]; };
|
||||
"markup.link.url" = {
|
||||
fg = "base09";
|
||||
modifiers = ["underlined"];
|
||||
};
|
||||
"markup.list" = "base08";
|
||||
"markup.quote" = "base0C";
|
||||
"markup.raw" = "base0B";
|
||||
"markup.strikethrough" = { modifiers = [ "crossed_out" ]; };
|
||||
"markup.strikethrough" = {modifiers = ["crossed_out"];};
|
||||
"namespace" = "base0E";
|
||||
"operator" = "base05";
|
||||
"special" = "base0D";
|
||||
"string" = "base0B";
|
||||
"type" = "base0A";
|
||||
"ui.background" = { bg = "base00"; };
|
||||
"ui.bufferline" = { fg = "base04"; bg = "base00"; };
|
||||
"ui.bufferline.active" = { fg = "base00"; bg = "base03"; modifiers = [ "bold" ]; };
|
||||
"ui.cursor" = { fg = "base04"; modifiers = [ "reversed" ]; };
|
||||
"ui.cursor.insert" = { fg = "base0A"; modifiers = [ "underlined" ]; };
|
||||
"ui.cursor.match" = { fg = "base0A"; modifiers = [ "underlined" ]; };
|
||||
"ui.cursor.select" = { fg = "base0A"; modifiers = [ "underlined" ]; };
|
||||
"ui.cursorline.primary" = { fg = "base05"; bg = "base01"; };
|
||||
"ui.gutter" = { bg = "base00"; };
|
||||
"ui.help" = { fg = "base06"; bg = "base01"; };
|
||||
"ui.linenr" = { fg = "base03"; bg = "base00"; };
|
||||
"ui.linenr.selected" = { fg = "base04"; bg = "base01"; modifiers = [ "bold" ]; };
|
||||
"ui.menu" = { fg = "base05"; bg = "base01"; };
|
||||
"ui.menu.scroll" = { fg = "base03"; bg = "base01"; };
|
||||
"ui.menu.selected" = { fg = "base01"; bg = "base04"; };
|
||||
"ui.popup" = { bg = "base01"; };
|
||||
"ui.selection" = { bg = "base02"; };
|
||||
"ui.selection.primary" = { bg = "base02"; };
|
||||
"ui.statusline" = { fg = "base0B"; bg = "base02"; };
|
||||
"ui.statusline.inactive" = { bg = "base01"; fg = "base02"; };
|
||||
"ui.statusline.insert" = { fg = "base00"; bg = "base0B"; };
|
||||
"ui.statusline.normal" = { fg = "base00"; bg = "base04"; };
|
||||
"ui.statusline.select" = { fg = "base00"; bg = "base0E"; };
|
||||
"ui.background" = {bg = "base00";};
|
||||
"ui.bufferline" = {
|
||||
fg = "base04";
|
||||
bg = "base00";
|
||||
};
|
||||
"ui.bufferline.active" = {
|
||||
fg = "base00";
|
||||
bg = "base03";
|
||||
modifiers = ["bold"];
|
||||
};
|
||||
"ui.cursor" = {
|
||||
fg = "base04";
|
||||
modifiers = ["reversed"];
|
||||
};
|
||||
"ui.cursor.insert" = {
|
||||
fg = "base0A";
|
||||
modifiers = ["underlined"];
|
||||
};
|
||||
"ui.cursor.match" = {
|
||||
fg = "base0A";
|
||||
modifiers = ["underlined"];
|
||||
};
|
||||
"ui.cursor.select" = {
|
||||
fg = "base0A";
|
||||
modifiers = ["underlined"];
|
||||
};
|
||||
"ui.cursorline.primary" = {
|
||||
fg = "base05";
|
||||
bg = "base01";
|
||||
};
|
||||
"ui.gutter" = {bg = "base00";};
|
||||
"ui.help" = {
|
||||
fg = "base06";
|
||||
bg = "base01";
|
||||
};
|
||||
"ui.linenr" = {
|
||||
fg = "base03";
|
||||
bg = "base00";
|
||||
};
|
||||
"ui.linenr.selected" = {
|
||||
fg = "base04";
|
||||
bg = "base01";
|
||||
modifiers = ["bold"];
|
||||
};
|
||||
"ui.menu" = {
|
||||
fg = "base05";
|
||||
bg = "base01";
|
||||
};
|
||||
"ui.menu.scroll" = {
|
||||
fg = "base03";
|
||||
bg = "base01";
|
||||
};
|
||||
"ui.menu.selected" = {
|
||||
fg = "base01";
|
||||
bg = "base04";
|
||||
};
|
||||
"ui.popup" = {bg = "base01";};
|
||||
"ui.selection" = {bg = "base02";};
|
||||
"ui.selection.primary" = {bg = "base02";};
|
||||
"ui.statusline" = {
|
||||
fg = "base0B";
|
||||
bg = "base02";
|
||||
};
|
||||
"ui.statusline.inactive" = {
|
||||
bg = "base01";
|
||||
fg = "base02";
|
||||
};
|
||||
"ui.statusline.insert" = {
|
||||
fg = "base00";
|
||||
bg = "base0B";
|
||||
};
|
||||
"ui.statusline.normal" = {
|
||||
fg = "base00";
|
||||
bg = "base04";
|
||||
};
|
||||
"ui.statusline.select" = {
|
||||
fg = "base00";
|
||||
bg = "base0E";
|
||||
};
|
||||
"ui.text" = "base05";
|
||||
"ui.text.focus" = "base05";
|
||||
"ui.virtual.indent-guide" = { fg = "base03"; };
|
||||
"ui.virtual.ruler" = { bg = "base01"; };
|
||||
"ui.virtual.whitespace" = { fg = "base01"; };
|
||||
"ui.window" = { bg = "base01"; };
|
||||
"ui.virtual.indent-guide" = {fg = "base03";};
|
||||
"ui.virtual.ruler" = {bg = "base01";};
|
||||
"ui.virtual.whitespace" = {fg = "base01";};
|
||||
"ui.window" = {bg = "base01";};
|
||||
"variable" = "base08";
|
||||
"variable.other.member" = "base08";
|
||||
"warning" = "base09";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,19 @@
|
|||
{ config, lib, inputs, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkIf;
|
||||
cfg = config.ooknet.editor.nvim;
|
||||
console = config.ooknet.console;
|
||||
|
||||
ookvim = inputs.ookvim.packages.${pkgs.system}.default;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf;
|
||||
inherit (config.ooknet) console;
|
||||
|
||||
cfg = config.ooknet.editor.nvim;
|
||||
|
||||
ookvim = inputs.ooks-vim.packages.${pkgs.system}.ooks-vim;
|
||||
in {
|
||||
config = mkIf (cfg.enable || console.editor == "nvim") {
|
||||
home.packages = [ ookvim ];
|
||||
home.packages = [ookvim];
|
||||
home.sessionVariables.EDITOR = mkIf (console.editor == "nvim") "nvim";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue