From b2372a73d7a3b0a08adba03299c7980767c0f50d Mon Sep 17 00:00:00 2001 From: schererleander Date: Tue, 3 Feb 2026 20:11:02 +0100 Subject: style(modules): format with nixfmt --- modules/nixos/desktop/cinnamon/default.nix | 7 +++- modules/nixos/desktop/gnome/default.nix | 15 +++++++-- modules/nixos/dns/default.nix | 51 ++++++++++++++++++------------ modules/nixos/hardware/printer/default.nix | 7 +++- modules/nixos/hardware/wooting/default.nix | 7 +++- modules/nixos/mullvad-vpn/default.nix | 7 +++- modules/nixos/openssh/default.nix | 7 +++- modules/nixos/server/nextcloud/default.nix | 11 +++---- modules/nixos/server/nginx/default.nix | 7 +++- modules/nixos/server/openssh/default.nix | 12 +++---- 10 files changed, 89 insertions(+), 42 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/desktop/cinnamon/default.nix b/modules/nixos/desktop/cinnamon/default.nix index 2561bdb..f86434b 100644 --- a/modules/nixos/desktop/cinnamon/default.nix +++ b/modules/nixos/desktop/cinnamon/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkEnableOption mkIf mkForce; cfg = config.nx.desktop.cinnamon; diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix index 9ffd353..3be22d5 100644 --- a/modules/nixos/desktop/gnome/default.nix +++ b/modules/nixos/desktop/gnome/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkEnableOption mkIf; cfg = config.nx.desktop.gnome; @@ -13,10 +18,14 @@ in services.gnome.games.enable = false; environment.gnome.excludePackages = with pkgs; [ - gnome-tour gnome-user-docs epiphany + gnome-tour + gnome-user-docs + epiphany ]; environment.systemPackages = with pkgs; [ - gnomeExtensions.pop-shell gnomeExtensions.blur-my-shell gnome-tweaks + gnomeExtensions.pop-shell + gnomeExtensions.blur-my-shell + gnome-tweaks ]; }; } diff --git a/modules/nixos/dns/default.nix b/modules/nixos/dns/default.nix index ac80e5c..0cc1766 100644 --- a/modules/nixos/dns/default.nix +++ b/modules/nixos/dns/default.nix @@ -1,6 +1,12 @@ { config, lib, ... }: let - inherit (lib) mkEnableOption mkOption types mkIf concatStringsSep; + inherit (lib) + mkEnableOption + mkOption + types + mkIf + concatStringsSep + ; cfg = config.nx.dns; in { @@ -17,31 +23,34 @@ in }; fallbackServers = mkOption { type = types.listOf types.str; - default = [ "8.8.8.8#dns.google" "8.8.4.4#dns.google" ]; + default = [ + "8.8.8.8#dns.google" + "8.8.4.4#dns.google" + ]; }; }; - config = mkIf cfg.enable { - services.resolved = { - enable = true; - settings = { - Resolve = { - DNS = cfg.servers; - FallbackDNS = cfg.fallbackServers; - DNSSEC = true; - DNSOverTLS = true; - Domains = [ "~." ]; - }; + config = mkIf cfg.enable { + services.resolved = { + enable = true; + settings = { + Resolve = { + DNS = cfg.servers; + FallbackDNS = cfg.fallbackServers; + DNSSEC = true; + DNSOverTLS = true; + Domains = [ "~." ]; }; }; - networking = { - nameservers = cfg.servers; - networkmanager.dns = lib.mkDefault "systemd-resolved"; - }; - systemd.services.systemd-resolved.environment = { - DNS = concatStringsSep " " cfg.servers; - FallbackDNS = concatStringsSep " " cfg.fallbackServers; - }; }; + networking = { + nameservers = cfg.servers; + networkmanager.dns = lib.mkDefault "systemd-resolved"; + }; + systemd.services.systemd-resolved.environment = { + DNS = concatStringsSep " " cfg.servers; + FallbackDNS = concatStringsSep " " cfg.fallbackServers; + }; + }; } diff --git a/modules/nixos/hardware/printer/default.nix b/modules/nixos/hardware/printer/default.nix index 749c766..09b6da4 100644 --- a/modules/nixos/hardware/printer/default.nix +++ b/modules/nixos/hardware/printer/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkEnableOption mkIf; cfg = config.nx.hardware.printer; diff --git a/modules/nixos/hardware/wooting/default.nix b/modules/nixos/hardware/wooting/default.nix index 62a4b78..7f6e3c6 100644 --- a/modules/nixos/hardware/wooting/default.nix +++ b/modules/nixos/hardware/wooting/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkEnableOption mkIf; cfg = config.nx.hardware.wooting; diff --git a/modules/nixos/mullvad-vpn/default.nix b/modules/nixos/mullvad-vpn/default.nix index d2c18b1..0c12d17 100644 --- a/modules/nixos/mullvad-vpn/default.nix +++ b/modules/nixos/mullvad-vpn/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkEnableOption mkIf; cfg = config.nx.mullvad-vpn; diff --git a/modules/nixos/openssh/default.nix b/modules/nixos/openssh/default.nix index 22f7df5..a37dfec 100644 --- a/modules/nixos/openssh/default.nix +++ b/modules/nixos/openssh/default.nix @@ -1,6 +1,11 @@ { config, lib, ... }: let - inherit (lib) mkEnableOption mkOption types mkIf; + inherit (lib) + mkEnableOption + mkOption + types + mkIf + ; cfg = config.nx.services.openssh; in { diff --git a/modules/nixos/server/nextcloud/default.nix b/modules/nixos/server/nextcloud/default.nix index 11d5ea9..3fba5c8 100644 --- a/modules/nixos/server/nextcloud/default.nix +++ b/modules/nixos/server/nextcloud/default.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkEnableOption mkIf mkDefault; + inherit (lib) mkEnableOption mkIf; cfg = config.nx.server.nextcloud; in { @@ -47,9 +47,9 @@ in # Non default #"OC\\Preview\\Font" "OC\\Preview\\HEIC" - #"OC\\Preview\\MP3" - #"OC\\Preview\\Movie" - #"OC\\Preview\\PDF" + "OC\\Preview\\MP3" + "OC\\Preview\\Movie" + "OC\\Preview\\PDF" #"OC\\Preview\\SVG" ]; }; @@ -113,7 +113,7 @@ in services.fail2ban = { enable = true; - bantime = lib.mkDefault "1h"; + bantime = lib.mkDefault "1h"; jails = { nextcloud = { enabled = true; @@ -145,4 +145,3 @@ in }; }; } - diff --git a/modules/nixos/server/nginx/default.nix b/modules/nixos/server/nginx/default.nix index 2bdaba1..cf97109 100644 --- a/modules/nixos/server/nginx/default.nix +++ b/modules/nixos/server/nginx/default.nix @@ -4,7 +4,12 @@ ... }: let - inherit (lib) mkEnableOption mkOption types mkIf; + inherit (lib) + mkEnableOption + mkOption + types + mkIf + ; cfg = config.nx.server.nginx; in { diff --git a/modules/nixos/server/openssh/default.nix b/modules/nixos/server/openssh/default.nix index ac23d28..0972e66 100644 --- a/modules/nixos/server/openssh/default.nix +++ b/modules/nixos/server/openssh/default.nix @@ -17,17 +17,17 @@ in services.openssh = { enable = true; ports = [ 8693 ]; - settings = { - PasswordAuthentication = false; - X11Forwarding = false; - PermitRootLogin = "yes"; - }; + settings = { + PasswordAuthentication = false; + X11Forwarding = false; + PermitRootLogin = "yes"; + }; }; networking.firewall.allowedTCPPorts = [ 8693 ]; services.fail2ban = { enable = true; - bantime = lib.mkDefault "1h"; + bantime = lib.mkDefault "1h"; jails = { sshd = { enabled = true; -- cgit v1.3.1