From 0b4d3edff8f3e0e33756355f1b3121cf311bafdb Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:32:14 +0200 Subject: tv: boot.tmpOnTmpfs = true --- tv/1systems/mu/config.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 4c6d1632..01de9ee6 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -50,11 +50,6 @@ with import ; "/boot" = { device = "/dev/sda1"; }; - "/tmp" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = [ "nosuid" "nodev" "noatime" ]; - }; }; swapDevices =[ ]; @@ -152,9 +147,4 @@ with import ; "networkmanager" ]; }; - - # see tmpfiles.d(5) - systemd.tmpfiles.rules = [ - "d /tmp 1777 root root - -" # does this work with mounted /tmp? - ]; } -- cgit v1.2.3 From 9b62b9d74ba298b10823d5b71aa46d6ea46f0e13 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:37:41 +0200 Subject: tv systems: normalize head --- tv/1systems/mu/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 01de9ee6..11715c14 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -1,8 +1,6 @@ -{ config, pkgs, ... }: - with import ; +{ config, pkgs, ... }: { -{ imports = [ -- cgit v1.2.3 From 91e48fae045a8b00239ae65bb027143ef9fcc50c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:47:08 +0200 Subject: tv: drop redundant swapDevices defs --- tv/1systems/mu/config.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 11715c14..0c1e7923 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -50,8 +50,6 @@ with import ; }; }; - swapDevices =[ ]; - nixpkgs.config.allowUnfree = true; hardware.opengl.driSupport32Bit = true; -- cgit v1.2.3 From 51042442288c2d27a2fb7ce073801932c5457813 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 23:28:21 +0200 Subject: tv: drop security.wrappers.sendmail --- tv/1systems/mu/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 0c1e7923..95b01bff 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -88,7 +88,6 @@ with import ; programs.ssh.startAgent = false; security.wrappers = { - sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron slock.source = "${pkgs.slock}/bin/slock"; }; -- cgit v1.2.3 From 13b161949cee6f1fb97781fcfa0a700ac4f5b352 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Aug 2017 00:22:49 +0200 Subject: tv mu: drop boot.extraModprobeConfig --- tv/1systems/mu/config.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 95b01bff..32143f37 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -31,10 +31,6 @@ with import ; boot.kernelModules = [ "fbcon" "kvm-intel" ]; boot.extraModulePackages = [ ]; - boot.extraModprobeConfig = '' - options kvm_intel nested=1 - ''; - fileSystems = { "/" = { device = "/dev/vgmu1/nixroot"; -- cgit v1.2.3 From f607ba46109e11466988b980ff36e395aa0c4049 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Aug 2017 02:13:57 +0200 Subject: tv mu: drop udev extraRules --- tv/1systems/mu/config.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 32143f37..42fcfdb2 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -12,16 +12,6 @@ with import ; krebs.build.host = config.krebs.hosts.mu; krebs.build.user = mkForce config.krebs.users.vv; - services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0" - SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0" - - # for jack - KERNEL=="rtc0", GROUP="audio" - KERNEL=="hpet", GROUP="audio" - ''; - - # hardware configuration boot.initrd.luks.devices = [ { name = "vgmu1"; device = "/dev/sda2"; } -- cgit v1.2.3 From d97d86eddec8002a7a7e5b01320e33121a6ff27f Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Aug 2017 02:14:23 +0200 Subject: tv mu: boot.loader.{gummiboot => systemd-boot} --- tv/1systems/mu/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 42fcfdb2..96ccd321 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -43,8 +43,8 @@ with import ; hardware.enableRedistributableFirmware = true; - boot.loader.gummiboot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = true; networking.networkmanager.enable = true; -- cgit v1.2.3 From 87c7d8dcf933c2de783098dfe9b6f1b383062daf Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Aug 2017 02:14:49 +0200 Subject: tv mu: enable x0vncserver --- tv/1systems/mu/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tv/1systems/mu/config.nix') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 96ccd321..08948187 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -12,6 +12,8 @@ with import ; krebs.build.host = config.krebs.hosts.mu; krebs.build.user = mkForce config.krebs.users.vv; + tv.x0vncserver.enable = true; + # hardware configuration boot.initrd.luks.devices = [ { name = "vgmu1"; device = "/dev/sda2"; } -- cgit v1.2.3