diff options
-rw-r--r-- | modules/module-list.nix | 1 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 1 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/packages.nix | 1 | ||||
-rw-r--r-- | modules/user/aszlig/programs/mpv/default.nix | 24 | ||||
-rw-r--r-- | overrides/default.nix | 10 |
5 files changed, 27 insertions, 10 deletions
diff --git a/modules/module-list.nix b/modules/module-list.nix index a67365bc..37c4ebc7 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -3,6 +3,7 @@ ./user/aszlig/profiles/workstation ./user/aszlig/programs/gajim ./user/aszlig/programs/git + ./user/aszlig/programs/mpv ./user/aszlig/programs/vim ./user/aszlig/programs/zsh ./user/aszlig/services/i3 diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index 14f21617..0c7c4f75 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -53,6 +53,7 @@ in { vuizvui.user.aszlig.services.vlock.enable = true; vuizvui.user.aszlig.programs.gajim.enable = true; + vuizvui.user.aszlig.programs.mpv.enable = true; vuizvui.user.aszlig.programs.git.enable = true; vuizvui.user.aszlig.programs.git.config = { diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix index 96331c17..5b60ac21 100644 --- a/modules/user/aszlig/profiles/workstation/packages.nix +++ b/modules/user/aszlig/profiles/workstation/packages.nix @@ -44,7 +44,6 @@ pkgs: with pkgs; [ mosh mp3info mpg321 - mpv mtr mutt ncdu diff --git a/modules/user/aszlig/programs/mpv/default.nix b/modules/user/aszlig/programs/mpv/default.nix new file mode 100644 index 00000000..1e412c71 --- /dev/null +++ b/modules/user/aszlig/programs/mpv/default.nix @@ -0,0 +1,24 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.vuizvui.user.aszlig.programs.mpv; + + patchedMpv = overrideDerivation pkgs.mpv (o: { + installPhase = o.installPhase + '' + cat > "$out/etc/mpv/mpv.conf" <<CONFIG + ao=pulse + CONFIG + ''; + }); + +in { + options.vuizvui.user.aszlig.programs.mpv = { + enable = mkEnableOption "aszlig's MPV"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ patchedMpv ]; + }; +} diff --git a/overrides/default.nix b/overrides/default.nix index 2712c801..9e736c62 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -22,15 +22,7 @@ let }; # derivation overrides - drvOverrides = mapOverride overrideDerivation argOverrides { - mpv = o: { - installPhase = o.installPhase + '' - cat > "$out/etc/mpv/mpv.conf" <<CONFIG - ao=pulse - CONFIG - ''; - }; - }; + drvOverrides = mapOverride overrideDerivation argOverrides {}; # misc misc = { |