From 0a17a244962778ef1597ac5749fb66d886053dd8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 4 Oct 2018 12:36:23 +0200 Subject: l mors.r: add adb-sync to pkgs --- lass/1systems/mors/config.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 69954a3e9..d3fb441a8 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -77,6 +77,7 @@ with import ; environment.systemPackages = [ pkgs.ovh-zone pkgs.bank + pkgs.adb-sync ]; } { -- cgit v1.2.3 From 1ca261eb502780a77d3059f54128720a2ed58e6a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 6 Oct 2018 18:33:03 +0200 Subject: l prism.r: remove radio.lassul.us --- lass/1systems/prism/config.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index f83721070..bf7de6fc5 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -291,16 +291,6 @@ with import ; ]; } { - services.nginx = { - enable = true; - virtualHosts."radio.lassul.us" = { - forceSSL = true; - enableACME = true; - locations."/".extraConfig = '' - proxy_pass http://localhost:8000; - ''; - }; - }; } { lass.nichtparasoup.enable = true; -- cgit v1.2.3 From 921473db45c83c192d3b72a7e326715b9652abbf Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 6 Oct 2018 22:10:26 +0200 Subject: l mors.r: use stable nix --- lass/1systems/mors/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass/1systems') diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index d3fb441a8..6d65b58c2 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -144,7 +144,6 @@ with import ; OnCalendar = "00:37"; }; - nix.package = pkgs.nixUnstable; programs.adb.enable = true; users.users.mainUser.extraGroups = [ "adbusers" "docker" ]; virtualisation.docker.enable = true; -- cgit v1.2.3 From 62314e64c259bc6bae39e2bd29ecec2c5e5ea262 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Oct 2018 20:57:53 +0200 Subject: remove nin --- lass/1systems/prism/config.nix | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index bf7de6fc5..808f35b24 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -57,13 +57,6 @@ with import ; config.krebs.users.makefu.pubkey ]; }; - users.users.nin = { - uid = genid "nin"; - isNormalUser = true; - openssh.authorizedKeys.keys = [ - config.krebs.users.nin.pubkey - ]; - }; users.extraUsers.dritter = { uid = genid "dritter"; isNormalUser = true; @@ -119,7 +112,6 @@ with import ; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey - config.krebs.users.nin.pubkey ]; }; autoStart = true; -- cgit v1.2.3 From 67dc10646904d8286ad0a4ac8fecda99893827fd Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 9 Oct 2018 21:12:36 +0200 Subject: Revert "remove nin" This reverts commit 62314e64c259bc6bae39e2bd29ecec2c5e5ea262. --- lass/1systems/prism/config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 808f35b24..bf7de6fc5 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -57,6 +57,13 @@ with import ; config.krebs.users.makefu.pubkey ]; }; + users.users.nin = { + uid = genid "nin"; + isNormalUser = true; + openssh.authorizedKeys.keys = [ + config.krebs.users.nin.pubkey + ]; + }; users.extraUsers.dritter = { uid = genid "dritter"; isNormalUser = true; @@ -112,6 +119,7 @@ with import ; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey + config.krebs.users.nin.pubkey ]; }; autoStart = true; -- cgit v1.2.3 From 2861c374a49b4b3045577243fa32af048e9b50f1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 23 Oct 2018 15:43:02 +0200 Subject: l prism.r: use new physical.nix --- lass/1systems/prism/physical.nix | 84 ++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 46 deletions(-) (limited to 'lass/1systems') 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 = [ ]; + 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"; } ]; -- cgit v1.2.3