summaryrefslogtreecommitdiffstats
path: root/lass/1systems/prism
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-11-05 18:20:42 +0100
committermakefu <github@syntax-fehler.de>2018-11-05 18:20:42 +0100
commit254e9e62b95951cecadd2b4800c03ef96f95b3c0 (patch)
tree6892ca816d01eb712b80af9dbd79cc6690f21752 /lass/1systems/prism
parent8b57f04ff84b53742ef6a8a9677560745075ffb1 (diff)
parent100ca928ad483471d61b36bd9e977e34441d404b (diff)
Merge remote-tracking branch 'lassul.us/master'
Diffstat (limited to 'lass/1systems/prism')
-rw-r--r--lass/1systems/prism/physical.nix84
1 files changed, 38 insertions, 46 deletions
diff --git a/lass/1systems/prism/physical.nix b/lass/1systems/prism/physical.nix
index 83f127c22..56348d0ab 100644
--- a/lass/1systems/prism/physical.nix
+++ b/lass/1systems/prism/physical.nix
@@ -3,27 +3,39 @@
imports = [
./config.nix
{
- networking.interfaces.et0.ipv4.addresses = [
- {
- address = config.krebs.build.host.nets.internet.ip4.addr;
+ boot.kernelParams = [ "net.ifnames=0" ];
+ networking = {
+ defaultGateway = "46.4.114.225";
+ # Use google's public DNS server
+ nameservers = [ "8.8.8.8" ];
+ interfaces.eth0 = {
+ ipAddress = "46.4.114.247";
prefixLength = 27;
- }
- {
- address = "46.4.114.243";
- prefixLength = 27;
- }
- ];
- networking.defaultGateway = "46.4.114.225";
- networking.nameservers = [
- "8.8.8.8"
- ];
- services.udev.extraRules = ''
- SUBSYSTEM=="net", ATTR{address}=="08:60:6e:e7:87:04", NAME="et0"
- '';
+ };
+ };
+ # TODO use this network config
+ #networking.interfaces.et0.ipv4.addresses = [
+ # {
+ # address = config.krebs.build.host.nets.internet.ip4.addr;
+ # prefixLength = 27;
+ # }
+ # {
+ # address = "46.4.114.243";
+ # prefixLength = 27;
+ # }
+ #];
+ #networking.defaultGateway = "46.4.114.225";
+ #networking.nameservers = [
+ # "8.8.8.8"
+ #];
+ #services.udev.extraRules = ''
+ # SUBSYSTEM=="net", ATTR{address}=="08:60:6e:e7:87:04", NAME="et0"
+ #'';
}
{
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+ networking.hostId = "fb4173ea";
boot.loader.grub = {
devices = [
"/dev/sda"
@@ -40,45 +52,25 @@
boot.kernelModules = [ "kvm-intel" ];
- fileSystems."/" = {
- device = "/dev/pool/nix_root";
- fsType = "ext4";
- };
-
- fileSystems."/tmp" = {
- device = "tmpfs";
- fsType = "tmpfs";
- options = ["nosuid" "nodev" "noatime"];
- };
-
- fileSystems."/var/download" = {
- device = "/dev/pool/download";
- fsType = "ext4";
- };
+ sound.enable = false;
+ nixpkgs.config.allowUnfree = true;
+ time.timeZone = "Europe/Berlin";
- fileSystems."/srv/http" = {
- device = "/dev/pool/http";
- fsType = "ext4";
+ fileSystems."/" = {
+ device = "rpool/root/nixos";
+ fsType = "zfs";
};
fileSystems."/home" = {
- device = "/dev/pool/home";
- fsType = "ext4";
+ device = "rpool/home";
+ fsType = "zfs";
};
- fileSystems."/bku" = {
- device = "/dev/pool/bku";
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/b67c3370-1597-4ce8-8a46-e257ca32150d";
fsType = "ext4";
};
- swapDevices = [
- { label = "swap1"; }
- { label = "swap2"; }
- ];
-
- sound.enable = false;
- nixpkgs.config.allowUnfree = true;
- time.timeZone = "Europe/Berlin";
}
];