From 545d36ecabba448757141d4a708b0ae294f8ad30 Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Fri, 9 Jun 2017 15:43:18 +0200 Subject: [PATCH] Ajout de bongo --- bongo-hw.nix | 29 +++++++++++++++++++++++++++++ lan-network.nix | 11 ++++++++++- metal.nix | 1 + 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 bongo-hw.nix diff --git a/bongo-hw.nix b/bongo-hw.nix new file mode 100644 index 0000000..bba512e --- /dev/null +++ b/bongo-hw.nix @@ -0,0 +1,29 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "ata_generic" "uhci_hcd" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/302a58a6-02da-4330-859a-200ec6245d5e"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BB96-EB34"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 2; +} diff --git a/lan-network.nix b/lan-network.nix index aa20d3b..077fce3 100644 --- a/lan-network.nix +++ b/lan-network.nix @@ -35,12 +35,18 @@ in nixpkgs.config.allowUnfree = true; }; - # 0ad server? + # Urban Terror server jessicaRabbit = { config, pkgs, lib, ... }: lib.recursiveUpdate common { imports = [ ./jessicaRabbit-hw.nix ]; }; + # file server + bongo = { config, pkgs, lib, ... }: + lib.recursiveUpdate common { + imports = [ ./bongo-hw.nix ]; + }; + # DHCP/DNS server eddieValiant = { config, pkgs, lib, ... }: lib.recursiveUpdate common { @@ -60,6 +66,9 @@ in { ethernetAddress = "00:23:ae:88:fb:b9"; hostName = "jessicaRabbit"; ipAddress = "10.42.0.3"; } + { ethernetAddress = "00:21:9b:2f:1f:99"; + hostName = "bongo"; + ipAddress = "10.42.0.4"; } ]; extraConfig = '' subnet 10.42.0.0 netmask 255.255.0.0 { diff --git a/metal.nix b/metal.nix index 63bf075..8b243ab 100644 --- a/metal.nix +++ b/metal.nix @@ -8,4 +8,5 @@ in eddieValiant = mkMachine "10.42.0.1"; rogerRabbit = mkMachine "10.42.0.2"; jessicaRabbit = mkMachine "10.42.0.3"; + bongo = mkMachine "10.42.0.4"; }