code cleanup with nixfmt

This commit is contained in:
Aly Raffauf 2024-03-28 16:40:23 -04:00
parent 0e05713778
commit aa64f93930
19 changed files with 40 additions and 41 deletions

View file

@ -68,7 +68,7 @@
}; };
programs.nnn.enable = true; programs.nnn.enable = true;
programs.rbw.enable = true; programs.rbw.enable = true;
programs.tmux = { programs.tmux = {

View file

@ -1,6 +1,5 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./flatpak ./steam ]; imports = [ ./flatpak ./steam ];
} }

View file

@ -1,7 +1,8 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
apps.flatpak.enable = lib.mkEnableOption "Enables flatpak support with GUI."; apps.flatpak.enable =
lib.mkEnableOption "Enables flatpak support with GUI.";
}; };
config = lib.mkIf config.apps.flatpak.enable { config = lib.mkIf config.apps.flatpak.enable {

View file

@ -3,4 +3,4 @@
{ {
imports = [ ./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig ]; imports = [ ./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig ];
} }

View file

@ -1,10 +1,9 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./gnome ./plasma ./windowManagers/hyprland ]; imports = [ ./gnome ./plasma ./windowManagers/hyprland ];
options = { options = {
desktopConfig.enable = desktopConfig.enable =
lib.mkEnableOption "Enables basic GUI X11 and Wayland environment."; lib.mkEnableOption "Enables basic GUI X11 and Wayland environment.";
}; };
@ -16,7 +15,7 @@
xkb.variant = ""; xkb.variant = "";
excludePackages = with pkgs; [ xterm ]; excludePackages = with pkgs; [ xterm ];
}; };
# Install pretty fonts. # Install pretty fonts.
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "Hack" "DroidSansMono" "Noto" ]; }) (nerdfonts.override { fonts = [ "Hack" "DroidSansMono" "Noto" ]; })
@ -40,4 +39,4 @@
desktopConfig.windowManagers.hyprland.enable = lib.mkDefault true; desktopConfig.windowManagers.hyprland.enable = lib.mkDefault true;
}; };
} }

View file

@ -1,11 +1,12 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ # Include X settings. imports = [ # Include X settings.
./fprintdFix.nix ./tripleBuffering.nix ./fprintdFix.nix
./tripleBuffering.nix
]; ];
options = { options = {
desktopConfig.gnome.enable = desktopConfig.gnome.enable =
lib.mkEnableOption "Enables GNOME desktop session."; lib.mkEnableOption "Enables GNOME desktop session.";
}; };
@ -34,4 +35,4 @@
}; };
}; };
}; };
} }

View file

@ -1,8 +1,8 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
desktopConfig.gnome.fprintdFix.enable = desktopConfig.gnome.fprintdFix.enable = lib.mkEnableOption
lib.mkEnableOption "Fixes fprintd and pam issues with GNOME Display Manager."; "Fixes fprintd and pam issues with GNOME Display Manager.";
}; };
config = lib.mkIf config.desktopConfig.gnome.fprintdFix.enable { config = lib.mkIf config.desktopConfig.gnome.fprintdFix.enable {
@ -30,4 +30,4 @@
''; '';
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
desktopConfig.gnome.tripleBuffering.enable = desktopConfig.gnome.tripleBuffering.enable =
lib.mkEnableOption "Enables dynamic triple buffering for GNOME."; lib.mkEnableOption "Enables dynamic triple buffering for GNOME.";
}; };
@ -21,4 +21,4 @@
}) })
]; ];
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
desktopConfig.plasma.enable = desktopConfig.plasma.enable =
lib.mkEnableOption "Enables plasma desktop session."; lib.mkEnableOption "Enables plasma desktop session.";
}; };
@ -33,4 +33,4 @@
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.sddm.enableGnomeKeyring = true; security.pam.services.sddm.enableGnomeKeyring = true;
}; };
} }

View file

@ -1,8 +1,8 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
desktopConfig.windowManagers.hyprland.enable = desktopConfig.windowManagers.hyprland.enable = lib.mkEnableOption
lib.mkEnableOption "Enables hyprland window manager session with lightdm."; "Enables hyprland window manager session with lightdm.";
}; };
config = lib.mkIf config.desktopConfig.windowManagers.hyprland.enable { config = lib.mkIf config.desktopConfig.windowManagers.hyprland.enable {
@ -49,4 +49,4 @@
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
}; };
} }

View file

@ -1,8 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
homeLab.binaryCache.enable = homeLab.binaryCache.enable = lib.mkEnableOption "Enables nixpkgs cache.";
lib.mkEnableOption "Enables nixpkgs cache.";
}; };
config = lib.mkIf config.homeLab.binaryCache.enable { config = lib.mkIf config.homeLab.binaryCache.enable {
@ -11,4 +10,4 @@
secretKeyFile = "/var/cache-priv-key.pem"; secretKeyFile = "/var/cache-priv-key.pem";
}; };
}; };
} }

View file

@ -10,8 +10,7 @@
]; ];
options = { options = {
homeLab.enable = homeLab.enable = lib.mkEnableOption "Enables fully functional HomeLab.";
lib.mkEnableOption "Enables fully functional HomeLab.";
}; };
config = lib.mkIf config.homeLab.enable { config = lib.mkIf config.homeLab.enable {
@ -22,4 +21,4 @@
homeLab.samba.enable = lib.mkDefault true; homeLab.samba.enable = lib.mkDefault true;
homeLab.virtualization.enable = lib.mkDefault true; homeLab.virtualization.enable = lib.mkDefault true;
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
homeLab.nixContainers.enable = homeLab.nixContainers.enable =
lib.mkEnableOption "Enables select nix containers."; lib.mkEnableOption "Enables select nix containers.";
}; };
@ -26,4 +26,4 @@
}; };
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
homeLab.ociContainers.enable = homeLab.ociContainers.enable =
lib.mkEnableOption "Enables select OCI containers."; lib.mkEnableOption "Enables select OCI containers.";
}; };
@ -52,4 +52,4 @@
}; };
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
homeLab.reverseProxy.enable = homeLab.reverseProxy.enable =
lib.mkEnableOption "Enables nginx reverse proxy."; lib.mkEnableOption "Enables nginx reverse proxy.";
}; };
@ -88,4 +88,4 @@
}; };
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
homeLab.samba.enable = homeLab.samba.enable =
lib.mkEnableOption "Enables /Archive and /Media samba shares."; lib.mkEnableOption "Enables /Archive and /Media samba shares.";
}; };
@ -38,4 +38,4 @@
}; };
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
homeLab.virtualization.enable = homeLab.virtualization.enable =
lib.mkEnableOption "Enables podman and virt-manager virtualization."; lib.mkEnableOption "Enables podman and virt-manager virtualization.";
}; };
@ -18,4 +18,4 @@
}; };
}; };
}; };
} }

View file

@ -1,7 +1,8 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
options = { options = {
systemConfig.plymouth.enable = lib.mkEnableOption "Enables plymouth boot screen with reduced text verbosity."; systemConfig.plymouth.enable = lib.mkEnableOption
"Enables plymouth boot screen with reduced text verbosity.";
}; };
config = lib.mkIf config.systemConfig.plymouth.enable { config = lib.mkIf config.systemConfig.plymouth.enable {

View file

@ -6,8 +6,8 @@
config = lib.mkIf config.systemConfig.zramSwap.enable { config = lib.mkIf config.systemConfig.zramSwap.enable {
zramSwap = { zramSwap = {
enable = true; enable = true;
memoryPercent = 25; memoryPercent = 25;
}; };
}; };
} }