Merge branch 'main' into storage-refactor

modules/common-modules/overlays/default.nix

@@ -2,5 +2,9 @@
 {inputs, ...}: {
   nixpkgs.overlays = [
     inputs.nix-vscode-extensions.overlays.default
+    # Add noita_entangled_worlds from upstream flake to pkgs
+    (final: prev: {
+      noita_entangled_worlds = inputs.noita-entangled-worlds.packages.${prev.stdenv.hostPlatform.system}.noita-proxy;
+    })
   ];
 }

modules/common-modules/pkgs/default.nix

@@ -20,9 +20,6 @@
         ./prostudiomasters.nix
         {};
     })
-    (final: prev: {
-      noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
-    })
     (final: prev: {
       gdx-liftoff = pkgs.callPackage ./gdx-liftoff.nix {};
     })

modules/common-modules/pkgs/noita-entangled-worlds.nix

@@ -1,46 +0,0 @@
-# not working yet
-{
-  pkgs,
-  rustPlatform,
-  fetchFromGitHub,
-  ...
-}: let
-  version = "1.5.3";
-  repo = fetchFromGitHub {
-    owner = "IntQuant";
-    repo = "noita_entangled_worlds";
-    rev = "v${version}";
-    hash = "sha256-frrpD0aWTeDbZYtp15R+quUUAZf7OvHlbSLtGJJtAqk=";
-  };
-in
-  rustPlatform.buildRustPackage {
-    name = "noita-proxy-${version}";
-    src = repo + "/noita-proxy";
-    prePatch = ''
-      substituteInPlace Cargo.toml \
-          --replace "path = \"../shared\"" "path = \"${repo + "/shared"}\""
-    '';
-    nativeBuildInputs = with pkgs; [
-      pkg-config
-      python3
-      cmake
-    ];
-    buildInputs = with pkgs; [
-      openssl
-      openssl.dev
-      libpulseaudio
-      libjack2
-      alsa-lib
-      xorg.libxcb
-      xorg.libxcb.dev
-      libopus
-    ];
-    propagatedBuildInputs = with pkgs; [
-      steamworks-sdk-redist
-    ];
-    runtimeDependencies = with pkgs; [
-      steamworks-sdk-redist
-    ];
-    doCheck = false;
-    cargoHash = "sha256-TzUS6d6PopgGf2i1yVaXaXdzNrvfSz+Gv67BAtxYmb4=";
-  }

modules/home-manager-modules/programs/default.nix

@@ -31,6 +31,7 @@
     ./freecad.nix
     ./onionshare.nix
     ./mfoc.nix
+    ./noita-entangled-worlds.nix
     ./pdfarranger.nix
     ./picard.nix
     ./qflipper.nix

modules/home-manager-modules/programs/noita-entangled-worlds.nix

@@ -0,0 +1,18 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
+  options = {
+    programs.noita-entangled-worlds = {
+      enable = lib.mkEnableOption "Noita Entangled Worlds multiplayer mod";
+    };
+  };
+
+  config = lib.mkIf config.programs.noita-entangled-worlds.enable {
+    home.packages = with pkgs; [
+      noita_entangled_worlds
+    ];
+  };
+}

modules/nixos-modules/desktop.nix

@@ -47,6 +47,9 @@
 
           # Get rid of xTerm
           desktopManager.xterm.enable = false;
+          excludePackages = with pkgs; [
+            xterm
+          ];
         };
 
         # Enable the GNOME Desktop Environment.