Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines

universedesktop: add pixelorama
universedesktop: replace screen
2025-07-21 19:09:05 -04:00 · 2025-07-21 19:09:01 -04:00 · 2025-07-21 19:08:45 -04:00 · 2025-07-12 23:38:59 -04:00 · 2025-07-12 23:38:21 -04:00 · 2025-06-22 11:10:27 -04:00
6 changed files with 33 additions and 59 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -112,11 +112,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750304462,
-        "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
+        "lastModified": 1752373701,
+        "narHash": "sha256-d0d7y9gjv9HU0Amws6kHJucR8bxrQ0PfVKxt2ll5cfs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
+        "rev": "fc25398450cdab61af9654928dfef9d101f51140",
        "type": "github"
      },
      "original": {
@@ -153,7 +153,7 @@
        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -190,11 +190,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1750358184,
-        "narHash": "sha256-17EYMeY5v8KRk9HW6Z4dExY8Wg4y/zM2eM2wbbx+vMs=",
+        "lastModified": 1752278584,
+        "narHash": "sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc",
+        "rev": "f30ae9b9e740116d044935c9c0c68bd1c2ce8432",
        "type": "github"
      },
      "original": {
@@ -210,11 +210,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750325256,
-        "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=",
+        "lastModified": 1751313918,
+        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9",
+        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1750134718,
-        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "lastModified": 1751984180,
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
        "type": "github"
      },
      "original": {
@@ -289,11 +289,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1750119275,
-        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
+        "lastModified": 1751606940,
+        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
+        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
        "type": "github"
      },
      "original": {
@@ -305,11 +305,11 @@
    "spectrum": {
      "flake": false,
      "locked": {
-        "lastModified": 1746869549,
-        "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=",
+        "lastModified": 1751265943,
+        "narHash": "sha256-XoHSo6GEElzRUOYAEg/jlh5c8TDsyDESFIux3nU/NMc=",
        "ref": "refs/heads/main",
-        "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87",
-        "revCount": 862,
+        "rev": "37c8663fab86fdb202fece339ef7ac7177ffc201",
+        "revCount": 904,
        "type": "git",
        "url": "https://spectrum-os.org/git/spectrum"
      },
--- a/flake.nix
+++ b/flake.nix
@@ -71,8 +71,8 @@
        modules = [
          ./machines/pericyte/configuration.nix
          modules.sops
-          #lix-module.nixosModules.default
-          microvm.nixosModules.host
+          # lix-module.nixosModules.default
+          # microvm.nixosModules.host
        ];
      };
    };
--- a/machines/pericyte/configuration.nix
+++ b/machines/pericyte/configuration.nix
@@ -6,7 +6,6 @@

    ./podman.nix
    ./container-registry.nix
-    ./test.nix
    # ./microvm-configuration.nix
    # ./k3s.nix
  ];
--- a/machines/pericyte/k3s.nix
+++ b/machines/pericyte/k3s.nix
@@ -16,4 +16,7 @@
      # "--debug" # Optionally add additional args to k3s
    ];
  };
+  environment.systemPackages = with pkgs; [
+    rancher
+  ];
 }
--- a/machines/universedesktop/programs/art.nix
+++ b/machines/universedesktop/programs/art.nix
@@ -5,41 +5,9 @@
        python-final: python-prev: let
          py = python-prev;
        in {
-          opencamlib = py.toPythonModule (pkgs.stdenv.mkDerivation rec {
-            pname = "opencamlib";
-            version = "2019.07";
-            nativeBuildInputs = (with pkgs;[
-              cmake
-              git
-              doxygen
-              boost
-              texlive.combined.scheme-full
-            ]);
-            propagatedNativeBuildInputs = [
-              py.python
-              py.boost
-              py.vtk
-            ];
-            postPatch = ''
-              mkdir -p $out/${py.python.sitePackages}/{lib,ocl}
-              sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-              sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-            '';
-            cmakeFlags = [
-              "-DVERSION_STRING=2019.07"
-              "-DBUILD_CXX_LIB=ON"
-              "-DBUILD_PY_LIB=ON"
-              "-DUSE_PY_3=ON"
-              "-DCMAKE_BUILD_TYPE=Release"
-            ];
-            src = pkgs.fetchFromGitHub {
-              owner = "aewallin";
-              repo = "opencamlib";
-              rev = "2019.07";
-              sha256 = "1a8pxp1mh8x3bfsb0l97vgxrpk482p7q9jprkd4m9hv69vva2bdz";
-            };
-          });
          equation = py.buildPythonPackage {
+            pyproject = true;
+            build-system = [ py.setuptools ];
            pname = "Equation";
            version = "1.2.01";
            nativeBuildInputs = [
@@ -52,6 +20,8 @@
            };
          };
          morphio = py.toPythonModule ( pkgs.stdenv.mkDerivation rec {
+            pyproject = true;
+            build-system = [ py.setuptools ];
            pname = "MorphIO";
            version = "3.3.4";
            nativeBuildInputs = (with pkgs; [
@@ -89,7 +59,7 @@
      # OpenCAMLib support
      shapely
      equation
-      #opencamlib
+      opencamlib
      # NeuroMorphoVis support
      matplotlib
      seaborn
@@ -118,6 +88,7 @@

    rx
    aseprite-unfree
+    pixelorama
    gimp
    
    glaxnimate
--- a/machines/universedesktop/programs/terminal.nix
+++ b/machines/universedesktop/programs/terminal.nix
@@ -9,7 +9,8 @@
    htop
    btop
    xclip
-    screen
+    tio
+    tmux
    usbutils
    man-pages
    man-pages-posix
Author	SHA1	Message	Date
David Crompton	7a10a92621	Merge branch 'main' of https://git.syzygial.cc/Syzygial/NixMachines	2025-07-21 19:09:05 -04:00
David Crompton	c73a6fff61	universedesktop: add pixelorama	2025-07-21 19:09:01 -04:00
David Crompton	7ff1da9886	universedesktop: replace screen	2025-07-21 19:08:45 -04:00
David Crompton	ea837aba45	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/863842639722dd12ae9e37ca83bcb61a63b36f6c?narHash=sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc%3D' (2025-06-19) → 'github:nix-community/home-manager/fc25398450cdab61af9654928dfef9d101f51140?narHash=sha256-d0d7y9gjv9HU0Amws6kHJucR8bxrQ0PfVKxt2ll5cfs%3D' (2025-07-13) • Updated input 'lix-module': '`b90bf629bb`.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D&rev=b90bf629bbd835e61f1317b99e12f8c831017006' (2025-01-18) → '`b90bf629bb`.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D' (2025-01-18) • Updated input 'microvm': 'github:astro/microvm.nix/fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc?narHash=sha256-17EYMeY5v8KRk9HW6Z4dExY8Wg4y/zM2eM2wbbx%2BvMs%3D' (2025-06-19) → 'github:astro/microvm.nix/f30ae9b9e740116d044935c9c0c68bd1c2ce8432?narHash=sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c%3D' (2025-07-12) • Updated input 'microvm/spectrum': 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=d927e78530892ec8ed389e8fae5f38abee00ad87' (2025-05-10) → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=37c8663fab86fdb202fece339ef7ac7177ffc201' (2025-06-30) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9?narHash=sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0%3D' (2025-06-19) → 'github:LnL7/nix-darwin/e04a388232d9a6ba56967ce5b53a8a6f713cdfcf?narHash=sha256-HsJM3XLa43WpG%2B665aGEh8iS8AfEwOIQWk3Mke3e7nk%3D' (2025-06-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9e83b64f727c88a7711a2c463a7b16eedb69a84c?narHash=sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI%3D' (2025-06-17) → 'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0?narHash=sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X%2BxgOL0%3D' (2025-07-08) • Updated input 'sops-nix': 'github:Mic92/sops-nix/77c423a03b9b2b79709ea2cb63336312e78b72e2?narHash=sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M%3D' (2025-06-17) → 'github:Mic92/sops-nix/3633fc4acf03f43b260244d94c71e9e14a2f6e0d?narHash=sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA%3D' (2025-07-04)	2025-07-12 23:38:59 -04:00
David Crompton	0d6c532340	universedesktop: Use prepackaged opencamlib	2025-07-12 23:38:21 -04:00
David Crompton	effa623876	Perciyte: nvm k3s still too slow	2025-06-22 11:10:27 -04:00
David Crompton	8dc4384350	Perciyte: Back to k3s (disable microvm)	2025-06-22 10:50:01 -04:00