diff --git a/boxes/mlg.nix b/boxes/mlg.nix index f609513..7eddb7b 100644 --- a/boxes/mlg.nix +++ b/boxes/mlg.nix @@ -3,9 +3,8 @@ { imports = [ ../common/desktop.nix - ../common/steam.nix - ../common/minecraft.nix ../common/nvidia.nix + ../common/gaming.nix ]; boot.loader = { diff --git a/common/desktop.nix b/common/desktop.nix index e78e04b..0d8a61e 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -37,6 +37,7 @@ in { xcape ffmpeg + ncmpcpp pciutils xscreensaver ncpamixer @@ -44,7 +45,6 @@ in { dunst libnotify tig - cmus neomutt mpv yt-dlp @@ -124,6 +124,18 @@ in { nativeMessagingHosts.tridactyl = true; }; + services.mpd = { + enable = true; + musicDirectory = "/home/usr/music"; + extraConfig = '' + audio_output { + type "pulse" + name "pulseaudio" + server "127.0.0.1" + } + ''; + }; + users.users.usr = { isNormalUser = true; extraGroups = [ "wheel" ]; diff --git a/common/steam.nix b/common/gaming.nix similarity index 80% rename from common/steam.nix rename to common/gaming.nix index 27e12ba..91c2ccd 100644 --- a/common/steam.nix +++ b/common/gaming.nix @@ -1,5 +1,4 @@ -{ lib, config, pkgs, ... }: - +{ config, lib, pkgs, ... }: { programs.steam = { enable = true; @@ -9,5 +8,8 @@ environment.systemPackages = with pkgs; [ steam-run + prismlauncher + xonotic + minetest ]; } diff --git a/common/minecraft.nix b/common/minecraft.nix deleted file mode 100644 index 673cbbd..0000000 --- a/common/minecraft.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - prismlauncher - ]; -}