From 215f8137d9a46634ed813456ae30040ca21b19f5 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:40:50 +1100 Subject: [PATCH 1/6] bump flake.lock --- home-manager/flake.lock | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 3f582cd..e62b638 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -95,13 +95,29 @@ "type": "github" } }, + "nixpkgs-gsr-ui": { + "locked": { + "lastModified": 1741023597, + "narHash": "sha256-09HLLCoC6L8OEjy0mvA7F6agriHQQOGXYsOisE0b4g8=", + "owner": "js6pak", + "repo": "nixpkgs", + "rev": "5c405e5de49ffe89bcdc5b43813b31383eef6f1c", + "type": "github" + }, + "original": { + "owner": "js6pak", + "ref": "gpu-screen-recorder-ui/init", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -167,6 +183,7 @@ "home-manager": "home-manager", "moonlight": "moonlight", "nixpkgs": "nixpkgs_2", + "nixpkgs-gsr-ui": "nixpkgs-gsr-ui", "nixpkgs-unstable": "nixpkgs-unstable", "shadps4-git": "shadps4-git" } @@ -178,11 +195,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-40v+vomEF78ueMyMiz3GbMFJi4WOnzfbkGxiB+vFLSY=", - "path": "/nix/store/7w83b1vpap9c0x2gz3g2an6k5n9wkmdk-source/home-manager/programs/shadps4", + "path": "/nix/store/8ch06glxnjrrjbaxgm0rnkp5n56ykb7g-source/programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/7w83b1vpap9c0x2gz3g2an6k5n9wkmdk-source/home-manager/programs/shadps4", + "path": "/nix/store/8ch06glxnjrrjbaxgm0rnkp5n56ykb7g-source/programs/shadps4", "type": "path" } }, From f6c37033fda454350c375409f291b158c91ec245 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:41:03 +1100 Subject: [PATCH 2/6] Fix mangohud fps limit --- MangoHud/MangoHud.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MangoHud/MangoHud.conf b/MangoHud/MangoHud.conf index 001dd0f..52446b2 100644 --- a/MangoHud/MangoHud.conf +++ b/MangoHud/MangoHud.conf @@ -51,7 +51,7 @@ fps_limit_method=late toggle_fps_limit=Shift_L+F1 show_fps_limit -fps_limit='157,157,120,0' +fps_limit=157,120,0 resolution fsr winesync From a53bc49fa8edbfb63f9c32caa58395ae284a45c6 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:41:50 +1100 Subject: [PATCH 3/6] Move wine to home-manager --- home-manager/packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/packages.nix b/home-manager/packages.nix index fd943ad..7436943 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -31,6 +31,8 @@ home.file."Godot/4.3-mono".source = unstable.godot_4_3-mono; home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates; + home.file."bin/wine".source = unstable.wineWowPackages.waylandFull; + # The home.packages option allows you to install Nix packages into your # environment. home.packages = with unstable; with inputs; [ @@ -49,6 +51,10 @@ pkgs.ludusavi inputs.shadps4-git.packages."x86_64-linux".default + unstable.wineWowPackages.waylandFull + unstable.winetricks + steamtinkerlaunch + # === Minecraft === pkgs.prismlauncher # pkgs.zulu8 From c2cb56e0bbc2ed91dd2cf220569b720a49c587d0 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:43:06 +1100 Subject: [PATCH 4/6] Add gpu-screen-recorder-ui from nixpkgs fork --- home-manager/flake.nix | 11 +++++++++++ home-manager/packages.nix | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 6249fbc..03b963c 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -18,6 +18,10 @@ shadps4-git.url = "./programs/shadps4"; + nixpkgs-gsr-ui = { + url = "github:js6pak/nixpkgs/gpu-screen-recorder-ui/init"; # Add `/develop` to the flake URL to use nightly. + }; + }; outputs = @@ -25,6 +29,7 @@ nixpkgs, home-manager, nixpkgs-unstable, + nixpkgs-gsr-ui, ... }@inputs: let @@ -39,6 +44,11 @@ config.allowUnfree = true; }; + gsr-ui = import nixpkgs-gsr-ui { + inherit system; + config.allowUnfree = true; + }; + in { homeConfigurations."buymymojo" = home-manager.lib.homeManagerConfiguration { @@ -46,6 +56,7 @@ extraSpecialArgs = { inherit unstable; inherit inputs; + inherit gsr-ui; }; # Specify your home configuration modules here, for example, diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 7436943..b5f5ecc 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -2,7 +2,7 @@ config, pkgs, unstable, - gpu-screen-recorder-ui-pkgs, + gsr-ui, inputs, ... }: @@ -132,8 +132,8 @@ pkgs.unityhub pkgs.material-maker - unstable.gpu-screen-recorder unstable.gpu-screen-recorder-gtk + gsr-ui.gpu-screen-recorder-ui # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your From f4eecfffaf80c67ca0d89947847037926dc58568 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:44:06 +1100 Subject: [PATCH 5/6] Add peazip --- home-manager/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/packages.nix b/home-manager/packages.nix index b5f5ecc..4184b0d 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -41,6 +41,7 @@ pkgs.xpipe pkgs.qbittorrent pkgs.monero-gui + unstable.peazip # pkgs.protonplus pkgs.pcsx2 From a6b3798ca963f658fc38c9d348349d6649752af1 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 29 Mar 2025 21:44:27 +1100 Subject: [PATCH 6/6] Move more packages to unstable --- home-manager/packages.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/home-manager/packages.nix b/home-manager/packages.nix index 4184b0d..36fa51f 100644 --- a/home-manager/packages.nix +++ b/home-manager/packages.nix @@ -44,12 +44,12 @@ unstable.peazip # pkgs.protonplus - pkgs.pcsx2 + unstable.pcsx2 pkgs.rpcs3 unstable.ryubing unstable.torzu pkgs.heroic-unwrapped - pkgs.ludusavi + unstable.ludusavi inputs.shadps4-git.packages."x86_64-linux".default unstable.wineWowPackages.waylandFull @@ -72,7 +72,7 @@ pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface pkgs.age pkgs.stow - pkgs.yt-dlp + unstable.yt-dlp pkgs.aria2 pkgs.jujutsu pkgs.lazyjj @@ -81,7 +81,7 @@ # === Image CLI === unstable.oxipng unstable.image_optim - pkgs.jpegoptim + unstable.jpegoptim pkgs.libjxl pkgs.libavif pkgs.libwebp @@ -97,7 +97,7 @@ # === Communication === # === Game perf === - pkgs.mangojuice + unstable.mangojuice unstable.goverlay # === Game perf === @@ -112,15 +112,15 @@ # === Dev tooling === # === Media === - pkgs.gimp - pkgs.krita + unstable.gimp + unstable.krita # pkgs.mpv unstable.losslesscut-bin # === Media === pkgs.polychromatic - pkgs.orca-slicer + unstable.orca-slicer pkgs.lazydocker pkgs.distrobox @@ -129,7 +129,7 @@ unstable.godot-mono unstable.godot-export-templates unstable.blender-hip - pkgs.freecad-wayland + unstable.freecad-wayland pkgs.unityhub pkgs.material-maker