From 86bf85ccf072cc345ec9ede244dfc5f6a0767745 Mon Sep 17 00:00:00 2001 From: greysoh Date: Mon, 29 Apr 2024 07:16:05 -0400 Subject: [PATCH] chore: Switch back to nix shell. --- flake.lock | 133 ----------------------------------------------------- flake.nix | 71 ---------------------------- shell.nix | 32 +++++++++++++ 3 files changed, 32 insertions(+), 204 deletions(-) delete mode 100644 flake.lock delete mode 100644 flake.nix create mode 100644 shell.nix diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 1e4b3f4..0000000 --- a/flake.lock +++ /dev/null @@ -1,133 +0,0 @@ -{ - "nodes": { - "devshell": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", - "owner": "numtide", - "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "devshell": "devshell", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 5d98be1..0000000 --- a/flake.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - description = "custom flake template using flake parts"; - outputs = inputs: - inputs.flake-parts.lib.mkFlake {inherit inputs;} { - imports = [ - inputs.devshell.flakeModule - ]; - systems = ["x86_64-linux"]; - perSystem = { - pkgs, - lib, - self', - inputs', - ... - }: { - devshells.default = { - packages = with pkgs; [ - # gui/ - cargo - rustc - gcc - - # api/ - nodejs - openssl - postgresql - lsof - ]; - commands = [ - { - help = "kill the api."; - name = "api.kill"; - command = "kill -9 $(lsof -i :3000 | awk '{l=$2} END {print l}')"; - category = "api"; - } - { - help = "start the gui."; - name = "gui.run"; - command = ''cd "$(git rev-parse --show-toplevel)/gui" && cargo run''; - category = "gui"; - } - ]; - env = []; - motd = '' - {63}welcome to the nextnet devshell{reset} - $(type -p menu &>/dev/null && menu)''; - devshell.startup.default = lib.noDepEntry '' - export PRISMA_QUERY_ENGINE_BINARY=${pkgs.prisma-engines}/bin/query-engine - export PRISMA_QUERY_ENGINE_LIBRARY=${pkgs.prisma-engines}/lib/libquery_engine.node - export PRISMA_SCHEMA_ENGINE_BINARY=${pkgs.prisma-engines}/bin/schema-engine - - # egui patches! - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.wayland}/lib - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.libxkbcommon}/lib - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libX11}/lib - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libXcursor}/lib - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libXrandr}/lib - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libXi}/lib - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.libGL}/lib - - source init.sh - ''; - }; - }; - }; - inputs = { - flake-parts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - devshell.url = "github:numtide/devshell"; - }; -} diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..9a10d05 --- /dev/null +++ b/shell.nix @@ -0,0 +1,32 @@ +{ + pkgs ? import { }, +}: pkgs.mkShell { + buildInputs = with pkgs; [ + # gui/ + cargo + rustc + + # api/ + nodejs + openssl + postgresql + lsof + ]; + + shellHook = '' + export PRISMA_QUERY_ENGINE_BINARY=${pkgs.prisma-engines}/bin/query-engine + export PRISMA_QUERY_ENGINE_LIBRARY=${pkgs.prisma-engines}/lib/libquery_engine.node + export PRISMA_SCHEMA_ENGINE_BINARY=${pkgs.prisma-engines}/bin/schema-engine + + # egui patches! + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.wayland}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.libxkbcommon}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libX11}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libXcursor}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libXrandr}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.xorg.libXi}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.libGL}/lib + + source init.sh + ''; +} \ No newline at end of file