From b713edf2f844e9cc5ca1cc00a9ad4113ecfad40b Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:01:23 +0100 Subject: l daedalus.r: install some software --- lass/1systems/daedalus/config.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 8ec744584..609fae3c8 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -40,6 +40,9 @@ with import <stockholm/lib>; zathura skype wine + geeqie + vlc + minecraft ]; nixpkgs.config.firefox.enableAdobeFlash = true; services.xserver.enable = true; -- cgit v1.2.3 From 291a3347e9baedd35baf855e58dc98caef066d69 Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:02:38 +0100 Subject: l: add minecraft.nix --- lass/1systems/prism/config.nix | 8 +------- lass/2configs/minecraft.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 lass/2configs/minecraft.nix (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 03e9f6eeb..3e42ecd75 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -289,13 +289,6 @@ in { 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/lass/2configs/dcso-dev.nix> { @@ -318,6 +311,7 @@ in { RandomizedDelaySec = "2min"; }; } + <stockholm/lass/2configs/minecraft.nix> ]; krebs.build.host = config.krebs.hosts.prism; diff --git a/lass/2configs/minecraft.nix b/lass/2configs/minecraft.nix new file mode 100644 index 000000000..aa33dcccc --- /dev/null +++ b/lass/2configs/minecraft.nix @@ -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"; } + ]; +} -- cgit v1.2.3 From dde9e711fc2e6f15565d4d402d1743fa69d111f3 Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:03:55 +0100 Subject: l prism.r: allow jeschli push to all branches --- lass/1systems/prism/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 3e42ecd75..5831cd6cf 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -300,7 +300,7 @@ in { jeschli-brauerei ]; 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 ]; } ]; } -- cgit v1.2.3 From 80e7b1254fd60a880f0cae5b36872607255f41fe Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:04:56 +0100 Subject: l prism.r: add downloading (again) --- lass/1systems/prism/config.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 5831cd6cf..087aaab06 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -311,6 +311,7 @@ in { RandomizedDelaySec = "2min"; }; } + <stockholm/lass/2configs/downloading.nix> <stockholm/lass/2configs/minecraft.nix> ]; -- cgit v1.2.3 From 07ba3cde29849f10d1a78db65d56632aeee1790c Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:06:04 +0100 Subject: l: add taskwarrior to pkgs --- lass/2configs/baseX.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 59ea0ecb7..65e8f15a4 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -85,6 +85,8 @@ in { screengrab slock sxiv + timewarrior + taskwarrior termite xclip xorg.xbacklight -- cgit v1.2.3 From 0b4ce5878640d222ab28d269acc36429ae20b7d0 Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:06:52 +0100 Subject: l browsers: use precedence --- lass/2configs/browsers.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index 9459cfd6f..8d57f1148 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -35,7 +35,10 @@ let useDefaultShell = true; createHome = true; }; - lass.browser.paths.${name}.path = bin; + lass.browser.paths.${name} = { + path = bin; + inherit precedence; + }; security.sudo.extraConfig = '' ${mainUser.name} ALL=(${name}) NOPASSWD: ALL ''; -- cgit v1.2.3 From c23738db3730c61ee2487a0dc1a1f48be6dd1db2 Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:07:08 +0100 Subject: l browsers: preconfigure chromium --- lass/2configs/browsers.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lass') diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index 8d57f1148..d04c56365 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -83,6 +83,14 @@ in { browser-select ]; + programs.chromium = { + enable = true; + extensions = [ + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin + "dbepggeogbaibhgnhhndojpepiihcmeb" # vimium + ]; + }; + imports = [ { options.lass.browser.select = mkOption { -- cgit v1.2.3 From 59f3f4257d58e8ff28a37a0167bd69acd83397e9 Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:07:29 +0100 Subject: l browsers: add fin --- lass/2configs/browsers.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lass') diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index d04c56365..cbbd54b6b 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -113,8 +113,9 @@ in { ( createFirefoxUser "ff" [ "audio" ] 10 ) ( createChromiumUser "cr" [ "video" "audio" ] 9 ) ( createChromiumUser "gm" [ "video" "audio" ] 8 ) - ( createChromiumUser "wk" [ "video" "audio" ] ) - ( createChromiumUser "fb" [ "video" "audio" ] ) - ( createChromiumUser "com" [ "video" "audio" ] ) + ( createChromiumUser "wk" [ "video" "audio" ] 0 ) + ( createChromiumUser "fb" [ "video" "audio" ] 0 ) + ( createChromiumUser "com" [ "video" "audio" ] 0 ) + ( createChromiumUser "fin" [] (-1) ) ]; } -- cgit v1.2.3 From dd03ce2e9e4a5a66c9259537e976bed5f6305c7a Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:08:01 +0100 Subject: l: add zsh --- lass/2configs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lass') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index c68aee330..5a5f1b347 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -2,11 +2,12 @@ with import <stockholm/lib>; { config, pkgs, ... }: { imports = [ - ../2configs/binary-cache/client.nix - ../2configs/gc.nix - ../2configs/mc.nix - ../2configs/vim.nix - ../2configs/monitoring/client.nix + ./binary-cache/client.nix + ./gc.nix + ./mc.nix + ./vim.nix + ./monitoring/client.nix + ./zsh.nix ./htop.nix ./backups.nix ./security-workarounds.nix -- cgit v1.2.3 From b49137cac3597800a4ccd108f8b65aa77de64e0c Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:08:55 +0100 Subject: l: add more emails --- lass/2configs/exim-smarthost.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lass') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 94191fcb7..0219f5216 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -54,6 +54,11 @@ with import <stockholm/lib>; { from = "bitstamp@lassul.us"; to = lass.mail; } { from = "bitcoin.de@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 = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From a3751cdb4731ff238d02e1e0e84bbe8aaa9217ac Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 00:09:46 +0100 Subject: l zsh: cleanup --- lass/2configs/zsh.nix | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'lass') diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix index 4d33aa79d..728c0cc0d 100644 --- a/lass/2configs/zsh.nix +++ b/lass/2configs/zsh.nix @@ -7,10 +7,8 @@ zsh-newuser-install() { :; } ''; interactiveShellInit = '' - #unsetopt nomatch setopt autocd extendedglob bindkey -e - zstyle :compinstall filename '/home/lass/.zshrc' #history magic bindkey "[A" up-line-or-local-history @@ -40,7 +38,6 @@ bindkey "^X^E" edit-command-line #completion magic - fpath=(~/.zsh/completions $fpath) autoload -Uz compinit compinit zstyle ':completion:*' menu select @@ -48,14 +45,18 @@ #enable automatic rehashing of $PATH zstyle ':completion:*' rehash true - - #eval $( dircolors -b ~/.LS_COLORS ) + eval $(dircolors -b ${pkgs.fetchFromGitHub { + 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" -' #beautiful colors alias ls='ls --color' - zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS} + # zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS} #emacs bindings bindkey "[7~" beginning-of-line @@ -66,24 +67,24 @@ #aliases alias ll='ls -l' 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 case $TERM in (*xterm* | *rxvt*) - - # Write some info to terminal title. - # This is seen when the shell prompts for input. 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. 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 @@ -119,4 +120,5 @@ ''; }; users.users.mainUser.shell = "/run/current-system/sw/bin/zsh"; + users.users.root.shell = "/run/current-system/sw/bin/zsh"; } -- cgit v1.2.3 From 74d1531be988057ccadd3de5184d915dcf84c92d Mon Sep 17 00:00:00 2001 From: lassulus <lassulus@lassul.us> Date: Tue, 16 Jan 2018 09:24:44 +0100 Subject: l nixpkgs: d202e30 -> 92d088e --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/source.nix b/lass/source.nix index 46c6d31dc..8ca3fe3c0 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "d202e30"; + ref = "92d088e"; }; secrets = getAttr builder { buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>; -- cgit v1.2.3