diff --git a/draw/default.nix b/draw/default.nix deleted file mode 100644 index 23eb43f..0000000 --- a/draw/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonApplication, - callPackage, - fetchFromGitHub, - poetry-core, - pydantic, - pcpp, - pyyaml, - platformdirs, - pydantic-settings, - tree-sitter, -}: let - tree-sitter-devicetree = callPackage ./tree-sitter-devicetree.nix {}; -in - buildPythonApplication rec { - pname = "keymap-drawer"; - version = "0.20.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "caksoylar"; - repo = pname; - rev = "ea00f44ac5a2ebe97b8b31f9166791bedf9136e5"; - hash = "sha256-F9lDUuqHKl2FOUsUszJrRK7/a/a1UJLw+RUg9Bv2zN0="; - }; - - build-system = [poetry-core]; - - propagatedBuildInputs = [ - pydantic - pcpp - pyyaml - platformdirs - pydantic-settings - tree-sitter - tree-sitter-devicetree - ]; - - doCheck = false; - - meta = { - homepage = "https://github.com/caksoylar/keymap-drawer"; - description = "Parse QMK & ZMK keymaps and draw them as vector graphics"; - license = lib.licenses.mit; - }; - } diff --git a/draw/tree-sitter-devicetree.nix b/draw/tree-sitter-devicetree.nix deleted file mode 100644 index fdc96d4..0000000 --- a/draw/tree-sitter-devicetree.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - tree-sitter, -}: -buildPythonPackage { - pname = "tree-sitter-devicetree"; - version = "0.12.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "joelspadin"; - repo = "tree-sitter-devicetree"; - rev = "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"; - hash = "sha256-UVxLF4IKRXexz+PbSlypS/1QsWXkS/iYVbgmFCgjvZM="; - }; - - build-system = [ - setuptools - ]; - - optional-dependencies = { - core = [ - tree-sitter - ]; - }; - - # There are no tests - doCheck = false; - pythonImportsCheck = ["tree_sitter_devicetree"]; - - meta = { - description = "Devicetree grammar for tree-sitter"; - homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; - license = lib.licenses.mit; - }; -} diff --git a/shell.nix b/shell.nix index f460010..a9faa5b 100644 --- a/shell.nix +++ b/shell.nix @@ -1,16 +1,13 @@ -{pkgs ? import {}}: let - keymap-drawer = - pkgs.python3Packages.callPackage ./draw {}; -in - pkgs.mkShell { - packages = with pkgs; [ - kicad - nodejs - freecad - # keymap-drawer - ]; +{pkgs ? import {}}: +pkgs.mkShell { + packages = with pkgs; [ + kicad + freecad + ergogen + # keymap-drawer + ]; - # no clue why we need those env vars for freecad - # QT_QPA_PLATFORM = "wayland;xcb"; - # QT_QPA_PLATFORMTHEME = "qt5ct"; - } + # no clue why we need those env vars for freecad + # QT_QPA_PLATFORM = "wayland;xcb"; + # QT_QPA_PLATFORMTHEME = "qt5ct"; +}