From 3897ba30d8193468885c4e364a255657c17e1d00 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 20 Dec 2023 22:52:31 -0500 Subject: [PATCH] nixfmt changes --- hosts/game-desktop/main.nix | 8 ++++---- hosts/gerg-desktop/git.nix | 2 +- hosts/gerg-desktop/main.nix | 24 +++++++++++----------- hosts/gerg-desktop/services/ddns.nix | 10 ++++----- hosts/gerg-desktop/services/gitea.nix | 8 ++++---- hosts/gerg-desktop/services/minecraft.nix | 20 +++++++++--------- hosts/gerg-desktop/services/miniflux.nix | 16 +++++++-------- hosts/gerg-desktop/services/nextcloud.nix | 6 +++--- hosts/gerg-desktop/services/nginx.nix | 4 ++-- hosts/gerg-desktop/services/parrot.nix | 8 ++++---- hosts/gerg-desktop/services/postgresql.nix | 2 +- hosts/gerg-desktop/services/searxng.nix | 6 +++--- hosts/gerg-desktop/spicetify.nix | 6 +++--- hosts/gerg-desktop/vfio.nix | 6 +++--- hosts/gerg-desktop/zfs.nix | 24 +++++++++++----------- hosts/iso/main.nix | 2 +- hosts/media-laptop/main.nix | 4 ++-- lib/default.nix | 12 +++++------ modules/DE/dwm.nix | 6 +++--- modules/DE/gnome.nix | 2 +- modules/DE/xfce.nix | 2 +- modules/DM/autoLogin.nix | 2 +- modules/DM/lightDM.nix | 4 ++-- modules/X11.nix | 4 ++-- modules/boot.nix | 8 ++++---- modules/builders.nix | 12 +++++------ modules/hardware.nix | 2 +- modules/keys.nix | 4 ++-- modules/misc.nix | 4 ++-- modules/nix.nix | 12 +++++------ modules/shell.nix | 4 ++-- modules/sops.nix | 8 ++++---- modules/theming.nix | 8 ++++---- outputs.nix | 4 ++-- packages/images/package.nix | 2 +- packages/nixfmt/package.nix | 2 +- packages/papermc/package.nix | 4 ++-- 37 files changed, 131 insertions(+), 131 deletions(-) diff --git a/hosts/game-desktop/main.nix b/hosts/game-desktop/main.nix index 0be4e38..d2ef21d 100644 --- a/hosts/game-desktop/main.nix +++ b/hosts/game-desktop/main.nix @@ -43,7 +43,7 @@ _: inherit (pkgs.wineWowPackages) unstableFull; inherit (pkgs.libsForQt5) kdenlive; - librewolf = pkgs.librewolf.override {cfg.speechSynthesisSupport = false;}; + librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; }; }; etc = { "jdks/17".source = "${pkgs.openjdk17}/bin"; @@ -65,7 +65,7 @@ _: useDefaultShell = true; uid = 1000; isNormalUser = true; - extraGroups = ["audio"]; + extraGroups = [ "audio" ]; initialHashedPassword = ""; }; "root" = { @@ -88,7 +88,7 @@ _: modesetting.enable = true; }; services.xserver = { - videoDrivers = ["nvidia"]; + videoDrivers = [ "nvidia" ]; #disable DPMS monitorSection = '' Option "DPMS" "false" @@ -110,7 +110,7 @@ _: "xhci_pci" "ahci" ]; - kernelModules = ["kvm-amd"]; + kernelModules = [ "kvm-amd" ]; kernelPackages = pkgs.linuxPackages_latest; }; swapDevices = [ diff --git a/hosts/gerg-desktop/git.nix b/hosts/gerg-desktop/git.nix index fcd3939..bc50e7c 100644 --- a/hosts/gerg-desktop/git.nix +++ b/hosts/gerg-desktop/git.nix @@ -1,5 +1,5 @@ _: -{pkgs, config, ...}: +{ pkgs, config, ... }: { programs.git = { enable = true; diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix index eb4668f..17a54e6 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -1,5 +1,5 @@ -{nvim-flake, self, ...}: -{pkgs, config, ...}: +{ nvim-flake, self, ... }: +{ pkgs, config, ... }: { local = { remoteBuild.isBuilder = true; @@ -13,9 +13,9 @@ enable = true; kmscon.enable = true; }; - allowedUnfree = ["nvidia-x11"]; + allowedUnfree = [ "nvidia-x11" ]; }; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; hardware.nvidia = { package = config.boot.kernelPackages.nvidiaPackages.beta; nvidiaPersistenced = false; @@ -34,7 +34,7 @@ enable = true; loadInNixShell = false; silent = true; - nix-direnv.package = pkgs.nix-direnv.override {nix = config.nix.package;}; + nix-direnv.package = pkgs.nix-direnv.override { nix = config.nix.package; }; }; nix.settings.system-features = [ @@ -68,7 +68,7 @@ ; inherit (nvim-flake.packages) neovim; inherit (self.packages) lint nixfmt; - librewolf = pkgs.librewolf.override {cfg.speechSynthesisSupport = false;}; + librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; }; }; etc = { "jdks/17".source = "${pkgs.openjdk17}/bin"; @@ -101,16 +101,16 @@ networks = { "enp11s0" = { name = "enp11s0"; - bridge = ["br0"]; + bridge = [ "br0" ]; linkConfig.RequiredForOnline = "enslaved"; }; "br0" = { name = "br0"; - address = ["192.168.1.4/24"]; - gateway = ["192.168.1.1"]; - dns = ["192.168.1.1"]; + address = [ "192.168.1.4/24" ]; + gateway = [ "192.168.1.1" ]; + dns = [ "192.168.1.1" ]; DHCP = "no"; - bridgeConfig = {}; + bridgeConfig = { }; linkConfig = { MACAddress = "D8:5E:D3:E5:47:90"; RequiredForOnline = "routable"; @@ -150,7 +150,7 @@ }; }; boot = { - kernelModules = ["amdgpu"]; + kernelModules = [ "amdgpu" ]; initrd = { availableKernelModules = [ "nvme" diff --git a/hosts/gerg-desktop/services/ddns.nix b/hosts/gerg-desktop/services/ddns.nix index 6128a53..f58c5e5 100644 --- a/hosts/gerg-desktop/services/ddns.nix +++ b/hosts/gerg-desktop/services/ddns.nix @@ -1,7 +1,7 @@ _: -{config, pkgs, ...}: +{ config, pkgs, ... }: { - sops.secrets.cloudflare = {}; + sops.secrets.cloudflare = { }; systemd.services.ddns = { reloadIfChanged = false; @@ -11,9 +11,9 @@ _: Type = "oneshot"; RemainAfterExit = true; }; - wantedBy = ["multi-user.target"]; - wants = ["network-online.target"]; - after = ["network-online.target"]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; startAt = "*:0/30"; serviceConfig = { diff --git a/hosts/gerg-desktop/services/gitea.nix b/hosts/gerg-desktop/services/gitea.nix index 5a90f21..5a1660f 100644 --- a/hosts/gerg-desktop/services/gitea.nix +++ b/hosts/gerg-desktop/services/gitea.nix @@ -1,12 +1,12 @@ _: -{config, ...}: +{ config, ... }: { users.users = { ${config.services.gitea.user} = { - openssh.authorizedKeys.keys = [config.local.keys.gerg_gerg-desktop]; - extraGroups = ["postgres"]; + openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ]; + extraGroups = [ "postgres" ]; }; - ${config.services.nginx.user}.extraGroups = [config.services.gitea.group]; + ${config.services.nginx.user}.extraGroups = [ config.services.gitea.group ]; }; services.gitea = { enable = true; diff --git a/hosts/gerg-desktop/services/minecraft.nix b/hosts/gerg-desktop/services/minecraft.nix index 129e817..1e07a10 100644 --- a/hosts/gerg-desktop/services/minecraft.nix +++ b/hosts/gerg-desktop/services/minecraft.nix @@ -1,9 +1,9 @@ -{self, ...}: -{lib, ...}: +{ self, ... }: +{ lib, ... }: { # I manually switch this sometimes config = lib.mkIf false { - networking.firewall.allowedTCPPorts = [25565]; + networking.firewall.allowedTCPPorts = [ 25565 ]; users.users.minecraft = { description = "Minecraft server service user"; @@ -12,10 +12,10 @@ isSystemUser = true; group = "minecraft"; }; - users.groups.minecraft = {}; + users.groups.minecraft = { }; systemd.sockets.minecraft-server = { - bindsTo = ["minecraft-server.service"]; + bindsTo = [ "minecraft-server.service" ]; socketConfig = { ListenFIFO = "/run/minecraft-server.stdin"; SocketMode = "0660"; @@ -29,13 +29,13 @@ systemd.services.minecraft-server = { enable = true; description = "Minecraft Server Service"; - wantedBy = ["multi-user.target"]; - requires = ["minecraft-server.socket"]; + wantedBy = [ "multi-user.target" ]; + requires = [ "minecraft-server.socket" ]; after = [ "network.target" "minecraft-server.socket" ]; - path = [self.packages.papermc]; + path = [ self.packages.papermc ]; script = '' minecraft-server \ -Xms8G \ @@ -71,8 +71,8 @@ StandardError = "journal"; # Hardening - CapabilityBoundingSet = [""]; - DeviceAllow = [""]; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; LockPersonality = true; PrivateDevices = true; PrivateTmp = true; diff --git a/hosts/gerg-desktop/services/miniflux.nix b/hosts/gerg-desktop/services/miniflux.nix index 51ff035..5f2a49a 100644 --- a/hosts/gerg-desktop/services/miniflux.nix +++ b/hosts/gerg-desktop/services/miniflux.nix @@ -6,13 +6,13 @@ _: ... }: { - sops.secrets.minifluxenv = {}; + sops.secrets.minifluxenv = { }; systemd.services = { miniflux = { description = "Miniflux service"; - wantedBy = ["multi-user.target"]; - requires = ["miniflux-dbsetup.service"]; + wantedBy = [ "multi-user.target" ]; + requires = [ "miniflux-dbsetup.service" ]; after = [ "network.target" "postgresql.service" @@ -26,8 +26,8 @@ _: RuntimeDirectoryMode = "0770"; EnvironmentFile = config.sops.secrets.minifluxenv.path; # Hardening - CapabilityBoundingSet = [""]; - DeviceAllow = [""]; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; LockPersonality = true; MemoryDenyWriteExecute = true; PrivateDevices = true; @@ -67,7 +67,7 @@ _: }; miniflux-dbsetup = { description = "Miniflux database setup"; - requires = ["postgresql.service"]; + requires = [ "postgresql.service" ]; after = [ "network.target" "postgresql.service" @@ -88,11 +88,11 @@ _: users = { miniflux = { group = "miniflux"; - extraGroups = ["postgres"]; + extraGroups = [ "postgres" ]; isSystemUser = true; uid = 377; }; - ${config.services.nginx.user}.extraGroups = ["miniflux"]; + ${config.services.nginx.user}.extraGroups = [ "miniflux" ]; }; }; } diff --git a/hosts/gerg-desktop/services/nextcloud.nix b/hosts/gerg-desktop/services/nextcloud.nix index 572913b..4c6ff11 100644 --- a/hosts/gerg-desktop/services/nextcloud.nix +++ b/hosts/gerg-desktop/services/nextcloud.nix @@ -1,13 +1,13 @@ _: -{pkgs, config, ...}: +{ pkgs, config, ... }: { sops.secrets.nextcloud.owner = "nextcloud"; - users.users.nextcloud.extraGroups = ["postgres"]; + users.users.nextcloud.extraGroups = [ "postgres" ]; services.nextcloud = { enable = true; - package = pkgs.nextcloud27; + package = pkgs.nextcloud28; datadir = "/persist/services/nextcloud"; hostName = "next.gerg-l.com"; autoUpdateApps.enable = false; diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index 9e13755..cc07b8f 100644 --- a/hosts/gerg-desktop/services/nginx.nix +++ b/hosts/gerg-desktop/services/nginx.nix @@ -1,5 +1,5 @@ _: -{config, lib, ...}: +{ config, lib, ... }: { sops.secrets = lib.genAttrs @@ -34,7 +34,7 @@ _: forceSSL = true; sslCertificate = config.sops.secrets.nixfu_ssl_cert.path; sslCertificateKey = config.sops.secrets.nixfu_ssl_key.path; - serverAliases = ["www.nix-fu.com"]; + serverAliases = [ "www.nix-fu.com" ]; globalRedirect = "github.com/Gerg-L"; }; "search.gerg-l.com" = { diff --git a/hosts/gerg-desktop/services/parrot.nix b/hosts/gerg-desktop/services/parrot.nix index b1a556e..65b68a3 100644 --- a/hosts/gerg-desktop/services/parrot.nix +++ b/hosts/gerg-desktop/services/parrot.nix @@ -6,12 +6,12 @@ _: ... }: { - sops.secrets.discordenv = {}; + sops.secrets.discordenv = { }; systemd.services.parrot = { enable = true; - wantedBy = ["multi-user.target"]; - wants = ["network-online.target"]; - after = ["network-online.target"]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; script = lib.getExe pkgs.parrot; serviceConfig = { EnvironmentFile = config.sops.secrets.discordenv.path; diff --git a/hosts/gerg-desktop/services/postgresql.nix b/hosts/gerg-desktop/services/postgresql.nix index fdade54..cddf359 100644 --- a/hosts/gerg-desktop/services/postgresql.nix +++ b/hosts/gerg-desktop/services/postgresql.nix @@ -1,5 +1,5 @@ _: -{config, pkgs, ...}: +{ config, pkgs, ... }: { services.postgresql = { enable = true; diff --git a/hosts/gerg-desktop/services/searxng.nix b/hosts/gerg-desktop/services/searxng.nix index 009212a..d753d22 100644 --- a/hosts/gerg-desktop/services/searxng.nix +++ b/hosts/gerg-desktop/services/searxng.nix @@ -1,8 +1,8 @@ _: -{config, pkgs, ...}: +{ config, pkgs, ... }: { - sops.secrets.searxngenv = {}; - users.users.${config.services.nginx.user}.extraGroups = ["searx"]; + sops.secrets.searxngenv = { }; + users.users.${config.services.nginx.user}.extraGroups = [ "searx" ]; services.searx = { enable = true; package = pkgs.searxng; diff --git a/hosts/gerg-desktop/spicetify.nix b/hosts/gerg-desktop/spicetify.nix index 7c611df..c85e2a9 100644 --- a/hosts/gerg-desktop/spicetify.nix +++ b/hosts/gerg-desktop/spicetify.nix @@ -1,10 +1,10 @@ -{spicetify-nix, ...}: +{ spicetify-nix, ... }: let spicePkgs = spicetify-nix.legacyPackages; in { - imports = [spicetify-nix.nixosModules.default]; - local.allowedUnfree = ["spotify"]; + imports = [ spicetify-nix.nixosModules.default ]; + local.allowedUnfree = [ "spotify" ]; programs.spicetify = { enable = true; enabledExtensions = builtins.attrValues { diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix index f644c30..fe19be6 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/vfio.nix @@ -54,13 +54,13 @@ let in { environment.etc = { - "Xorg/1_mon.conf".source = pkgs.runCommand "1_mon.conf" {} ( + "Xorg/1_mon.conf".source = pkgs.runCommand "1_mon.conf" { } ( xserverbase + '' cat ${./1_mon.conf} >> $out '' ); - "Xorg/2_mon.conf".source = pkgs.runCommand "2_mon.conf" {} ( + "Xorg/2_mon.conf".source = pkgs.runCommand "2_mon.conf" { } ( xserverbase + '' cat ${./2_mon.conf} >> $out @@ -132,7 +132,7 @@ in "libvirtd" ]; - services.xserver.displayManager.xserverArgs = lib.mkAfter ["-config /etc/Xorg/active.conf"]; + services.xserver.displayManager.xserverArgs = lib.mkAfter [ "-config /etc/Xorg/active.conf" ]; services.xserver.displayManager.sessionCommands = lib.mkBefore '' if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then ${lib.getExe cfg_monitors} diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix index 36de907..2e96641 100644 --- a/hosts/gerg-desktop/zfs.nix +++ b/hosts/gerg-desktop/zfs.nix @@ -18,11 +18,11 @@ _: mode = "0644"; }; #make sure the sopskey is found - sops.age.sshKeyPaths = lib.mkForce ["/persist/ssh/ssh_host_ed25519_key"]; + sops.age.sshKeyPaths = lib.mkForce [ "/persist/ssh/ssh_host_ed25519_key" ]; fileSystems = { "/persist".neededForBoot = true; - "/efi22".options = ["nofail"]; - "/efi0E".options = ["nofail"]; + "/efi22".options = [ "nofail" ]; + "/efi0E".options = [ "nofail" ]; }; boot = { @@ -32,22 +32,22 @@ _: }; kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; #disable hibernate and set cache max - kernelParams = ["zfs.zfs_arc_max=17179869184"]; + kernelParams = [ "zfs.zfs_arc_max=17179869184" ]; initrd = { #module for multiple swap devices - kernelModules = ["dm_mod"]; + kernelModules = [ "dm_mod" ]; #keyboard module for zfs password - availableKernelModules = ["hid_generic"]; + availableKernelModules = [ "hid_generic" ]; systemd.services.rollback = { - path = [pkgs.zfs]; + path = [ pkgs.zfs ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; unitConfig.DefaultDependencies = "no"; - wantedBy = ["initrd.target"]; - after = ["zfs-import.target"]; - before = ["sysroot.mount"]; + wantedBy = [ "initrd.target" ]; + after = [ "zfs-import.target" ]; + before = [ "sysroot.mount" ]; script = '' zfs rollback -r rpool/root@empty zfs rollback -r rpool/var@empty @@ -67,11 +67,11 @@ _: mirroredBoots = [ { path = "/efi22"; - devices = ["nodev"]; + devices = [ "nodev" ]; } { path = "/efi0E"; - devices = ["nodev"]; + devices = [ "nodev" ]; } ]; splashImage = null; diff --git a/hosts/iso/main.nix b/hosts/iso/main.nix index abafb28..754c2b8 100644 --- a/hosts/iso/main.nix +++ b/hosts/iso/main.nix @@ -1,4 +1,4 @@ -{disko, nixos-generators, ...}: +{ disko, nixos-generators, ... }: { lib, modulesPath, diff --git a/hosts/media-laptop/main.nix b/hosts/media-laptop/main.nix index 62267a5..5451525 100644 --- a/hosts/media-laptop/main.nix +++ b/hosts/media-laptop/main.nix @@ -28,7 +28,7 @@ _: chromium ; }; - services.xserver.videoDrivers = ["intel"]; + services.xserver.videoDrivers = [ "intel" ]; networking.networkmanager.enable = true; @@ -72,7 +72,7 @@ _: "sr_mod" "rtsx_usb_sdmmc" ]; - kernelModules = ["kvm-intel"]; + kernelModules = [ "kvm-intel" ]; }; systemd.user.tmpfiles.users.media.rules = [ "L+ %h/Desktop/chromium-browser.desktop - - - - ${pkgs.chromium}/share/applications/chromium-browser.desktop" diff --git a/lib/default.nix b/lib/default.nix index 450543a..2a2d7e3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -55,20 +55,20 @@ rec { gerg-utils = config: outputs: - lib.foldAttrs lib.mergeAttrs {} ( + lib.foldAttrs lib.mergeAttrs { } ( map ( system: let pkgs = - if config == {} then + if config == { } then unstable.legacyPackages.${system} else - import unstable {inherit system config;}; + import unstable { inherit system config; }; in - lib.mapAttrs (name: value: if needsSystem name then {${system} = value pkgs;} else value) outputs + lib.mapAttrs (name: value: if needsSystem name then { ${system} = value pkgs; } else value) outputs ) - ["x86_64-linux"] + [ "x86_64-linux" ] ); mkHosts = @@ -145,7 +145,7 @@ rec { in x.callPackage "${path}/${n}/package.nix" x.args else - callPackage "${path}/${n}/package.nix" {} + callPackage "${path}/${n}/package.nix" { } )) ]; diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 39095c0..18b4fab 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -1,4 +1,4 @@ -{suckless, self, ...}: +{ suckless, self, ... }: { pkgs, config, @@ -11,7 +11,7 @@ config = lib.mkIf config.local.DE.dwm.enable { systemd.user.services = { sxhkd = { - path = [pkgs.sxhkd]; + path = [ pkgs.sxhkd ]; script = "sxhkd -c /etc/sxhkd/sxhkdrc"; serviceConfig = { Restart = "always"; @@ -21,7 +21,7 @@ }; picom = { - path = [pkgs.picom]; + path = [ pkgs.picom ]; script = "picom"; serviceConfig = { Restart = "always"; diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix index 05bbeba..4d0e2de 100644 --- a/modules/DE/gnome.nix +++ b/modules/DE/gnome.nix @@ -10,7 +10,7 @@ _: config = lib.mkIf config.local.DE.gnome.enable { environment = { - systemPackages = [pkgs.gnome.gnome-calculator]; + systemPackages = [ pkgs.gnome.gnome-calculator ]; gnome.excludePackages = builtins.attrValues { inherit (pkgs) gnome-photos diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix index 701fda0..c16f0dd 100644 --- a/modules/DE/xfce.nix +++ b/modules/DE/xfce.nix @@ -9,7 +9,7 @@ _: options.local.DE.xfce.enable = lib.mkEnableOption ""; config = lib.mkIf config.local.DE.xfce.enable { - environment.systemPackages = [pkgs.xfce.xfce4-whiskermenu-plugin]; + environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ]; services.xserver = { enable = true; desktopManager.xfce = { diff --git a/modules/DM/autoLogin.nix b/modules/DM/autoLogin.nix index d4c80e0..637cf45 100644 --- a/modules/DM/autoLogin.nix +++ b/modules/DM/autoLogin.nix @@ -1,5 +1,5 @@ _: -{config, lib, ...}: +{ config, lib, ... }: { options.local.DM = { autoLogin = lib.mkEnableOption ""; diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix index 347cb66..f19c3fc 100644 --- a/modules/DM/lightDM.nix +++ b/modules/DM/lightDM.nix @@ -1,5 +1,5 @@ -{self, ...}: -{config, lib, ...}: +{ self, ... }: +{ config, lib, ... }: { options.local.DM.lightdm.enable = lib.mkEnableOption ""; diff --git a/modules/X11.nix b/modules/X11.nix index 1a91b9f..80facc7 100644 --- a/modules/X11.nix +++ b/modules/X11.nix @@ -1,5 +1,5 @@ _: -{pkgs, lib, ...}: +{ pkgs, lib, ... }: { services.xserver = { tty = lib.mkDefault 1; @@ -7,7 +7,7 @@ _: layout = "us"; libinput.enable = true; xautolock.enable = false; - excludePackages = [pkgs.xterm]; + excludePackages = [ pkgs.xterm ]; desktopManager.xterm.enable = false; }; #_file diff --git a/modules/boot.nix b/modules/boot.nix index 6531746..c88380c 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -1,4 +1,4 @@ -{self, ...}: +{ self, ... }: { lib, pkgs, @@ -15,7 +15,7 @@ }; }; boot = { - blacklistedKernelModules = ["pcspkr"]; + blacklistedKernelModules = [ "pcspkr" ]; kernelParams = lib.mkBefore [ "acpi_call" "pti=auto" @@ -78,8 +78,8 @@ Type = "oneshot"; RemainAfterExit = true; }; - path = [pkgs.efibootmgr]; - wantedBy = ["default.target"]; + path = [ pkgs.efibootmgr ]; + wantedBy = [ "default.target" ]; script = '' efibootmgr -t 0 ''; diff --git a/modules/builders.nix b/modules/builders.nix index e35fd5b..145048d 100644 --- a/modules/builders.nix +++ b/modules/builders.nix @@ -1,5 +1,5 @@ _: -{config, lib, ...}: +{ config, lib, ... }: { options.local.remoteBuild = { enable = lib.mkEnableOption ""; @@ -13,8 +13,8 @@ _: keep-derivations = false; builders-use-substitutes = true; max-jobs = 0; - substituters = ["ssh-ng://nix-ssh@gerg-desktop"]; - trusted-public-keys = ["gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8="]; + substituters = [ "ssh-ng://nix-ssh@gerg-desktop" ]; + trusted-public-keys = [ "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ]; }; distributedBuilds = true; buildMachines = [ @@ -40,7 +40,7 @@ _: }; programs.ssh.knownHosts = { gerg-desktop = { - extraHostNames = ["gerg-desktop.lan"]; + extraHostNames = [ "gerg-desktop.lan" ]; publicKey = config.local.keys.root_gerg-desktop; }; }; @@ -54,9 +54,9 @@ _: ]; in lib.mkIf config.local.remoteBuild.isBuilder { - sops.secrets.store_key = {}; + sops.secrets.store_key = { }; users = { - groups.builder = {}; + groups.builder = { }; users.builder = { createHome = false; isSystemUser = true; diff --git a/modules/hardware.nix b/modules/hardware.nix index b5d6027..aaf8bbe 100644 --- a/modules/hardware.nix +++ b/modules/hardware.nix @@ -1,5 +1,5 @@ _: -{config, lib, ...}: +{ config, lib, ... }: let cfg = config.local.hardware; in diff --git a/modules/keys.nix b/modules/keys.nix index 550c7a7..1e34223 100644 --- a/modules/keys.nix +++ b/modules/keys.nix @@ -1,7 +1,7 @@ _: -{lib, ...}: +{ lib, ... }: { - options.local.keys = lib.mkOption {}; + options.local.keys = lib.mkOption { }; config.local.keys = { gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77"; diff --git a/modules/misc.nix b/modules/misc.nix index b506600..bbea972 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -8,7 +8,7 @@ _: { options.local.allowedUnfree = lib.mkOption { type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; }; config = { @@ -39,7 +39,7 @@ _: programs.mtr.enable = true; # ping and traceroute services.openssh = { enable = true; - hostKeys = lib.mkForce []; + hostKeys = lib.mkForce [ ]; settings = { PermitRootLogin = lib.mkDefault "no"; PasswordAuthentication = false; diff --git a/modules/nix.nix b/modules/nix.nix index c23ffe1..d08301d 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,13 +1,13 @@ inputs: -{lib, config, ...}: +{ lib, config, ... }: { # # Flake registry and $NIX_PATH pinning # nix.registry = lib.pipe inputs [ (lib.filterAttrs (_: lib.isType "flake")) - (lib.mapAttrs (_: flake: {inherit flake;})) - (x: x // {nixpkgs.flake = inputs.unstable;}) + (lib.mapAttrs (_: flake: { inherit flake; })) + (x: x // { nixpkgs.flake = inputs.unstable; }) ]; environment.etc = @@ -17,7 +17,7 @@ inputs: value.source = value.flake; }) config.nix.registry; - nix.nixPath = ["/etc/nix/path"]; + nix.nixPath = [ "/etc/nix/path" ]; # # Ignore global registry # @@ -52,8 +52,8 @@ inputs: # Use for testing # #allow-import-from-derivation = false; - trusted-users = ["root"]; - allowed-users = ["@wheel"]; + trusted-users = [ "root" ]; + allowed-users = [ "@wheel" ]; use-xdg-base-directories = true; auto-allocate-uids = true; }; diff --git a/modules/shell.nix b/modules/shell.nix index da0bf16..2d6f2a1 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -1,4 +1,4 @@ -{fetch-rs, ...}: +{ fetch-rs, ... }: { pkgs, config, @@ -6,7 +6,7 @@ ... }: { - systemd.tmpfiles.rules = ["d /tmp/neovim-page 0777 root root - -"]; + systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ]; environment = { systemPackages = builtins.attrValues { inherit (pkgs) page eza fzf; diff --git a/modules/sops.nix b/modules/sops.nix index 07dd08f..131e840 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -1,4 +1,4 @@ -{sops-nix, self, ...}: +{ sops-nix, self, ... }: { pkgs, config, @@ -6,13 +6,13 @@ ... }: { - imports = [sops-nix.nixosModules.sops]; + imports = [ sops-nix.nixosModules.sops ]; options.local.sops.disable = lib.mkEnableOption ""; config = lib.mkIf (!config.local.sops.disable) { - environment.systemPackages = [pkgs.sops]; + environment.systemPackages = [ pkgs.sops ]; sops = { defaultSopsFile = "${self}/hosts/${config.networking.hostName}/secrets.yaml"; - age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; + age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; }; }; #_file diff --git a/modules/theming.nix b/modules/theming.nix index e00fad5..60ad3b4 100644 --- a/modules/theming.nix +++ b/modules/theming.nix @@ -62,16 +62,16 @@ in fonts = { packages = [ pkgs.overpass - (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + (pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) ]; enableDefaultPackages = false; fontDir.enable = true; fontconfig = { enable = true; defaultFonts = { - serif = ["Overpass"]; - sansSerif = ["Overpass"]; - monospace = ["Overpass Mono"]; + serif = [ "Overpass" ]; + sansSerif = [ "Overpass" ]; + monospace = [ "Overpass Mono" ]; }; hinting.enable = true; antialias = true; diff --git a/outputs.nix b/outputs.nix index 6421f9a..532164a 100644 --- a/outputs.nix +++ b/outputs.nix @@ -2,7 +2,7 @@ inputs: let lib = import ./lib inputs; in -lib.gerg-utils {} { +lib.gerg-utils { } { inherit lib; nixosConfigurations = lib.mkHosts "x86_64-linux" [ "gerg-desktop" @@ -21,7 +21,7 @@ lib.gerg-utils {} { formatter = pkgs: inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.lint; - devShells = pkgs: {default = pkgs.mkShell {packages = [pkgs.sops];};}; + devShells = pkgs: { default = pkgs.mkShell { packages = [ pkgs.sops ]; }; }; packages = lib.mkPackages ./packages; } diff --git a/packages/images/package.nix b/packages/images/package.nix index 6649c6c..75b2377 100644 --- a/packages/images/package.nix +++ b/packages/images/package.nix @@ -13,7 +13,7 @@ runCommand "images" url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/376ed4ba8dc2e611b7e8a62fdc680967ead5bd87/logo/nix-snowflake.svg"; sha256 = "sha256-SCuQlSPB14GFTq4XvExJ0QEuK2VIbrd5YYKHLRG/q5I="; }; - buildInputs = [imagemagick]; + buildInputs = [ imagemagick ]; } '' mkdir -p $out diff --git a/packages/nixfmt/package.nix b/packages/nixfmt/package.nix index cc83132..412910e 100644 --- a/packages/nixfmt/package.nix +++ b/packages/nixfmt/package.nix @@ -1,4 +1,4 @@ -{inputs, nixfmt}: +{ inputs, nixfmt }: (nixfmt.overrideAttrs { version = "0.6.0-${inputs.nixfmt.shortRev}"; diff --git a/packages/papermc/package.nix b/packages/papermc/package.nix index cbe1067..7787278 100644 --- a/packages/papermc/package.nix +++ b/packages/papermc/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation ( runHook postInstall ''; - nativeBuildInputs = [makeBinaryWrapper]; + nativeBuildInputs = [ makeBinaryWrapper ]; dontUnpack = true; preferLocalBuild = true; @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation ( meta = { description = "High-performance Minecraft Server"; homepage = "https://papermc.io/"; - sourceProvenance = with lib.sourceTypes; [binaryBytecode]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [