diff --git a/config.nix b/config.nix index e5bdaaa8f1315f866ca4f681c09e9885f1e3f079..24e654b94eb75a12cfcdd51ee3bbd22b0d13b2bd 100644 --- a/config.nix +++ b/config.nix @@ -1,29 +1,70 @@ {pkgs ? import {}}: { + "%" = "match_brackets"; + templ = pkgs.buildGoModule rec { + pname = "templ"; + version = "0.2.334"; + + indent-guides = { ignore = [".idea/" "result" "node_modules/" "dist/"]; + indent-guides = { settings = { + indent-guides = { theme = "catppuccin_mocha_transparent"; + indent-guides = { editor = { +{pkgs ? import {}}: { line-number = "relative"; + line-number = "relative"; + }; + + indent-guides = { mouse = false; + + indent-guides = { bufferline = "always"; + + indent-guides = { color-modes = true; + {pkgs ? import {}}: { + mouse = false; {pkgs ? import {}}: { + mouse = false; {pkgs ? import {}}: { {pkgs ? import {}}: { + mouse = false; ignore = [".idea/" "result" "node_modules/" "dist/"]; {pkgs ? import {}}: { + mouse = false; settings = { {pkgs ? import {}}: { + mouse = false; theme = "catppuccin_mocha_transparent"; + }; {pkgs ? import {}}: { + line-number = "relative"; + render = true; editor = { + ignore = [".idea/" "result" "node_modules/" "dist/"]; + settings = { + theme = "catppuccin_mocha_transparent"; + editor = { + line-number = "relative"; + mouse = false; + bufferline = "always"; + color-modes = true; + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + file-picker = {hidden = false;}; indent-guides = { render = true; skip-levels = 1; }; {pkgs ? import {}}: { - color-modes = true; + Y = [ statusline = { right = [ "version-control" @@ -33,7 +74,7 @@ "position" "file-encoding" ]; }; - ignore = [".idea/" "result" "node_modules/" "dist/"]; + render = true; bufferline = "always"; }; keys = { @@ -161,6 +202,13 @@ name = "go"; formatter = { command = "sh"; args = ["-c" "set -o pipefail; ${gotools}/bin/goimports | ${gofumpt}/bin/gofumpt"]; + }; + } + { + name = "lua"; + formatter = with nodePackages; { + command = "${lua-fmt}/bin/luafmt"; + args = ["--stdin"]; }; } { diff --git a/flake.lock b/flake.lock index b8cc80555d5aa320b0e23c9a819c3e391b30ffc8..0d1df4988dd5ce40e75d36e710af586c21a63708 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,12 @@ { "nodes": { "nixpkgs": { "locked": { + "lastModified": 1699343069, + "nodes": { "lastModified": 1708001613, - "narHash": "sha256-woOmAXW05XnqlLn7dKzCkRAEOSOdA/Z2ndVvKcjid94=", "owner": "nixos", "repo": "nixpkgs", - "rev": "085589047343aad800c4d305cf7b98e8a3d51ae2", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": {