5 Commits

Author SHA1 Message Date
6d379f7a02 chore(flake): bump version
All checks were successful
build-flake / Build flake (push) Successful in 4m57s
build-flake / Release a new version (push) Successful in 8s
2025-12-29 12:11:44 +02:00
a513133bbe chore: add editorconfig 2025-12-29 12:11:44 +02:00
42719a9f92 feat(conform): do not disable formatters on timeout 2025-12-29 12:11:44 +02:00
06ccfa6b64 feat(conform): re-enable auto formatting, fix #47 2025-12-29 12:11:44 +02:00
6ab4db91ab chore(deps): update actions/checkout action to v6
All checks were successful
check-commits / Check commits (pull_request) Successful in 17s
build-flake / build (pull_request) Successful in 13m39s
build-flake / Build flake (push) Successful in 7m44s
build-flake / Release a new version (push) Successful in 9s
2025-12-03 00:02:43 +00:00
4 changed files with 87 additions and 35 deletions

14
.editorconfig Normal file
View File

@@ -0,0 +1,14 @@
# Editor configuration, see http://editorconfig.org
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
max_line_length = 0
trim_trailing_whitespace = false

View File

@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v5 uses: actions/checkout@v6
- name: Setup sudo (required for the next step) - name: Setup sudo (required for the next step)
run: apt-get update && apt-get install -y sudo run: apt-get update && apt-get install -y sudo
- name: Setup nix - name: Setup nix

View File

@@ -1,8 +1,3 @@
{
lib,
pkgs,
...
}:
{ {
config = { config = {
extraConfigLuaPre = extraConfigLuaPre =
@@ -48,6 +43,7 @@
enable = true; enable = true;
autoInstall.enable = true; autoInstall.enable = true;
settings = { settings = {
default_format_opts.lsp_format = "fallback";
formatters_by_ft = { formatters_by_ft = {
html = { html = {
__unkeyed-1 = "prettierd"; __unkeyed-1 = "prettierd";
@@ -81,7 +77,7 @@
}; };
python = [ "ruff_format" ]; python = [ "ruff_format" ];
lua = [ "stylua" ]; lua = [ "stylua" ];
nix = [ "nixfmt-rfc-style" ]; nix = [ "nixfmt" ];
markdown = { markdown = {
__unkeyed-1 = "prettierd"; __unkeyed-1 = "prettierd";
__unkeyed-2 = "prettier"; __unkeyed-2 = "prettier";
@@ -103,20 +99,62 @@
"goimports" "goimports"
"gofmt" "gofmt"
]; ];
# Auto correct misspelled words
# "*" = [ "codebook" ];
"_" = [ "trim_whitespace" ]; "_" = [ "trim_whitespace" ];
}; };
formatters = { formatters = {
terraform_fmt = { # Disabling because if project has a project limitatiton, then
command = "${lib.getExe ( # formatter not working at all
pkgs.terraform.overrideAttrs (oldAttrs: { # terraform_fmt = {
meta = lib.recursiveUpdate oldAttrs.meta { # command = "${lib.getExe (
license = lib.licenses.gpl3Only; # pkgs.terraform.overrideAttrs (oldAttrs: {
}; # meta = lib.recursiveUpdate oldAttrs.meta {
}) # license = lib.licenses.gpl3Only;
)}"; # };
}; # })
# )}";
# };
}; };
format_on_save = # Lua
''
function(bufnr)
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
return
end
-- if slow_format_filetypes[vim.bo[bufnr].filetype] then
-- return
-- end
local function on_format(err)
return
-- if err and err:match("timeout$") then
-- slow_format_filetypes[vim.bo[bufnr].filetype] = true
-- end
end
return { timeout_ms = 200, lsp_fallback = true }, on_format
end
'';
# format_after_save = # Lua
# ''
# function(bufnr)
# if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
# return
# end
#
# if not slow_format_filetypes[vim.bo[bufnr].filetype] then
# return
# end
#
# return { lsp_fallback = true }
# end
# '';
log_level = "warn";
notify_on_error = true;
notify_no_formatters = false;
}; };
}; };
keymaps = [ keymaps = [

38
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1763759067, "lastModified": 1765835352,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763759067, "lastModified": 1765835352,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -87,11 +87,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764522689, "lastModified": 1766473571,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -103,11 +103,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1761765539, "lastModified": 1765674936,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -118,11 +118,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1764338033, "lastModified": 1766473571,
"narHash": "sha256-1LNGcU+aTbATD3BPCf7U1KsP1CjCH+ZWqM6JH0sZ6Q0=", "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba9b83e5fb4b552a423d24dabe5ccb47a9c89901", "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -140,11 +140,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1764614282, "lastModified": 1766849711,
"narHash": "sha256-oHT1/E5yf9lvOVHtO5joevADcQLGp5mVab5shVVqxso=", "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "6bdabc1359d7658e1d9ce065db37df92e904b581", "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074",
"type": "github" "type": "github"
}, },
"original": { "original": {