Merge remote-tracking branch 'origin/staging/jeschli'

This commit is contained in:
jeschli 2018-08-21 19:46:58 +02:00
commit f2dadea808
2 changed files with 7 additions and 1 deletions

View File

@ -165,4 +165,9 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
krebs.build.host = config.krebs.hosts.bln; krebs.build.host = config.krebs.hosts.bln;
networking.interfaces.enp0s31f6.ipv4.addresses = [
{ address = "10.99.23.2"; prefixLength = 24; }
];
} }

View File

@ -21,7 +21,8 @@ pkgs.writeText "Xresources" /* xdefaults */ ''
URxvt*charClass: 33:48,37:48,45-47:48,64:48,38:48,61:48,63:48 URxvt*charClass: 33:48,37:48,45-47:48,64:48,38:48,61:48,63:48
URxvt*cutNewline: False URxvt*cutNewline: False
URxvt*cutToBeginningOfLine: False URxvt*cutToBeginningOfLine: False
URxvt*font: xft:Monospace:size=12
URxvt*font: xft:Monospace:size=12:bold
URxvt*color0: #232342 URxvt*color0: #232342
URxvt*color3: #c07000 URxvt*color3: #c07000
URxvt*color4: #4040c0 URxvt*color4: #4040c0