diff options
| author | lassulus <lassulus@lassul.us> | 2017-10-01 17:54:06 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-10-01 17:54:06 +0200 |
| commit | d7f65ea679866f24e4ca52b51bd6f068a6b38195 (patch) | |
| tree | 6a09e7cc2a4c9af0507bdc189652c78832a2f952 /krebs/2configs | |
| parent | d973c779eb71749af464edb1ed0216b0d5317eb2 (diff) | |
| parent | e62f376e6177f3efb0e0bcd3aad97a991c3b6d60 (diff) | |
Merge branch 'master' into staging/17.09
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/binary-cache/prism.nix | 1 | ||||
| -rw-r--r-- | krebs/2configs/hw/x220.nix | 2 | ||||
| -rw-r--r-- | krebs/2configs/repo-sync.nix | 4 | ||||
| -rw-r--r-- | krebs/2configs/shack/muell_caller.nix | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/krebs/2configs/binary-cache/prism.nix b/krebs/2configs/binary-cache/prism.nix index 4813eeb0f..46b386e14 100644 --- a/krebs/2configs/binary-cache/prism.nix +++ b/krebs/2configs/binary-cache/prism.nix @@ -7,6 +7,7 @@ ]; binaryCachePublicKeys = [ "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU=" + "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI=" ]; }; } diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index c85bac0d4..44743b87d 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -8,6 +8,8 @@ with import <stockholm/lib>; hardware.cpu.intel.updateMicrocode = true; + hardware.opengl.enable = true; + services.tlp.enable = true; boot = { diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix index b0b0b2f62..84b7d9c0e 100644 --- a/krebs/2configs/repo-sync.nix +++ b/krebs/2configs/repo-sync.nix @@ -15,8 +15,8 @@ let post-receive = pkgs.git-hooks.irc-announce { nick = config.networking.hostName; verbose = false; - channel = "#retiolum"; - server = "ni.r"; + channel = "#xxx"; + server = "irc.r"; branches = [ "master" ]; }; }); diff --git a/krebs/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix index a39d0cc02..19768cb2e 100644 --- a/krebs/2configs/shack/muell_caller.nix +++ b/krebs/2configs/shack/muell_caller.nix @@ -6,8 +6,8 @@ let name = "muell_caller-2017-06-01"; src = pkgs.fetchgit { url = "https://github.com/shackspace/muell_caller/"; - rev = "bbd4009"; - sha256 = "1bfnfl2vdh0p5wzyz5p48qh04vvsg2445avg86fzhzragx25fqv0"; + rev = "ee4e499"; + sha256 = "0q1v07q633sbqg4wkgf0zya2bnqrikpyjhzp05iwn2vcs8rvsi3k"; }; buildInputs = [ (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ |