diff --git a/flake.lock b/flake.lock index ade5fd2..2eb8376 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -198,17 +198,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "umu": "umu" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733622933, - "narHash": "sha256-DspyRdaFEPy8QHAONFfqG+EprRFYBe4ro5c6+1JaPqA=", + "lastModified": 1741657497, + "narHash": "sha256-2X7d94f9QcRnBKz1jJQfumATe8w4gXjwRly150ERnek=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b15e082eeea1afdf6bfe7aa0dbe4758097958f80", + "rev": "64a949349294543a48b3f946c9fca84332d1398b", "type": "github" }, "original": { @@ -219,30 +216,33 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", - "owner": "nixos", + "lastModified": 1741678040, + "narHash": "sha256-rmBsz7BBcDwfvDkxnKHmolKceGJrr0nyz5PQYZg0kMk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "3ee8818da146871cd570b164fc4f438f78479a50", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { @@ -263,11 +263,27 @@ }, "nixpkgs2": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -281,7 +297,7 @@ "inputs": { "home-manager": "home-manager", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs2": "nixpkgs2", "stylix": "stylix" @@ -383,31 +399,6 @@ "repo": "tinted-tmux", "type": "github" } - }, - "umu": { - "inputs": { - "nixpkgs": [ - "nix-gaming", - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1733509971, - "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", - "ref": "refs/heads/main", - "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", - "revCount": 865, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - }, - "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 334f561..03cf860 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ nix-gaming = { # Удобно ставить некоторые игры url = "github:fufexan/nix-gaming"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 7db78a9..78d79b6 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -67,10 +67,12 @@ in { xdg.portal = { enable = true; configPackages = with pkgs; [ - xdg-desktop-portal-gtk # Чтоб загружать файлы и стримить в дискорде + xdg-desktop-portal + # xdg-desktop-portal-gtk # Чтоб загружать файлы и стримить в дискорде ]; extraPortals = with pkgs; [ - xdg-desktop-portal-gtk # Чтоб загружать файлы и стримить в дискорде + xdg-desktop-portal + # xdg-desktop-portal-gtk # Чтоб загружать файлы и стримить в дискорде ]; }; diff --git a/nixos/packages.nix b/nixos/packages.nix index b18651e..1d0f5b2 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -406,7 +406,8 @@ # Чтоб не компилить wine, надо закомментить и сделать ребилд без игры. # Потом раскомментить и сделать ребилд с игрой inputs.nix-gaming.packages.${pkgs.system}.osu-stable # osu!stable from nix-gaming - osu-lazer-bin + inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin # osu!lazer from nix-gaming + # pkgs2.osu-lazer-bin # steam # Мб не надо сюда писать, раз через programs.steam редачу # heroic # A Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac @@ -416,7 +417,7 @@ # Мб зависимости steam-run # На всякий случай mangohud # Фпс и нагрузку на пк показывает в играх - gamemode # Оптимизации линуха и игр + # gamemode # Оптимизации линуха и игр wineWowPackages.stable # support both 32- and 64-bit applications # wineWowPackages.staging # Можно назвать бета версией вайна winetricks # winetricks (all versions)