diff options
| author | Franck Cuny <franck@fcuny.net> | 2022-06-09 09:03:40 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2022-06-09 09:33:48 -0700 |
| commit | 11ec444ec77ec913d0aff34b19a58bb0308904f7 (patch) | |
| tree | 3ab50a3a0dd3b6516ba485cf0349c6fca888befc | |
| parent | ref(sane): move sane's configuration to correct place (diff) | |
| download | world-11ec444ec77ec913d0aff34b19a58bb0308904f7.tar.gz | |
ref(multimedia): move multimedia modules to hosts
Consume the modules related to multimedia applications at the host level, instead of having a level of indirection with a profile. Change-Id: I567f0e01cbfe591beaa2e9086e33434402a4a002 Reviewed-on: https://cl.fcuny.net/c/world/+/292 Reviewed-by: Franck Cuny <franck@fcuny.net>
| -rw-r--r-- | hosts/aptos/home.nix | 3 | ||||
| -rw-r--r-- | hosts/aptos/profile.nix | 1 | ||||
| -rw-r--r-- | hosts/carmel/home.nix | 9 | ||||
| -rw-r--r-- | profiles/default.nix | 2 | ||||
| -rw-r--r-- | profiles/multimedia/default.nix | 12 |
5 files changed, 10 insertions, 17 deletions
diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix index d7a6545..c7ef977 100644 --- a/hosts/aptos/home.nix +++ b/hosts/aptos/home.nix @@ -10,5 +10,8 @@ scanner.enable = true; tmux.enable = true; yt-dlp.enable = true; + vlc.enable = true; + mpv.enable = true; + sublime-music.enable = true; }; } diff --git a/hosts/aptos/profile.nix b/hosts/aptos/profile.nix index b807f24..3195d52 100644 --- a/hosts/aptos/profile.nix +++ b/hosts/aptos/profile.nix @@ -2,7 +2,6 @@ my.profiles = { desktop.enable = true; - multimedia.enable = true; trusted.enable = true; }; } diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix index 231aebd..c7ef977 100644 --- a/hosts/carmel/home.nix +++ b/hosts/carmel/home.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { my.home = { packages.enable = true; + bluetooth.enable = true; + element.enable = true; zsh.enable = true; git.enable = true; go.enable = true; @@ -10,5 +10,8 @@ scanner.enable = true; tmux.enable = true; yt-dlp.enable = true; + vlc.enable = true; + mpv.enable = true; + sublime-music.enable = true; }; } diff --git a/profiles/default.nix b/profiles/default.nix index df86fe6..059b945 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./gtk ./trusted ./wm ./desktop ./multimedia ]; } +{ ... }: { imports = [ ./gtk ./trusted ./wm ./desktop ]; } diff --git a/profiles/multimedia/default.nix b/profiles/multimedia/default.nix deleted file mode 100644 index 4c1d3fe..0000000 --- a/profiles/multimedia/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: -let cfg = config.my.profiles.multimedia; -in { - options.my.profiles.multimedia = with lib; { - enable = mkEnableOption "multimedia profile"; - }; - config = lib.mkIf cfg.enable { - my.home.vlc.enable = true; - my.home.mpv.enable = true; - my.home.sublime-music.enable = true; - }; -} |