Compare commits
4 Commits
1.11.0
...
feat/updat
| Author | SHA1 | Date | |
|---|---|---|---|
| eae4cbc30f | |||
| 6286e367c7 | |||
| 543ccb7573 | |||
| 4cdac1381b |
@@ -9,7 +9,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
- name: Setup sudo (required for the next step)
|
||||
run: apt-get update && apt-get install -y sudo
|
||||
- name: Setup nix
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
extra_nix_config: |
|
||||
experimental-features = nix-command flakes
|
||||
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
|
||||
with:
|
||||
name: palkx
|
||||
|
||||
@@ -12,4 +12,4 @@ jobs:
|
||||
release:
|
||||
name: Release a new version
|
||||
needs: build
|
||||
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.3
|
||||
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.0
|
||||
|
||||
@@ -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
cog.toml
1
cog.toml
@@ -1,3 +1,2 @@
|
||||
[commit_types]
|
||||
version = { bump_patch = true, changelog_title = "Version" }
|
||||
chore = { bump_patch = true, changelog_title = "Chore" }
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
extraConfigLuaPre =
|
||||
@@ -42,12 +41,7 @@
|
||||
|
||||
plugins.conform-nvim = {
|
||||
enable = true;
|
||||
autoInstall = {
|
||||
enable = true;
|
||||
overrides = {
|
||||
"terraform_fmt" = pkgs.asdf-vm;
|
||||
};
|
||||
};
|
||||
autoInstall.enable = true;
|
||||
settings = {
|
||||
default_format_opts.lsp_format = "fallback";
|
||||
formatters_by_ft = {
|
||||
@@ -130,33 +124,34 @@
|
||||
return
|
||||
end
|
||||
|
||||
if slow_format_filetypes[vim.bo[bufnr].filetype] then
|
||||
return
|
||||
end
|
||||
-- if slow_format_filetypes[vim.bo[bufnr].filetype] then
|
||||
-- return
|
||||
-- end
|
||||
|
||||
local function on_format(err)
|
||||
if err and err:match("timeout$") then
|
||||
slow_format_filetypes[vim.bo[bufnr].filetype] = true
|
||||
end
|
||||
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
|
||||
'';
|
||||
# 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;
|
||||
|
||||
14
flake.lock
generated
14
flake.lock
generated
@@ -87,11 +87,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767799921,
|
||||
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
|
||||
"lastModified": 1766473571,
|
||||
"narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
|
||||
"rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -118,15 +118,15 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1767799921,
|
||||
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
|
||||
"lastModified": 1766473571,
|
||||
"narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
|
||||
"rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
||||
Reference in New Issue
Block a user