Merge remote-tracking branch 'origin/staging/jeschli'
This commit is contained in:
commit
676f5668de
@ -13,7 +13,9 @@ with import <stockholm/lib>;
|
|||||||
};
|
};
|
||||||
plugins = with pkgs.ReaktorPlugins; [
|
plugins = with pkgs.ReaktorPlugins; [
|
||||||
sed-plugin
|
sed-plugin
|
||||||
taskwarrior
|
task-add
|
||||||
|
task-delete
|
||||||
|
task-list
|
||||||
] ++
|
] ++
|
||||||
(attrValues (todo "agenda"))
|
(attrValues (todo "agenda"))
|
||||||
;
|
;
|
||||||
|
@ -10,6 +10,9 @@ with import <stockholm/lib>;
|
|||||||
};
|
};
|
||||||
plugins = with pkgs.ReaktorPlugins; [
|
plugins = with pkgs.ReaktorPlugins; [
|
||||||
sed-plugin
|
sed-plugin
|
||||||
|
task-add
|
||||||
|
task-delete
|
||||||
|
task-list
|
||||||
] ++
|
] ++
|
||||||
(attrValues (todo "agenda"))
|
(attrValues (todo "agenda"))
|
||||||
;
|
;
|
||||||
|
@ -146,16 +146,28 @@ rec {
|
|||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
taskwarrior = buildSimpleReaktorPlugin "task" {
|
taskrcFile = builtins.toFile "taskrc" ''
|
||||||
pattern = "^task: (?P<args>.*)$$";
|
confirmation=no
|
||||||
script = let
|
'';
|
||||||
taskrc = "$HOME/.taskrc";
|
|
||||||
in
|
task-add = buildSimpleReaktorPlugin "task-add" {
|
||||||
pkgs.writeDash "task-wrapper" ''
|
pattern = "^task-add: (?P<args>.*)$$";
|
||||||
if [ -f ${taskrc} ] ; then
|
script = pkgs.writeDash "task-add" ''
|
||||||
touch ${taskrc}
|
${pkgs.taskwarrior}/bin/task rc:${taskrcFile} add "$*"
|
||||||
fi
|
'';
|
||||||
${pkgs.taskwarrior}/bin/task "$*"
|
};
|
||||||
|
|
||||||
|
task-list = buildSimpleReaktorPlugin "task-list" {
|
||||||
|
pattern = "^task-list";
|
||||||
|
script = pkgs.writeDash "task-list" ''
|
||||||
|
${pkgs.taskwarrior}/bin/task rc:${taskrcFile} list
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
task-delete = buildSimpleReaktorPlugin "task-delete" {
|
||||||
|
pattern = "^task-delete: (?P<args>.*)$$";
|
||||||
|
script = pkgs.writeDash "task-delete" ''
|
||||||
|
${pkgs.taskwarrior}/bin/task rc:${taskrcFile} delete "$*"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
fetchgit {
|
fetchgit {
|
||||||
url = https://cgit.krebsco.de/krops;
|
url = https://cgit.krebsco.de/krops;
|
||||||
rev = "refs/tags/v1.0.0";
|
rev = "refs/tags/v1.1.0";
|
||||||
sha256 = "0ahp3fxb3l1vcjylxw0cd0f4hfp98bxskkf3z9d37hl3m7v4pcb4";
|
sha256 = "19z5385rdci2bj0l7ksjbgyj84vsb29kz87j9x6vj5vv16y7y4ll";
|
||||||
}
|
}
|
||||||
|
@ -55,6 +55,7 @@ with import <stockholm/lib>;
|
|||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts.default = {
|
virtualHosts.default = {
|
||||||
|
default = true;
|
||||||
serverAliases = [
|
serverAliases = [
|
||||||
"localhost"
|
"localhost"
|
||||||
"${config.krebs.build.host.name}"
|
"${config.krebs.build.host.name}"
|
||||||
@ -80,9 +81,6 @@ with import <stockholm/lib>;
|
|||||||
client.enable = true;
|
client.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{
|
|
||||||
services.mongodb.enable = true;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.mors;
|
krebs.build.host = config.krebs.hosts.mors;
|
||||||
|
@ -315,21 +315,6 @@ with import <stockholm/lib>;
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{ #weechat port forwarding to blue
|
|
||||||
krebs.iptables.tables.filter.INPUT.rules = [
|
|
||||||
{ predicate = "-p tcp --dport 9998"; target = "ACCEPT";}
|
|
||||||
];
|
|
||||||
krebs.iptables.tables.nat.PREROUTING.rules = [
|
|
||||||
{ v6 = false; precedence = 1000; predicate = "-d ${config.krebs.hosts.prism.nets.internet.ip4.addr} -p tcp --dport 9998"; target = "DNAT --to-destination ${config.krebs.hosts.blue.nets.retiolum.ip4.addr}:9999"; }
|
|
||||||
];
|
|
||||||
krebs.iptables.tables.filter.FORWARD.rules = [
|
|
||||||
{ v6 = false; precedence = 1000; predicate = "-d ${config.krebs.hosts.blue.nets.retiolum.ip4.addr} -p tcp --dport 9999"; target = "ACCEPT"; }
|
|
||||||
{ v6 = false; precedence = 1000; predicate = "-s ${config.krebs.hosts.blue.nets.retiolum.ip4.addr}"; target = "ACCEPT"; }
|
|
||||||
];
|
|
||||||
krebs.iptables.tables.nat.POSTROUTING.rules = [
|
|
||||||
{ v6 = false; predicate = "-d ${config.krebs.hosts.blue.nets.retiolum.ip4.addr} -p tcp --dport 9999"; target = "MASQUERADE"; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
krebs.iptables.tables.filter.INPUT.rules = [
|
krebs.iptables.tables.filter.INPUT.rules = [
|
||||||
{ predicate = "-p udp --dport 51820"; target = "ACCEPT"; }
|
{ predicate = "-p udp --dport 51820"; target = "ACCEPT"; }
|
||||||
@ -376,4 +361,8 @@ with import <stockholm/lib>;
|
|||||||
krebs.build.host = config.krebs.hosts.prism;
|
krebs.build.host = config.krebs.hosts.prism;
|
||||||
# workaround because grub store paths are broken
|
# workaround because grub store paths are broken
|
||||||
boot.copyKernels = true;
|
boot.copyKernels = true;
|
||||||
|
services.earlyoom = {
|
||||||
|
enable = true;
|
||||||
|
freeMemThreshold = 5;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -90,7 +90,7 @@ in {
|
|||||||
}
|
}
|
||||||
( createQuteUser "qb" [ "audio" ] 20 )
|
( createQuteUser "qb" [ "audio" ] 20 )
|
||||||
( createFirefoxUser "ff" [ "audio" ] 10 )
|
( createFirefoxUser "ff" [ "audio" ] 10 )
|
||||||
( createChromiumUser "cr" [ "audio" ] 9 )
|
( createChromiumUser "cr" [ "audio" "video" ] 9 )
|
||||||
( createChromiumUser "gm" [ "video" "audio" ] 8 )
|
( createChromiumUser "gm" [ "video" "audio" ] 8 )
|
||||||
( createChromiumUser "wk" [ "audio" ] 0 )
|
( createChromiumUser "wk" [ "audio" ] 0 )
|
||||||
( createChromiumUser "fb" [ "audio" ] 0 )
|
( createChromiumUser "fb" [ "audio" ] 0 )
|
||||||
|
@ -17,6 +17,7 @@ in {
|
|||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
config.krebs.users.lass.pubkey
|
config.krebs.users.lass.pubkey
|
||||||
config.krebs.users.lass-android.pubkey
|
config.krebs.users.lass-android.pubkey
|
||||||
|
config.krebs.users.lass-mors.pubkey
|
||||||
config.krebs.users.jeschli-bln.pubkey
|
config.krebs.users.jeschli-bln.pubkey
|
||||||
config.krebs.users.jeschli-brauerei.pubkey
|
config.krebs.users.jeschli-brauerei.pubkey
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1T5+2epslFARSnETdr4wdolA6ocJaD4H9tmz6BZFQKXlwIq+OMp+sSEdwYwW3Lu9+mNbBHPxVVJDWg/We9DXB0ezXPM5Bs1+FcehmkoGwkmgKaFCDt0sL+CfSnog/3wEkN21O/rQxVFqMmiJ7WUDGci6IKCFZ5ZjOsmmfHg5p3LYxU9xv33fNr2v+XauhrGbFtQ7eDz4kSywxN/aw73LN4d8em0V0UV8VPI3Qkw7MamDFwefA+K1TfK8pBzMeruU6N7HLuNkpkAp7kS+K4Zzd72aQtR37a5qMiFUbOxQ9B7iFypuPx0iu6ZwY1s/sM8t3kLmcDJ9O4FOTzlbpneet3as6iJ+Ckr/TlfKor2Tl5pWcXh2FXHoG8VUu5bYmIViJBrKihAlAQfQN0mJ9fdFTnCXVTtbYTy11s4eEVHgUlb7oSpgBnx5bnBONgApbsOX9zyoo8wz8KkZBcf1SQpkV5br8uUAHCcZtHuY6I3kKlv+8lJmgUipiYzMdTi7+dHa49gVEcEKL4ZnJ0msQkl4XT7JjKETLvumC4/TIqVuRu48wuYalkCR9OzxCsTXQ/msBJBztPdYLrEOXVb2HfzuCT+43UuMQ5rP/EoPy0TWQO9BaqfEXqvbOvWjVxj/GMvglQ2ChZTwHxwwTKB8qRVvJLnbZQwizQiSrkzjb6hRJfQ== u0_a165@localhost"
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1T5+2epslFARSnETdr4wdolA6ocJaD4H9tmz6BZFQKXlwIq+OMp+sSEdwYwW3Lu9+mNbBHPxVVJDWg/We9DXB0ezXPM5Bs1+FcehmkoGwkmgKaFCDt0sL+CfSnog/3wEkN21O/rQxVFqMmiJ7WUDGci6IKCFZ5ZjOsmmfHg5p3LYxU9xv33fNr2v+XauhrGbFtQ7eDz4kSywxN/aw73LN4d8em0V0UV8VPI3Qkw7MamDFwefA+K1TfK8pBzMeruU6N7HLuNkpkAp7kS+K4Zzd72aQtR37a5qMiFUbOxQ9B7iFypuPx0iu6ZwY1s/sM8t3kLmcDJ9O4FOTzlbpneet3as6iJ+Ckr/TlfKor2Tl5pWcXh2FXHoG8VUu5bYmIViJBrKihAlAQfQN0mJ9fdFTnCXVTtbYTy11s4eEVHgUlb7oSpgBnx5bnBONgApbsOX9zyoo8wz8KkZBcf1SQpkV5br8uUAHCcZtHuY6I3kKlv+8lJmgUipiYzMdTi7+dHa49gVEcEKL4ZnJ0msQkl4XT7JjKETLvumC4/TIqVuRu48wuYalkCR9OzxCsTXQ/msBJBztPdYLrEOXVb2HfzuCT+43UuMQ5rP/EoPy0TWQO9BaqfEXqvbOvWjVxj/GMvglQ2ChZTwHxwwTKB8qRVvJLnbZQwizQiSrkzjb6hRJfQ== u0_a165@localhost"
|
||||||
@ -63,4 +64,12 @@ in {
|
|||||||
networking.interfaces.et0.ipv4.addresses = [
|
networking.interfaces.et0.ipv4.addresses = [
|
||||||
{ address = "10.99.23.1"; prefixLength = 24; }
|
{ address = "10.99.23.1"; prefixLength = 24; }
|
||||||
];
|
];
|
||||||
|
virtualisation.docker.enable = true;
|
||||||
|
environment.etc."docker/daemon.json".source = pkgs.writeText "daemon.json" ''
|
||||||
|
{
|
||||||
|
"bip": "172.25.0.1/16"
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
services.rabbitmq.enable = true;
|
||||||
|
services.postgresql.enable = true;
|
||||||
}
|
}
|
||||||
|
@ -83,6 +83,7 @@ with import <stockholm/lib>;
|
|||||||
{ from = "elitedangerous@lassul.us"; to = lass.mail; }
|
{ from = "elitedangerous@lassul.us"; to = lass.mail; }
|
||||||
{ from = "boardgamegeek@lassul.us"; to = lass.mail; }
|
{ from = "boardgamegeek@lassul.us"; to = lass.mail; }
|
||||||
{ from = "qwertee@lassul.us"; to = lass.mail; }
|
{ from = "qwertee@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "zazzle@lassul.us"; to = lass.mail; }
|
||||||
];
|
];
|
||||||
system-aliases = [
|
system-aliases = [
|
||||||
{ from = "mailer-daemon"; to = "postmaster"; }
|
{ from = "mailer-daemon"; to = "postmaster"; }
|
||||||
|
@ -30,6 +30,14 @@ let
|
|||||||
rules = concatMap make-rules (attrValues repos);
|
rules = concatMap make-rules (attrValues repos);
|
||||||
|
|
||||||
public-repos = mapAttrs make-public-repo {
|
public-repos = mapAttrs make-public-repo {
|
||||||
|
cholerab = {
|
||||||
|
cgit.desc = "krebs thesauron & enterprise-patterns";
|
||||||
|
cgit.section = "documentation";
|
||||||
|
};
|
||||||
|
disko = {
|
||||||
|
cgit.desc = "take a description of your disk layout and produce a format script";
|
||||||
|
cgit.section = "software";
|
||||||
|
};
|
||||||
news = {
|
news = {
|
||||||
cgit.desc = "take a rss feed and a timeout and print it to stdout";
|
cgit.desc = "take a rss feed and a timeout and print it to stdout";
|
||||||
cgit.section = "software";
|
cgit.section = "software";
|
||||||
|
@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
let
|
let
|
||||||
|
unstable_nixpkgs = import (pkgs.fetchFromGitHub {
|
||||||
|
owner = "NixOS";
|
||||||
|
repo = "nixpkgs";
|
||||||
|
rev = "a8c71037e041725d40fbf2f3047347b6833b1703";
|
||||||
|
sha256 = "1z4cchcw7qgjhy0x6mnz7iqvpswc2nfjpdynxc54zpm66khfrjqw";
|
||||||
|
}) {};
|
||||||
out = {
|
out = {
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(hiPrio vim)
|
(hiPrio vim)
|
||||||
@ -9,6 +15,10 @@ let
|
|||||||
(pkgs.writeDashBin "govet" ''
|
(pkgs.writeDashBin "govet" ''
|
||||||
go vet "$@"
|
go vet "$@"
|
||||||
'')
|
'')
|
||||||
|
(hiPrio (unstable_nixpkgs.python3.withPackages (ps: [
|
||||||
|
ps.python-language-server
|
||||||
|
ps.pyls-isort
|
||||||
|
])))
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.etc.vimrc.source = vimrc;
|
environment.etc.vimrc.source = vimrc;
|
||||||
@ -68,11 +78,17 @@ let
|
|||||||
au BufRead,BufNewFile /dev/shm/* set nobackup nowritebackup noswapfile
|
au BufRead,BufNewFile /dev/shm/* set nobackup nowritebackup noswapfile
|
||||||
|
|
||||||
"Syntastic config
|
"Syntastic config
|
||||||
let g:syntastic_python_checkers=['flake8']
|
"let g:syntastic_python_checkers=['flake8']
|
||||||
let g:syntastic_python_flake8_post_args='--ignore=E501'
|
"let g:syntastic_python_flake8_post_args='--ignore=E501'
|
||||||
|
|
||||||
let g:go_metalinter_autosave = 1
|
nnoremap <F5> :call LanguageClient_contextMenu()<CR>
|
||||||
let g:go_metalinter_deadline = "10s"
|
set hidden
|
||||||
|
let g:LanguageClient_serverCommands = {
|
||||||
|
\ 'python': ['pyls'],
|
||||||
|
\ 'go': ['~/go/bin/go-langserver']
|
||||||
|
\ }
|
||||||
|
|
||||||
|
let g:LanguageClient_diagnosticsDisplay = { 2: { "signText": "W" } }
|
||||||
|
|
||||||
nmap <esc>q :buffer
|
nmap <esc>q :buffer
|
||||||
nmap <M-q> :buffer
|
nmap <M-q> :buffer
|
||||||
@ -115,9 +131,11 @@ let
|
|||||||
extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
|
extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
|
||||||
pkgs.vimPlugins.ack-vim
|
pkgs.vimPlugins.ack-vim
|
||||||
pkgs.vimPlugins.Gundo
|
pkgs.vimPlugins.Gundo
|
||||||
pkgs.vimPlugins.Syntastic
|
#pkgs.vimPlugins.Syntastic
|
||||||
pkgs.vimPlugins.undotree
|
pkgs.vimPlugins.undotree
|
||||||
pkgs.vimPlugins.vim-go
|
pkgs.vimPlugins.vim-go
|
||||||
|
pkgs.vimPlugins.fzf-vim
|
||||||
|
unstable_nixpkgs.vimPlugins.LanguageClient-neovim
|
||||||
(pkgs.vimUtils.buildVimPlugin {
|
(pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "file-line-1.0";
|
name = "file-line-1.0";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
|
@ -119,6 +119,7 @@ in {
|
|||||||
{ from = "ms@ubikmedia.eu"; to = "ms"; }
|
{ from = "ms@ubikmedia.eu"; to = "ms"; }
|
||||||
{ from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms"; }
|
{ from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms"; }
|
||||||
{ from = "akayguen@freemonkey.art"; to ="akayguen"; }
|
{ from = "akayguen@freemonkey.art"; to ="akayguen"; }
|
||||||
|
{ from = "bui@freemonkey.art"; to ="bui"; }
|
||||||
|
|
||||||
{ from = "testuser@lassul.us"; to = "testuser"; }
|
{ from = "testuser@lassul.us"; to = "testuser"; }
|
||||||
{ from = "testuser@ubikmedia.eu"; to = "testuser"; }
|
{ from = "testuser@ubikmedia.eu"; to = "testuser"; }
|
||||||
@ -183,5 +184,12 @@ in {
|
|||||||
createHome = true;
|
createHome = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.users.bui = {
|
||||||
|
uid = genid_signed "bui";
|
||||||
|
home = "/home/bui";
|
||||||
|
useDefaultShell = true;
|
||||||
|
createHome = true;
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ in {
|
|||||||
<stockholm/makefu/2configs/iodined.nix>
|
<stockholm/makefu/2configs/iodined.nix>
|
||||||
|
|
||||||
## buildbot
|
## buildbot
|
||||||
#<stockholm/makefu/2configs/remote-build/slave.nix>
|
<stockholm/makefu/2configs/remote-build/slave.nix>
|
||||||
|
|
||||||
# Removed until move: no extra mails
|
# Removed until move: no extra mails
|
||||||
# <stockholm/makefu/2configs/urlwatch>
|
# <stockholm/makefu/2configs/urlwatch>
|
||||||
@ -94,6 +94,7 @@ in {
|
|||||||
## Temporary:
|
## Temporary:
|
||||||
# <stockholm/makefu/2configs/temp/rst-issue.nix>
|
# <stockholm/makefu/2configs/temp/rst-issue.nix>
|
||||||
<stockholm/makefu/2configs/virtualisation/docker.nix>
|
<stockholm/makefu/2configs/virtualisation/docker.nix>
|
||||||
|
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
||||||
|
|
||||||
#{
|
#{
|
||||||
# services.dockerRegistry.enable = true;
|
# services.dockerRegistry.enable = true;
|
||||||
|
@ -26,18 +26,15 @@ with import <stockholm/lib>;
|
|||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "/dev/mapper/wuvga-root";
|
device = "/dev/mapper/wuvga-root";
|
||||||
fsType = "btrfs";
|
fsType = "ext4";
|
||||||
options = ["defaults" "noatime" "ssd" "compress=lzo"];
|
|
||||||
};
|
};
|
||||||
"/bku" = {
|
"/bku" = {
|
||||||
device = "/dev/mapper/wuvga-bku";
|
device = "/dev/mapper/wuvga-bku";
|
||||||
fsType = "btrfs";
|
fsType = "ext4";
|
||||||
options = ["defaults" "noatime" "ssd" "compress=lzo"];
|
|
||||||
};
|
};
|
||||||
"/home" = {
|
"/home" = {
|
||||||
device = "/dev/mapper/wuvga-home";
|
device = "/dev/mapper/wuvga-home";
|
||||||
fsType = "btrfs";
|
fsType = "ext4";
|
||||||
options = ["defaults" "noatime" "ssd" "compress=lzo"];
|
|
||||||
};
|
};
|
||||||
"/boot" = {
|
"/boot" = {
|
||||||
device = "/dev/sda1";
|
device = "/dev/sda1";
|
||||||
|
@ -32,6 +32,9 @@ let {
|
|||||||
dic = {
|
dic = {
|
||||||
cgit.desc = "dict.leo.org command line interface";
|
cgit.desc = "dict.leo.org command line interface";
|
||||||
};
|
};
|
||||||
|
disko = {
|
||||||
|
cgit.desc = "declarative partitioning and formatting tool";
|
||||||
|
};
|
||||||
get = {};
|
get = {};
|
||||||
hstool = {
|
hstool = {
|
||||||
cgit.desc = "Haskell Development Environment ^_^";
|
cgit.desc = "Haskell Development Environment ^_^";
|
||||||
|
Loading…
Reference in New Issue
Block a user