diff options
author | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2017-01-25 23:23:29 +0100 |
commit | bf405736962fd20df738f84665e5fc7f8d74e72d (patch) | |
tree | ae01054fe88089d6476b3c1b1952066fd6c79092 /tv/2configs | |
parent | 7e1bd2729e11e5c63749c69093359de0bb3329b2 (diff) | |
parent | 89c5b22129d3cb875d16a3171a4e3ab3bee9cb0a (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/backup.nix | 12 | ||||
-rw-r--r-- | tv/2configs/git.nix | 6 | ||||
-rw-r--r-- | tv/2configs/hw/w110er.nix | 8 | ||||
-rw-r--r-- | tv/2configs/urlwatch.nix | 2 | ||||
-rw-r--r-- | tv/2configs/vim.nix | 7 |
5 files changed, 10 insertions, 25 deletions
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix index 7c91b1cf..5cc86cfd 100644 --- a/tv/2configs/backup.nix +++ b/tv/2configs/backup.nix @@ -46,12 +46,6 @@ with import <stockholm/lib>; dst = { host = config.krebs.hosts.zu; path = "/bku/xu-home"; }; startAt = "06:20"; }; - xu-pull-cd-ejabberd = { - method = "pull"; - src = { host = config.krebs.hosts.cd; path = "/var/ejabberd"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/cd-ejabberd"; }; - startAt = "07:00"; - }; xu-pull-cd-home = { method = "pull"; src = { host = config.krebs.hosts.cd; path = "/home"; }; @@ -76,12 +70,6 @@ with import <stockholm/lib>; dst = { host = config.krebs.hosts.xu; path = "/bku/zu-home"; }; startAt = "05:00"; }; - zu-pull-cd-ejabberd = { - method = "pull"; - src = { host = config.krebs.hosts.cd; path = "/var/ejabberd"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/cd-ejabberd"; }; - startAt = "06:00"; - }; zu-pull-cd-home = { method = "pull"; src = { host = config.krebs.hosts.cd; path = "/home"; }; diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 48d73836..9ccb0a05 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -2,9 +2,9 @@ with import <stockholm/lib>; -let +let { - out = { + body = { krebs.git = { enable = true; cgit = { @@ -123,4 +123,4 @@ let perm = fetch; }; -in out +} diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix index aa829244..787bfc6e 100644 --- a/tv/2configs/hw/w110er.nix +++ b/tv/2configs/hw/w110er.nix @@ -12,9 +12,11 @@ boot.initrd.availableKernelModules = [ "ahci" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.loader.gummiboot.enable = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; + networking.wireless.enable = true; nix = { @@ -31,10 +33,6 @@ HandleSuspendKey=ignore ''; - services.xserver = { - vaapiDrivers = [ pkgs.vaapiIntel ]; - }; - system.activationScripts.powertopTunables = '' echo 1 > /sys/module/snd_hda_intel/parameters/power_save echo 1500 > /proc/sys/vm/dirty_writeback_centisecs diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index b3459090..6e11e025 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -47,7 +47,7 @@ with import <stockholm/lib>; #http://hackage.haskell.org/package/web-page # ref <stockholm/krebs/3modules>, services.openssh.knownHosts.github* - https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/ + https://help.github.com/articles/github-s-ip-addresses/ # <stockholm/tv/2configs/xserver/xserver.conf.nix> # is derived from `configFile` in: diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index cc59a95a..1ffafe9c 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: with import <stockholm/lib>; -let - out = { +let { + body = { environment.systemPackages = [ vim ]; @@ -411,5 +411,4 @@ let catch /^Vim\%((\a\+)\)\=:E484/ endtry ''; -in -out +} |