From 4d78ae7fa8c0346fb194c790ba9a390becc9c75d Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 7 Apr 2024 12:16:13 +0200 Subject: [PATCH] chore(dev): move nix flake to top level, add api tooling --- frontend/.envrc => .envrc | 0 .gitignore | 1 + frontend/flake.lock => flake.lock | 0 flake.nix | 18 ++++++++++++++++++ frontend/.gitignore | 1 - frontend/flake.nix | 10 ---------- 6 files changed, 19 insertions(+), 11 deletions(-) rename frontend/.envrc => .envrc (100%) rename frontend/flake.lock => flake.lock (100%) create mode 100644 flake.nix delete mode 100644 frontend/flake.nix diff --git a/frontend/.envrc b/.envrc similarity index 100% rename from frontend/.envrc rename to .envrc diff --git a/.gitignore b/.gitignore index 6cf9dc87e..671232683 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ vendor/ os-packages/ mage_output_file.go mage-static +.direnv/ diff --git a/frontend/flake.lock b/flake.lock similarity index 100% rename from frontend/flake.lock rename to flake.lock diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..f7d49917d --- /dev/null +++ b/flake.nix @@ -0,0 +1,18 @@ +{ + description = "Vikunja dev environment"; + + outputs = { self, nixpkgs }: + let pkgs = nixpkgs.legacyPackages.x86_64-linux; + in { + defaultPackage.x86_64-linux = + pkgs.mkShell { buildInputs = with pkgs; [ + # General tools + git-cliff + # Frontend tools + nodePackages.pnpm cypress + # API tools + go golangci-lint mage + ]; + }; + }; +} diff --git a/frontend/.gitignore b/frontend/.gitignore index ace110b86..3ed14bfd6 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -13,7 +13,6 @@ node_modules /dist* coverage *.zip -.direnv/ # Test files cypress/screenshots diff --git a/frontend/flake.nix b/frontend/flake.nix deleted file mode 100644 index fb29c9a62..000000000 --- a/frontend/flake.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - description = "Vikunja frontend dev environment"; - - outputs = { self, nixpkgs }: - let pkgs = nixpkgs.legacyPackages.x86_64-linux; - in { - defaultPackage.x86_64-linux = - pkgs.mkShell { buildInputs = [ pkgs.nodePackages.pnpm pkgs.cypress pkgs.git-cliff ]; }; - }; -}