Compare commits

..

No commits in common. "a6b3798ca963f658fc38c9d348349d6649752af1" and "fa5e9af38efd14856a05d201720bc116fcb882b0" have entirely different histories.

4 changed files with 17 additions and 52 deletions

View file

@ -51,7 +51,7 @@ fps_limit_method=late
toggle_fps_limit=Shift_L+F1 toggle_fps_limit=Shift_L+F1
show_fps_limit show_fps_limit
fps_limit=157,120,0 fps_limit='157,157,120,0'
resolution resolution
fsr fsr
winesync winesync

View file

@ -95,29 +95,13 @@
"type": "github" "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": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1743095683, "lastModified": 1742889210,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,7 +167,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"moonlight": "moonlight", "moonlight": "moonlight",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-gsr-ui": "nixpkgs-gsr-ui",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"shadps4-git": "shadps4-git" "shadps4-git": "shadps4-git"
} }
@ -195,11 +178,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-40v+vomEF78ueMyMiz3GbMFJi4WOnzfbkGxiB+vFLSY=", "narHash": "sha256-40v+vomEF78ueMyMiz3GbMFJi4WOnzfbkGxiB+vFLSY=",
"path": "/nix/store/8ch06glxnjrrjbaxgm0rnkp5n56ykb7g-source/programs/shadps4", "path": "/nix/store/7w83b1vpap9c0x2gz3g2an6k5n9wkmdk-source/home-manager/programs/shadps4",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/8ch06glxnjrrjbaxgm0rnkp5n56ykb7g-source/programs/shadps4", "path": "/nix/store/7w83b1vpap9c0x2gz3g2an6k5n9wkmdk-source/home-manager/programs/shadps4",
"type": "path" "type": "path"
} }
}, },

View file

@ -18,10 +18,6 @@
shadps4-git.url = "./programs/shadps4"; 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 = outputs =
@ -29,7 +25,6 @@
nixpkgs, nixpkgs,
home-manager, home-manager,
nixpkgs-unstable, nixpkgs-unstable,
nixpkgs-gsr-ui,
... ...
}@inputs: }@inputs:
let let
@ -44,11 +39,6 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
gsr-ui = import nixpkgs-gsr-ui {
inherit system;
config.allowUnfree = true;
};
in in
{ {
homeConfigurations."buymymojo" = home-manager.lib.homeManagerConfiguration { homeConfigurations."buymymojo" = home-manager.lib.homeManagerConfiguration {
@ -56,7 +46,6 @@
extraSpecialArgs = { extraSpecialArgs = {
inherit unstable; inherit unstable;
inherit inputs; inherit inputs;
inherit gsr-ui;
}; };
# Specify your home configuration modules here, for example, # Specify your home configuration modules here, for example,

View file

@ -2,7 +2,7 @@
config, config,
pkgs, pkgs,
unstable, unstable,
gsr-ui, gpu-screen-recorder-ui-pkgs,
inputs, inputs,
... ...
}: }:
@ -31,8 +31,6 @@
home.file."Godot/4.3-mono".source = unstable.godot_4_3-mono; 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."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 # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = with unstable; with inputs; [ home.packages = with unstable; with inputs; [
@ -41,21 +39,16 @@
pkgs.xpipe pkgs.xpipe
pkgs.qbittorrent pkgs.qbittorrent
pkgs.monero-gui pkgs.monero-gui
unstable.peazip
# pkgs.protonplus # pkgs.protonplus
unstable.pcsx2 pkgs.pcsx2
pkgs.rpcs3 pkgs.rpcs3
unstable.ryubing unstable.ryubing
unstable.torzu unstable.torzu
pkgs.heroic-unwrapped pkgs.heroic-unwrapped
unstable.ludusavi pkgs.ludusavi
inputs.shadps4-git.packages."x86_64-linux".default inputs.shadps4-git.packages."x86_64-linux".default
unstable.wineWowPackages.waylandFull
unstable.winetricks
steamtinkerlaunch
# === Minecraft === # === Minecraft ===
pkgs.prismlauncher pkgs.prismlauncher
# pkgs.zulu8 # pkgs.zulu8
@ -72,7 +65,7 @@
pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface
pkgs.age pkgs.age
pkgs.stow pkgs.stow
unstable.yt-dlp pkgs.yt-dlp
pkgs.aria2 pkgs.aria2
pkgs.jujutsu pkgs.jujutsu
pkgs.lazyjj pkgs.lazyjj
@ -81,7 +74,7 @@
# === Image CLI === # === Image CLI ===
unstable.oxipng unstable.oxipng
unstable.image_optim unstable.image_optim
unstable.jpegoptim pkgs.jpegoptim
pkgs.libjxl pkgs.libjxl
pkgs.libavif pkgs.libavif
pkgs.libwebp pkgs.libwebp
@ -97,7 +90,7 @@
# === Communication === # === Communication ===
# === Game perf === # === Game perf ===
unstable.mangojuice pkgs.mangojuice
unstable.goverlay unstable.goverlay
# === Game perf === # === Game perf ===
@ -112,15 +105,15 @@
# === Dev tooling === # === Dev tooling ===
# === Media === # === Media ===
unstable.gimp pkgs.gimp
unstable.krita pkgs.krita
# pkgs.mpv # pkgs.mpv
unstable.losslesscut-bin unstable.losslesscut-bin
# === Media === # === Media ===
pkgs.polychromatic pkgs.polychromatic
unstable.orca-slicer pkgs.orca-slicer
pkgs.lazydocker pkgs.lazydocker
pkgs.distrobox pkgs.distrobox
@ -129,12 +122,12 @@
unstable.godot-mono unstable.godot-mono
unstable.godot-export-templates unstable.godot-export-templates
unstable.blender-hip unstable.blender-hip
unstable.freecad-wayland pkgs.freecad-wayland
pkgs.unityhub pkgs.unityhub
pkgs.material-maker pkgs.material-maker
unstable.gpu-screen-recorder
unstable.gpu-screen-recorder-gtk unstable.gpu-screen-recorder-gtk
gsr-ui.gpu-screen-recorder-ui
# # You can also create simple shell scripts directly inside your # # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your # # configuration. For example, this adds a command 'my-hello' to your