gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

more nixfmt changes

Browse source
This commit is contained in:
Gerg-L 2023-11-16 21:55:44 -05:00
parent 43557a4b19
commit 7000c74af2
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
4 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hosts/gerg-desktop/vfio.nix
View file

@ -14,9 +14,7 @@ let
pkgs.xorg.fontadobe100dpi pkgs.xorg.fontadobe100dpi
pkgs.xorg.fontadobe75dpi pkgs.xorg.fontadobe75dpi
]; ];
fontpath = fontpath = lib.optionalString (xcfg.fontPath != null) ''FontPath "${xcfg.fontPath}"'';
lib.optionalString (xcfg.fontPath != null)
''FontPath "${xcfg.fontPath}"'';
in in
'' ''
echo 'Section "Files"' >> $out echo 'Section "Files"' >> $out
@ -135,9 +133,7 @@ in
"libvirtd" "libvirtd"
]; ];
services.xserver.displayManager.xserverArgs = lib.mkAfter [ services.xserver.displayManager.xserverArgs = lib.mkAfter [ "-config /etc/Xorg/active.conf" ];
"-config /etc/Xorg/active.conf"
];
services.xserver.displayManager.sessionCommands = lib.mkBefore '' services.xserver.displayManager.sessionCommands = lib.mkBefore ''
if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
${lib.getExe cfg_monitors} ${lib.getExe cfg_monitors}

4
modules/builders.nix
View file

@ -14,9 +14,7 @@ _:
builders-use-substitutes = true; builders-use-substitutes = true;
max-jobs = 0; max-jobs = 0;
substituters = [ "ssh-ng://nix-ssh@gerg-desktop" ]; substituters = [ "ssh-ng://nix-ssh@gerg-desktop" ];
trusted-public-keys = [ trusted-public-keys = [ "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ];
"gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8="
];
}; };
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ buildMachines = [

3
modules/misc.nix
View file

@ -15,8 +15,7 @@ _:
nixpkgs = { nixpkgs = {
config = { config = {
allowAliases = false; allowAliases = false;
allowUnfreePredicate = allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree;
pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree;
}; };
}; };

3
modules/shell.nix
View file

@ -27,8 +27,7 @@
pastebin = "curl -F 'clbin=<-' https://clbin.com"; pastebin = "curl -F 'clbin=<-' https://clbin.com";
termbin = "nc termbin.com 9999"; termbin = "nc termbin.com 9999";
#nix stuff #nix stuff
gc-check = '' gc-check = ''nix-store --gc --print-roots | egrep -v "^(/nix/var|/run/w+-system|{memory|/proc)"'';
nix-store --gc --print-roots | egrep -v "^(/nix/var|/run/w+-system|{memory|/proc)"'';
#vim stuff #vim stuff
vi = "nvim"; vi = "nvim";
vim = "nvim"; vim = "nvim";