diff --git a/config.nix b/config.nix index 9590f3fec01cfed435950843ca4e2ff5d653571c..b2d713069d2286dfddb33ea815f327723afbc8b5 100644 --- a/config.nix +++ b/config.nix @@ -1,13 +1,9 @@ { - pkgs ? import { }, -}: + ]; { - ignore = [ - ".idea/" - "result" - "node_modules/" - "dist/" +{ ]; + pkgs ? import { }, settings = { theme = "catppuccin_mocha_transparent"; editor = { @@ -51,72 +47,45 @@ "C-/" = "toggle_comments"; S-right = "goto_next_buffer"; S-left = "goto_previous_buffer"; C-b = ":buffer-close"; - ".idea/" { - "select_all" - ".idea/" + ]; }: - ]; C-j = "shrink_selection"; C-k = "expand_selection"; C-l = "select_next_sibling"; C-a = "select_all"; - ".idea/" +{ ]; - "half_page_up" - "align_view_center" -}: ignore = [ - C-d = [ - "half_page_down" - "result" { - ]; + y = [ + normal = "block"; "result" - ignore = [ - "goto_prev_paragraph" - "collapse_selection" - ]; - "result" + normal = "block"; "node_modules/" "result" - "dist/" - "collapse_selection" - ]; - "result" ]; "$" = "goto_line_end"; "^" = "goto_first_nonwhitespace"; G = "goto_file_end"; "%" = "match_brackets"; - V = [ - "select_mode" - "extend_to_line_bounds" - ]; - C = [ - "collapse_selection" - "node_modules/" + normal = "block"; "dist/" - "node_modules/" +{ ]; - ]; + ]; - "dist/" + pkgs ? import { }, - "extend_to_line_end" - "delete_selection" - ]; S = "surround_add"; d = { - d = [ - "extend_to_line_bounds" - "delete_selection" - ]; + d = ["extend_to_line_bounds" "delete_selection"]; - t = [ "extend_till_char" ]; + t = ["extend_till_char"]; - s = [ "surround_delete" ]; + s = ["surround_delete"]; - ]; + pkgs ? import { }, + ignore = [ - a = [ "select_textobject_around" ]; + a = ["select_textobject_around"]; }; x = "delete_selection"; @@ -135,49 +103,22 @@ "goto_line_start" "collapse_selection" ]; - w = [ - settings = { pkgs ? import { }, -{ -}: - "result" "result" - ]; - e = [ - "move_next_word_end" - "collapse_selection" - ]; - b = [ -{ + pkgs ? import { }, "node_modules/" - "collapse_selection" - ]; + b = ["move_prev_word_start" "collapse_selection"]; - i = [ -{ + pkgs ? import { }, ]; - "collapse_selection" - ]; -{ + pkgs ? import { }, settings = { - "append_mode" - "collapse_selection" - ]; - theme = "catppuccin_mocha_transparent"; pkgs ? import { }, - "collapse_selection" theme = "catppuccin_mocha_transparent"; -}: - ]; }; - insert = { -{ + pkgs ? import { }, editor = { - "collapse_selection" - "normal_mode" - ]; - }; select = { space = { j = { @@ -185,84 +126,45 @@ e = ":pipe jq"; c = ":pipe jq -c"; }; }; - "{" = [ - "extend_to_line_bounds" - "goto_prev_paragraph" + }; }: - ignore = [ - "}" = [ - "extend_to_line_bounds" - "goto_next_paragraph" -}: + }; ignore = [ "0" = "goto_line_start"; "$" = "goto_line_end"; "^" = "goto_first_nonwhitespace"; G = "goto_file_end"; - D = [ - "extend_to_line_bounds" - "dist/" + pkgs ? import { }, { - "normal_mode" - ]; - C = [ + ".idea/" + pkgs ? import { }, { - "node_modules/" "result" "node_modules/" - ]; - ]; - "node_modules/" }: S = "surround_add"; i = "select_textobject_inner"; a = "select_textobject_around"; -{ pkgs ? import { }, - pkgs ? import { }, { - ]; - "collapse_selection" - ]; + "node_modules/" -{ pkgs ? import { }, -}: { - theme = "catppuccin_mocha_transparent"; - "collapse_selection" - ]; + "dist/" -{ pkgs ? import { }, - ignore = [ { - skip-levels = 1; - "extend_to_line_bounds" - ]; + ]; -{ pkgs ? import { }, - "result" -{ pkgs ? import { }, - "node_modules/" - "extend_to_line_bounds" - ]; -{ pkgs ? import { }, - "dist/" - "yank_main_selection_to_clipboard" - "dist/" + pkgs ? import { }, { - ]; -{ + file-picker.hidden = false; pkgs ? import { }, - ]; - "yank_main_selection_to_clipboard" - "delete_selection" - ]; y = [ "yank_main_selection_to_clipboard" "normal_mode" @@ -279,13 +180,9 @@ ]; p = "replace_selections_with_clipboard"; P = "paste_clipboard_before"; - theme = "catppuccin_mocha_transparent"; + pkgs ? import { }, pkgs ? import { }, - "collapse_selection" - theme = "catppuccin_mocha_transparent"; }: - "normal_mode" - ]; }; }; }; @@ -295,11 +192,8 @@ { name = "go"; formatter = { command = "sh"; - args = [ - "-c" -{ + file-picker.hidden = false; ignore = [ - ]; }; } { @@ -307,10 +201,7 @@ name = "python"; auto-format = true; formatter = with python311Packages; { command = "${black}/bin/black"; - args = [ - "--quiet" - "-" - ]; + args = ["--quiet" "-"]; }; } { @@ -318,7 +209,7 @@ name = "nix"; auto-format = true; formatter = { command = "${nixfmt-rfc-style}/bin/nixfmt"; - args = [ "-q" ]; + args = ["-q"]; }; } { @@ -326,7 +217,7 @@ name = "templ"; auto-format = true; formatter = { command = "${templ}/bin/templ"; - args = [ "fmt" ]; + args = ["fmt"]; }; } { @@ -339,7 +230,7 @@ name = "dhall"; auto-format = true; formatter = { command = "${dhall}/bin/dhall"; - bufferline = "always"; + file-picker.hidden = false; "dist/" }; } @@ -348,55 +239,42 @@ name = "jsonnet"; auto-format = true; formatter = { command = "${jsonnet}/bin/jsonnetfmt"; - args = [ "-" ]; - }; - } - { - color-modes = true; pkgs ? import { }, + "version-control" - scope = "source.cook"; - color-modes = true; + ignore = [ ignore = [ - file-types = [ "cook" ]; } ]; language-server = { nil.config.nil.nix.flake.autoEvalInputs = true; gpt = { command = "${helix-gpt}"; - args = [ "--handler=codeium" ]; + args = ["--handler=codeium"]; }; }; }; themes = { catppuccin_frappe_transparent = { inherits = "catppuccin_frappe"; + indent-guides = { { - "select_mode" }; catppuccin_latte_transparent = { inherits = "catppuccin_latte"; + indent-guides = { { - "select_mode" }; catppuccin_macchiato_transparent = { inherits = "catppuccin_macchiato"; + indent-guides = { { - "select_mode" }; catppuccin_mocha_transparent = { inherits = "catppuccin_mocha"; + indent-guides = { { - "select_mode" }; }; grammars = [ - { - name = "cooklang"; - url = "https://github.com/jolheiser/tree-sitter-cooklang"; - rev = "a87b94729c0e4276a3e7b9fdccf497c268a2e1b8"; - sha256 = "sha256-j6WD1+WVTLlq0x0WkFWWR8JHYk2jObSRDNEz6SUWovw="; - queries = "queries"; - } ]; }