Merge branch 'main' into renovate/lock-file-maintenance

Tarow · web-flow · commit 4cd0fc47f8bb · 2025-02-23T10:09:35.000+01:00
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake .#dockdns
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.60
+          version: v1.64
 
   build-and-push-image:
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,7 @@ bin/
 tmp/
 
 # Nix build result
-result
+result
+
+# direnv
+.direnv/
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -23,17 +23,18 @@
     devShells = forAllSystems (system: let
       pkgs = nixpkgs.legacyPackages.${system};
       unstable = nixpkgs-unstable.legacyPackages.${system};
-    in {
-      default = pkgs.mkShell {
-        packages = with pkgs;
-          [
+    in rec {
+      default = dockdns;
+      dockdns = pkgs.mkShell {
+        packages =
+          (with pkgs; [
             go
             golangci-lint
             air
             gopls
             gotools
             delve
-          ]
+          ])
           ++ (with unstable; [
             templ
           ]);
