flake: fix/update

Author: jaredmontoya

.envrc

@@ -1,2 +1,2 @@
-watch_file shell.nix
+watch_file nix/shell.nix
 use flake

.github/workflows/ci.yml

@@ -22,10 +22,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version-file: ./go.mod
 
       - name: Run tests
         run: go test -v ./...
+
+      - name: Check Formatting
+        run: nix flake check

.github/workflows/update-version-and-create-tag.yml

@@ -25,9 +25,6 @@ jobs:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
 
-      - name: Setup Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@main
-
       - name: Set up Git
         run: |
           git config user.name "github-actions[bot]"
@@ -63,21 +60,21 @@ jobs:
 
       - name: Update version.nix file
         run: |
-          echo "\"${{ env.new_version }}\"" > pkgs/fabric/version.nix
+          echo "\"${{ env.new_version }}\"" > nix/pkgs/fabric/version.nix
       
-      - name: Format source codes
+      - name: Format source code
         run: |
-          go fmt ./...
+          nix fmt
 
       - name: Update gomod2nix.toml file
         run: |
-          nix run .#gomod2nix
+          nix run .#gomod2nix -- --outdir nix/pkgs/fabric
 
       - name: Commit changes
         run: |
           git add version.go
-          git add pkgs/fabric/version.nix
-          git add gomod2nix.toml
+          git add nix/pkgs/fabric/version.nix
+          git add nix/pkgs/fabric/gomod2nix.toml
           git add .
           if ! git diff --staged --quiet; then
             git commit -m "Update version to ${{ env.new_tag }} and commit $commit_hash"

cli/cli_test.go

@@ -1,10 +1,11 @@
 package cli
 
 import (
-	"github.com/danielmiessler/fabric/core"
 	"os"
 	"testing"
 
+	"github.com/danielmiessler/fabric/core"
+
 	"github.com/stretchr/testify/assert"
 )
 

cli/output.go

@@ -2,8 +2,9 @@ package cli
 
 import (
 	"fmt"
-	"github.com/atotto/clipboard"
 	"os"
+
+	"github.com/atotto/clipboard"
 )
 
 func CopyToClipboard(message string) (err error) {

common/attachment.go

@@ -6,11 +6,12 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/gabriel-vasile/mimetype"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"github.com/gabriel-vasile/mimetype"
 )
 
 type Attachment struct {

common/domain_test.go

@@ -1,9 +1,10 @@
 package common
 
 import (
+	"testing"
+
 	goopenai "github.com/sashabaranov/go-openai"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestNormalizeMessages(t *testing.T) {

common/groups_items.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"fmt"
+
 	"github.com/samber/lo"
 )
 

core/plugin_registry.go

@@ -3,11 +3,12 @@ package core
 import (
 	"bytes"
 	"fmt"
-	"github.com/danielmiessler/fabric/plugins/ai/exolab"
 	"os"
 	"path/filepath"
 	"strconv"
 
+	"github.com/danielmiessler/fabric/plugins/ai/exolab"
+
 	"github.com/samber/lo"
 
 	"github.com/danielmiessler/fabric/common"

flake.lock

@@ -33,7 +33,7 @@
         let
           pkgs = nixpkgs.legacyPackages.${system};
         in
-        treefmt-nix.lib.evalModule pkgs ./treefmt.nix
+        treefmt-nix.lib.evalModule pkgs ./nix/treefmt.nix
       );
     in
     {
@@ -49,7 +49,7 @@
           pkgs = nixpkgs.legacyPackages.${system};
           goEnv = gomod2nix.legacyPackages.${system}.mkGoEnv { pwd = ./.; };
         in
-        import ./shell.nix {
+        import ./nix/shell.nix {
           inherit pkgs goEnv;
           inherit (gomod2nix.legacyPackages.${system}) gomod2nix;
         }
@@ -62,7 +62,7 @@
         in
         {
           default = self.packages.${system}.fabric;
-          fabric = pkgs.callPackage ./pkgs/fabric {
+          fabric = pkgs.callPackage ./nix/pkgs/fabric {
             inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;
           };
           inherit (gomod2nix.legacyPackages.${system}) gomod2nix;

flake.nix

@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/jessevdk/go-flags"
 	"os"
 
+	"github.com/jessevdk/go-flags"
+
 	"github.com/danielmiessler/fabric/cli"
 )
 

main.go

@@ -6,9 +6,11 @@
 buildGoApplication {
   pname = "fabric-ai";
   version = import ./version.nix;
-  src = ../../.;
-  pwd = ../../.;
-  modules = ../../gomod2nix.toml;
+  src = ../../../.;
+  pwd = ../../../.;
+  modules = ./gomod2nix.toml;
+
+  doCheck = false;
 
   ldflags = [
     "-s"

pkgs/fabric/default.nix renamed to nix/pkgs/fabric/default.nix

@@ -6,6 +6,7 @@
     statix.enable = true;
     nixfmt.enable = true;
 
+    goimports.enable = true;
     gofmt.enable = true;
   };
 }

gomod2nix.toml renamed to nix/pkgs/fabric/gomod2nix.toml

@@ -1,10 +1,11 @@
 package azure
 
 import (
+	"strings"
+
 	"github.com/danielmiessler/fabric/plugins"
 	"github.com/danielmiessler/fabric/plugins/ai/openai"
 	goopenai "github.com/sashabaranov/go-openai"
-	"strings"
 )
 
 func NewClient() (ret *Client) {

pkgs/fabric/version.nix renamed to nix/pkgs/fabric/version.nix

@@ -1,10 +1,11 @@
 package dryrun
 
 import (
-	"github.com/danielmiessler/fabric/common"
-	"github.com/sashabaranov/go-openai"
 	"reflect"
 	"testing"
+
+	"github.com/danielmiessler/fabric/common"
+	"github.com/sashabaranov/go-openai"
 )
 
 // Test generated using Keploy

shell.nix renamed to nix/shell.nix

@@ -1,9 +1,10 @@
 package exolab
 
 import (
+	"strings"
+
 	"github.com/danielmiessler/fabric/plugins"
 	"github.com/danielmiessler/fabric/plugins/ai/openai"
-	"strings"
 
 	goopenai "github.com/sashabaranov/go-openai"
 )

treefmt.nix renamed to nix/treefmt.nix

@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/danielmiessler/fabric/plugins"
 	goopenai "github.com/sashabaranov/go-openai"
-	"strings"
 
 	"github.com/danielmiessler/fabric/common"
 	"github.com/google/generative-ai-go/genai"

plugins/ai/azure/azure.go

@@ -1,8 +1,9 @@
 package gemini
 
 import (
-	"github.com/google/generative-ai-go/genai"
 	"testing"
+
+	"github.com/google/generative-ai-go/genai"
 )
 
 // Test generated using Keploy

plugins/ai/dryrun/dryrun_test.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/danielmiessler/fabric/plugins"
 	"io"
 	"log/slog"
 
+	"github.com/danielmiessler/fabric/plugins"
+
 	"github.com/danielmiessler/fabric/common"
 	"github.com/samber/lo"
 	"github.com/sashabaranov/go-openai"

plugins/ai/exolab/exolab.go

@@ -2,6 +2,7 @@ package ai
 
 import (
 	"context"
+
 	"github.com/danielmiessler/fabric/plugins"
 	goopenai "github.com/sashabaranov/go-openai"
 

plugins/ai/gemini/gemini.go

@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/danielmiessler/fabric/plugins"
 	"sync"
+
+	"github.com/danielmiessler/fabric/plugins"
 )
 
 func NewVendorsManager() *VendorsManager {

plugins/ai/gemini/gemini_test.go

@@ -2,10 +2,11 @@ package fsdb
 
 import (
 	"fmt"
-	"github.com/joho/godotenv"
 	"os"
 	"path/filepath"
 	"time"
+
+	"github.com/joho/godotenv"
 )
 
 func NewDb(dir string) (db *Db) {

plugins/ai/openai/openai.go

@@ -2,6 +2,7 @@ package fsdb
 
 import (
 	"fmt"
+
 	"github.com/danielmiessler/fabric/common"
 	goopenai "github.com/sashabaranov/go-openai"
 )

plugins/ai/vendor.go

@@ -1,8 +1,9 @@
 package fsdb
 
 import (
-	goopenai "github.com/sashabaranov/go-openai"
 	"testing"
+
+	goopenai "github.com/sashabaranov/go-openai"
 )
 
 func TestSessions_GetOrCreateSession(t *testing.T) {

plugins/ai/vendors.go

@@ -2,6 +2,7 @@ package converter
 
 import (
 	"bytes"
+
 	"github.com/go-shiori/go-readability"
 )
 

plugins/db/fsdb/db.go

@@ -5,13 +5,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/danielmiessler/fabric/core"
-	"github.com/gin-gonic/gin"
 	"io"
 	"log"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/danielmiessler/fabric/core"
+	"github.com/gin-gonic/gin"
 )
 
 type OllamaModel struct {