diff options
Diffstat (limited to 'modules/nixos/desktop')
| -rw-r--r-- | modules/nixos/desktop/audio.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/desktop/budgie/default.nix | 3 | ||||
| -rw-r--r-- | modules/nixos/desktop/fonts.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/desktop/gnome/default.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/desktop/plasma/default.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/desktop/programs.nix | 1 |
6 files changed, 12 insertions, 3 deletions
diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix index 06ce693..6361687 100644 --- a/modules/nixos/desktop/audio.nix +++ b/modules/nixos/desktop/audio.nix @@ -6,11 +6,15 @@ in options.desktop.audio = { enable = lib.mkEnableOption "desktop audio configuration" // { default = config.desktop.enable; + defaultText = lib.literalExpression "config.desktop.enable"; }; }; config = lib.mkIf cfg.enable { + # we only want pipewire hardware.pulseaudio.enable = false; + + # this is recommended for both, though security.rtkit.enable = true; services = { diff --git a/modules/nixos/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix index fb97877..e8bfbb9 100644 --- a/modules/nixos/desktop/budgie/default.nix +++ b/modules/nixos/desktop/budgie/default.nix @@ -10,6 +10,7 @@ in { options.desktop.budgie.enable = lib.mkEnableOption "Budgie desktop"; + # TODO: improve this module config = lib.mkIf cfg.enable { environment = { budgie.excludePackages = with pkgs; [ @@ -42,6 +43,7 @@ in }; services.xserver = { + # fedora uses these by default displayManager.lightdm.greeters.slick = { theme = { name = "Materia-dark"; @@ -55,6 +57,7 @@ in desktopManager.budgie = { enable = true; + # make sure we actually use the above themes extraGSettingsOverrides = '' [org.gnome.desktop.interface:Budgie] color-scheme='prefer-dark' diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix index d85af17..ebaeca1 100644 --- a/modules/nixos/desktop/fonts.nix +++ b/modules/nixos/desktop/fonts.nix @@ -11,6 +11,7 @@ in options.desktop.fonts = { enable = lib.mkEnableOption "desktop fonts" // { default = config.desktop.enable; + defaultText = lib.literalExpression "config.desktop.enable"; }; }; diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix index 1763e6b..080320f 100644 --- a/modules/nixos/desktop/gnome/default.nix +++ b/modules/nixos/desktop/gnome/default.nix @@ -22,7 +22,7 @@ in }; systemPackages = with pkgs; [ - adw-gtk3 + adw-gtk3 # make gtk3 apps look good blackbox-terminal celluloid ]; diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index 7c43907..c869b6e 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -24,8 +24,8 @@ in }; systemPackages = [ - pkgs.haruna - inputs.krunner-nix.packages.${pkgs.system}.default + pkgs.haruna # mpv frontend + inputs.krunner-nix.packages.${pkgs.system}.default # thank you leah ]; }; diff --git a/modules/nixos/desktop/programs.nix b/modules/nixos/desktop/programs.nix index 4b5f8e1..60d4735 100644 --- a/modules/nixos/desktop/programs.nix +++ b/modules/nixos/desktop/programs.nix @@ -11,6 +11,7 @@ in options.desktop.defaultPrograms = { enable = lib.mkEnableOption "default desktop programs" // { default = config.desktop.enable; + defaultText = lib.literalExpression "config.desktop.enable"; }; }; |
