Merge branch 'master' of prism.r:stockholm
This commit is contained in:
commit
595b5de0bd
@ -58,7 +58,7 @@ let
|
|||||||
ref = "heads/master";
|
ref = "heads/master";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
krebs.git = defineRepo name true;
|
krebs.git = defineRepo name false;
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
|
|
||||||
{
|
{
|
||||||
|
dns.providers = {
|
||||||
|
"lassul.us" = "zones";
|
||||||
|
};
|
||||||
hosts = mapAttrs (_: recursiveUpdate {
|
hosts = mapAttrs (_: recursiveUpdate {
|
||||||
owner = config.krebs.users.lass;
|
owner = config.krebs.users.lass;
|
||||||
ci = true;
|
ci = true;
|
||||||
@ -80,6 +83,18 @@ with import <stockholm/lib>;
|
|||||||
prism IN A ${nets.internet.ip4.addr}
|
prism IN A ${nets.internet.ip4.addr}
|
||||||
paste IN A ${nets.internet.ip4.addr}
|
paste IN A ${nets.internet.ip4.addr}
|
||||||
'';
|
'';
|
||||||
|
"lassul.us" = ''
|
||||||
|
$TTL 3600
|
||||||
|
@ IN SOA dns16.ovh.net. tech.ovh.net. (2017093001 86400 3600 3600000 300)
|
||||||
|
60 IN NS ns16.ovh.net.
|
||||||
|
60 IN NS dns16.ovh.net.
|
||||||
|
60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
|
||||||
|
60 IN TXT v=spf1 mx -all
|
||||||
|
cgit 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
|
||||||
|
io 60 IN NS ions.lassul.us.
|
||||||
|
ions 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
|
||||||
|
paste 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
nets = rec {
|
nets = rec {
|
||||||
internet = {
|
internet = {
|
||||||
|
@ -40,6 +40,9 @@ with import <stockholm/lib>;
|
|||||||
zathura
|
zathura
|
||||||
skype
|
skype
|
||||||
wine
|
wine
|
||||||
|
geeqie
|
||||||
|
vlc
|
||||||
|
minecraft
|
||||||
];
|
];
|
||||||
nixpkgs.config.firefox.enableAdobeFlash = true;
|
nixpkgs.config.firefox.enableAdobeFlash = true;
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
@ -289,13 +289,6 @@ in {
|
|||||||
alias /var/realwallpaper/realwallpaper.png;
|
alias /var/realwallpaper/realwallpaper.png;
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
{
|
|
||||||
services.minecraft-server.enable = true;
|
|
||||||
krebs.iptables.tables.filter.INPUT.rules = [
|
|
||||||
{ predicate = "-p tcp --dport 25565"; target = "ACCEPT"; }
|
|
||||||
{ predicate = "-p udp --dport 25565"; target = "ACCEPT"; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
<stockholm/krebs/2configs/reaktor-krebs.nix>
|
<stockholm/krebs/2configs/reaktor-krebs.nix>
|
||||||
<stockholm/lass/2configs/dcso-dev.nix>
|
<stockholm/lass/2configs/dcso-dev.nix>
|
||||||
{
|
{
|
||||||
@ -307,7 +300,7 @@ in {
|
|||||||
jeschli-brauerei
|
jeschli-brauerei
|
||||||
];
|
];
|
||||||
repo = [ config.krebs.git.repos.stockholm ];
|
repo = [ config.krebs.git.repos.stockholm ];
|
||||||
perm = with git; push "refs/heads/staging/jeschli" [ fast-forward non-fast-forward create delete merge ];
|
perm = with git; push "refs/heads/staging/jeschli*" [ fast-forward non-fast-forward create delete merge ];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@ -318,6 +311,8 @@ in {
|
|||||||
RandomizedDelaySec = "2min";
|
RandomizedDelaySec = "2min";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
<stockholm/lass/2configs/downloading.nix>
|
||||||
|
<stockholm/lass/2configs/minecraft.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.prism;
|
krebs.build.host = config.krebs.hosts.prism;
|
||||||
|
@ -85,6 +85,8 @@ in {
|
|||||||
screengrab
|
screengrab
|
||||||
slock
|
slock
|
||||||
sxiv
|
sxiv
|
||||||
|
timewarrior
|
||||||
|
taskwarrior
|
||||||
termite
|
termite
|
||||||
xclip
|
xclip
|
||||||
xorg.xbacklight
|
xorg.xbacklight
|
||||||
|
@ -35,7 +35,10 @@ let
|
|||||||
useDefaultShell = true;
|
useDefaultShell = true;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
};
|
};
|
||||||
lass.browser.paths.${name}.path = bin;
|
lass.browser.paths.${name} = {
|
||||||
|
path = bin;
|
||||||
|
inherit precedence;
|
||||||
|
};
|
||||||
security.sudo.extraConfig = ''
|
security.sudo.extraConfig = ''
|
||||||
${mainUser.name} ALL=(${name}) NOPASSWD: ALL
|
${mainUser.name} ALL=(${name}) NOPASSWD: ALL
|
||||||
'';
|
'';
|
||||||
@ -80,6 +83,14 @@ in {
|
|||||||
browser-select
|
browser-select
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.chromium = {
|
||||||
|
enable = true;
|
||||||
|
extensions = [
|
||||||
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
|
||||||
|
"dbepggeogbaibhgnhhndojpepiihcmeb" # vimium
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
{
|
{
|
||||||
options.lass.browser.select = mkOption {
|
options.lass.browser.select = mkOption {
|
||||||
@ -102,8 +113,9 @@ in {
|
|||||||
( createFirefoxUser "ff" [ "audio" ] 10 )
|
( createFirefoxUser "ff" [ "audio" ] 10 )
|
||||||
( createChromiumUser "cr" [ "video" "audio" ] 9 )
|
( createChromiumUser "cr" [ "video" "audio" ] 9 )
|
||||||
( createChromiumUser "gm" [ "video" "audio" ] 8 )
|
( createChromiumUser "gm" [ "video" "audio" ] 8 )
|
||||||
( createChromiumUser "wk" [ "video" "audio" ] )
|
( createChromiumUser "wk" [ "video" "audio" ] 0 )
|
||||||
( createChromiumUser "fb" [ "video" "audio" ] )
|
( createChromiumUser "fb" [ "video" "audio" ] 0 )
|
||||||
( createChromiumUser "com" [ "video" "audio" ] )
|
( createChromiumUser "com" [ "video" "audio" ] 0 )
|
||||||
|
( createChromiumUser "fin" [] (-1) )
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,12 @@ with import <stockholm/lib>;
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../2configs/binary-cache/client.nix
|
./binary-cache/client.nix
|
||||||
../2configs/gc.nix
|
./gc.nix
|
||||||
../2configs/mc.nix
|
./mc.nix
|
||||||
../2configs/vim.nix
|
./vim.nix
|
||||||
../2configs/monitoring/client.nix
|
./monitoring/client.nix
|
||||||
|
./zsh.nix
|
||||||
./htop.nix
|
./htop.nix
|
||||||
./backups.nix
|
./backups.nix
|
||||||
./security-workarounds.nix
|
./security-workarounds.nix
|
||||||
|
@ -54,6 +54,11 @@ with import <stockholm/lib>;
|
|||||||
{ from = "bitstamp@lassul.us"; to = lass.mail; }
|
{ from = "bitstamp@lassul.us"; to = lass.mail; }
|
||||||
{ from = "bitcoin.de@lassul.us"; to = lass.mail; }
|
{ from = "bitcoin.de@lassul.us"; to = lass.mail; }
|
||||||
{ from = "ableton@lassul.us"; to = lass.mail; }
|
{ from = "ableton@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "dhl@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "sipgate@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "coinexchange@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "verwaltung@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "gearbest@lassul.us"; to = lass.mail; }
|
||||||
];
|
];
|
||||||
system-aliases = [
|
system-aliases = [
|
||||||
{ from = "mailer-daemon"; to = "postmaster"; }
|
{ from = "mailer-daemon"; to = "postmaster"; }
|
||||||
|
21
lass/2configs/minecraft.nix
Normal file
21
lass/2configs/minecraft.nix
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
users.users = {
|
||||||
|
mc = {
|
||||||
|
name = "mc";
|
||||||
|
description = "user playing mc";
|
||||||
|
home = "/home/mc";
|
||||||
|
createHome = true;
|
||||||
|
useDefaultShell = true;
|
||||||
|
packages = with pkgs; [
|
||||||
|
tmux
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
krebs.per-user.mc.packages = [ pkgs.jdk ];
|
||||||
|
krebs.iptables.tables.filter.INPUT.rules = [
|
||||||
|
{ predicate = "-p tcp --dport 25565"; target = "ACCEPT"; }
|
||||||
|
{ predicate = "-p udp --dport 25565"; target = "ACCEPT"; }
|
||||||
|
];
|
||||||
|
}
|
@ -7,10 +7,8 @@
|
|||||||
zsh-newuser-install() { :; }
|
zsh-newuser-install() { :; }
|
||||||
'';
|
'';
|
||||||
interactiveShellInit = ''
|
interactiveShellInit = ''
|
||||||
#unsetopt nomatch
|
|
||||||
setopt autocd extendedglob
|
setopt autocd extendedglob
|
||||||
bindkey -e
|
bindkey -e
|
||||||
zstyle :compinstall filename '/home/lass/.zshrc'
|
|
||||||
|
|
||||||
#history magic
|
#history magic
|
||||||
bindkey "[A" up-line-or-local-history
|
bindkey "[A" up-line-or-local-history
|
||||||
@ -40,7 +38,6 @@
|
|||||||
bindkey "^X^E" edit-command-line
|
bindkey "^X^E" edit-command-line
|
||||||
|
|
||||||
#completion magic
|
#completion magic
|
||||||
fpath=(~/.zsh/completions $fpath)
|
|
||||||
autoload -Uz compinit
|
autoload -Uz compinit
|
||||||
compinit
|
compinit
|
||||||
zstyle ':completion:*' menu select
|
zstyle ':completion:*' menu select
|
||||||
@ -48,14 +45,18 @@
|
|||||||
#enable automatic rehashing of $PATH
|
#enable automatic rehashing of $PATH
|
||||||
zstyle ':completion:*' rehash true
|
zstyle ':completion:*' rehash true
|
||||||
|
|
||||||
|
eval $(dircolors -b ${pkgs.fetchFromGitHub {
|
||||||
#eval $( dircolors -b ~/.LS_COLORS )
|
owner = "trapd00r";
|
||||||
|
repo = "LS_COLORS";
|
||||||
|
rev = "master";
|
||||||
|
sha256="05lh5w3bgj9h8d8lrbbwbzw8788709cnzzkl8yh7m1dawkpf6nlp";
|
||||||
|
}}/LS_COLORS)
|
||||||
|
|
||||||
# export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
|
# export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
|
||||||
|
|
||||||
#beautiful colors
|
#beautiful colors
|
||||||
alias ls='ls --color'
|
alias ls='ls --color'
|
||||||
zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}
|
# zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}
|
||||||
|
|
||||||
#emacs bindings
|
#emacs bindings
|
||||||
bindkey "[7~" beginning-of-line
|
bindkey "[7~" beginning-of-line
|
||||||
@ -66,24 +67,24 @@
|
|||||||
#aliases
|
#aliases
|
||||||
alias ll='ls -l'
|
alias ll='ls -l'
|
||||||
alias la='ls -la'
|
alias la='ls -la'
|
||||||
alias pinginet='ping 8.8.8.8'
|
|
||||||
alias du='du -hd1'
|
|
||||||
alias qiv="qiv -f -m"
|
|
||||||
alias zshres="source ~/.zshrc"
|
|
||||||
|
|
||||||
#fancy window title magic
|
#fancy window title magic
|
||||||
case $TERM in
|
case $TERM in
|
||||||
(*xterm* | *rxvt*)
|
(*xterm* | *rxvt*)
|
||||||
|
|
||||||
# Write some info to terminal title.
|
|
||||||
# This is seen when the shell prompts for input.
|
|
||||||
function precmd {
|
function precmd {
|
||||||
print -Pn "\e]0;%(1j,%j job%(2j|s|); ,)%~\a"
|
if test -n "$SSH_CLIENT"; then
|
||||||
|
echo -ne "\033]0;$$ $USER@$HOST $PWD\007"
|
||||||
|
else
|
||||||
|
echo -ne "\033]0;$$ $USER@$PWD\007"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
# Write command and args to terminal title.
|
|
||||||
# This is seen while the shell waits for a command to complete.
|
# This is seen while the shell waits for a command to complete.
|
||||||
function preexec {
|
function preexec {
|
||||||
printf "\033]0;%s\a" "$1"
|
if test -n "$SSH_CLIENT"; then
|
||||||
|
echo -ne "\033]0;$$ $USER@$HOST $PWD $1\007"
|
||||||
|
else
|
||||||
|
echo -ne "\033]0;$$ $USER@$PWD $1\007"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -119,4 +120,5 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
users.users.mainUser.shell = "/run/current-system/sw/bin/zsh";
|
users.users.mainUser.shell = "/run/current-system/sw/bin/zsh";
|
||||||
|
users.users.root.shell = "/run/current-system/sw/bin/zsh";
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ in
|
|||||||
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
|
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/nixos/nixpkgs;
|
url = https://github.com/nixos/nixpkgs;
|
||||||
ref = "d202e30";
|
ref = "92d088e";
|
||||||
};
|
};
|
||||||
secrets = getAttr builder {
|
secrets = getAttr builder {
|
||||||
buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
|
buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
|
||||||
|
Loading…
Reference in New Issue
Block a user