Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 12394ad542 | |||
| 7561b0e946 | |||
| 398745443d | |||
| fba52b1f2f | |||
| 702b8808cb | |||
| 4535cb4db5 | |||
| d93120d43e | |||
|
9418deddae
|
|||
|
fedfd9235c
|
|||
|
0eed1c5008
|
@@ -12,4 +12,4 @@ jobs:
|
||||
release:
|
||||
name: Release a new version
|
||||
needs: build
|
||||
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.0
|
||||
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.3
|
||||
|
||||
@@ -11,6 +11,8 @@ jobs:
|
||||
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
|
||||
@@ -21,15 +23,6 @@ jobs:
|
||||
path: nix-config
|
||||
ref: master
|
||||
token: ${{ secrets.NIX_CONFIGURATION_GITEA_CLONE_TOKEN }}
|
||||
- name: Setup sudo and jq (required for the next step)
|
||||
run: apt-get update && apt-get install -y sudo jq
|
||||
- name: Setup nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
with:
|
||||
extra_nix_config: |
|
||||
experimental-features = nix-command flakes
|
||||
github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
|
||||
nix_path: nixpkgs=channel:nixos-25.11
|
||||
- name: Check for update and perform update
|
||||
id: checkChanges
|
||||
run: |
|
||||
@@ -42,20 +35,20 @@ jobs:
|
||||
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 echo 'CHANGES=y'>>$GITHUB_OUTPUT; else echo 'CHANGES=n'>>$GITHUB_OUTPUT; fi
|
||||
- name: Build nix flake
|
||||
if: ${{ steps.checkChanges.outputs.CHANGES == 'y' }}
|
||||
run: |
|
||||
nix build .
|
||||
- name: Check nix flake
|
||||
if: ${{ steps.checkChanges.outputs.CHANGES == 'y' }}
|
||||
run: nix flake check --all-systems
|
||||
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: update
|
||||
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.0
|
||||
needs: build
|
||||
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.1.0
|
||||
with:
|
||||
ref: ${{ github.ref_name }}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
extraConfigLuaPre =
|
||||
@@ -41,7 +42,12 @@
|
||||
|
||||
plugins.conform-nvim = {
|
||||
enable = true;
|
||||
autoInstall.enable = true;
|
||||
autoInstall = {
|
||||
enable = true;
|
||||
overrides = {
|
||||
"terraform_fmt" = pkgs.asdf-vm;
|
||||
};
|
||||
};
|
||||
settings = {
|
||||
default_format_opts.lsp_format = "fallback";
|
||||
formatters_by_ft = {
|
||||
|
||||
12
flake.lock
generated
12
flake.lock
generated
@@ -87,11 +87,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767047869,
|
||||
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
|
||||
"lastModified": 1768242861,
|
||||
"narHash": "sha256-F4IIxa5xDHjtrmMcayM8lHctUq1oGltfBQu2+oqDWP4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a",
|
||||
"rev": "1327e798cb055f96f92685df444e9a2c326ab5ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -118,11 +118,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1767047869,
|
||||
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
|
||||
"lastModified": 1768242861,
|
||||
"narHash": "sha256-F4IIxa5xDHjtrmMcayM8lHctUq1oGltfBQu2+oqDWP4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a",
|
||||
"rev": "1327e798cb055f96f92685df444e9a2c326ab5ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
Reference in New Issue
Block a user