Superredstone/nixos
1
0
Fork 0
mirror of https://github.com/Superredstone/nixos.git synced 2026-03-07 20:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge issues

Browse Source
This commit is contained in:
Patrick Canal
2025-08-09 13:01:15 +02:00
parent b08d46bcae
commit 7849771e42
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
flake.lock generated
View File

@@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754886238, "lastModified": 1755618859,
"narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=", "narHash": "sha256-VGEZMAX/bOKrkg9x5DjXBfjpxm9gvU3kRVps7RKm8mQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0d492b89d1993579e63b9dbdaed17fd7824834da", "rev": "0e0a16b342bcd435ad83c62f4794ce1a4ccff0ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -216,11 +216,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754886238, "lastModified": 1755618859,
"narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=", "narHash": "sha256-VGEZMAX/bOKrkg9x5DjXBfjpxm9gvU3kRVps7RKm8mQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0d492b89d1993579e63b9dbdaed17fd7824834da", "rev": "0e0a16b342bcd435ad83c62f4794ce1a4ccff0ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -303,11 +303,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1754844749, "lastModified": 1755531739,
"narHash": "sha256-QNT0yXHyjvZ++vrJICAWFBMrcrTVbgRIZLplmOv1W7s=", "narHash": "sha256-TGFQdnGC1U2qg2Efjyk+94+aKxAkW5O+2IuKIsoQqzI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "584b844aaf72cd7ea6851117f1bd598b7467ffc1", "rev": "1a0ed00f74f7cfcc3b7c4fd7e3bf0073c4973267",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -524,11 +524,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1754856671, "lastModified": 1755368946,
"narHash": "sha256-WXRvs14lYgg1AMppoupJQrD19fS5u+Es9SxZg/rphLA=", "narHash": "sha256-VAGzrUm9pLl6tUXdKISvZZWJzTvhlwCaY7sR5uAUR6I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "d6f6a9efb282d1547a1758abbd946a1141886a81", "rev": "92574f4649ed6e4519424bcec81f24b6082f0519",
"revCount": 2023, "revCount": 2037,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/SteamClientHomebrew/Millennium" "url": "https://github.com/SteamClientHomebrew/Millennium"
@@ -603,11 +603,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1754800730, "lastModified": 1755268003,
"narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "641d909c4a7538f1539da9240dedb1755c907e40", "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -635,11 +635,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1754800730, "lastModified": 1755268003,
"narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "641d909c4a7538f1539da9240dedb1755c907e40", "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/packages.nix
View File

@@ -52,7 +52,6 @@
kitty kitty
mpv mpv
telegram-desktop telegram-desktop
virt-manager
] ++ (if gamingSystem then [ ] ++ (if gamingSystem then [
archipelago archipelago
dolphin-emu dolphin-emu
@@ -67,6 +66,7 @@
++ (if workSystem then [ ++ (if workSystem then [
android-studio android-studio
ansible ansible
virt-manager
] else [])) ] else []))
++ (if currentSystemDe == "plasma" then [ ++ (if currentSystemDe == "plasma" then [
kdePackages.wallpaper-engine-plugin kdePackages.wallpaper-engine-plugin
@@ -85,7 +85,7 @@
programs.steam = if gamingSystem then { programs.steam = if gamingSystem then {
enable = true; enable = true;
package = pkgs.steam-millennium; # package = pkgs.steam-millennium;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
} else {}; } else {};