Desktop/jamesdsp: install using home-manager, fix build

Flake: drop nur
Gaming/rpcs3: use package from nixpkgs
2025-03-15 17:08:45 +01:00 · 2025-03-15 17:07:47 +01:00 · 2025-03-15 17:07:09 +01:00 · 2025-03-15 17:05:23 +01:00 · 2025-03-15 09:39:23 +01:00
6 changed files with 65 additions and 148 deletions
--- a/flake.lock
+++ b/flake.lock
@ -28,11 +28,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1739934729,
-        "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
+        "lastModified": 1741985801,
+        "narHash": "sha256-EnjiCpEi8p1kFgNUCVPuDUYoOSYBlr7ByMEF8qMGZws=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
+        "rev": "f833a338ff6c091c84e041ee77ce88f8b242ca79",
        "type": "github"
      },
      "original": {
@ -73,27 +73,6 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems_2"
@ -188,11 +167,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740845322,
-        "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
+        "lastModified": 1741955947,
+        "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
+        "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
        "type": "github"
      },
      "original": {
@ -230,11 +209,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740892961,
-        "narHash": "sha256-RpuRrwn4Iu3ColOUfQJITSB3Pu8p979zELXv1zihWwU=",
+        "lastModified": 1742021951,
+        "narHash": "sha256-Nxrkvh353BeG6/D8yPq50VCaYnCMKviS7krw4DfzLVU=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "483fc372ebcc522ef0226bf5a211942203edda90",
+        "rev": "ecaf8b6aa7d28cb7b87da334310fbe1ba31f8d64",
        "type": "github"
      },
      "original": {
@ -246,11 +225,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1740991434,
-        "narHash": "sha256-9N14m5KRYEUV3nRHNO1myMR/2J/seFj37biiMHqujEk=",
-        "rev": "18975fa016fbe6c13525d6a833b22bb55703fffb",
+        "lastModified": 1741976543,
+        "narHash": "sha256-hSiO4cq2ub0Hs1bH+Qnne7pF8596wKZxmbWH2Kqe9UE=",
+        "rev": "85d614538fd1e6fa8a230d5f1c4d6e5587e9e3ef",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/18975fa016fbe6c13525d6a833b22bb55703fffb.tar.gz?rev=18975fa016fbe6c13525d6a833b22bb55703fffb"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85d614538fd1e6fa8a230d5f1c4d6e5587e9e3ef.tar.gz?rev=85d614538fd1e6fa8a230d5f1c4d6e5587e9e3ef"
      },
      "original": {
        "type": "tarball",
@ -269,11 +248,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738176840,
-        "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
-        "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
+        "lastModified": 1741894565,
+        "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=",
+        "rev": "a6da43f8193d9e329bba1795c42590c27966082e",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a6da43f8193d9e329bba1795c42590c27966082e.tar.gz?rev=a6da43f8193d9e329bba1795c42590c27966082e"
      },
      "original": {
        "type": "tarball",
@ -292,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738176840,
-        "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
-        "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
+        "lastModified": 1741894565,
+        "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=",
+        "rev": "a6da43f8193d9e329bba1795c42590c27966082e",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a6da43f8193d9e329bba1795c42590c27966082e.tar.gz?rev=a6da43f8193d9e329bba1795c42590c27966082e"
      },
      "original": {
        "type": "tarball",
@ -305,11 +284,11 @@
    },
    "nix-flatpak": {
      "locked": {
-        "lastModified": 1739444422,
-        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
+        "lastModified": 1741903049,
+        "narHash": "sha256-8Y8brH04JjSLrCLvBEbhK9vOu7lhQhqUBW4kI3tifdI=",
        "owner": "gmodena",
        "repo": "nix-flatpak",
-        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
+        "rev": "42c7fb2702219b86a8f5969c3475ce594c28f5d0",
        "type": "github"
      },
      "original": {
@ -363,11 +342,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740886574,
-        "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=",
+        "lastModified": 1741619381,
+        "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5",
+        "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
        "type": "github"
      },
      "original": {
@ -383,11 +362,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740886574,
-        "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=",
+        "lastModified": 1741619381,
+        "narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5",
+        "rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
        "type": "github"
      },
      "original": {
@ -398,11 +377,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1740646007,
-        "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
+        "lastModified": 1741792691,
+        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
+        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
        "type": "github"
      },
      "original": {
@ -414,11 +393,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1736012469,
-        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "lastModified": 1741851582,
+        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
        "type": "github"
      },
      "original": {
@ -430,11 +409,11 @@
    },
    "nixpkgs-raw": {
      "locked": {
-        "lastModified": 1740865531,
-        "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
+        "lastModified": 1741862977,
+        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
+        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
        "type": "github"
      },
      "original": {
@ -445,11 +424,11 @@
    },
    "nixpkgs-unstable-raw": {
      "locked": {
-        "lastModified": 1740828860,
-        "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
+        "lastModified": 1741851582,
+        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
        "type": "github"
      },
      "original": {
@ -470,28 +449,6 @@
        "type": "indirect"
      }
    },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs-unstable-raw"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1741014528,
-        "narHash": "sha256-Nez5gUmX8wX1fxZXgiuzIe4wEtmkzRNM9/zIts6hyfQ=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "e5b6c67aaac0b58a91fe25b0497f9377f5945f34",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@ -534,7 +491,6 @@
        "nixos-hardware": "nixos-hardware",
        "nixpkgs-raw": "nixpkgs-raw",
        "nixpkgs-unstable-raw": "nixpkgs-unstable-raw",
-        "nur": "nur",
        "plasma-manager": "plasma-manager",
        "secrets": "secrets",
        "shows-api": "shows-api"
@ -635,27 +591,6 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "utils": {
      "inputs": {
        "systems": "systems_4"
--- a/flake.nix
+++ b/flake.nix
@ -58,11 +58,6 @@

    nix-flatpak.url = "github:gmodena/nix-flatpak/main";

-    nur = {
-      url = "github:nix-community/NUR";
-      inputs.nixpkgs.follows = "nixpkgs-unstable-raw";
-    };
-
    catppuccin.url = "github:catppuccin/nix";

    lix-module = {
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@ -5,7 +5,6 @@
  flakeSelf,
  ...
 }: {
-  imports = [flakeSelf.inputs.nur.modules.nixos.default];
  environment = {
    # As of the 1st of May 2023, the default packages are nano, perl, rsync and strace
    # I don't need any of them, so I just empty the list
--- a/roles/desktop/programs/jamesdsp.nix
+++ b/roles/desktop/programs/jamesdsp.nix
@ -1,3 +1,24 @@
 {pkgs, ...}: {
-  users.users.toast.packages = [pkgs.jamesdsp];
+  home-manager.users.toast = {
+    home.packages = with pkgs; [
+      jamesdsp
+    ];
+  };
+  nixpkgs.overlays = [
+    (
+      final: prev: {
+        # https://github.com/wwmm/easyeffects/commit/38bef46bffdb535e2a70c3332719c557ff577e56
+        jamesdsp = prev.jamesdsp.overrideAttrs {
+          patchPhase = ''
+            substituteInPlace src/audio/pipewire/PwPipelineManager.cpp \
+              --replace-fail "pw_node_add_listener" "pw_proxy_add_object_listener" \
+              --replace-fail "pw_link_add_listener" "pw_proxy_add_object_listener" \
+              --replace-fail "pw_module_add_listener" "pw_proxy_add_object_listener" \
+              --replace-fail "pw_client_add_listener" "pw_proxy_add_object_listener" \
+              --replace-fail "pw_device_add_listener" "pw_proxy_add_object_listener"
+          '';
+        };
+      }
+    )
+  ];
 }
--- a/roles/gaming/programs/rpcs3.nix
+++ b/roles/gaming/programs/rpcs3.nix
@ -1,12 +1,7 @@
 {pkgs, ...}: {
  environment.systemPackages = with pkgs; [
-    nur.repos.ataraxiasjel.rpcs3
+    rpcs3
  ];
-  # Compiling RPCS3 takes quite a while
-  nix.settings = {
-    substituters = ["https://ataraxiadev-foss.cachix.org"];
-    trusted-public-keys = ["ataraxiadev-foss.cachix.org-1:ws/jmPRUF5R8TkirnV1b525lP9F/uTBsz2KraV61058="];
-  };

  # Increase the memory lock limit
  security.pam.loginLimits = [
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@ -37,34 +37,6 @@ in {
  # Enable the Plasma 6 Desktop Environment
  services.desktopManager.plasma6.enable = true;

-  # Same as https://github.com/NixOS/nixpkgs/pull/386932
-  nixpkgs.overlays = [
-    (
-      final: prev: {
-        kdePackages = prev.kdePackages.overrideScope (
-          kFinal: kPrev: {
-            qtbase-vulkan = kPrev.qtbase.overrideAttrs {
-              postFixup = ''
-                moveToOutput      "mkspecs/modules" "$dev"
-                fixQtModulePaths  "$dev/mkspecs/modules"
-                fixQtBuiltinPaths "$out" '*.pr?'
-                patchelf --add-rpath "${final.libmysqlclient}/lib/mariadb" $out/lib/qt-6/plugins/sqldrivers/libqsqlmysql.so
-                patchelf --add-rpath "${final.vulkan-loader}/lib" --add-needed "libvulkan.so" $out/lib/libQt6Gui.so
-              '';
-            };
-          }
-        );
-      }
-    )
-  ];
-
-  system.replaceDependencies.replacements = with pkgs.kdePackages; [
-    {
-      oldDependency = qtbase;
-      newDependency = qtbase-vulkan;
-    }
-  ];
-
  qt.enable = true;

  # GTK apps need dconf to grab the correct theme on Wayland
Author	SHA1	Message	Date
Toast	5d77bb0959	Desktop/jamesdsp: install using home-manager, fix build	2025-03-15 17:08:45 +01:00
Toast	71a1bad913	Flake: drop nur	2025-03-15 17:07:47 +01:00
Toast	8385b2d6e6	Gaming/rpcs3: use package from nixpkgs	2025-03-15 17:07:09 +01:00
Toast	0c64697063	Flake: update lock file	2025-03-15 17:05:23 +01:00
Toast	a0fadd7a1b	Revert "Kde: fix qt wayland" This reverts commit `f3ee33177f`.	2025-03-15 09:39:23 +01:00