Merge pull request #66 from acmcsufoss/nix-stuff

Modularize nix and other little things

Author: sidvasu

.air.toml

@@ -5,15 +5,15 @@ tmp_dir = "tmp"
 [build]
   args_bin = []
   bin = "./bin/api"
-  cmd = "make"
+  cmd = "go build -o bin/api ./cmd/api"
   delay = 1000
   exclude_dir = ["assets", "tmp", "vendor", "testdata"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false
   follow_symlink = false
   full_bin = ""
-  include_dir = []
+  include_dir = ["internal", "cmd"]
   include_ext = ["go", "tpl", "tmpl", "html"]
   include_file = []
   kill_delay = "0s"

.gitignore

@@ -27,7 +27,7 @@ go.work
 
 # Nix related
 .direnv/
-result/
+result
 
 # Build artifact generated by Makefile
 .generate.marker

LICENSE

@@ -1,14 +1,21 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
+MIT License
 
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+Copyright (c) 2025 acmcsufoss
 
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. You just DO WHAT THE FUCK YOU WANT TO.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

flake.nix

@@ -15,57 +15,8 @@
       system: let
         pkgs = nixpkgs.legacyPackages.${system};
       in {
-        packages.default = pkgs.buildGoModule {
-          name = "api-acmcsuf";
-          src = ./.;
-          vendorHash = "sha256-xcJrcUGnMKkYxJnNsJ3nvSWHb8u2ujRv/PmJMJdEWhM=";
-
-          nativeBuildInputs = with pkgs; [
-            sqlc
-          ];
-
-          env.CGO_ENABLED = 0;
-
-          preBuild = ''
-            go generate ./...
-          '';
-
-          postBuild = ''
-            mv $GOPATH/bin/api $GOPATH/bin/api-acmcsuf
-          '';
-
-          subPackages = ["cmd/api"];
-
-          meta = with pkgs.lib; {
-            description = "api for acmcsuf oss";
-            homepage = "https://github.com/acmcsufoss/api.acmcsuf.com";
-            license = licenses.mit;
-          };
-        };
-
-        devShells.default = pkgs.mkShell {
-          packages = with pkgs; [
-            go
-            gotools
-            gopls # Go langauge server
-            nilaway # Go static analysis tool
-            delve # Go debugger
-            sqlc # compiles SQL queries to Go code
-            air # run dev server with hot reload
-            sqlfluff # SQL linter
-            gnumake
-            curl
-            xh
-            jq
-            go-swag
-          ];
-
-          shellHook = ''
-            export DATABASE_URL="file:dev.db?cache=shared&mode=rwc"
-            export CGO_ENABLED=0  # cgo compiler flags cause issues with delve when using Nix
-            echo "Loaded dev shell."
-          '';
-        };
+        packages.default = pkgs.callPackage ./nix/package.nix {};
+        devShells.default = pkgs.callPackage ./nix/devShell.nix {};
       }
     );
 }

nix/devShell.nix

@@ -0,0 +1,39 @@
+{
+  mkShell,
+  go,
+  gotools,
+  gopls,
+  nilaway,
+  delve,
+  sqlc,
+  air,
+  sqlfluff,
+  gnumake,
+  curl,
+  xh,
+  jq,
+  go-swag,
+}:
+mkShell {
+  packages = [
+    go
+    gotools
+    gopls # Go language server
+    nilaway # Go static analysis tool
+    delve # Go debugger
+    sqlc # compiles SQL queries to Go code
+    air # run dev server with hot reload
+    sqlfluff # SQL linter
+    gnumake
+    curl
+    xh
+    jq
+    go-swag
+  ];
+
+  shellHook = ''
+    export DATABASE_URL="file:dev.db?cache=shared&mode=rwc"
+    export CGO_ENABLED=0  # cgo compiler flags cause issues with delve when using Nix
+    echo "Loaded dev shell."
+  '';
+}

nix/package.nix

@@ -0,0 +1,21 @@
+{
+  lib,
+  buildGoModule,
+}:
+buildGoModule {
+  name = "api-acmcsuf";
+  src = ../.;
+  vendorHash = "sha256-PbObU1GpSa18kwp1kQvYTR3j+Vuh6dNLphwDYXxOejc=";
+
+  postBuild = ''
+    mv $GOPATH/bin/api $GOPATH/bin/api-acmcsuf
+  '';
+
+  subPackages = ["cmd/api"];
+
+  meta = {
+    description = "API created and used by CSUF's ACM chapter";
+    homepage = "https://github.com/acmcsufoss/api.acmcsuf.com";
+    license = lib.licenses.mit;
+  };
+}