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
8 changed files with 33 additions and 127 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" }
+1 -2
View File
@@ -10,10 +10,10 @@
./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/dap.nix
./modules/plugins/fzf-lua.nix ./modules/plugins/fzf-lua.nix
./modules/plugins/gitsigns.nix ./modules/plugins/gitsigns.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/tmux-navigator.nix
@@ -21,7 +21,6 @@
./modules/plugins/undotree.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
# ./modules/plugins/neotree.nix
]; ];
performance.byteCompileLua.enable = true; performance.byteCompileLua.enable = true;
+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;
-33
View File
@@ -1,33 +0,0 @@
{
plugins.dap = {
enable = true;
luaConfig.post = ''
local dap = require('dap')
dap.configurations.python = {
{
type = 'python',
request = 'attach',
name = 'Attach Remote (prompt for path)',
connect = {
host = '127.0.0.1',
port = 5678,
},
pathMappings = function()
local remoteRoot = vim.fn.input('Remote root path: ', '/app')
return {
{
localRoot = vim.fn.getcwd(),
remoteRoot = remoteRoot,
},
}
end,
},
}
'';
};
plugins.dap-ui.enable = true;
plugins.dap-python.enable = true;
keymaps = [ ];
}
Generated
+7 -7
View File
@@ -87,11 +87,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771903837, "lastModified": 1766473571,
"narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -118,15 +118,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1771903837, "lastModified": 1766473571,
"narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "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"