diff --git a/flake.lock b/flake.lock index db5c352..19977d6 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1786240917, - "narHash": "sha256-4aAr5NeOn8fp8QBrKnfYB7N5mBZO1HjPFYpvqlCirOo=", + "lastModified": 1786323743, + "narHash": "sha256-bPT6UmXMc33Rd4rU9O8eMHhLbsJuU6ZxC2V7VDlmfms=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "65610fe65b0ea94eb7913b9f37a532c83d46790f", + "rev": "a67e334856b7bf0ab9b5b4f38dffd436c0b8a2e5", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1785314864, - "narHash": "sha256-imz9J5iMNersDeQ1ymenFg35N6C2R3MCaGg2i0XCIrE=", + "lastModified": 1785919363, + "narHash": "sha256-4FDhl7ybhL5qhJw1X2IviFJ2MERnzV7X1HlJhFeSBXU=", "owner": "nix-community", "repo": "fenix", - "rev": "594418b2c9ea0731bee6988236ef5bfd97e81dca", + "rev": "d17fa5c004217ac6e51da9a8c2d2b79b0ed37109", "type": "github" }, "original": { @@ -181,11 +181,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1786248171, - "narHash": "sha256-ALbtZKFam+O2ONRk7XhYsXmXxmhR0Y3Bj+qZkTA8zCg=", + "lastModified": 1786420971, + "narHash": "sha256-irKN0AY5fDS96h7z3Cjp3EB7OwTJU1SeWFb1GxnFu3E=", "owner": "rycee", "repo": "nur-expressions", - "rev": "2e85abc79236d031845a0e2be3ebbd1759cea715", + "rev": "a56dfe072a448e664d208e9ed5f7f9dc9a720686", "type": "gitlab" }, "original": { @@ -364,11 +364,11 @@ ] }, "locked": { - "lastModified": 1786031233, - "narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=", + "lastModified": 1786356609, + "narHash": "sha256-ou8fYz5w9yhXC8YbvvExybFIa19MyW5G/8dEPqa90hM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7834e82588860aaf780cec1366524456a70898d7", + "rev": "c30c7955cec30d664a9baced6bc0112e263d4647", "type": "github" }, "original": { @@ -437,11 +437,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1786106723, - "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=", + "lastModified": 1786384358, + "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", + "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1786239779, - "narHash": "sha256-JxVEUqGZH1PzNh4w6p0UjJRycm33uUxX1ryotRErf3A=", + "lastModified": 1786471551, + "narHash": "sha256-7NQU+Peux6ZUszNGvBEtgRhzGCxJ/RQaYP0G7cVPt2c=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ad647ae1bc1a119eaafb849ccce5391e9fdb0918", + "rev": "0b1398de6b5e245a7048d9e4c2efdf563fa14d61", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1785261141, - "narHash": "sha256-sA+DHPejWD68mLA7gtTiHGd5T41F6W+NKf0g+ibFCW4=", + "lastModified": 1785889825, + "narHash": "sha256-U98Y5RADVCkMCbrKCFXppe6MSAi0tUTLxi3cB/SMcZI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "bec66814323579659ffd77c909b3d963af118ece", + "rev": "6817dd3094203c8bc4911f5799baf897623003de", "type": "github" }, "original": { @@ -647,11 +647,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1786216702, - "narHash": "sha256-fOOmw9tUYeqWVnK2w2NiuMTmGIbluj8xiBFTTFDCcEE=", + "lastModified": 1786382682, + "narHash": "sha256-rWN1IYcqZD+rNA7PuNcMctjZgEzp83iPboeVVvgUHBM=", "owner": "danth", "repo": "stylix", - "rev": "b67debfd2db1eb1f0fd8740b950f598bbaf74b8f", + "rev": "4e328a8a98eceeb25ee19c88b36b355b400a7f68", "type": "github" }, "original": { diff --git a/hosts/Garand-Desktop/home-modules.nix b/hosts/Garand-Desktop/home-modules.nix index f905e78..8e9fa0a 100644 --- a/hosts/Garand-Desktop/home-modules.nix +++ b/hosts/Garand-Desktop/home-modules.nix @@ -36,11 +36,12 @@ _: { */ lutris.enable = false; # Lutris: an open gaming platform mangohud.enable = true; # MangoHud: Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more + prismlauncher.enable = true; # Prism Launcher: Minecraft modded launcher /* Media recording and streaming */ - obs-studio.enable = false; # OBS Studio: streaming and recording software + obs-studio.enable = true; # OBS Studio: streaming and recording software /* Office suite diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix index 76270ab..e25b98b 100644 --- a/hosts/Garand-Desktop/system-modules.nix +++ b/hosts/Garand-Desktop/system-modules.nix @@ -60,7 +60,6 @@ _: { /* Gaming */ - prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game heroic.enable = false; # Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac diff --git a/hosts/Garand-Laptop/home-modules.nix b/hosts/Garand-Laptop/home-modules.nix index b224dce..f554713 100644 --- a/hosts/Garand-Laptop/home-modules.nix +++ b/hosts/Garand-Laptop/home-modules.nix @@ -36,6 +36,7 @@ _: { */ lutris.enable = false; # Lutris: an open gaming platform mangohud.enable = true; # MangoHud: Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more + prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher /* Media recording and streaming diff --git a/hosts/Garand-Laptop/system-modules.nix b/hosts/Garand-Laptop/system-modules.nix index 90a45aa..2c6ca4c 100644 --- a/hosts/Garand-Laptop/system-modules.nix +++ b/hosts/Garand-Laptop/system-modules.nix @@ -60,7 +60,6 @@ _: { /* Gaming */ - prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game heroic.enable = false; # Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac diff --git a/hosts/default/home-modules.nix b/hosts/default/home-modules.nix index 692da3c..baee5a8 100644 --- a/hosts/default/home-modules.nix +++ b/hosts/default/home-modules.nix @@ -36,6 +36,7 @@ _: { */ lutris.enable = false; # Lutris: an open gaming platform mangohud.enable = false; # MangoHud: Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more + prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher /* Media recording and streaming diff --git a/hosts/default/system-modules.nix b/hosts/default/system-modules.nix index d0de3e0..ca5e9c9 100644 --- a/hosts/default/system-modules.nix +++ b/hosts/default/system-modules.nix @@ -60,7 +60,6 @@ _: { /* Gaming */ - prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher spaceCadetPinball.enable = false; # SpaceCadet Pinball: classic pinball game ttySolitaire.enable = false; # TTY Solitaire: terminal‑based solitaire game heroic.enable = false; # Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac diff --git a/modules/core/packages/appimages/helium.nix b/modules/core/packages/appimages/helium.nix index cb3f18a..e4aea22 100644 --- a/modules/core/packages/appimages/helium.nix +++ b/modules/core/packages/appimages/helium.nix @@ -37,3 +37,4 @@ in }; } # https://github.com/imputnet/helium-linux/releases/download/0.11.7.1/helium-0.11.7.1-x86_64.AppImage + diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index a203e43..6b0b779 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -25,7 +25,6 @@ exercism = exercism; jan = jan; lazygit = lazygit; - prismlauncher = inputs.prismlauncher-cracked.packages.${system}.default; spaceCadetPinball = space-cadet-pinball; ttySolitaire = tty-solitaire; gimp = gimp; diff --git a/modules/core/user.nix b/modules/core/user.nix index 825d462..9e48eb1 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -68,6 +68,7 @@ "wheel" # sudo access "vboxusers" # Virtual Box "gamemode" + "video" "lpadmin" "dialout" ]; diff --git a/modules/home/default.nix b/modules/home/default.nix index 4a76e5b..a8f201b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -34,6 +34,7 @@ _: { ./ollama.nix ./onlyoffice.nix ./opencode.nix + ./prismlauncher.nix ./qt.nix ./ssh.nix ./starship.nix diff --git a/modules/home/prismlauncher.nix b/modules/home/prismlauncher.nix new file mode 100644 index 0000000..4af7837 --- /dev/null +++ b/modules/home/prismlauncher.nix @@ -0,0 +1,28 @@ +{ + pkgs, + inputs, + system, + lib, + config, + ... +}: let + prismlauncher-cracked-fixed = inputs.prismlauncher-cracked.packages.${system}.default.override { + prismlauncher-unwrapped = + (inputs.prismlauncher-cracked.packages.${system}.prismlauncher-unwrapped.override { + extra-cmake-modules = pkgs.kdePackages.extra-cmake-modules; + }).overrideAttrs (oldAttrs: { + nativeBuildInputs = + (oldAttrs.nativeBuildInputs or []) + ++ [ + pkgs.pkg-config + ]; + }); + }; +in { + options.prismlauncher.enable = lib.mkEnableOption "Enable Prism Launcher"; + + config.programs.prismlauncher = lib.mkIf config.prismlauncher.enable { + enable = true; + package = prismlauncher-cracked-fixed; + }; +}