Compare commits

..

No commits in common. "8c876a7c7f4e6804f25f111f63554f34fd9ea908" and "eac2a30d1645f98a48c1f2d6581035a757227389" have entirely different histories.

2 changed files with 3 additions and 4 deletions

View File

@ -1,7 +1,7 @@
nixfiles: final: prev: nixfiles: final: prev:
let let
pkgs-unstable = import nixfiles.inputs.nixpkgs-unstable { config.allowUnfree = true; inherit (final) system; }; pkgs-unstable = import nixfiles.inputs.nixpkgs-unstable { config.allowUnfree = true; inherit (final) system; };
inherit (final) callPackage kdePackages lib; inherit (final) callPackage qt6Packages lib;
backport = let backport = let
_callPackage = callPackage; _callPackage = callPackage;
@ -32,11 +32,12 @@ in {
obsidian = backport { pkgname="obsidian"; override.electron = final.electron_28; }; obsidian = backport { pkgname="obsidian"; override.electron = final.electron_28; };
prismlauncher-unwrapped = backport { prismlauncher-unwrapped = backport {
pkgname = "prismlauncher-unwrapped"; pkgname = "prismlauncher-unwrapped";
inherit (kdePackages) callPackage; inherit (qt6Packages) callPackage;
override = { override = {
# apple something idk why the package doesn't just ask for darwin and get it itself # apple something idk why the package doesn't just ask for darwin and get it itself
# maybe i should make a pull request that changes the params to `darwin, Cocoa ? darwin.apple_sdk.frameworks.Cocoa` # maybe i should make a pull request that changes the params to `darwin, Cocoa ? darwin.apple_sdk.frameworks.Cocoa`
inherit (final.darwin.apple_sdk.frameworks) Cocoa; inherit (final.darwin.apple_sdk.frameworks) Cocoa;
inherit stripJavaArchivesHook;
}; };
}; };
} }

View File

@ -2,7 +2,6 @@
let let
cfg = config.nixfiles.sessions.hyprland; cfg = config.nixfiles.sessions.hyprland;
flake-package = inputs.hyprland.packages.${pkgs.system}.hyprland; flake-package = inputs.hyprland.packages.${pkgs.system}.hyprland;
flake-portal = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
in in
{ {
# imports = [ # imports = [
@ -45,7 +44,6 @@ in
# enableNvidiaPatches = lib.mkIf (!cfg.useFlake) lib.mkDefault true; # enableNvidiaPatches = lib.mkIf (!cfg.useFlake) lib.mkDefault true;
xwayland.enable = true; xwayland.enable = true;
package = lib.mkIf cfg.useFlake flake-package; package = lib.mkIf cfg.useFlake flake-package;
portalPackage = lib.mkIf cfg.useFlake flake-portal;
}; };
hardware.opengl = let hardware.opengl = let