diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix index b360d14..ccf0795 100644 --- a/home/modules/linux/graphical/default.nix +++ b/home/modules/linux/graphical/default.nix @@ -28,8 +28,6 @@ in pkgs.unstable.vscode feh deluge # Torrent client - mailspring - unstable.discord pavucontrol # PulseAudio control panel unstable.slack @@ -37,7 +35,10 @@ in dex # .desktop file management, startup sct # Display color temperature xdg-utils # Open stuff - ]); + ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [ + mailspring + unstable.discord + ])); # Cursor home.pointerCursor = { diff --git a/home/modules/linux/graphical/x11.nix b/home/modules/linux/graphical/x11.nix index a24bd89..c3229a4 100644 --- a/home/modules/linux/graphical/x11.nix +++ b/home/modules/linux/graphical/x11.nix @@ -1,8 +1,16 @@ { pkgs, config, lib, ... }: +let + cfg = config.linux.graphical; +in with lib; { imports = [ ./x11/hidpi.nix ./x11/i3.nix ]; - config = mkIf (config.linux.graphical.type == "x11") { + options.linux.graphical.hasDE = mkOption { + type = types.bool; + description = "When enabled, disable stuff that already comes with a DE"; + default = true; + }; + config = mkIf (cfg.type == "x11") { # X Session settings xsession.enable = true; @@ -23,10 +31,10 @@ with lib; home.pointerCursor.x11.enable = true; # Notification system - services.X11.xfce4-notifyd.enable = true; + services.X11.xfce4-notifyd.enable = !cfg.hasDE; # Picom: X Compositor - services.picom = { + services.picom = mkIf (!cfg.hasDE) { enable = true; blur = true; fade = true;