From 7000c74af2d14c2ee37453ca36adb7e2d3a10572 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Thu, 16 Nov 2023 21:55:44 -0500 Subject: [PATCH] more nixfmt changes --- hosts/gerg-desktop/vfio.nix | 8 ++------ modules/builders.nix | 4 +--- modules/misc.nix | 3 +-- modules/shell.nix | 3 +-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix index 769018e..ef2750d 100644 --- a/hosts/gerg-desktop/vfio.nix +++ b/hosts/gerg-desktop/vfio.nix @@ -14,9 +14,7 @@ let pkgs.xorg.fontadobe100dpi pkgs.xorg.fontadobe75dpi ]; - fontpath = - lib.optionalString (xcfg.fontPath != null) - ''FontPath "${xcfg.fontPath}"''; + fontpath = lib.optionalString (xcfg.fontPath != null) ''FontPath "${xcfg.fontPath}"''; in '' echo 'Section "Files"' >> $out @@ -135,9 +133,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/modules/builders.nix b/modules/builders.nix index 1800afe..856daa1 100644 --- a/modules/builders.nix +++ b/modules/builders.nix @@ -14,9 +14,7 @@ _: builders-use-substitutes = true; max-jobs = 0; substituters = [ "ssh-ng://nix-ssh@gerg-desktop" ]; - trusted-public-keys = [ - "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" - ]; + trusted-public-keys = [ "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ]; }; distributedBuilds = true; buildMachines = [ diff --git a/modules/misc.nix b/modules/misc.nix index 1354a04..bca59be 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -15,8 +15,7 @@ _: nixpkgs = { config = { allowAliases = false; - allowUnfreePredicate = - pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree; + allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree; }; }; diff --git a/modules/shell.nix b/modules/shell.nix index be07f19..4a23405 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -27,8 +27,7 @@ pastebin = "curl -F 'clbin=<-' https://clbin.com"; termbin = "nc termbin.com 9999"; #nix stuff - gc-check = '' - nix-store --gc --print-roots | egrep -v "^(/nix/var|/run/w+-system|{memory|/proc)"''; + gc-check = ''nix-store --gc --print-roots | egrep -v "^(/nix/var|/run/w+-system|{memory|/proc)"''; #vim stuff vi = "nvim"; vim = "nvim";