From 3a9d27adb8e789bfee4506de8191f0769ad9c838 Mon Sep 17 00:00:00 2001 From: worble Date: Tue, 18 Nov 2025 22:48:25 +0000 Subject: [PATCH] move lsfg to gaming; add notes for 24.11 release; --- configuration/modules/gaming.nix | 8 +++++++- configuration/modules/virtualisation.nix | 2 +- devices/tuxedo/configuration.nix | 3 --- devices/tuxedo/flake.lock | 24 ++++++++++++------------ devices/tuxedo/home.nix | 1 + home-manager/default.nix | 2 +- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/configuration/modules/gaming.nix b/configuration/modules/gaming.nix index d878c75..6367e0e 100644 --- a/configuration/modules/gaming.nix +++ b/configuration/modules/gaming.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { hardware.graphics.enable32Bit = true; # For 32 bit applications @@ -35,4 +35,10 @@ }; programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work + + # 25.11 move to stable + environment.systemPackages = [ + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui + ]; } diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 3dfd518..9f747d7 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -34,7 +34,7 @@ with lib; }; waydroid = { enable = true; - # TODO: update when this is in stable + # 25.11 move to stable package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-nftables; }; }; diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index ebc43c3..598d86a 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -67,9 +67,6 @@ environment.systemPackages = with pkgs;[ distrobox gpu-screen-recorder-gtk - - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui ]; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/devices/tuxedo/flake.lock b/devices/tuxedo/flake.lock index f6daf4f..01d5da6 100644 --- a/devices/tuxedo/flake.lock +++ b/devices/tuxedo/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1762660502, - "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", + "lastModified": 1763265660, + "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", + "rev": "469ef53571ea80890c9497952787920c79c1ee6e", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763171608, - "narHash": "sha256-W0iHOP2SX8cKgmvLaAKodTa92YN8/6ptcuHd7SU0IZ0=", + "lastModified": 1763430920, + "narHash": "sha256-4RCKEWs9vVaRvNRn2VS0NI9RsUfc1pu16aOQeujS/XA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0f6a247888aae2de9ab6307471a9d72e7a7043f2", + "rev": "c653a0ab06ba1b34121368e94982ea8963a15343", "type": "github" }, "original": { @@ -97,11 +97,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763334038, + "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", "type": "github" }, "original": { diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 1393392..c767798 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -30,6 +30,7 @@ ffmpeg-full # comms + # 25.11 move to stable inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".teams-for-linux teamspeak6-client diff --git a/home-manager/default.nix b/home-manager/default.nix index d21d207..3200541 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -11,7 +11,7 @@ thunderbird qbittorrent libreoffice-qt - # Can move to stable when https://github.com/NixOS/nixpkgs/pull/460058 gets backported + # 25.11 Can move to stable when https://github.com/NixOS/nixpkgs/pull/460058 gets backported inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop # comms