not sure how that worked???

willruggiano · Apr 16, 2024 · 028ec13 · 028ec13
1 parent 3977f3d
commit 028ec13
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
@@ -6,7 +6,7 @@ on:
       - main
 
 concurrency:
-  group: default
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -20,11 +20,13 @@ jobs:
       - uses: cachix/install-nix-action@v25
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
+          extra_nix_config: |
+            accept-flake-config = true
       - uses: DeterminateSystems/magic-nix-cache-action@v4
       - uses: cachix/cachix-action@v14
         with:
           name: willruggiano
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - run: nix flake check --accept-flake-config --impure
-      - run: nix build --accept-flake-config
-      - run: cachix pin willruggiano nvim-drv "$(nix build --accept-flake-config --print-out-paths)"
+      - run: nix flake check --impure
+      - run: nix build
+      - run: cachix pin willruggiano nvim-drv "$(nix build --print-out-paths)"
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: default
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -39,7 +39,7 @@ jobs:
         with:
           name: willruggiano
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - name: nix run .#ci
+      - name: nix run .#update
         run: |
           git config --global user.name 'github-actions[bot]' &&
           git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com' &&

diff --git a/flake.nix b/flake.nix
@@ -52,24 +52,25 @@
             name = "push.sh";
             runtimeInputs = with pkgs; [cachix jq];
             text = ''
-              nix flake archive --accept-flake-config --json \
+              nix flake archive --json \
               | jq -r '.path,(.inputs|to_entries[].value.path)' \
               | cachix push willruggiano;
 
-              nix build --accept-flake-config --json \
+              nix build --json \
               | jq -r '.[].outputs | to_entries[].value' \
               | cachix push willruggiano;
 
-              cachix pin willruggiano nvim-drv "$(nix build --accept-flake-config --print-out-paths)"
+              cachix pin willruggiano nvim-drv "$(nix build --print-out-paths)"
             '';
           };
           update.program = pkgs.writeShellApplication {
             name = "update.sh";
             runtimeInputs = with pkgs; [niv];
             text = ''
-              nix flake update --accept-flake-config &&
+              nix flake update &&
               niv update &&
               nix run .#nvim-treesitter.update-grammars -- ./pkgs/nvim-treesitter &&
+              nix flake check --impure &&
               git commit -am 'chore: 🌶️🌶️🌶️' &&
               git push
             '';

diff --git a/plugins/lsp.lua b/plugins/lsp.lua
@@ -425,7 +425,7 @@ return function()
       null_ls.builtins.diagnostics.jsonlint,
       null_ls.builtins.diagnostics.luacheck.with { extra_args = { "--globals", "vim", "--no-max-line-length" } },
       null_ls.builtins.diagnostics.shellcheck.with { filetypes = { "bash", "sh" } },
-      null_ls.builtins.diagnostics.sqlfluff.with { extra_args = { "--dialect", "postgres" } },
+      -- null_ls.builtins.diagnostics.sqlfluff.with { extra_args = { "--dialect", "postgres" } },
       null_ls.builtins.diagnostics.statix,
     },
   }