flake.lock: Update

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/670d9ecc3e46a6e3265c203c2d136031a3d3548e' (2024-04-21)
  → 'github:nix-community/home-manager/9036fe9ef8e15a819fa76f47a8b1f287903fb848' (2024-05-02)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed' (2024-04-19)
  → 'github:LnL7/nix-darwin/230a197063de9287128e2c68a7a4b0cd7d0b50a7' (2024-04-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19)
  → 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/09f1bc8ba3277c0f052f7887ec92721501541938' (2024-04-21)
  → 'github:Mic92/sops-nix/f1b0adc27265274e3b0c9b872a8f476a098679bd' (2024-04-23)

flake.lock

@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705708511,
+        "lastModified": 1714679908,
-        "narHash": "sha256-3f4BkRY70Fj7yvuo87c4QQPAjnt571g2wJ50jY7hnYc=",
+        "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ce4b88c465d928f4f8b75d0920f1788d5b65ca94",
+        "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705452289,
+        "lastModified": 1713946171,
-        "narHash": "sha256-i/WodLabBcmRr9hdSv5jzDigL1hRYuI8vNh+xTbGt+g=",
+        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "74ab0227ee495e526f2dd57ea684b34f6396445a",
+        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705496572,
+        "lastModified": 1714635257,
-        "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=",
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
         "type": "github"
       },
       "original": {
@@ -156,27 +156,27 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1705033721,
+        "lastModified": 1713638189,
-        "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
+        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
+        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1704842529,
+        "lastModified": 1713596654,
-        "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
+        "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
+        "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1705356877,
+        "lastModified": 1713892811,
-        "narHash": "sha256-274jL1cH64DcXUXebVMZBRUsTs3FvFlPIPkCN/yhSnI=",
+        "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "87755331580fdf23df7e39b46d63ac88236bf42c",
+        "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
         "type": "github"
       },
       "original": {

machines/universedesktop/ccache.nix

@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }: {
-nixpkgs.overlays = [
+  nixpkgs.overlays = [
-  (self: super: {
+    (self: super: {
-    ccacheWrapper = super.ccacheWrapper.override {
+      ccacheWrapper = super.ccacheWrapper.override {
-      extraConfig = ''
+        extraConfig = ''
         export CCACHE_COMPRESS=1
         export CCACHE_DIR="${config.programs.ccache.cacheDir}"
         export CCACHE_UMASK=007
@@ -23,8 +23,22 @@ nixpkgs.overlays = [
           exit 1
         fi
       '';
-    };
+      };
-  })
+    })
-];
+  ];
-nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
+  nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ];
+  nix.settings = {
+    substituters = [
+      "https://cuda-maintainers.cachix.org"
+    ];
+    trusted-substituters = [
+      "https://cuda-maintainers.cachix.org"
+    ];
+    trusted-public-keys = [
+      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+    ];
+    trusted-users = [
+      "universe"
+    ];
+  };
 }

machines/universedesktop/configuration.nix

@@ -120,31 +120,33 @@
       alsa.support32Bit = true;
       pulse.enable = true;
       # If you want to use JACK applications, uncomment this
-      jack.enable = true;
+      # jack.enable = true;
     };
-    # services.pipewire = {
+#    services.pipewire.extraConfig.pipewire."92-low-latency" = {
-    #   config.pipewire = {
+#      context.properties = {
-    #     "context.properties" = {
+#        default.clock.rate = 48000;
-    #       #"link.max-buffers" = 64;
+#        default.clock.quantum = 32;
-    #       "link.max-buffers" = 16; # version < 3 clients can't handle more than this
+#        default.clock.min-quantum = 32;
-    #       "log.level" = 2; # https://docs.pipewire.org/page_daemon.html
+#        default.clock.max-quantum = 32;
-    #       #"default.clock.rate" = 48000;
+#      };
-    #       #"default.clock.quantum" = 1024;
+#      context.modules = [
-    #       #"default.clock.min-quantum" = 32;
+#        {
-    #       #"default.clock.max-quantum" = 8192;
+#          name = "libpipewire-module-protocol-pulse";
-    #     };
+#          args = {
-    #   };
+#            pulse.min.req = "32/48000";
-    # };
+#            pulse.default.req = "32/48000";
-    # environment.etc = {
+#            pulse.max.req = "32/48000";
-    # 	"wireplumber/bluetooth.lua.d/52-bluez-config.lua".text = ''
+#            pulse.min.quantum = "32/48000";
-    # 		bluez_monitor.properties = {
+#            pulse.max.quantum = "32/48000";
-    # 			["bluez5.enable-sbc-xq"] = true,
+#          };
-    # 			["bluez5.enable-msbc"] = true,
+#        }
-    # 			["bluez5.enable-hw-volume"] = true,
+#      ];
-    # 			["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+#      stream.properties = {
-    # 	'';
+#        node.latency = "32/48000";
-    # };
+#        resample.quality = 1;
-
+#      };
+#    };
+    
     # Enable touchpad support (enabled default in most desktopManager).
     # services.xserver.libinput.enable = true;
     users.groups.net = {};
@@ -170,10 +172,19 @@
     
     nixpkgs.config.allowUnfree = true;
     services.xserver.videoDrivers = [ "nvidia" ];
+    
     # Wayland support
-    boot.kernelParams = ["nvidia_drm.modeset=1"];
+    hardware = {
-    hardware.opengl.enable = true;
+      opengl.enable = true;
-    hardware.opengl.driSupport = true;
+      opengl.driSupport = true;
+      opengl.driSupport32Bit = true;
+
+      nvidia = {
+        modesetting.enable = true;
+        powerManagement.enable = true;
+        open = false;
+      };
+    };
     
     services.fwupd.enable = true;
         

machines/universedesktop/programs/art.nix

@@ -1,117 +1,114 @@
-{ lib, config, pkgs, ... }: let
+{ lib, config, pkgs, ... }: {
-  py3 = pkgs.python3;
+  nixpkgs.overlays = [(final: prev: rec {
-  py3Pkgs = py3.pkgs;
+    pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-  # For 3D CNC machining
+      (
-  opencamlib = py3Pkgs.toPythonModule (pkgs.stdenv.mkDerivation rec {
+        python-final: python-prev: let
-    pname = "opencamlib";
+          py = python-prev;
-    version = "2019.07";
+        in {
-    nativeBuildInputs = (with pkgs;[
+          opencamlib = py.toPythonModule (pkgs.stdenv.mkDerivation rec {
-      cmake
+            pname = "opencamlib";
-      git
+            version = "2019.07";
-      doxygen
+            nativeBuildInputs = (with pkgs;[
-      boost
+              cmake
-      texlive.combined.scheme-full
+              git
-    ]);
+              doxygen
-    propagatedNativeBuildInputs = (with pkgs; [
+              boost
-      py3
+              texlive.combined.scheme-full
-      py3.pkgs.boost
+            ]);
-      py3.pkgs.vtk
+            propagatedNativeBuildInputs = [
-    ]);
+              py.python
-    postPatch = ''
+              py.boost
-        mkdir -p $out/${py3.sitePackages}/{lib,ocl}
+              py.vtk
-        sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py3.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
+            ];
-        sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py3.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
+            postPatch = ''
-      '';
+              mkdir -p $out/${py.python.sitePackages}/{lib,ocl}
-    cmakeFlags = [
+              sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-      "-DVERSION_STRING=2019.07"
+              sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-      "-DBUILD_CXX_LIB=ON"
+            '';
-      "-DBUILD_PY_LIB=ON"
+            cmakeFlags = [
-      "-DUSE_PY_3=ON"
+              "-DVERSION_STRING=2019.07"
-      "-DCMAKE_BUILD_TYPE=Release"
+              "-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 {
+            pname = "Equation";
+            version = "1.2.01";
+            nativeBuildInputs = [
+              py.setuptools
+              py.numpy
+            ];
+            src = pkgs.fetchzip {
+              url = "https://files.pythonhosted.org/packages/2e/cc/115fb1722051f99b9699864586e7f96ca0080645387698af922fade4f7b2/Equation-1.2.01.zip";
+              sha256 = "YFxZB3vaC5s49K1AQLFF4WGUr2RpomJTLQdZ24ITXr4=";
+            };
+          };
+          morphio = py.toPythonModule ( pkgs.stdenv.mkDerivation rec {
+            pname = "MorphIO";
+            version = "3.3.4";
+            nativeBuildInputs = (with pkgs; [
+              cmake
+              ninja
+              py.numpy
+              hdf5
+            ]);
+            cmakeFlags = [
+              "-DMorphIO_CXX_WARNINGS=OFF"
+            ];
+            postInstall = ''
+              mkdir -p $out/${py.python.sitePackages}
+              mv ../morphio $out/${py.python.sitePackages}
+              cp binds/python/_morphio.* $out/${py.python.sitePackages}/morphio/
+            '';
+            src = pkgs.fetchFromGitHub {
+              owner = "BlueBrain";
+              repo = "MorphIO";
+              rev = "v${version}";
+              deepClone = true;
+              fetchSubmodules = true;
+              sha256 = "C3zDziG7LF7v22ZvplBrtOYq7iKGnAavfpiBCcShHaQ=";
+            };
+          });
+
+        }
+      )
     ];
-    src = pkgs.fetchFromGitHub {
-      owner = "aewallin";
-      repo = "opencamlib";
-      rev = "2019.07";
-      sha256 = "1a8pxp1mh8x3bfsb0l97vgxrpk482p7q9jprkd4m9hv69vva2bdz";
-    };
-  });
-  equation = py3Pkgs.buildPythonPackage {
-    pname = "Equation";
-    version = "1.2.01";
-    nativeBuildInputs = [
-      py3Pkgs.setuptools
-      py3Pkgs.numpy
-    ];
-    src = pkgs.fetchzip {
-      url = "https://files.pythonhosted.org/packages/2e/cc/115fb1722051f99b9699864586e7f96ca0080645387698af922fade4f7b2/Equation-1.2.01.zip";
-      sha256 = "YFxZB3vaC5s49K1AQLFF4WGUr2RpomJTLQdZ24ITXr4=";
-    };
-  };
-  morphio = py3.pkgs.toPythonModule ( pkgs.stdenv.mkDerivation rec {
-    pname = "MorphIO";
-    version = "3.3.4";
-    nativeBuildInputs = (with pkgs; [
-      cmake
-      ninja
-      py3
-      py3.pkgs.numpy
-      hdf5
-    ]);
-    cmakeFlags = [
-      "-DMorphIO_CXX_WARNINGS=OFF"
-    ];
-    postInstall = ''
-      mkdir -p $out/${py3.sitePackages}
-      mv ../morphio $out/${py3.sitePackages}
-      cp binds/python/_morphio.* $out/${py3.sitePackages}/morphio/
-    '';
-    src = pkgs.fetchFromGitHub {
-      owner = "BlueBrain";
-      repo = "MorphIO";
-      rev = "v${version}";
-      deepClone = true;
-      fetchSubmodules = true;
-      sha256 = "C3zDziG7LF7v22ZvplBrtOYq7iKGnAavfpiBCcShHaQ=";
-    };
-  });
-in {
-  nixpkgs.overlays = [(self: super: rec {
     # Add CUDA Support to Blender
-    blender_cuda = super.blender.override {
+    blender_cuda = prev.blender.override {
-      stdenv = super.ccacheStdenv;
       cudaSupport = true;
     };
-    # Add Opencamlib for BlenderCAM Support
+    blender = final.blender_cuda.withPackages (p: with p; [
-    blender = blender_cuda.overrideAttrs (old: {
+      # OpenCAMLib support
-      pythonPath = old.pythonPath ++ (with py3Pkgs; [
+      shapely
-        # OpenCAMLib support
+      equation
-        shapely
+      opencamlib
-        equation
+      # NeuroMorphoVis support
-        opencamlib
+      matplotlib
-        # NeuroMorphoVis support
+      seaborn
-        matplotlib
+      pandas
-        seaborn
+      pillow
-        pandas
+      h5py
-        pillow
+      morphio
-        h5py
+      # TODO add BluePy support?
-        morphio
+    ]);
-        # TODO add BluePy support?
-      ]);
-    });
     # Update RX and Aseprite
-    rx = super.rx.overrideAttrs (old: {
+    rx = prev.rx.overrideAttrs (old: {
       version = "git";
-      src = super.fetchFromGitHub {
+      src = prev.fetchFromGitHub {
         owner = "cloudhead";
         repo = old.pname;
         rev = "18625a68921873ebe21a7ea8096409a9f0314541";
         sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
       };
     });
-    glaxnimate = super.glaxnimate.override {
-      python3 = self.python310;
-    };
   })];
 
   environment.systemPackages = with pkgs; [

machines/universedesktop/programs/audio.nix

@@ -3,7 +3,9 @@
     easyeffects
     helvum
 
-    musescore
+    # https://nixpk.gs/pr-tracker.html?pr=290037
+    # Waiting for this ^
+    # musescore
     audacity
 
     tidal-hifi

machines/universedesktop/programs/cad.nix

@@ -1,74 +1,4 @@
-{ lib, config, pkgs, ... }: let
+{ lib, config, pkgs, ... }: {
-  # FreeCAD uses pyside2 (qt 5.15) which doesn't support > 3.10
-  py3 = pkgs.python310;
-  py3Pkgs = py3.pkgs;
-  # For 3D CNC machining
-  opencamlib = py3Pkgs.toPythonModule (pkgs.stdenv.mkDerivation rec {
-    pname = "opencamlib";
-    version = "2019.07";
-    nativeBuildInputs = (with pkgs;[
-      cmake
-      git
-      doxygen
-      boost
-      texlive.combined.scheme-full
-    ]);
-    propagatedNativeBuildInputs = (with pkgs; [
-      py3
-      py3.pkgs.boost
-      py3.pkgs.vtk
-    ]);
-    postPatch = ''
-        mkdir -p $out/${py3.sitePackages}/{lib,ocl}
-        sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py3.sitePackages}#g' -i src/pythonlib/pythonlib.cmake
-        sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py3.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";
-    };
-  });
-
-  py3Cad = py3.withPackages (p: (with p; [
-    numpy
-    scipy
-    seaborn
-    pandas
-    matplotlib
-    ipython
-    python-lsp-server
-    opencamlib
-  ]));
-in {
-  # if you also want support for flakes 
-  nixpkgs.overlays = [(self: super: rec {
-    freecad = super.freecad.override {
-      stdenv = super.ccacheStdenv;
-      python = py3Cad;
-      boost = py3Pkgs.boost;
-    inherit (py3Pkgs)
-      gitpython
-      matplotlib
-      pivy
-      ply
-      pycollada
-      pyside2
-      pyside2-tools
-      pyyaml
-      scipy
-      shiboken2;
-    };
-  })];
-
   environment.systemPackages = with pkgs; [
     openscad
     freecad

machines/universedesktop/programs/desktop.nix

@@ -26,6 +26,7 @@
 
       discord-canary
       discord
+      vesktop
       betterdiscordctl
       slack
       signal-desktop

machines/universedesktop/programs/office.nix

@@ -2,7 +2,6 @@
   environment.systemPackages = with pkgs; [
     kitty
     me-emacs
-    rnix-lsp
     texlive.combined.scheme-full
     pandoc
     libreoffice-qt

machines/universedesktop/secrets/secrets.yaml

@@ -1,4 +1,4 @@
-wireless: ENC[AES256_GCM,data:oqQlkeerLsS8zKsLU5bIDSvi3+c56f51yKMgyHpeZmFOD7TqJaqqXg==,iv:0dg1qXPFvXIQa67JJSGDvyUuf70r61Y6Nafky6L5V44=,tag:+ePBK/bBtrcGZphHqv8zHw==,type:str]
+wireless: ENC[AES256_GCM,data:rOnpkuFvcy3/mNPGVQXm6gjEDkIkmEMNJyugSfKddnWAlqbMbVbBhy8UQg==,iv:7/ba9+kUxsLaVG6uxZjF4WBUGa5i0/FFRyGAhkATEg8=,tag:ZD+Xy69K/txJzC1C/CLDlg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -14,8 +14,8 @@ sops:
             WS93Uzg1UkFSSGM1eUR1UG9WRFVCYVEKbnE6DuVqtkynqphNIybtVgfVFJtgm6vI
             XywmFg8F1dOq1xDz97oFBbzbJa1J9qsMjNlPxZkC04snM9msZm9v2g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-19T20:52:25Z"
+    lastmodified: "2024-03-08T03:50:15Z"
-    mac: ENC[AES256_GCM,data:o+7YNnHWQfSq/kFA7aOX2ECaTZJnahWa8XrmSz23ozSu7cYHfxtXF5D6ZlZiCv0p9EgDxVOGt+eztSp2SKG9kmMTtZvXuywjHCmXZ1cMAJfoRPOarvs9XT0imVmLNJMFVqILtbZFynYNmEC1ktWWCm3Z21V1e7qlLBRdiI9XNVY=,iv:ANgCWMvHze5Jl1Rzycss+TwqG5SzO6pZDk5giXMFGvc=,tag:LflYmTEVephiRoHQZ37Lkg==,type:str]
+    mac: ENC[AES256_GCM,data:1mZG+AFeBhilH8Zenvy+0YZM60CcCil7KfX02aEci8+0ne3g8y9jrbycCyR/E2wmB/FNYuNvwfwEWroHvooayeTZ09Wlh3D9RhTWPIHIj3s6aTmdV+OkcbfJt6tpuuSLcNcpHWnKF8EBKwPiZZnZSUuoGgEKAPiznV7qPLDYqLc=,iv:GnfojCZ4G6rHOTEYvt8AfAM2Vh1GUsGv3Aevcx9gkT8=,tag:bG/nckGVmSJx4SmsTLrUPg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1