Compare commits

..

4 Commits

Author SHA1 Message Date
palkx eae4cbc30f chore(flake): bump version
check-commits / Check commits (pull_request) Successful in 8s
build-flake / build (pull_request) Successful in 4m56s
2025-12-29 12:06:30 +02:00
palkx 6286e367c7 chore: add editorconfig 2025-12-29 12:06:17 +02:00
palkx 543ccb7573 feat(conform): do not disable formatters on timeout 2025-12-29 12:05:57 +02:00
palkx 4cdac1381b feat(conform): re-enable auto formatting, fix #47
check-commits / Check commits (pull_request) Successful in 9s
build-flake / build (pull_request) Successful in 11m20s
2025-12-29 10:19:20 +02:00
13 changed files with 64 additions and 191 deletions
+2 -2
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@v6 uses: actions/checkout@v5
- 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
@@ -18,7 +18,7 @@ jobs:
extra_nix_config: | extra_nix_config: |
experimental-features = nix-command flakes experimental-features = nix-command flakes
github_access_token: ${{ secrets.GH_ACCESS_TOKEN }} github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
nix_path: nixpkgs=channel:nixos-25.11 nix_path: nixpkgs=channel:nixos-25.05
- uses: cachix/cachix-action@v16 - uses: cachix/cachix-action@v16
with: with:
name: palkx name: palkx
+1 -1
View File
@@ -12,4 +12,4 @@ jobs:
release: release:
name: Release a new version name: Release a new version
needs: build needs: build
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.3 uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.0
-54
View File
@@ -1,54 +0,0 @@
name: Sync flake lock with main nix-configuration project
on:
schedule:
- cron: "15 3 * * *"
workflow_dispatch:
jobs:
update:
permissions:
contents: write
name: Sync flake lock with main nix-configuration project
runs-on: ubuntu-latest
outputs:
changes: ${{ steps.checkChanges.outputs.CHANGES }}
steps:
- name: Checkout Repository
uses: actions/checkout@v6
- name: Checkout nix-configuration repository
uses: actions/checkout@v6
with:
repository: xaked/nix-config
path: nix-config
ref: master
token: ${{ secrets.NIX_CONFIGURATION_GITEA_CLONE_TOKEN }}
- name: Check for update and perform update
id: checkChanges
run: |
git config user.name gitea-bot
git config user.email bot@git.palkoi.net
git config --global user.email bot@git.palkoi.net
git config --global user.name gitea-bot
tmpfile="$(mktemp)"
jq -srM '.[1].nodes.nixpkgs = .[0].nodes.nixpkgs_2|.[1].nodes.nixpkgs_2 = .[0].nodes.nixpkgs_2 | .[1]' ./nix-config/flake.lock flake.lock > "$tmpfile"
cat "$tmpfile" > flake.lock
git add flake.lock
if [ -n "$(git diff --cached)" ]; then git diff --cached; echo 'CHANGES=y'>>$GITHUB_OUTPUT; else echo 'CHANGES=n'>>$GITHUB_OUTPUT; fi
- name: Commit updates
if: ${{ steps.checkChanges.outputs.CHANGES == 'y' }}
run: |
git commit --no-gpg-sign -m 'chore(flake): update flake.lock'
git push
build:
name: Build flake
if: ${{ needs.update.outputs.changes == 'y' }}
needs: update
uses: ./.gitea/workflows/build-flake.yml
release:
name: Release a new version
needs: build
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.1.0
with:
ref: ${{ github.ref_name }}
-1
View File
@@ -1,3 +1,2 @@
[commit_types] [commit_types]
version = { bump_patch = true, changelog_title = "Version" } version = { bump_patch = true, changelog_title = "Version" }
chore = { bump_patch = true, changelog_title = "Chore" }
+4 -1
View File
@@ -6,16 +6,19 @@
./modules/plugins/lsp ./modules/plugins/lsp
./modules/plugins/airline.nix
./modules/plugins/blink-cmp.nix ./modules/plugins/blink-cmp.nix
./modules/plugins/bufferline.nix ./modules/plugins/bufferline.nix
./modules/plugins/conform-nvim.nix ./modules/plugins/conform-nvim.nix
./modules/plugins/fzf-lua.nix ./modules/plugins/fzf-lua.nix
./modules/plugins/gitsigns.nix ./modules/plugins/gitsigns.nix
./modules/plugins/lualine.nix
./modules/plugins/mini.nix ./modules/plugins/mini.nix
# ./modules/plugins/neotree.nix
./modules/plugins/oil.nix ./modules/plugins/oil.nix
./modules/plugins/snacks.nix ./modules/plugins/snacks.nix
./modules/plugins/tmux-navigator.nix
./modules/plugins/treesitter.nix ./modules/plugins/treesitter.nix
./modules/plugins/undotree.nix
./modules/plugins/venv-selector.nix ./modules/plugins/venv-selector.nix
./modules/plugins/which-key.nix ./modules/plugins/which-key.nix
]; ];
+22 -27
View File
@@ -1,4 +1,3 @@
{ pkgs, ... }:
{ {
config = { config = {
extraConfigLuaPre = extraConfigLuaPre =
@@ -42,12 +41,7 @@
plugins.conform-nvim = { plugins.conform-nvim = {
enable = true; enable = true;
autoInstall = { autoInstall.enable = true;
enable = true;
overrides = {
"terraform_fmt" = pkgs.asdf-vm;
};
};
settings = { settings = {
default_format_opts.lsp_format = "fallback"; default_format_opts.lsp_format = "fallback";
formatters_by_ft = { formatters_by_ft = {
@@ -130,33 +124,34 @@
return return
end end
if slow_format_filetypes[vim.bo[bufnr].filetype] then -- if slow_format_filetypes[vim.bo[bufnr].filetype] then
return -- return
end -- end
local function on_format(err) local function on_format(err)
if err and err:match("timeout$") then return
slow_format_filetypes[vim.bo[bufnr].filetype] = true -- if err and err:match("timeout$") then
end -- slow_format_filetypes[vim.bo[bufnr].filetype] = true
-- end
end end
return { timeout_ms = 200, lsp_fallback = true }, on_format return { timeout_ms = 200, lsp_fallback = true }, on_format
end end
''; '';
format_after_save = # Lua # format_after_save = # Lua
'' # ''
function(bufnr) # function(bufnr)
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then # if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
return # return
end # end
#
if not slow_format_filetypes[vim.bo[bufnr].filetype] then # if not slow_format_filetypes[vim.bo[bufnr].filetype] then
return # return
end # end
#
return { lsp_fallback = true } # return { lsp_fallback = true }
end # end
''; # '';
log_level = "warn"; log_level = "warn";
notify_on_error = true; notify_on_error = true;
notify_no_formatters = false; notify_no_formatters = false;
-9
View File
@@ -1,9 +0,0 @@
{
plugins.lightline = {
enable = true;
settings = {
colorscheme = "catppuccin";
tabline = false;
};
};
}
-9
View File
@@ -1,9 +0,0 @@
{
plugins.lualine = {
enable = true;
settings.options = {
theme = "catppuccin";
globalstatus = true;
};
};
}
+1
View File
@@ -5,6 +5,7 @@
modules = { modules = {
icons = { }; icons = { };
comment = { }; comment = { };
diff = { };
}; };
}; };
} }
+6 -13
View File
@@ -4,14 +4,14 @@
enable = true; enable = true;
settings = { settings = {
bigfile.enabled = true; bigfile.enabled = true;
notifier.enabled = true;
quickfile.enabled = true;
statuscolumn.enabled = true; statuscolumn.enabled = true;
words.enabled = true;
lazygit.enabled = true; lazygit.enabled = true;
picker = { picker.enabled = true;
enabled = true; indent.enabled = true;
matcher = { scope.enabled = true;
frecency = true;
};
};
}; };
}; };
@@ -436,13 +436,6 @@
desc = "Delete Buffer"; desc = "Delete Buffer";
}; };
} }
{
key = "<leader>bo";
action = lib.nixvim.mkRaw "function() Snacks.bufdelete.other() end";
options = {
desc = "Delete Other Buffers";
};
}
{ {
key = "<leader>cR"; key = "<leader>cR";
action = lib.nixvim.mkRaw "function() Snacks.rename.rename_file() end"; action = lib.nixvim.mkRaw "function() Snacks.rename.rename_file() end";
+6 -38
View File
@@ -3,6 +3,7 @@
plugins = { plugins = {
treesitter = { treesitter = {
enable = true; enable = true;
settings = { settings = {
indent = { indent = {
enable = true; enable = true;
@@ -16,48 +17,12 @@
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars; grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
}; };
# Show sticky context window at top
treesitter-context = { treesitter-context = {
enable = true; enable = false;
settings = {
max_lines = 5;
mode = "topline";
trim_scope = "outer";
};
};
# highlight scoped function
indent-blankline = {
enable = true;
settings = {
exclude = {
buftypes = [
"terminal"
"quickfix"
];
filetypes = [
""
"checkhealth"
"help"
"lspinfo"
"packer"
"TelescopePrompt"
"TelescopeResults"
];
};
indent = {
char = "";
};
scope = {
show_end = false;
show_exact_scope = true;
show_start = true;
};
};
}; };
treesitter-textobjects = { treesitter-textobjects = {
enable = false; enable = true;
settings = { settings = {
select = { select = {
enable = true; enable = true;
@@ -66,4 +31,7 @@
}; };
}; };
}; };
extraConfigLua = ''
local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
'';
} }
-14
View File
@@ -62,15 +62,6 @@
scrolloff = 5; scrolloff = 5;
}; };
# Enable limit colomn
opts.colorcolumn = "80,120";
opts.wrap = false;
# This info is displayed in lightline
opts.showmode = false;
# UK keymap
opts.langmap = "йq,цw,уe,кr,еt,нy,гu,шi,щo,зp,х[,ї],фa,іs,вd,аf,пg,рh,оj,лk,дl,ж\\;,є',яz,чx,сc,мv,иb,тn,ьm,б\\,,ю.,ЙQ,ЦW,УE,КR,ЕT,НY,ГU,ШI,ЩO,ЗP,Х{,Ї},ФA,ІS,ВD,АF,ПG,РH,ОJ,ЛK,ДL,Ж:,Є\",ЯZ,ЧX,СC,МV,ИB,ТN,ЬM,Б<,Ю>,ґ`,Ґ~";
diagnostic.settings = { diagnostic.settings = {
update_in_insert = true; update_in_insert = true;
severity_sort = true; severity_sort = true;
@@ -121,9 +112,4 @@
# Comment.underline = true; # Comment.underline = true;
# Comment.bold = true; # Comment.bold = true;
# }; # };
withNodeJs = false;
withPerl = false;
withPython3 = false;
withRuby = false;
} }
Generated
+22 -22
View File
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1765835352,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768135262, "lastModified": 1765835352,
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -87,11 +87,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776067740, "lastModified": 1766473571,
"narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -103,11 +103,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1774748309, "lastModified": 1765674936,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a", "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -118,15 +118,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1776067740, "lastModified": 1766473571,
"narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@@ -140,11 +140,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1769049374, "lastModified": 1766849711,
"narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -164,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768249818, "lastModified": 1761730856,
"narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
"type": "github" "type": "github"
}, },
"original": { "original": {