Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
lassulus 2018-08-04 11:37:56 +02:00
commit 7824d67d94
4 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jeschli/1systems/bln/config.nix
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; }
];
} }

1
jeschli/2configs/emacs.nix
View File

@ -57,6 +57,7 @@ let
(global-set-key "\C-x\ \C-r" 'recentf-open-files) (global-set-key "\C-x\ \C-r" 'recentf-open-files)
''; '';
dotEmacs = pkgs.writeText "dot-emacs" '' dotEmacs = pkgs.writeText "dot-emacs" ''
${evilMode}
${packageRepos} ${packageRepos}
${orgMode} ${orgMode}
${recentFiles} ${recentFiles}

3
jeschli/2configs/xserver/Xresources.nix
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

60
krebs/3modules/git.nix
View File

@ -8,6 +8,21 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let 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; cfg = config.krebs.git;
out = { out = {
@ -121,42 +136,15 @@ let
cgit-settings = types.submodule { cgit-settings = types.submodule {
# A setting's value of `null` means cgit's default should be used. # A setting's value of `null` means cgit's default should be used.
options = { options = {
cache-root = mkOption { cache-root = defaultAbsolutpath("/tmp/cgit");
type = types.absolute-pathname; cache-size = defaultUint(1000);
default = "/tmp/cgit"; css = defaultAbsolutpath("/static/cgit.css");
}; enable-commit-graph = defaultBool(true);
cache-size = mkOption { enable-index-links = defaultBool(true);
type = types.uint; enable-index-owner = defaultBool(false);
default = 1000; enable-log-filecount = defaultBool(true);
}; enable-log-linecount = defaultBool(true);
css = mkOption { enable-remote-branches = defaultBool(true);
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;
};
logo = mkOption { logo = mkOption {
type = types.absolute-pathname; type = types.absolute-pathname;
default = "/static/cgit.png"; default = "/static/cgit.png";