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

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

Browse Source
This commit is contained in:
jeschli 2018-08-01 14:08:04 +02:00
commit ca73603b25
4 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jeschli/1systems/brauerei/config.nix
View File

@ -25,21 +25,11 @@
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
} ]; } ];
# networking.hostName = "brauerei";
# Define your hostname.
# networking.wireless.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# Enables wireless support via wpa_supplicant.
# Select internationalisation properties.
# i18n = {
# consoleFont = "Lat2-Terminus16";
# consoleKeyMap = "us";
# defaultLocale = "en_US.UTF-8";
# };
# Set your time zone. #
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget
environment.shellAliases = { environment.shellAliases = {
n = "nix-shell"; n = "nix-shell";
stocki = pkgs.writeDash "deploy" '' stocki = pkgs.writeDash "deploy" ''
@ -47,6 +37,7 @@
exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"' exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"'
''; '';
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# system helper # system helper
ag ag
@ -103,6 +94,7 @@
zathura zathura
# xorg # xorg
xorg.xbacklight xorg.xbacklight
taskwarrior
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -126,7 +118,7 @@
display = 11; display = 11;
tty = 11; tty = 11;
dpi = 96; dpi = 144;
# videoDrivers = [ "nvidia" ]; # videoDrivers = [ "nvidia" ];
synaptics = { synaptics = {
@ -138,7 +130,7 @@
users.extraUsers.jeschli = { # TODO: define as krebs.users users.extraUsers.jeschli = { # TODO: define as krebs.users
isNormalUser = true; isNormalUser = true;
extraGroups = ["docker" "vboxusers"]; extraGroups = ["docker" "vboxusers" "audio"];
uid = 1000; uid = 1000;
}; };
users.extraUsers.jamie = { users.extraUsers.jamie = {

1
jeschli/1systems/brauerei/hardware-configuration.nix
View File

@ -29,5 +29,6 @@
swapDevices = [ ]; swapDevices = [ ];
hardware.pulseaudio.enable = true;
nix.maxJobs = lib.mkDefault 4; nix.maxJobs = lib.mkDefault 4;
} }

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}

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";