diff options
| author | seth <[email protected]> | 2024-06-30 09:56:30 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2024-06-30 10:23:04 -0400 |
| commit | 088facf700946cb8f2d96c6089185bdc2a67180a (patch) | |
| tree | c5b4e4cffbb3ee4ad2498c2251892bd457e9d3c7 /modules/nixos/desktop | |
| parent | 5d3045a0769af3a94fba7b5cf646e8498aaef595 (diff) | |
alejandra -> nixfmt-rfc-style
Diffstat (limited to 'modules/nixos/desktop')
| -rw-r--r-- | modules/nixos/desktop/audio.nix | 14 | ||||
| -rw-r--r-- | modules/nixos/desktop/budgie/default.nix | 6 | ||||
| -rw-r--r-- | modules/nixos/desktop/default.nix | 14 | ||||
| -rw-r--r-- | modules/nixos/desktop/fonts.nix | 26 | ||||
| -rw-r--r-- | modules/nixos/desktop/gnome/default.nix | 6 | ||||
| -rw-r--r-- | modules/nixos/desktop/plasma/default.nix | 6 | ||||
| -rw-r--r-- | modules/nixos/desktop/programs.nix | 15 |
7 files changed, 53 insertions, 34 deletions
diff --git a/modules/nixos/desktop/audio.nix b/modules/nixos/desktop/audio.nix index 1e47ab2..8e0c069 100644 --- a/modules/nixos/desktop/audio.nix +++ b/modules/nixos/desktop/audio.nix @@ -1,13 +1,13 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.desktop.audio; enable = config.desktop.enable && cfg.enable; -in { +in +{ options.desktop.audio = { - enable = lib.mkEnableOption "desktop audio configuration" // {default = true;}; + enable = lib.mkEnableOption "desktop audio configuration" // { + default = true; + }; }; config = lib.mkIf enable { diff --git a/modules/nixos/desktop/budgie/default.nix b/modules/nixos/desktop/budgie/default.nix index dbd3715..dce24b4 100644 --- a/modules/nixos/desktop/budgie/default.nix +++ b/modules/nixos/desktop/budgie/default.nix @@ -3,9 +3,11 @@ lib, pkgs, ... -}: let +}: +let cfg = config.desktop.budgie; -in { +in +{ options.desktop.budgie.enable = lib.mkEnableOption "budgie desktop"; config = lib.mkIf cfg.enable { diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 17392c4..83a4fba 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,10 +1,8 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.desktop; -in { +in +{ options.desktop = { enable = lib.mkEnableOption "desktop settings"; }; @@ -19,7 +17,5 @@ in { ./plasma ]; - config = lib.mkIf cfg.enable { - services.xserver.enable = true; - }; + config = lib.mkIf cfg.enable { services.xserver.enable = true; }; } diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/desktop/fonts.nix index 212f88c..f6df64c 100644 --- a/modules/nixos/desktop/fonts.nix +++ b/modules/nixos/desktop/fonts.nix @@ -3,12 +3,16 @@ lib, pkgs, ... -}: let +}: +let cfg = config.desktop.fonts; enable = config.desktop.enable && cfg.enable; -in { +in +{ options.desktop.fonts = { - enable = lib.mkEnableOption "desktop fonts" // {default = true;}; + enable = lib.mkEnableOption "desktop fonts" // { + default = true; + }; }; config = lib.mkIf enable { @@ -16,7 +20,13 @@ in { enableDefaultPackages = true; packages = with pkgs; [ - (nerdfonts.override {fonts = ["FiraCode" "Hack" "Noto"];}) + (nerdfonts.override { + fonts = [ + "FiraCode" + "Hack" + "Noto" + ]; + }) noto-fonts noto-fonts-extra noto-fonts-color-emoji @@ -27,10 +37,10 @@ in { enable = true; cache32Bit = lib.mkDefault true; defaultFonts = lib.mkDefault { - serif = ["Noto Serif"]; - sansSerif = ["Noto Sans"]; - emoji = ["Noto Color Emoji"]; - monospace = ["Noto Sans Mono"]; + serif = [ "Noto Serif" ]; + sansSerif = [ "Noto Sans" ]; + emoji = [ "Noto Color Emoji" ]; + monospace = [ "Noto Sans Mono" ]; }; }; }; diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix index 8822bd4..1763e6b 100644 --- a/modules/nixos/desktop/gnome/default.nix +++ b/modules/nixos/desktop/gnome/default.nix @@ -3,9 +3,11 @@ lib, pkgs, ... -}: let +}: +let cfg = config.desktop.gnome; -in { +in +{ options.desktop.gnome.enable = lib.mkEnableOption "GNOME desktop"; config = lib.mkIf cfg.enable { diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index b6e06da..7c43907 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -4,9 +4,11 @@ pkgs, inputs, ... -}: let +}: +let cfg = config.desktop.plasma; -in { +in +{ options.desktop.plasma.enable = lib.mkEnableOption "Plasma desktop"; config = lib.mkIf cfg.enable { diff --git a/modules/nixos/desktop/programs.nix b/modules/nixos/desktop/programs.nix index 94bde49..15ddbcc 100644 --- a/modules/nixos/desktop/programs.nix +++ b/modules/nixos/desktop/programs.nix @@ -3,18 +3,25 @@ lib, pkgs, ... -}: let +}: +let cfg = config.desktop.defaultPrograms; enable = config.desktop.enable && cfg.enable; -in { +in +{ options.desktop.defaultPrograms = { - enable = lib.mkEnableOption "default desktop programs" // {default = true;}; + enable = lib.mkEnableOption "default desktop programs" // { + default = true; + }; }; config = lib.mkIf enable { environment = { noXlibs = lib.mkForce false; - systemPackages = with pkgs; [wl-clipboard xclip]; + systemPackages = with pkgs; [ + wl-clipboard + xclip + ]; }; programs = { |
