diff options
author | tv <tv@shackspace.de> | 2015-07-31 15:58:26 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-07-31 15:58:26 +0200 |
commit | 7e00495a4839777e2afcdfc6f63695bb23af6e50 (patch) | |
tree | 407e921627cca764f903a1b535418bb4a0590ee4 /makefu | |
parent | 62a766c45a921c60a3d1548f0eb5adeaaa7c9473 (diff) | |
parent | 65d79890493600b09dc01209a378c070f2f0a028 (diff) |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu')
-rw-r--r-- | makefu/1systems/pnp.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/repunit.nix | 63 |
2 files changed, 65 insertions, 0 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 4c4ce716f..549658983 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -40,6 +40,8 @@ # networking.firewall is enabled by default networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.rejectPackets = true; + networking.firewall.allowPing = true; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix index e69de29bb..7596a3d54 100644 --- a/makefu/1systems/repunit.nix +++ b/makefu/1systems/repunit.nix @@ -0,0 +1,63 @@ +# 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. + <nixpkgs/nixos/modules/profiles/qemu-guest.nix> + ../2configs/base.nix + ../2configs/cgit-retiolum.nix + ]; + krebs.build.host = config.krebs.hosts.repunit; + krebs.build.user = config.krebs.users.makefu; + krebs.build.target = "root@repunit"; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + }; + secrets = { + url = "/home/makefu/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; + + 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 ]; + networking.firewall.allowPing = true; + + fileSystems."/" = + { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + krebs.retiolum = { + enable = true; + hosts = ../../Zhosts; + connectTo = [ + "gum" + "pigstarter" + "fastpoke" + ]; + }; + +# $ nix-env -qaP | grep wget + environment.systemPackages = with pkgs; [ + jq + ]; +} |