From 7849771e4248a838930c8a134199db6180b55128 Mon Sep 17 00:00:00 2001 From: Superredstone Date: Sat, 9 Aug 2025 13:01:15 +0200 Subject: [PATCH] Fixed merge issues --- flake.lock | 38 +++++++++++++++++++------------------- modules/packages.nix | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b00e638..d028e88 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1754886238, - "narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=", + "lastModified": 1755618859, + "narHash": "sha256-VGEZMAX/bOKrkg9x5DjXBfjpxm9gvU3kRVps7RKm8mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d492b89d1993579e63b9dbdaed17fd7824834da", + "rev": "0e0a16b342bcd435ad83c62f4794ce1a4ccff0ea", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1754886238, - "narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=", + "lastModified": 1755618859, + "narHash": "sha256-VGEZMAX/bOKrkg9x5DjXBfjpxm9gvU3kRVps7RKm8mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d492b89d1993579e63b9dbdaed17fd7824834da", + "rev": "0e0a16b342bcd435ad83c62f4794ce1a4ccff0ea", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1754844749, - "narHash": "sha256-QNT0yXHyjvZ++vrJICAWFBMrcrTVbgRIZLplmOv1W7s=", + "lastModified": 1755531739, + "narHash": "sha256-TGFQdnGC1U2qg2Efjyk+94+aKxAkW5O+2IuKIsoQqzI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "584b844aaf72cd7ea6851117f1bd598b7467ffc1", + "rev": "1a0ed00f74f7cfcc3b7c4fd7e3bf0073c4973267", "type": "github" }, "original": { @@ -524,11 +524,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754856671, - "narHash": "sha256-WXRvs14lYgg1AMppoupJQrD19fS5u+Es9SxZg/rphLA=", + "lastModified": 1755368946, + "narHash": "sha256-VAGzrUm9pLl6tUXdKISvZZWJzTvhlwCaY7sR5uAUR6I=", "ref": "refs/heads/main", - "rev": "d6f6a9efb282d1547a1758abbd946a1141886a81", - "revCount": 2023, + "rev": "92574f4649ed6e4519424bcec81f24b6082f0519", + "revCount": 2037, "submodules": true, "type": "git", "url": "https://github.com/SteamClientHomebrew/Millennium" @@ -603,11 +603,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", + "lastModified": 1755268003, + "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", + "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", + "lastModified": 1755268003, + "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", + "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", "type": "github" }, "original": { diff --git a/modules/packages.nix b/modules/packages.nix index c0bdb21..4e03f96 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -52,7 +52,6 @@ kitty mpv telegram-desktop - virt-manager ] ++ (if gamingSystem then [ archipelago dolphin-emu @@ -67,6 +66,7 @@ ++ (if workSystem then [ android-studio ansible + virt-manager ] else [])) ++ (if currentSystemDe == "plasma" then [ kdePackages.wallpaper-engine-plugin @@ -85,7 +85,7 @@ programs.steam = if gamingSystem then { enable = true; - package = pkgs.steam-millennium; + # package = pkgs.steam-millennium; remotePlay.openFirewall = true; } else {};