From 3ef9a0744e716ab2c5484c253c1cb40dd703e1b0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Jun 2016 22:09:57 +0200 Subject: l 1: move hardware: mors <-> shodan --- lass/1systems/mors.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index a7a1fd253..b044939d7 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -131,8 +131,8 @@ }; services.udev.extraRules = '' - SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:29:26:bc", NAME="wl0" - SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:0c:a7:63", NAME="et0" + SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:a0:0c", NAME="wl0" + SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:85:c9", NAME="et0" ''; #TODO activationScripts seem broken, fix them! -- cgit v1.2.3 From b447c3953334947421eb4693f66050c37acf2c34 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Jun 2016 22:11:11 +0200 Subject: l 1 mors: disable broken startupScript --- lass/1systems/mors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index b044939d7..598e502ad 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -146,7 +146,7 @@ #Autosuspend for USB device Broadcom Bluetooth Device [Broadcom Corp] #echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control' #Autosuspend for USB device Biometric Coprocessor - echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' + #echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' #Runtime PMs echo 'auto' > '/sys/bus/pci/devices/0000:00:02.0/power/control' -- cgit v1.2.3 From 69c36df9acb0ca85c7412bf2ebb815fe827c0ba9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 13 Jun 2016 13:48:43 +0200 Subject: l 1 mors: add umts config --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 598e502ad..beb5659d0 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -29,6 +29,7 @@ ../2configs/cbase.nix ../2configs/mail.nix ../2configs/krebs-pass.nix + ../2configs/umts.nix #../2configs/buildbot-standalone.nix { #risk of rain port -- cgit v1.2.3 From 401d80610243f1eac1fcb123f51ce3ea6e2280da Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 22 Jun 2016 19:21:11 +0200 Subject: l 2: rename cbase to c-base --- lass/1systems/mors.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index beb5659d0..062e4c29d 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -26,11 +26,10 @@ ../2configs/teamviewer.nix ../2configs/libvirt.nix ../2configs/fetchWallpaper.nix - ../2configs/cbase.nix + ../2configs/c-base.nix ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/umts.nix - #../2configs/buildbot-standalone.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ -- cgit v1.2.3 From 2b74d0defdc3c97ffa5e1f18a5e86637f208d7cb Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 25 Jun 2016 18:38:30 +0200 Subject: l: cleanup --- lass/1systems/mors.nix | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 062e4c29d..cccfa791c 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -3,6 +3,7 @@ { imports = [ ../. + ../2configs/hw/tp-x220.nix ../2configs/baseX.nix ../2configs/exim-retiolum.nix ../2configs/programs.nix @@ -14,14 +15,9 @@ ../2configs/elster.nix ../2configs/steam.nix ../2configs/wine.nix - #../2configs/texlive.nix - ../2configs/binary-caches.nix - #../2configs/ircd.nix ../2configs/chromium-patched.nix ../2configs/git.nix - #../2configs/wordpress.nix ../2configs/bitlbee.nix - #../2configs/firefoxPatched.nix ../2configs/skype.nix ../2configs/teamviewer.nix ../2configs/libvirt.nix @@ -57,17 +53,10 @@ # package = pkgs.postgresql; # }; #} - { - } ]; krebs.build.host = config.krebs.hosts.mors; - networking.wireless.enable = true; - - hardware.enableAllFirmware = true; - nixpkgs.config.allowUnfree = true; - boot = { loader.grub.enable = true; loader.grub.version = 2; @@ -77,7 +66,6 @@ initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; #kernelModules = [ "kvm-intel" "msr" ]; - kernelModules = [ "msr" ]; }; fileSystems = { "/" = { @@ -168,22 +156,6 @@ echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.4/power/control' ''; - hardware.trackpoint = { - enable = true; - sensitivity = 220; - speed = 0; - emulateWheel = true; - }; - - services.xserver = { - videoDriver = "intel"; - vaapiDrivers = [ pkgs.vaapiIntel ]; - deviceSection = '' - Option "AccelMethod" "sna" - BusID "PCI:0:2:0" - ''; - }; - environment.systemPackages = with pkgs; [ acronym cac-api @@ -217,12 +189,4 @@ services.mongodb = { enable = true; }; - - krebs.iptables = { - tables = { - filter.INPUT.rules = [ - { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; precedence = 9001; } - ]; - }; - }; } -- cgit v1.2.3 From 70d375985262e148238fce406027a161fbd1d765 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 26 Jun 2016 17:55:21 +0200 Subject: l 1 mors: activate repo-sync --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index cccfa791c..d7b19f2b5 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -26,6 +26,7 @@ ../2configs/mail.nix ../2configs/krebs-pass.nix ../2configs/umts.nix + ../2configs/repo-sync.nix { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ -- cgit v1.2.3 From 8fd02a0cccc3cda258956fe400997a2e3ede496d Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 28 Jun 2016 17:25:12 +0200 Subject: l 1 mors: sync repos once daily --- lass/1systems/mors.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass/1systems/mors.nix') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index d7b19f2b5..f26f0ed5f 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -187,6 +187,10 @@ }; }; + krebs.repo-sync.timerConfig = { + OnCalendar = "00:37"; + }; + services.mongodb = { enable = true; }; -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/ad100000.lock: No such file or directory (2)