summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-08-21 19:46:58 +0200
committerjeschli <jeschli@gmail.com>2018-08-21 19:46:58 +0200
commitf2dadea808323f69531c51b12ed5cb872ac933a0 (patch)
tree4239c41416fed74f1a50c164e89b723e44ffac35
parent7f53d51c0afa7cb2c98a1b21f4df6e5590ec2ce5 (diff)
parentca73603b2588df6a8c2f4de30b1e83bf88a5d258 (diff)
Merge remote-tracking branch 'origin/staging/jeschli'
-rw-r--r--jeschli/1systems/bln/config.nix5
-rw-r--r--jeschli/2configs/xserver/Xresources.nix3
2 files changed, 7 insertions, 1 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index e17d5a41b..6e3c3bec8 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -165,4 +165,9 @@
hardware.bluetooth.enable = true;
krebs.build.host = config.krebs.hosts.bln;
+
+ networking.interfaces.enp0s31f6.ipv4.addresses = [
+ { address = "10.99.23.2"; prefixLength = 24; }
+ ];
+
}
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
index 98f325256..ebe7159ff 100644
--- a/jeschli/2configs/xserver/Xresources.nix
+++ b/jeschli/2configs/xserver/Xresources.nix
@@ -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*cutNewline: False
URxvt*cutToBeginningOfLine: False
-
+ URxvt*font: xft:Monospace:size=12
+ URxvt*font: xft:Monospace:size=12:bold
URxvt*color0: #232342
URxvt*color3: #c07000
URxvt*color4: #4040c0