From f5bab74dfac06a6143a56dfa199613669092058e Mon Sep 17 00:00:00 2001 From: harry123 Date: Fri, 25 Jul 2025 16:44:45 +0200 Subject: [PATCH] tried stuff out with moonlight, doesnt seem to work --- flake.lock | 181 +++++++++++++----- flake.nix | 7 + home-manager/home.nix | 18 ++ hosts/goober/features/software/discord.nix | 15 +- .../workstation/features/software/discord.nix | 14 +- 5 files changed, 185 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 9196a28..4807b49 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752828704, - "narHash": "sha256-I8cCVFZIFcIy+7KBnjCuS/ISTJYeR8mkah1oxA6qBVk=", + "lastModified": 1753260820, + "narHash": "sha256-hh7QESW339Wp0YqgcFIFL66JPN8SV3j2zdGShfQH+Fw=", "owner": "catppuccin", "repo": "nix", - "rev": "f5d22072074b0bc3c47a3a96a00e4fad263014ff", + "rev": "227c41fd57210559a05720bece5453369d7abe0f", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -184,6 +184,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -273,11 +291,11 @@ ] }, "locked": { - "lastModified": 1753056897, - "narHash": "sha256-AVVMBFcuOXqIgmShvRv9TED3fkiZhQ0ZvlhsPoFfkNE=", + "lastModified": 1753181343, + "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "13a83d1b6545b7f0e8f7689bad62e7a3b1d63771", + "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", "type": "github" }, "original": { @@ -340,11 +358,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753136274, - "narHash": "sha256-wXgEAtyxfOIyml1t2+XGh1BUVPBsGRQSJnP6WGIiZDg=", - "rev": "bf3d52e5bbf4bfd333b04a53e7f8937763bbda66", + "lastModified": 1753239105, + "narHash": "sha256-b6kNz4HI/K/XANrGbBLwE4e0c9DsJ+PkKfAPpZMX1mE=", + "rev": "8a2d25054ddff44dd8878154b702365eb1966a78", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bf3d52e5bbf4bfd333b04a53e7f8937763bbda66.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a2d25054ddff44dd8878154b702365eb1966a78.tar.gz?rev=8a2d25054ddff44dd8878154b702365eb1966a78" }, "original": { "type": "tarball", @@ -381,11 +399,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1753258679, - "narHash": "sha256-yWhJbv8AOkEyFZWB7XybaQvnv3QRIq/hT4AQHgu/87A=", + "lastModified": 1753263647, + "narHash": "sha256-/ppK3tT5cpZqouENpdaUMDmOYW7OZF21s+ZeCCZ4wgU=", "ref": "refs/heads/main", - "rev": "f8ba8fb8eee79afca7f990379acbe9697a2441f2", - "revCount": 25, + "rev": "33c593fd25cb4eeaf00023416c81ad9958c7ee75", + "revCount": 26, "type": "git", "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" }, @@ -394,6 +412,46 @@ "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" } }, + "moonlight": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgsUnstable" + ] + }, + "locked": { + "lastModified": 1753392240, + "narHash": "sha256-4U0ABI8mT/C4mySei6nlkvsvr62dA+5BdTSEFrZkMlM=", + "owner": "moonlight-mod", + "repo": "moonlight", + "rev": "7248b01a141412f7cc0b4224eead0f90443780aa", + "type": "github" + }, + "original": { + "owner": "moonlight-mod", + "ref": "develop", + "repo": "moonlight", + "type": "github" + } + }, + "musnix": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1741303672, + "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", + "owner": "musnix", + "repo": "musnix", + "rev": "d56a15f30329f304151e4e05fa82264d127da934", + "type": "github" + }, + "original": { + "owner": "musnix", + "repo": "musnix", + "type": "github" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", @@ -401,15 +459,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1752923485, - "narHash": "sha256-AHKTY+vsJEGe/U3wmyspZR8G1Uf65pENHhWms0P3gQc=", + "lastModified": 1753258173, + "narHash": "sha256-a7ri+24SEelYz1P1VyO2joZrXQgWhc4g6Iy5i/YROI0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c36cdca55cc9fc1ac964b4c9033e10c1a221bb19", + "rev": "5c2f79eef3dbe9522b6e79fb7f1d99dd593e478a", "type": "github" }, "original": { @@ -421,11 +479,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1752877898, - "narHash": "sha256-UmnzK7OWI+elWVf/xdvVWFXHs0kP5sNSROYrehLIj74=", + "lastModified": 1753225057, + "narHash": "sha256-/Z6FyO4cZ9SGa8X7l7MmEXoKlZWCXgv65qZ9HYbuDvw=", "owner": "neovim", "repo": "neovim", - "rev": "3a140ddbc62171451fb2f0b2f49bb38b1bc07f24", + "rev": "1685c44dd463217db01643a97163420ed9f5b177", "type": "github" }, "original": { @@ -524,11 +582,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -555,11 +613,11 @@ }, "nixpkgsSmall": { "locked": { - "lastModified": 1753028336, - "narHash": "sha256-n8h8fGBKvLq4MDvdBGqN0mcnnMkwTyzHbVe0HNkL+jU=", + "lastModified": 1753208034, + "narHash": "sha256-w24+7Iu031O5iAcWY+exrtRkc60Q9Q3qs+LqhBxQiTg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0612748b970076a805ade087726cbf0295aacca5", + "rev": "3f7a24d6c01fc1875650ff6f7849126910fe9369", "type": "github" }, "original": { @@ -619,11 +677,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752809442, - "narHash": "sha256-7fALxZGWDspRe79LaDwIdmkDl568Cphfvr83PGCXUUQ=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e821e03193486359aa942372be2d9c1f377b7a18", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1753151930, + "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83e677f31c84212343f4cc553bab85c2efcad60a", "type": "github" }, "original": { @@ -633,13 +707,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1753115646, + "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "92c2e04a475523e723c67ef872d8037379073681", "type": "github" }, "original": { @@ -649,7 +723,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -665,7 +739,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1750605355, "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", @@ -736,12 +810,14 @@ "lix": "lix", "lix-module": "lix-module", "miovim": "miovim", + "moonlight": "moonlight", + "musnix": "musnix", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix", @@ -772,7 +848,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1752544651, @@ -791,7 +867,7 @@ "swww": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay" }, "locked": { @@ -853,6 +929,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -861,11 +952,11 @@ ] }, "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "lastModified": 1753006367, + "narHash": "sha256-tzbhc4XttkyEhswByk5R38l+ztN9UDbnj0cTcP6Hp9A=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", + "rev": "421b56313c65a0815a52b424777f55acf0b56ddf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8634a2c..c704f22 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,10 @@ musnix = { url = "github:musnix/musnix"; }; + moonlight = { + url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly. + inputs.nixpkgs.follows = "nixpkgsUnstable"; + }; }; outputs = @@ -76,6 +80,7 @@ zen-browser, musnix, lix-module, + moonlight, ... }@inputs: let @@ -126,6 +131,7 @@ imports = [ ./home-manager/home.nix catppuccin.homeModules.catppuccin + moonlight.homeModules.default ]; home.packages = [ @@ -153,6 +159,7 @@ imports = [ ./home-manager/home.nix catppuccin.homeModules.catppuccin + moonlight.homeModules.default ]; home.packages = [ diff --git a/home-manager/home.nix b/home-manager/home.nix index 192692f..53df2cb 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -350,6 +350,24 @@ network.startWhenNeeded = true; }; + # programs.moonlight = { + # enable = true; + # configs.stable = { + # extensions = { + # allActivites.enabled = true; + # alwaysFocus.enabled = true; + # + # betterEmbedsYT = { + # enabled = true; + # config = { + # fullDescription = false; + # expandDescription = true; + # }; + # }; + # }; + # }; + # }; + # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/hosts/goober/features/software/discord.nix b/hosts/goober/features/software/discord.nix index 98b093b..562702e 100644 --- a/hosts/goober/features/software/discord.nix +++ b/hosts/goober/features/software/discord.nix @@ -1,9 +1,16 @@ -{ config, pkgs, ... }: +{ + inputs, + config, + pkgs, + ... +}: { environment.systemPackages = with pkgs; [ - (discord.override { - withVencord = true; - }) + discord.override + { + withMoonlight = true; + moonlight = inputs.moonlight.packages.${pkgs.system}.moonlight; + } vesktop ]; # screen record support diff --git a/hosts/workstation/features/software/discord.nix b/hosts/workstation/features/software/discord.nix index 7d2fa65..8cdb9fe 100644 --- a/hosts/workstation/features/software/discord.nix +++ b/hosts/workstation/features/software/discord.nix @@ -1,6 +1,18 @@ -{ config, pkgs, ... }: +{ + config, + pkgs, + inputs, + ... +}: +let + moonlight-client = pkgs.discord.override { + withMoonlight = true; + }; +in { environment.systemPackages = with pkgs; [ + moonlight-client + inputs.moonlight.packages.${pkgs.system}.moonlight vesktop ]; # screen record support