diff options
| author | Jon Santmyer <jon@jonsantmyer.com> | 2026-08-29 10:27:34 -0400 |
|---|---|---|
| committer | Jon Santmyer <jon@jonsantmyer.com> | 2026-08-29 10:27:34 -0400 |
| commit | b5906d21bbe4cc15ad474397c0e08d4112057af1 (patch) | |
| tree | b770d397079b0c0e1a67836efecba89d55b2c64c /modules | |
| parent | 40c65ac3e6226dcf5c834c0ba2447df1bd0ca37d (diff) | |
| download | nix-config-desktop.tar.gz nix-config-desktop.tar.bz2 nix-config-desktop.zip | |
desktop changes 2026-08-29desktop
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop/apps/games/prism.nix | 17 | ||||
| -rw-r--r-- | modules/desktop/apps/mpd.nix | 14 | ||||
| -rw-r--r-- | modules/hardware/audio.nix | 9 |
3 files changed, 31 insertions, 9 deletions
diff --git a/modules/desktop/apps/games/prism.nix b/modules/desktop/apps/games/prism.nix index b586451..4ee10b0 100644 --- a/modules/desktop/apps/games/prism.nix +++ b/modules/desktop/apps/games/prism.nix @@ -16,9 +16,20 @@ in { }; config = lib.mkIf (prismConf.enable) { - home.packages = [ - pkgs.javaPackages.compiler.temurin-bin.jre-25 - pkgs.prismlauncher + home.packages = with pkgs; [ + (prismlauncher.override { + jdks = [ + graalvmPackages.graalvm-ce + (graalvmPackages.graalvm-ce.overrideAttrs (old: rec { + version = "17.0.9"; + src = pkgs.fetchurl { + sha256 = "sha256-5HunIpzvAjk+GdW49G9/HKtIKd0Xv+hNVDH8j/DiKpY="; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_linux-x64_bin.tar.gz"; + }; + doInstallCheck = false; + })) + ]; + }) ]; }; } diff --git a/modules/desktop/apps/mpd.nix b/modules/desktop/apps/mpd.nix index 3ec86e4..f6f9ff3 100644 --- a/modules/desktop/apps/mpd.nix +++ b/modules/desktop/apps/mpd.nix @@ -23,12 +23,14 @@ in services.mpd = { enable = true; musicDirectory = "/home/jon/mus"; - extraConfig = '' -audio_output { - type "pipewire" - name "Pipewire Output" -} - ''; + settings = { + audio_output = [ + { + type = "pipewire"; + name = "Pipewire"; + } + ]; + }; user = "jon"; }; systemd.services.mpd.environment = { diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix index a674597..d70b1d2 100644 --- a/modules/hardware/audio.nix +++ b/modules/hardware/audio.nix @@ -29,10 +29,19 @@ in { "bluez5.enable-sbc-xq" = true; "bluez5.enable-msbc" = true; "bluez5.enable-hw-volume" = true; + "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" "a2dp_source" "bap_source" ]; }; }; }; + environment.systemPackages = with pkgs; [ + alsa-firmware + alsa-oss + alsa-ucm-conf + ]; + + hardware.alsa.enablePersistence = true; + user.extraGroups = ["audio"]; home.packages = [pkgs.pavucontrol]; } |