diff --git a/hosts/game-desktop/main.nix b/hosts/game-desktop/main.nix index 6e7dcbe..6ba86e6 100644 --- a/hosts/game-desktop/main.nix +++ b/hosts/game-desktop/main.nix @@ -39,7 +39,7 @@ _: webcord blender unzip - ; + ; inherit (pkgs.wineWowPackages) unstableFull; inherit (pkgs.libsForQt5) kdenlive; @@ -62,7 +62,7 @@ _: useDefaultShell = true; uid = 1000; isNormalUser = true; - extraGroups = [ "audio" ]; + extraGroups = ["audio"]; initialHashedPassword = ""; }; "root" = { @@ -85,7 +85,7 @@ _: modesetting.enable = true; }; services.xserver = { - videoDrivers = [ "nvidia" ]; + videoDrivers = ["nvidia"]; #disable DPMS monitorSection = '' Option "DPMS" "false" @@ -107,7 +107,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 a10ce38..548a97f 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 4381372..a07602f 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -1,5 +1,5 @@ -{ nvim-flake, nixfmt, ... }: -{ pkgs, config, ... }: +{nvim-flake, nixfmt, ...}: +{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; @@ -73,7 +73,7 @@ # QMK configuration via qmk - ; + ; inherit (nvim-flake.packages) neovim; inherit fmt; lint = pkgs.writeShellApplication { @@ -128,16 +128,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"; @@ -177,7 +177,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 f58c5e5..6128a53 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 06caa0e..92cbb0a 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 25cb894..a884de0 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 9e9b110..51ff035 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,15 +67,13 @@ _: }; miniflux-dbsetup = { description = "Miniflux database setup"; - requires = [ "postgresql.service" ]; + requires = ["postgresql.service"]; after = [ "network.target" "postgresql.service" ]; script = '' - ${ - lib.getExe' config.services.postgresql.package "psql" - } "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore" + ${lib.getExe' config.services.postgresql.package "psql"} "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore" ''; serviceConfig = { Type = "oneshot"; @@ -90,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 191aedf..6216b76 100644 --- a/hosts/gerg-desktop/services/nextcloud.nix +++ b/hosts/gerg-desktop/services/nextcloud.nix @@ -1,9 +1,9 @@ _: -{ pkgs, config, ... }: +{pkgs, config, ...}: { sops.secrets.nextcloud.owner = "nextcloud"; - users.users.nextcloud.extraGroups = [ "postgres" ]; + users.users.nextcloud.extraGroups = ["postgres"]; services.nextcloud = { enable = true; diff --git a/hosts/gerg-desktop/services/nginx.nix b/hosts/gerg-desktop/services/nginx.nix index 76d1853..4c75ea8 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 735589c..3bafb60 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 f87c020..5c9367b 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 be49f05..94c12c8 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 86152e6..674381a 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 36fa39e..e0e877e 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 f0f21c7..a0a8d11 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 6d925eb..a5e28b4 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 a1a15ef..5f80f3c 100644 --- a/hosts/media-laptop/main.nix +++ b/hosts/media-laptop/main.nix @@ -26,9 +26,9 @@ _: vlc pavucontrol # gui volume control 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 8f6661b..ccfd396 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -51,20 +51,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 = diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 82202fb..9ee41f5 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"; @@ -78,7 +78,7 @@ numlockx picom sxhkd - ; + ; }; etc."sxhkd/sxhkdrc".text = '' XF86AudioPlay diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix index 8180076..1347ba4 100644 --- a/modules/DE/gnome.nix +++ b/modules/DE/gnome.nix @@ -10,14 +10,14 @@ _: 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 gnome-tour gnome-text-editor gnome-online-accounts - ; + ; inherit (pkgs.gnome) gnome-weather gnome-shell @@ -38,7 +38,7 @@ _: iagno # go game hitori # sudoku game atomix # puzzle game - ; + ; }; }; diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix index 469b3e4..1b2d5e2 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 a8e0ba0..370db70 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 20f91be..b277d43 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 442605d..bbd63fe 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 = ./X11.nix; diff --git a/modules/boot.nix b/modules/boot.nix index fd3dfea..bff425c 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 856daa1..dd4962a 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 ae09666..1939ced 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 bb2af3a..5dcba98 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 bca59be..555059a 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 = { @@ -31,7 +31,7 @@ _: nix-output-monitor # nom nom nom nom; nix-tree # view packages pciutils # lspci - ; + ; } ); @@ -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 c4b2f1d..456edf2 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 # @@ -51,8 +51,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 4a23405..5fe0c24 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 58564df..68ef3af 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 = ./sops.nix; diff --git a/modules/theming.nix b/modules/theming.nix index a82cb18..e4ece35 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 33af969..a4a0aef 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" @@ -38,7 +38,7 @@ lib.gerg-utils { } { ''; }; - 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 75b2377..6649c6c 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/papermc/package.nix b/packages/papermc/package.nix index 3254dab..84aefa4 100644 --- a/packages/papermc/package.nix +++ b/packages/papermc/package.nix @@ -23,12 +23,12 @@ runCommandNoCC "papermc" hash = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [makeBinaryWrapper]; 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; [