Merge remote-tracking branch 'pnp/master'

1 files changed, 42 insertions, 44 deletions

diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix
index f98cd5276..7e4ccf2c1 100644
--- a/1systems/makefu/pnp.nix
+++ b/1systems/makefu/pnp.nix
@@ -5,50 +5,48 @@
 { config, pkgs, ... }:
 
 {
-    imports =
-        [ # Include the results of the hardware scan.
-        <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-        ../../2configs/makefu/base.nix
-        ../../3modules/krebs/retiolum.nix
-        ../../2configs/makefu/cgit-retiolum.nix
-        ];
-    krebs.enable = true;
-    boot.loader.grub.enable = true;
-    boot.loader.grub.version = 2;
-    boot.loader.grub.device = "/dev/vda";
-
-    boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-    hardware.enableAllFirmware = true;
-    hardware.cpu.amd.updateMicrocode = true;
-
-    # networking.firewall is enabled by default
-    networking.firewall.allowedTCPPorts = [ 80 ];
-
-    fileSystems."/" =
-    { device = "/dev/disk/by-label/nixos";
-        fsType = "ext4";
-    };
-        krebs.retiolum = {
-            enable = true;
-            hosts = ../../Zhosts;
-            connectTo = [
-                "gum"
-                "pigstarter"
-                "fastpoke"
-            ];
-        };
-
-    nix.maxJobs = 1;
-    networking.hostName = "pnp"; # Define your hostname.
+  imports =
+    [ # Include the results of the hardware scan.
+      <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+      ../../2configs/makefu/base.nix
+      ../../2configs/makefu/cgit-retiolum.nix
+    ];
+  krebs.enable = true;
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/vda";
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+  hardware.enableAllFirmware = true;
+  hardware.cpu.amd.updateMicrocode = true;
+
+# networking.firewall is enabled by default
+  networking.firewall.allowedTCPPorts = [ 80 ];
+
+  fileSystems."/" =
+  { device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+  krebs.retiolum = {
+    enable = true;
+    hosts = ../../Zhosts;
+    connectTo = [
+      "gum"
+      "pigstarter"
+      "fastpoke"
+    ];
+  };
+
+  nix.maxJobs = 2;
+  networking.hostName = "pnp"; # Define your hostname.
 
 # $ nix-env -qaP | grep wget
-        environment.systemPackages = with pkgs; [
-        wget
-        git
-        gnumake
-        jq
-        ];
-
+    environment.systemPackages = with pkgs; [
+      wget
+      git
+      gnumake
+      jq
+    ];
 }