diff --git a/flake.lock b/flake.lock index 54320dc..4b0e61c 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724442134, - "narHash": "sha256-RpA3GmcBvd6DLssIWfYKdDfiumLv8w4KIhDaI+//6ls=", + "lastModified": 1724329681, + "narHash": "sha256-cwYetPD6aAnER0KTLw3l6SvNuprLcPC5AsZBIcOCELY=", "ref": "refs/heads/main", - "rev": "688fe5c14781c63a1db23d4d02bf239283068ff6", - "revCount": 5131, + "rev": "f634b9e61af7dae0ca70379bd207eea45bb417d1", + "revCount": 5127, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -186,31 +186,6 @@ "type": "github" } }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": [ - "xdg-desktop-portal-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -240,29 +215,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -288,33 +240,6 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "xdg-desktop-portal-hyprland", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "xdg-desktop-portal-hyprland", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -408,30 +333,13 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_3", - "spicetify-nix": "spicetify-nix", - "xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland" + "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { @@ -485,57 +393,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "xdg-desktop-portal-hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1724073926, - "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "a08ecbbf33598924e93542f737fc6169a26b481e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", diff --git a/flake.nix b/flake.nix index 44f9e8d..cd5b946 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; }; diff --git a/nixos.nix b/nixos.nix index 3626cd0..e4c2b77 100644 --- a/nixos.nix +++ b/nixos.nix @@ -6,7 +6,6 @@ config, pkgs, hyprland, - xdg-desktop-portal-hyprland, ... }: @@ -276,7 +275,7 @@ in enable = true; package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = xdg-desktop-portal-hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default; + portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; # Enable XDG Desktop Portals. diff --git a/programs/gamemode.ini b/programs/gamemode.ini index b8fa758..4b76c17 100644 --- a/programs/gamemode.ini +++ b/programs/gamemode.ini @@ -20,7 +20,7 @@ renice=0 ; between 0 and 7 here (with 0 being highest priority), or one of the special values ; "off" (to disable) or "reset" (to restore Linux default behavior based on CPU priority), ; currently, only the best-effort class is supported thus you cannot set it here -ioprio=reset +ioprio=0 ; Sets whether gamemode will inhibit the screensaver when active ; Defaults to 1 diff --git a/programs/obs-studio.nix b/programs/obs-studio.nix index 055ef5c..e6eaea1 100644 --- a/programs/obs-studio.nix +++ b/programs/obs-studio.nix @@ -6,7 +6,6 @@ plugins = with pkgs.obs-studio-plugins; [ input-overlay obs-backgroundremoval - obs-pipewire-audio-capture ]; }; } diff --git a/services/minecraft/default.nix b/services/minecraft/default.nix index 2a3b6b3..4caa35a 100644 --- a/services/minecraft/default.nix +++ b/services/minecraft/default.nix @@ -2,8 +2,8 @@ let modpack = pkgs.fetchPackwizModpack { - url = "https://git.thewizard.link/wizardlink/silly-pack/raw/tag/1.0.8/pack.toml"; - packHash = "sha256-sCk9OO1q+/c1A6ns4zhvneulNtmEMr1yz4+Ku+A+mdk="; + url = "https://git.thewizard.link/wizardlink/silly-pack/raw/tag/1.0.7/pack.toml"; + packHash = "sha256-BUGBlADOmtaWrUa7lm2pt27vA5UMW9CbHHWPJ9GfHg0="; }; in {