aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devShells/default.nix7
-rw-r--r--devShells/nuttx.nix38
-rw-r--r--devShells/python.nix51
-rw-r--r--devShells/qt.nix15
-rw-r--r--flake.lock190
-rw-r--r--nixos/modules/desktop.nix1
-rw-r--r--nixos/modules/develop.nix27
7 files changed, 85 insertions, 244 deletions
diff --git a/devShells/default.nix b/devShells/default.nix
index 1e46ad0..882f828 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -1,11 +1,4 @@
pkgs: rec {
- armv7e = import ./nuttx.nix pkgs c {
- arch = "armv7e-m";
- fpu = "vfpv3-d16";
- };
- espc = import ./nuttx.nix pkgs c {arch = "rv32imc";};
c = import ./c.nix pkgs;
- qt = import ./qt.nix pkgs c;
- python = import ./python.nix pkgs;
apo = import ./apo.nix pkgs c;
}
diff --git a/devShells/nuttx.nix b/devShells/nuttx.nix
deleted file mode 100644
index 97675e9..0000000
--- a/devShells/nuttx.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-pkgs: c: {
- arch,
- fpu ? null,
-}:
-with builtins;
-with pkgs.lib; let
- pkgsCross = import pkgs.path {
- localSystem = pkgs.buildPlatform.system;
- crossSystem = {
- config =
- if (hasPrefix "armv" arch)
- then "arm-none-eabi" + (optionalString (fpu != null) "hf")
- else "riscv32-none-elf";
- libc = "newlib";
- gcc =
- {
- inherit arch;
- }
- // (optionalAttrs (fpu != null) {inherit fpu;});
- };
- };
-in
- pkgsCross.buildPackages.mkShell {
- packages = with pkgsCross.buildPackages;
- [
- kconfig-frontends
- genromfs
- xxd
- openocd
- gcc
- gdb
- ]
- ++ (optionals (hasPrefix "rv32" arch) [
- esptool
- ]);
- inputsFrom = [c];
- meta.platforms = pkgsCross.lib.platforms.linux;
- }
diff --git a/devShells/python.nix b/devShells/python.nix
deleted file mode 100644
index 1bd1dad..0000000
--- a/devShells/python.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-pkgs:
-pkgs.mkShell {
- packages = with pkgs; [
- (python3.withPackages (pypkgs:
- with pypkgs; [
- ipython
-
- pytest
- pytest-html
- pytest-tap
- coverage
- python-lsp-black
- pylint
- pydocstyle
- mypy
-
- pygraphviz
- matplotlib
-
- python-gitlab
- PyGithub
-
- schema
- jinja2
- ruamel-yaml
- msgpack
- urllib3
-
- influxdb-client
- #psycopg
- paho-mqtt
-
- humanize
- rich
-
- pygobject3
-
- pyserial
- pylibftdi
- pylxd
- selenium
- ]))
- geckodriver
- chromedriver
-
- gobject-introspection
- gtk3
- gtk4
- ];
- meta.platforms = pkgs.lib.platforms.linux;
-}
diff --git a/devShells/qt.nix b/devShells/qt.nix
deleted file mode 100644
index 35558c2..0000000
--- a/devShells/qt.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgs: c:
-pkgs.mkShell {
- packages = with pkgs;
- with libsForQt5; [
- qtbase
- qttranslations
- qtserialport
- qtwebsockets
- doctest
- qtcharts
- qtwayland
- ];
- inputsFrom = [c];
- meta.platforms = pkgs.lib.platforms.linux;
-}
diff --git a/flake.lock b/flake.lock
index 0698404..88b13b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,23 +65,6 @@
"systems": "systems_9"
},
"locked": {
- "lastModified": 1681202837,
- "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
- "type": "github"
- },
- "original": {
- "id": "flake-utils",
- "type": "indirect"
- }
- },
- "flake-utils_11": {
- "inputs": {
- "systems": "systems_10"
- },
- "locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
@@ -95,23 +78,6 @@
}
},
"flake-utils_2": {
- "inputs": {
- "systems": "systems_3"
- },
- "locked": {
- "lastModified": 1692799911,
- "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
- "type": "github"
- },
- "original": {
- "id": "flake-utils",
- "type": "indirect"
- }
- },
- "flake-utils_3": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@@ -125,9 +91,9 @@
"type": "indirect"
}
},
- "flake-utils_4": {
+ "flake-utils_3": {
"inputs": {
- "systems": "systems_4"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
@@ -142,9 +108,9 @@
"type": "indirect"
}
},
- "flake-utils_5": {
+ "flake-utils_4": {
"inputs": {
- "systems": "systems_5"
+ "systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
@@ -159,7 +125,7 @@
"type": "indirect"
}
},
- "flake-utils_6": {
+ "flake-utils_5": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@@ -173,9 +139,9 @@
"type": "indirect"
}
},
- "flake-utils_7": {
+ "flake-utils_6": {
"inputs": {
- "systems": "systems_6"
+ "systems": "systems_5"
},
"locked": {
"lastModified": 1705309234,
@@ -190,9 +156,9 @@
"type": "indirect"
}
},
- "flake-utils_8": {
+ "flake-utils_7": {
"inputs": {
- "systems": "systems_7"
+ "systems": "systems_6"
},
"locked": {
"lastModified": 1705309234,
@@ -207,9 +173,9 @@
"type": "indirect"
}
},
- "flake-utils_9": {
+ "flake-utils_8": {
"inputs": {
- "systems": "systems_8"
+ "systems": "systems_7"
},
"locked": {
"lastModified": 1694529238,
@@ -224,25 +190,21 @@
"type": "indirect"
}
},
- "flatline": {
+ "flake-utils_9": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "systems": "systems_8"
},
"locked": {
- "lastModified": 1710337543,
- "narHash": "sha256-qMfZOsB+p787hJdqGIvcoEByRTwwbT4SKIBctjCIB6Q=",
- "ref": "refs/heads/master",
- "rev": "fa5c4161e4c66646235c52ef8949a072f74a36d5",
- "revCount": 3563,
- "submodules": true,
- "type": "git",
- "url": "https://gitlab.elektroline.cz/elektroline/flatlineng.git"
+ "lastModified": 1681202837,
+ "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+ "type": "github"
},
"original": {
- "submodules": true,
- "type": "git",
- "url": "https://gitlab.elektroline.cz/elektroline/flatlineng.git"
+ "id": "flake-utils",
+ "type": "indirect"
}
},
"home-manager": {
@@ -268,8 +230,8 @@
},
"libshv": {
"inputs": {
- "flake-utils": "flake-utils_9",
- "nixpkgs": "nixpkgs_9"
+ "flake-utils": "flake-utils_8",
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1705505951,
@@ -289,8 +251,8 @@
},
"nixbigclown": {
"inputs": {
- "flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_3"
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1680946769,
@@ -308,8 +270,8 @@
},
"nixdeploy": {
"inputs": {
- "flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_4"
+ "flake-utils": "flake-utils_3",
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1710150065,
@@ -357,20 +319,6 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1705566941,
- "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nixpkgs_11": {
- "locked": {
"lastModified": 1682109806,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
"owner": "NixOS",
@@ -383,7 +331,7 @@
"type": "indirect"
}
},
- "nixpkgs_12": {
+ "nixpkgs_11": {
"locked": {
"lastModified": 1707877513,
"narHash": "sha256-sp0w2apswd3wv0sAEF7StOGHkns3XUQaO5erhWFZWXk=",
@@ -399,20 +347,6 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1694032533,
- "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
- "nixpkgs_3": {
- "locked": {
"lastModified": 1679319606,
"narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=",
"owner": "NixOS",
@@ -425,7 +359,7 @@
"type": "indirect"
}
},
- "nixpkgs_4": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1708469763,
"narHash": "sha256-wCJljz6nQdCAnfTx+3i4fWteB3TnVEq95z6d6LhwVKs=",
@@ -439,7 +373,7 @@
"type": "indirect"
}
},
- "nixpkgs_5": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1710339354,
"narHash": "sha256-+P5ccUPiLouHexb8aJrUOVOIja9qm+fG57pgAu7uIRs=",
@@ -454,7 +388,7 @@
"type": "indirect"
}
},
- "nixpkgs_6": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1710252211,
"narHash": "sha256-hQChQpB4LDBaSrNlD6DPLhU9T+R6oyxMCg2V+S7Y1jg=",
@@ -468,7 +402,7 @@
"type": "indirect"
}
},
- "nixpkgs_7": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
@@ -482,7 +416,7 @@
"type": "indirect"
}
},
- "nixpkgs_8": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1705566941,
"narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=",
@@ -496,7 +430,7 @@
"type": "indirect"
}
},
- "nixpkgs_9": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1694948089,
"narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=",
@@ -510,10 +444,24 @@
"type": "indirect"
}
},
+ "nixpkgs_9": {
+ "locked": {
+ "lastModified": 1705566941,
+ "narHash": "sha256-CLNtVRDA8eUPk+bxsCCZtRO0Cp+SpHdn1nNOLoFypLs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
"nixturris": {
"inputs": {
- "flake-utils": "flake-utils_5",
- "nixpkgs": "nixpkgs_6"
+ "flake-utils": "flake-utils_4",
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1710278775,
@@ -546,9 +494,9 @@
},
"pyshv": {
"inputs": {
- "flake-utils": "flake-utils_8",
+ "flake-utils": "flake-utils_7",
"libshv": "libshv",
- "nixpkgs": "nixpkgs_10"
+ "nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1705600354,
@@ -568,11 +516,10 @@
"inputs": {
"agenix": "agenix",
"flake-utils": "flake-utils",
- "flatline": "flatline",
"nixbigclown": "nixbigclown",
"nixdeploy": "nixdeploy",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_4",
"nixturris": "nixturris",
"personal-secret": "personal-secret",
"shellrc": "shellrc",
@@ -584,8 +531,8 @@
},
"shellrc": {
"inputs": {
- "flake-utils": "flake-utils_6",
- "nixpkgs": "nixpkgs_7"
+ "flake-utils": "flake-utils_5",
+ "nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1710324061,
@@ -603,8 +550,8 @@
},
"shvcli": {
"inputs": {
- "flake-utils": "flake-utils_7",
- "nixpkgs": "nixpkgs_8",
+ "flake-utils": "flake-utils_6",
+ "nixpkgs": "nixpkgs_7",
"pyshv": "pyshv"
},
"locked": {
@@ -623,8 +570,8 @@
},
"shvspy": {
"inputs": {
- "flake-utils": "flake-utils_10",
- "nixpkgs": "nixpkgs_11"
+ "flake-utils": "flake-utils_9",
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1709892386,
@@ -657,21 +604,6 @@
"type": "github"
}
},
- "systems_10": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"systems_2": {
"locked": {
"lastModified": 1681028828,
@@ -794,8 +726,8 @@
},
"usbkey": {
"inputs": {
- "flake-utils": "flake-utils_11",
- "nixpkgs": "nixpkgs_12"
+ "flake-utils": "flake-utils_10",
+ "nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1707940956,
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index e33a8d9..8238af7 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -143,7 +143,6 @@ in {
gst_all_1.gst-plugins-viperfx
# Writing
- texlive.combined.scheme-full
typst
typst-fmt
typst-live
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 5e812b2..2daead8 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -70,9 +70,6 @@ in {
pytest-html
pytest-tap
coverage
- python-lsp-black
- pylint
- pydocstyle
mypy
pygraphviz
@@ -80,10 +77,34 @@ in {
python-gitlab
PyGithub
+
+ schema
+ jinja2
+ ruamel-yaml
+ msgpack
+ urllib3
+
+ influxdb-client
+ psycopg
+ paho-mqtt
+
+ humanize
+ rich
+
+ pygobject3
+
+ pyserial
+ pylibftdi
+ pylxd
+ selenium
]))
ruff
geckodriver
chromedriver
+ # Libraries to be used by python packages
+ gobject-introspection
+ gtk3
+ gtk4
# Lua
selene
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 17:12:40 +0000