From feed949d47ada12077a1a9eca3f83f5c8138487b Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 23 Jul 2015 17:54:31 +0200 Subject: add pnp --- 1systems/makefu/pnp.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 1systems/makefu/pnp.nix (limited to '1systems/makefu') diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3 From 2b3030c7b27f98b8f00d91c63bd60c980e64071b Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Jul 2015 10:52:43 +0200 Subject: makefu: init pnp this is the first entry for my hosts, it provides only very basic support with a lot of copy-paste from tv/lass --- 1systems/makefu/pnp.nix | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to '1systems/makefu') diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix index e69de29bb..51f5bb00c 100644 --- a/1systems/makefu/pnp.nix +++ b/1systems/makefu/pnp.nix @@ -0,0 +1,38 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + + ../../2configs/makefu/base.nix + ]; + 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; + + fileSystems."/" = + { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + + nix.maxJobs = 1; + networking.hostName = "pnp"; # Define your hostname. + +# $ nix-env -qaP | grep wget + environment.systemPackages = with pkgs; [ + wget + git + gnumake + ]; + +} -- cgit v1.2.3 From 13cc704c60ce97a8d7404a3558ad925100fcc1a9 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Jul 2015 22:39:11 +0200 Subject: pnp provides cgit, update identity --- 1systems/makefu/pnp.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to '1systems/makefu') diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix index 51f5bb00c..f98cd5276 100644 --- a/1systems/makefu/pnp.nix +++ b/1systems/makefu/pnp.nix @@ -9,7 +9,10 @@ [ # Include the results of the hardware scan. ../../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"; @@ -20,19 +23,32 @@ 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. # $ nix-env -qaP | grep wget - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; [ wget git gnumake - ]; + jq + ]; } -- cgit v1.2.3 From f9c46e9d43c765d426f88f0f318bf02962a67578 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Jul 2015 23:03:50 +0200 Subject: makefu: fix whitespace, use registry instead of readfile --- 1systems/makefu/pnp.nix | 87 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 44 deletions(-) (limited to '1systems/makefu') diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix index f98cd5276..158a4f8c2 100644 --- a/1systems/makefu/pnp.nix +++ b/1systems/makefu/pnp.nix @@ -5,50 +5,49 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - - ../../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. + + ../../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. # $ nix-env -qaP | grep wget - environment.systemPackages = with pkgs; [ - wget - git - gnumake - jq - ]; - + environment.systemPackages = with pkgs; [ + wget + git + gnumake + jq + ]; } -- cgit v1.2.3 From a4d2509918c3ce1400071eb0ef2b5421023976ca Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 24 Jul 2015 23:13:33 +0200 Subject: pnp: maxJobs++ --- 1systems/makefu/pnp.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '1systems/makefu') diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix index 158a4f8c2..7e4ccf2c1 100644 --- a/1systems/makefu/pnp.nix +++ b/1systems/makefu/pnp.nix @@ -9,7 +9,6 @@ [ # Include the results of the hardware scan. ../../2configs/makefu/base.nix - ../../3modules/krebs/retiolum.nix ../../2configs/makefu/cgit-retiolum.nix ]; krebs.enable = true; @@ -40,7 +39,7 @@ ]; }; - nix.maxJobs = 1; + nix.maxJobs = 2; networking.hostName = "pnp"; # Define your hostname. # $ nix-env -qaP | grep wget -- cgit v1.2.3