From 0957b051ef4befd86ce97deef04f5095bea9543b Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 20 Feb 2023 01:53:23 -0500 Subject: start using nixpkgs-fmt --- hosts/common/desktop/default.nix | 45 ++++++++++++++++++++-------------------- hosts/common/desktop/gnome.nix | 30 +++++++++++++-------------- hosts/common/desktop/plasma.nix | 24 ++++++++++----------- 3 files changed, 50 insertions(+), 49 deletions(-) (limited to 'hosts/common/desktop') diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix index 3f6aba7..3496df9 100644 --- a/hosts/common/desktop/default.nix +++ b/hosts/common/desktop/default.nix @@ -1,25 +1,26 @@ +{ lib +, desktop +, ... +}: +let + gui = desktop != ""; +in { - lib, - desktop, - ... -}: let - gui = desktop != ""; -in { - imports = - [] - ++ ( - if (desktop == "gnome") - then [./gnome.nix] - else [] - ) - ++ ( - if (desktop == "plasma") - then [./plasma.nix] - else [] - ); + imports = + [ ] + ++ ( + if (desktop == "gnome") + then [ ./gnome.nix ] + else [ ] + ) + ++ ( + if (desktop == "plasma") + then [ ./plasma.nix ] + else [ ] + ); - environment.noXlibs = lib.mkForce false; - programs.xwayland.enable = gui; - services.xserver.enable = gui; - xdg.portal.enable = gui; + environment.noXlibs = lib.mkForce false; + programs.xwayland.enable = gui; + services.xserver.enable = gui; + xdg.portal.enable = gui; } diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix index e3f8b21..f8d59a5 100644 --- a/hosts/common/desktop/gnome.nix +++ b/hosts/common/desktop/gnome.nix @@ -1,17 +1,17 @@ -{pkgs, ...}: { - environment = { - gnome.excludePackages = with pkgs; [ - epiphany - gnome-tour - ]; - systemPackages = with pkgs; [ - adw-gtk3 - blackbox-terminal - ]; - }; +{ pkgs, ... }: { + environment = { + gnome.excludePackages = with pkgs; [ + epiphany + gnome-tour + ]; + systemPackages = with pkgs; [ + adw-gtk3 + blackbox-terminal + ]; + }; - services.xserver = { - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; + services.xserver = { + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + }; } diff --git a/hosts/common/desktop/plasma.nix b/hosts/common/desktop/plasma.nix index 80514fd..cd31983 100644 --- a/hosts/common/desktop/plasma.nix +++ b/hosts/common/desktop/plasma.nix @@ -1,13 +1,13 @@ -{pkgs, ...}: { - services.xserver = { - displayManager.sddm.enable = true; - desktopManager.plasma5 = { - enable = true; - excludePackages = with pkgs.libsForQt5; [ - khelpcenter - plasma-browser-integration - print-manager - ]; - }; - }; +{ pkgs, ... }: { + services.xserver = { + displayManager.sddm.enable = true; + desktopManager.plasma5 = { + enable = true; + excludePackages = with pkgs.libsForQt5; [ + khelpcenter + plasma-browser-integration + print-manager + ]; + }; + }; } -- cgit v1.2.3