From d487c1b5c2a34de41376dddfb39224719d3d81c4 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 1 Aug 2018 13:53:46 +0200
Subject: [PATCH 1/4] j emacs: activate evilMode
---
jeschli/2configs/emacs.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 2089d4254..3bd2dbfc4 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -57,6 +57,7 @@ let
(global-set-key "\C-x\ \C-r" 'recentf-open-files)
'';
dotEmacs = pkgs.writeText "dot-emacs" ''
+ ${evilMode}
${packageRepos}
${orgMode}
${recentFiles}
From dbbf237393468b49f07beaeea614e12bac35a6c2 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 1 Aug 2018 13:55:10 +0200
Subject: [PATCH 2/4] krebs git: refactor
---
krebs/3modules/git.nix | 60 +++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 36 deletions(-)
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index 5ae24b40b..6311e88ab 100644
--- a/krebs/3modules/git.nix
+++ b/krebs/3modules/git.nix
@@ -8,6 +8,21 @@
with import <stockholm/lib>;
let
+ defaultBool = o: mkOption {
+ type = types.bool;
+ default = option;
+ };
+
+ defaultUint = o: mkOption {
+ type = types.uint;
+ default = o;
+ };
+
+ defaultAbsolutpath = o: mkOption {
+ type = types.absolute-pathname;
+ default = o;
+ };
+
cfg = config.krebs.git;
out = {
@@ -121,42 +136,15 @@ let
cgit-settings = types.submodule {
# A setting's value of `null` means cgit's default should be used.
options = {
- cache-root = mkOption {
- type = types.absolute-pathname;
- default = "/tmp/cgit";
- };
- cache-size = mkOption {
- type = types.uint;
- default = 1000;
- };
- css = mkOption {
- type = types.absolute-pathname;
- default = "/static/cgit.css";
- };
- enable-commit-graph = mkOption {
- type = types.bool;
- default = true;
- };
- enable-index-links = mkOption {
- type = types.bool;
- default = true;
- };
- enable-index-owner = mkOption {
- type = types.bool;
- default = false;
- };
- enable-log-filecount = mkOption {
- type = types.bool;
- default = true;
- };
- enable-log-linecount = mkOption {
- type = types.bool;
- default = true;
- };
- enable-remote-branches = mkOption {
- type = types.bool;
- default = true;
- };
+ cache-root = defaultAbsolutpath("/tmp/cgit");
+ cache-size = defaultUint(1000);
+ css = defaultAbsolutpath("/static/cgit.css");
+ enable-commit-graph = defaultBool(true);
+ enable-index-links = defaultBool(true);
+ enable-index-owner = defaultBool(false);
+ enable-log-filecount = defaultBool(true);
+ enable-log-linecount = defaultBool(true);
+ enable-remote-branches = defaultBool(true);
logo = mkOption {
type = types.absolute-pathname;
default = "/static/cgit.png";
From 49bfd805d525889c191137800892ce254f2c4c0b Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 1 Aug 2018 14:02:54 +0200
Subject: [PATCH 3/4] j bln: +pair programming eth link
---
jeschli/1systems/bln/config.nix | 5 +++++
1 file changed, 5 insertions(+)
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; }
+ ];
+
}
From 33577e0fb43fd6539c53d4dae25dfdc9b540b0e2 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 1 Aug 2018 14:05:29 +0200
Subject: [PATCH 4/4] j xserver: removed dpi; modified urxvt font-size
---
jeschli/2configs/xserver/Xresources.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix
index adf06ee63..ebe7159ff 100644
--- a/jeschli/2configs/xserver/Xresources.nix
+++ b/jeschli/2configs/xserver/Xresources.nix
@@ -5,7 +5,6 @@ with import <stockholm/lib>;
pkgs.writeText "Xresources" /* xdefaults */ ''
Xcursor.theme: aero-large-drop
Xcursor.size: 128
- Xft.dpi: 144
URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’"
URxvt*eightBitInput: false
@@ -22,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