diff options
author | makefu <github@syntax-fehler.de> | 2015-12-15 18:46:25 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-12-15 18:46:25 +0100 |
commit | bb096de06fda9f0957a736b44494ae0f54fa70bf (patch) | |
tree | a074d6b818fb8dbcb7d277b218cd0d2011811481 /2configs | |
parent | 07edc1981dd24a80a267147ab53b28f146110502 (diff) | |
parent | 144d97c0e4c3a4396b7dc3e9a52608c30f627cb0 (diff) |
Merge branch 'master' of gum.krebsco.de:stockholm
Diffstat (limited to '2configs')
-rw-r--r-- | 2configs/Reaktor/full.nix | 18 | ||||
-rw-r--r-- | 2configs/git/cgit-retiolum.nix | 20 | ||||
-rw-r--r-- | 2configs/zsh-user.nix | 32 |
3 files changed, 49 insertions, 21 deletions
diff --git a/2configs/Reaktor/full.nix b/2configs/Reaktor/full.nix new file mode 100644 index 000000000..50620890f --- /dev/null +++ b/2configs/Reaktor/full.nix @@ -0,0 +1,18 @@ +_: +{ + # implementation of the complete Reaktor bot + imports = [ + #./stockholmLentil.nix + ./simpleExtend.nix + ./random-emoji.nix + ./titlebot.nix + ./shack-correct.nix + ./sed-plugin.nix + ]; + krebs.Reaktor.nickname = "Reaktor|bot"; + krebs.Reaktor.enable = true; + + krebs.Reaktor.extraEnviron = { + REAKTOR_CHANNELS = "#krebs,#binaergewitter,#shackspace"; + }; +} diff --git a/2configs/git/cgit-retiolum.nix b/2configs/git/cgit-retiolum.nix index 68fd976d6..35bb169cf 100644 --- a/2configs/git/cgit-retiolum.nix +++ b/2configs/git/cgit-retiolum.nix @@ -80,26 +80,6 @@ let }; in { - imports = [{ - krebs.users = { - makefu-omo = { - name = "makefu-omo" ; - pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub; - }; - makefu-vbob = { - name = "makefu-vbob" ; - pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_vbob.ssh.pub; - }; - makefu-tsp = { - name = "makefu-tsp" ; - pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub; - }; - exco = { - name = "exco"; - pubkey= with builtins; readFile ../../../krebs/Zpubkeys/exco.ssh.pub; - }; - }; - }]; krebs.git = { enable = true; root-title = "public repositories"; diff --git a/2configs/zsh-user.nix b/2configs/zsh-user.nix index 3089b706a..266ce256a 100644 --- a/2configs/zsh-user.nix +++ b/2configs/zsh-user.nix @@ -5,6 +5,36 @@ let mainUser = config.krebs.build.user.name; in { - programs.zsh.enable = true; users.extraUsers.${mainUser}.shell = "/run/current-system/sw/bin/zsh"; + programs.zsh= { + enable = true; + interactiveShellInit = '' + HISTSIZE=900001 + HISTFILESIZE=$HISTSIZE + SAVEHIST=$HISTSIZE + + setopt HIST_IGNORE_ALL_DUPS + setopt HIST_IGNORE_SPACE + setopt HIST_FIND_NO_DUPS + bindkey -e + # shift-tab + bindkey '^[[Z' reverse-menu-complete + + autoload -U compinit && compinit + zstyle ':completion:*' menu select + ''; + + promptInit = '' + RPROMPT="" + autoload colors && colors + case $UID in + 0) PROMPT="%{$fg[red]%}%~%{$reset_color%} " ;; + 9001) PROMPT="%{$fg[green]%}%~%{$reset_color%} " ;; + *) PROMPT="%{$fg[yellow]%}%n %{$fg[green]%}%~%{$reset_color%} " ;; + esac + if test -n "$SSH_CLIENT"; then + PROMPT="%{$fg[magenta]%}%m $PROMPT" + fi + ''; + }; } |