From a5faa62d561e4839ac3f10862c85c06a3707acfe Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Mon, 22 Jan 2024 18:01:46 -0500 Subject: [PATCH] global/kitty,mpd: disable when not in graphical environment --- users/modules/global/kitty.nix | 33 +++++++++++++++++-------------- users/modules/global/mpd.nix | 36 ++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/users/modules/global/kitty.nix b/users/modules/global/kitty.nix index 060e587..23617ba 100644 --- a/users/modules/global/kitty.nix +++ b/users/modules/global/kitty.nix @@ -1,19 +1,22 @@ -{ pkgs, ... }: { - programs.kitty = { - enable = true; - font = { - package = (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }); - name = "DejaVuSansMono"; - size = 12; +{ main, pkgs, lib, ... }: +{ + config = lib.mkIf main.info.graphical { + programs.kitty = { + enable = true; + font = { + package = (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }); + name = "DejaVuSansMono"; + size = 12; + }; + settings = { + confirm_os_window_close = 0; + scrollback_lines = 100000; + }; }; - settings = { - confirm_os_window_close = 0; - scrollback_lines = 100000; - }; - }; - home.shellAliases = { - ssh = "kitty +kitten ssh"; - icat = "kitty +kitten icat"; + home.shellAliases = { + ssh = "kitty +kitten ssh"; + icat = "kitty +kitten icat"; + }; }; } diff --git a/users/modules/global/mpd.nix b/users/modules/global/mpd.nix index f9bc5c8..76c10fb 100644 --- a/users/modules/global/mpd.nix +++ b/users/modules/global/mpd.nix @@ -1,22 +1,24 @@ -{ config, lib, pkgs, ... }: +{ main, config, lib, pkgs, ... }: { - services = { - mpd = { - enable = true; - extraConfig = '' - audio_output { - type "pipewire" - name "PipeWire Sound Server" - } - ''; + config = lib.mkIf main.info.graphical { + services = { + mpd = { + enable = true; + extraConfig = '' + audio_output { + type "pipewire" + name "PipeWire Sound Server" + } + ''; + }; + mpd-mpris.enable = true; + mpris-proxy.enable = true; + playerctld.enable = true; }; - mpd-mpris.enable = true; - mpris-proxy.enable = true; - playerctld.enable = true; - }; - home.packages = with pkgs; [ - playerctl - ]; + home.packages = with pkgs; [ + playerctl + ]; + }; }