From aa64f939300808cd44b3a719ded093a5000c31de Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 28 Mar 2024 16:40:23 -0400 Subject: [PATCH] code cleanup with nixfmt --- home/shell/default.nix | 2 +- nixosModules/apps/default.nix | 3 +-- nixosModules/apps/flatpak/default.nix | 3 ++- nixosModules/default.nix | 2 +- nixosModules/desktopConfig/default.nix | 7 +++---- nixosModules/desktopConfig/gnome/default.nix | 7 ++++--- nixosModules/desktopConfig/gnome/fprintdFix.nix | 6 +++--- nixosModules/desktopConfig/gnome/tripleBuffering.nix | 4 ++-- nixosModules/desktopConfig/plasma/default.nix | 4 ++-- .../desktopConfig/windowManagers/hyprland/default.nix | 6 +++--- nixosModules/homeLab/binaryCache/default.nix | 5 ++--- nixosModules/homeLab/default.nix | 5 ++--- nixosModules/homeLab/nixContainers/default.nix | 4 ++-- nixosModules/homeLab/ociContainers/default.nix | 4 ++-- nixosModules/homeLab/reverseProxy/default.nix | 4 ++-- nixosModules/homeLab/samba/default.nix | 4 ++-- nixosModules/homeLab/virtualization/default.nix | 4 ++-- nixosModules/systemConfig/plymouth/default.nix | 3 ++- nixosModules/systemConfig/zramSwap/default.nix | 4 ++-- 19 files changed, 40 insertions(+), 41 deletions(-) diff --git a/home/shell/default.nix b/home/shell/default.nix index a686f7aa..e5513d59 100644 --- a/home/shell/default.nix +++ b/home/shell/default.nix @@ -68,7 +68,7 @@ }; programs.nnn.enable = true; - + programs.rbw.enable = true; programs.tmux = { diff --git a/nixosModules/apps/default.nix b/nixosModules/apps/default.nix index 29ae006b..b3e4dd5e 100644 --- a/nixosModules/apps/default.nix +++ b/nixosModules/apps/default.nix @@ -1,6 +1,5 @@ { pkgs, lib, config, ... }: { - imports = [ ./flatpak ./steam ]; -} \ No newline at end of file +} diff --git a/nixosModules/apps/flatpak/default.nix b/nixosModules/apps/flatpak/default.nix index de0533d4..4c0be246 100644 --- a/nixosModules/apps/flatpak/default.nix +++ b/nixosModules/apps/flatpak/default.nix @@ -1,7 +1,8 @@ { pkgs, lib, config, ... }: { 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 { diff --git a/nixosModules/default.nix b/nixosModules/default.nix index a3cb97c5..4376bf00 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -3,4 +3,4 @@ { imports = [ ./desktopConfig ./homeLab ./apps ./systemConfig ./userConfig ]; -} \ No newline at end of file +} diff --git a/nixosModules/desktopConfig/default.nix b/nixosModules/desktopConfig/default.nix index f3412550..87f7e21f 100644 --- a/nixosModules/desktopConfig/default.nix +++ b/nixosModules/desktopConfig/default.nix @@ -1,10 +1,9 @@ { pkgs, lib, config, ... }: { - imports = [ ./gnome ./plasma ./windowManagers/hyprland ]; options = { - desktopConfig.enable = + desktopConfig.enable = lib.mkEnableOption "Enables basic GUI X11 and Wayland environment."; }; @@ -16,7 +15,7 @@ xkb.variant = ""; excludePackages = with pkgs; [ xterm ]; }; - + # Install pretty fonts. fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "Hack" "DroidSansMono" "Noto" ]; }) @@ -40,4 +39,4 @@ desktopConfig.windowManagers.hyprland.enable = lib.mkDefault true; }; -} \ No newline at end of file +} diff --git a/nixosModules/desktopConfig/gnome/default.nix b/nixosModules/desktopConfig/gnome/default.nix index 8a336466..4a1fab50 100644 --- a/nixosModules/desktopConfig/gnome/default.nix +++ b/nixosModules/desktopConfig/gnome/default.nix @@ -1,11 +1,12 @@ { pkgs, lib, config, ... }: { imports = [ # Include X settings. - ./fprintdFix.nix ./tripleBuffering.nix + ./fprintdFix.nix + ./tripleBuffering.nix ]; options = { - desktopConfig.gnome.enable = + desktopConfig.gnome.enable = lib.mkEnableOption "Enables GNOME desktop session."; }; @@ -34,4 +35,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/desktopConfig/gnome/fprintdFix.nix b/nixosModules/desktopConfig/gnome/fprintdFix.nix index dfc2fdf0..cb4ebd1a 100644 --- a/nixosModules/desktopConfig/gnome/fprintdFix.nix +++ b/nixosModules/desktopConfig/gnome/fprintdFix.nix @@ -1,8 +1,8 @@ { pkgs, lib, config, ... }: { options = { - desktopConfig.gnome.fprintdFix.enable = - lib.mkEnableOption "Fixes fprintd and pam issues with GNOME Display Manager."; + desktopConfig.gnome.fprintdFix.enable = lib.mkEnableOption + "Fixes fprintd and pam issues with GNOME Display Manager."; }; config = lib.mkIf config.desktopConfig.gnome.fprintdFix.enable { @@ -30,4 +30,4 @@ ''; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/desktopConfig/gnome/tripleBuffering.nix b/nixosModules/desktopConfig/gnome/tripleBuffering.nix index 03e029c4..505e6883 100644 --- a/nixosModules/desktopConfig/gnome/tripleBuffering.nix +++ b/nixosModules/desktopConfig/gnome/tripleBuffering.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - desktopConfig.gnome.tripleBuffering.enable = + desktopConfig.gnome.tripleBuffering.enable = lib.mkEnableOption "Enables dynamic triple buffering for GNOME."; }; @@ -21,4 +21,4 @@ }) ]; }; -} \ No newline at end of file +} diff --git a/nixosModules/desktopConfig/plasma/default.nix b/nixosModules/desktopConfig/plasma/default.nix index a59fbdb2..271cc8f5 100644 --- a/nixosModules/desktopConfig/plasma/default.nix +++ b/nixosModules/desktopConfig/plasma/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - desktopConfig.plasma.enable = + desktopConfig.plasma.enable = lib.mkEnableOption "Enables plasma desktop session."; }; @@ -33,4 +33,4 @@ services.gnome.gnome-keyring.enable = true; security.pam.services.sddm.enableGnomeKeyring = true; }; -} \ No newline at end of file +} diff --git a/nixosModules/desktopConfig/windowManagers/hyprland/default.nix b/nixosModules/desktopConfig/windowManagers/hyprland/default.nix index c4fc5be8..7cc22097 100644 --- a/nixosModules/desktopConfig/windowManagers/hyprland/default.nix +++ b/nixosModules/desktopConfig/windowManagers/hyprland/default.nix @@ -1,8 +1,8 @@ { pkgs, lib, config, ... }: { options = { - desktopConfig.windowManagers.hyprland.enable = - lib.mkEnableOption "Enables hyprland window manager session with lightdm."; + desktopConfig.windowManagers.hyprland.enable = lib.mkEnableOption + "Enables hyprland window manager session with lightdm."; }; config = lib.mkIf config.desktopConfig.windowManagers.hyprland.enable { @@ -49,4 +49,4 @@ environment.sessionVariables.NIXOS_OZONE_WL = "1"; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/binaryCache/default.nix b/nixosModules/homeLab/binaryCache/default.nix index d7c4f864..ce4e3a7e 100644 --- a/nixosModules/homeLab/binaryCache/default.nix +++ b/nixosModules/homeLab/binaryCache/default.nix @@ -1,8 +1,7 @@ { pkgs, lib, config, ... }: { options = { - homeLab.binaryCache.enable = - lib.mkEnableOption "Enables nixpkgs cache."; + homeLab.binaryCache.enable = lib.mkEnableOption "Enables nixpkgs cache."; }; config = lib.mkIf config.homeLab.binaryCache.enable { @@ -11,4 +10,4 @@ secretKeyFile = "/var/cache-priv-key.pem"; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/default.nix b/nixosModules/homeLab/default.nix index 9ea6ec14..4c53de03 100644 --- a/nixosModules/homeLab/default.nix +++ b/nixosModules/homeLab/default.nix @@ -10,8 +10,7 @@ ]; options = { - homeLab.enable = - lib.mkEnableOption "Enables fully functional HomeLab."; + homeLab.enable = lib.mkEnableOption "Enables fully functional HomeLab."; }; config = lib.mkIf config.homeLab.enable { @@ -22,4 +21,4 @@ homeLab.samba.enable = lib.mkDefault true; homeLab.virtualization.enable = lib.mkDefault true; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/nixContainers/default.nix b/nixosModules/homeLab/nixContainers/default.nix index 7dd7aa01..56b2facf 100644 --- a/nixosModules/homeLab/nixContainers/default.nix +++ b/nixosModules/homeLab/nixContainers/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - homeLab.nixContainers.enable = + homeLab.nixContainers.enable = lib.mkEnableOption "Enables select nix containers."; }; @@ -26,4 +26,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/ociContainers/default.nix b/nixosModules/homeLab/ociContainers/default.nix index d8647de5..0e1c49f1 100644 --- a/nixosModules/homeLab/ociContainers/default.nix +++ b/nixosModules/homeLab/ociContainers/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - homeLab.ociContainers.enable = + homeLab.ociContainers.enable = lib.mkEnableOption "Enables select OCI containers."; }; @@ -52,4 +52,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/reverseProxy/default.nix b/nixosModules/homeLab/reverseProxy/default.nix index 9df7f8c2..74dd3d34 100644 --- a/nixosModules/homeLab/reverseProxy/default.nix +++ b/nixosModules/homeLab/reverseProxy/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - homeLab.reverseProxy.enable = + homeLab.reverseProxy.enable = lib.mkEnableOption "Enables nginx reverse proxy."; }; @@ -88,4 +88,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/samba/default.nix b/nixosModules/homeLab/samba/default.nix index 9424c543..e9ecb814 100644 --- a/nixosModules/homeLab/samba/default.nix +++ b/nixosModules/homeLab/samba/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - homeLab.samba.enable = + homeLab.samba.enable = lib.mkEnableOption "Enables /Archive and /Media samba shares."; }; @@ -38,4 +38,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/homeLab/virtualization/default.nix b/nixosModules/homeLab/virtualization/default.nix index f8a2fd7d..d392aa6e 100644 --- a/nixosModules/homeLab/virtualization/default.nix +++ b/nixosModules/homeLab/virtualization/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - homeLab.virtualization.enable = + homeLab.virtualization.enable = lib.mkEnableOption "Enables podman and virt-manager virtualization."; }; @@ -18,4 +18,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/nixosModules/systemConfig/plymouth/default.nix b/nixosModules/systemConfig/plymouth/default.nix index 0e2c47c3..3ae00307 100644 --- a/nixosModules/systemConfig/plymouth/default.nix +++ b/nixosModules/systemConfig/plymouth/default.nix @@ -1,7 +1,8 @@ { pkgs, lib, config, ... }: { 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 { diff --git a/nixosModules/systemConfig/zramSwap/default.nix b/nixosModules/systemConfig/zramSwap/default.nix index 1d920bec..f50f2660 100644 --- a/nixosModules/systemConfig/zramSwap/default.nix +++ b/nixosModules/systemConfig/zramSwap/default.nix @@ -6,8 +6,8 @@ config = lib.mkIf config.systemConfig.zramSwap.enable { zramSwap = { - enable = true; - memoryPercent = 25; + enable = true; + memoryPercent = 25; }; }; }