From 259e2ce8554be0f8374ed35e7bef02b9396db92b Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 21 May 2015 19:36:17 +0200 Subject: experiment with gitolite --- modules/lass/base.nix | 118 -------------------------------------------------- 1 file changed, 118 deletions(-) (limited to 'modules/lass') diff --git a/modules/lass/base.nix b/modules/lass/base.nix index d16c4d34..29010dd9 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -68,124 +68,6 @@ enable = true; dataDir = "/home/gitolite"; adminPubkey = config.sshKeys.lass.pub; - #commonHooks = [ - # (pkgs.writeText "irc-announce" '' - # #! /bin/sh - # set -euf - - # config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" - # if test -f "$config_file"; then - # . "$config_file" - # fi - - # # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update - # # any relevant gitolite LOCAL_CODE! - # # CAVEAT we hope that IRC_NICK is unique - # IRC_NICK="''${IRC_NICK-gl$GL_TID}" - # IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" - # IRC_SERVER="''${IRC_SERVER-ire.retiolum}" - # IRC_PORT="''${IRC_PORT-6667}" - - # # for privmsg_cat below - # export IRC_CHANNEL - - # # collect users that are mentioned in the gitolite configuration - # interested_users="$(perl -e ' - # do "gl-conf"; - # print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); - # ')" - - # # CAVEAT beware of real TABs in grep pattern! - # # CAVEAT there will never be more than 42 relevant log entries! - # log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" - # update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" - - # # (debug output) - # env | sed 's/^/env: /' - # echo "$log" | sed 's/^/log: /' - - # # see http://gitolite.com/gitolite/dev-notes.html#lff - # reponame=$(echo "$update_log" | cut -f 4) - # username=$(echo "$update_log" | cut -f 5) - # ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') - # old_sha=$(echo "$update_log" | cut -f 8) - # new_sha=$(echo "$update_log" | cut -f 9) - - # # check if new branch is created - # if test $old_sha = 0000000000000000000000000000000000000000; then - # # TODO what should we really show? - # old_sha=$new_sha^ - # fi - - # # - # git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" - # commit_count=$(echo "$git_log" | wc -l) - - # # echo2 and cat2 are used output to both, stdout and stderr - # # This is used to see what we send to the irc server. (debug output) - # echo2() { echo "$*"; echo "$*" >&2; } - # cat2() { tee /dev/stderr; } - - # # privmsg_cat transforms stdin to a privmsg - # privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } - - # # ircin is used to feed the output of netcat back to the "irc client" - # # so we can implement expect-like behavior with sed^_^ - # # XXX mkselfdestructingtmpfifo would be nice instead of this cruft - # tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" - # cd "$tmpdir" - # mkfifo ircin - # trap " - # rm ircin - # cd '$OLDPWD' - # rmdir '$tmpdir' - # trap - EXIT INT QUIT - # " EXIT INT QUIT - - # # - # # - # # - # { - # echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" - # echo2 "NICK $IRC_NICK" - - # # wait for MODE message - # sed -n '/^:[^ ]* MODE /q' - - # echo2 "JOIN $IRC_CHANNEL" - - # echo "$interested_users" \ - # | tr ' ' '\n' \ - # | grep -v "^$GL_USER" \ - # | sed 's/$/: poke/' \ - # | privmsg_cat \ - # | cat2 - - # printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ - # "$reponame" \ - # "$username" \ - # "$commit_count" \ - # "$(test $commit_count = 1 || echo s)" \ - # "$(hostname)" \ - # "$ref_name" \ - # | privmsg_cat \ - # | cat2 - - # echo "$git_log" \ - # | sed 's/^/14/;s/ / /' \ - # | privmsg_cat \ - # | cat2 - - # echo2 "PART $IRC_CHANNEL" - - # # wait for PART confirmation - # sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' - - # echo2 'QUIT :Gone to have lunch' - # } < ircin \ - # | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin - # '') - #]; }; services.openssh = { -- cgit v1.2.3 From 26a166c8c1a577cefe7884eaeea1541eb910aa87 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 13:46:02 +0200 Subject: better terminal&vim colors --- modules/lass/urxvt.nix | 29 ++++------------------------- modules/lass/vim.nix | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 32 deletions(-) (limited to 'modules/lass') diff --git a/modules/lass/urxvt.nix b/modules/lass/urxvt.nix index 9c9702e5..889f768a 100644 --- a/modules/lass/urxvt.nix +++ b/modules/lass/urxvt.nix @@ -31,31 +31,10 @@ in URxvt.intensityStyles: false - !solarized colors - URxvt*fading: 5 - URxvt*background: #002b36 - URxvt*foreground: #657b83 - URxvt*fadeColor: #002b36 - URxvt*cursorColor: #93a1a1 - URxvt*pointerColorBackground: #586e75 - URxvt*pointerColorForeground: #93a1a1 - URxvt*colorUL: #859900 - URxvt*colorBD: #268bd2 - URxvt*color0: #073642 - URxvt*color8: #002b36 - URxvt*color1: #dc322f - URxvt*color9: #cb4b16 - URxvt*color2: #859900 - URxvt*color10: #586e75 - URxvt*color3: #b58900 - URxvt*color11: #657b83 + URxvt*background: #000000 + URxvt*foreground: #ffffff + + !change unreadable blue URxvt*color4: #268bd2 - URxvt*color12: #839496 - URxvt*color5: #d33682 - URxvt*color13: #6c71c4 - URxvt*color6: #2aa198 - URxvt*color14: #93a1a1 - URxvt*color7: #eee8d5 - URxvt*color15: #fdf6e3 ''; } diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix index e277bd72..56a20c38 100644 --- a/modules/lass/vim.nix +++ b/modules/lass/vim.nix @@ -1,6 +1,17 @@ { config, pkgs, ... }: -{ +let + customPlugins.mustang2 = pkgs.vimUtils.buildVimPlugin { + name = "Mustang2"; + src = pkgs.fetchFromGitHub { + owner = "croaker"; + repo = "mustang-vim"; + rev = "6533d7d21bf27cae94d9c2caa575f627f003dfd5"; + sha256 = "0zlmcrr04j3dkiivrhqi90f618lmnnnpvbz1b9msfs78cmgw9w67"; + }; + }; + +in { environment.systemPackages = with pkgs; [ (vim_configurable.customize { @@ -12,7 +23,7 @@ syntax on " TODO autoload colorscheme file set background=dark - colorscheme solarized + colorscheme mustang filetype off filetype plugin indent on @@ -81,13 +92,12 @@ set undofile ''; - vimrcConfig.vam.knownPlugins = vimPlugins; + vimrcConfig.vam.knownPlugins = vimPlugins // customPlugins; vimrcConfig.vam.pluginDictionaries = [ - { name = "Gundo"; } - { name = "commentary"; } - { name = "vim-addon-nix"; } - { name = "colors-solarized"; } + { names = [ "Gundo" "commentary" "vim-addon-nix" ]; } + { name = "mustang2"; } ]; + }) ]; } -- cgit v1.2.3 From 67526d6c0849d9abc60c9a4cbee28e3a2dc707ce Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 19:32:54 +0200 Subject: activate gitolite config --- modules/lass/gitolite-base.nix | 172 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 modules/lass/gitolite-base.nix (limited to 'modules/lass') diff --git a/modules/lass/gitolite-base.nix b/modules/lass/gitolite-base.nix new file mode 100644 index 00000000..9fcdbb9e --- /dev/null +++ b/modules/lass/gitolite-base.nix @@ -0,0 +1,172 @@ +{ config, ... }: + +{ + services.gitolite = { + mutable = false; + keys = { + lass = config.sshKeys.lass.pub; + }; + rc = '' + %RC = ( + UMASK => 0077, + GIT_CONFIG_KEYS => "", + LOG_EXTRA => 1, + ROLES => { + READERS => 1, + WRITERS => 1, + }, + LOCAL_CODE => "$ENV{HOME}/.gitolite", + ENABLE => [ + 'help', + 'desc', + 'info', + 'perms', + 'writable', + 'ssh-authkeys', + 'git-config', + 'daemon', + 'gitweb', + 'repo-specific-hooks', + ], + ); + 1; + ''; + + hooks.repoSpecific = { + irc-announce = '' + #! /bin/sh + set -euf + + config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" + if test -f "$config_file"; then + . "$config_file" + fi + + # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update + # any relevant gitolite LOCAL_CODE! + # CAVEAT we hope that IRC_NICK is unique + IRC_NICK="''${IRC_NICK-gl$GL_TID}" + IRC_CHANNEL="''${IRC_CHANNEL-#retiolum}" + IRC_SERVER="''${IRC_SERVER-ire.retiolum}" + IRC_PORT="''${IRC_PORT-6667}" + + # for privmsg_cat below + export IRC_CHANNEL + + # collect users that are mentioned in the gitolite configuration + interested_users="$(perl -e ' + do "gl-conf"; + print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); + ')" + + # CAVEAT beware of real TABs in grep pattern! + # CAVEAT there will never be more than 42 relevant log entries! + tab=$(printf '\x09') + log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^$tab]*$tab$GL_TID$tab" || :)" + + update_log="$(echo "$log" | grep "^[^$tab]*$tab$GL_TID''${tab}update")" + + # (debug output) + env | sed 's/^/env: /' + echo "$log" | sed 's/^/log: /' + + # see http://gitolite.com/gitolite/dev-notes.html#lff + reponame=$(echo "$update_log" | cut -f 4) + username=$(echo "$update_log" | cut -f 5) + ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') + old_sha=$(echo "$update_log" | cut -f 8) + new_sha=$(echo "$update_log" | cut -f 9) + + # check if new branch is created + if test $old_sha = 0000000000000000000000000000000000000000; then + # TODO what should we really show? + old_sha=$new_sha^ + fi + + # + git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" + commit_count=$(echo "$git_log" | wc -l) + + # echo2 and cat2 are used output to both, stdout and stderr + # This is used to see what we send to the irc server. (debug output) + echo2() { echo "$*"; echo "$*" >&2; } + cat2() { tee /dev/stderr; } + + # privmsg_cat transforms stdin to a privmsg + privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } + + # ircin is used to feed the output of netcat back to the "irc client" + # so we can implement expect-like behavior with sed^_^ + # XXX mkselfdestructingtmpfifo would be nice instead of this cruft + tmpdir="$(mktemp -d irc-announce_XXXXXXXX)" + cd "$tmpdir" + mkfifo ircin + trap " + rm ircin + cd '$OLDPWD' + rmdir '$tmpdir' + trap - EXIT INT QUIT + " EXIT INT QUIT + + # + # + # + { + echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" + echo2 "NICK $IRC_NICK" + + # wait for MODE message + sed -n '/^:[^ ]* MODE /q' + + echo2 "JOIN $IRC_CHANNEL" + + echo "$interested_users" \ + | tr ' ' '\n' \ + | grep -v "^$GL_USER" \ + | sed 's/$/: poke/' \ + | privmsg_cat \ + | cat2 + + printf '[\x0313%s\x03] %s pushed %s new commit%s to \x036%s %s\x03\n' \ + "$reponame" \ + "$username" \ + "$commit_count" \ + "$(test $commit_count = 1 || echo s)" \ + "$(hostname)" \ + "$ref_name" \ + | privmsg_cat \ + | cat2 + + echo "$git_log" \ + | sed 's/^/\x0314/;s/ /\x03 /' \ + | privmsg_cat \ + | cat2 + + echo2 "PART $IRC_CHANNEL" + + # wait for PART confirmation + sed -n '/:'"$IRC_NICK"'![^ ]* PART /q' + + echo2 'QUIT :Gone to have lunch' + } < ircin \ + | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin + ''; + }; + customFiles = [ + { + filename = ".gitolite/conf/irc-announce.conf"; + content = '' + IRC_NICK="$(hostname)$GL_TID" + case "$GL_REPO" in + brain|painload|services|load-env|config) + IRC_CHANNEL='#retiolum' + ;; + *) + IRC_CHANNEL='&testing' + ;; + esac + ''; + } + ]; + }; +} -- cgit v1.2.3 From 224c8965eef21b3f003d1ffd28cd0643765545d8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 29 May 2015 02:43:46 +0200 Subject: update vim.nix --- modules/lass/vim.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'modules/lass') diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix index 56a20c38..1000b8da 100644 --- a/modules/lass/vim.nix +++ b/modules/lass/vim.nix @@ -13,8 +13,8 @@ let in { - environment.systemPackages = with pkgs; [ - (vim_configurable.customize { + environment.systemPackages = [ + (pkgs.vim_configurable.customize { name = "vim"; vimrcConfig.customRC = '' @@ -58,8 +58,6 @@ in { "Tabwidth set ts=2 sts=2 sw=2 et - autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et - autocmd BufRead *.hs set ts=4 sts=4 sw=4 et " create Backup/tmp/undo dirs function! InitBackupDir() @@ -90,12 +88,24 @@ in { set viminfo='20,<1000,s100,h,n~/.vim/tmp/info set undodir=$HOME/.vim/undo set undofile + + " highlight whitespaces + highlight ExtraWhitespace ctermbg=red guibg=red + match ExtraWhitespace /\s\+$/ + autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ + autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@ Date: Fri, 29 May 2015 02:44:04 +0200 Subject: add uriel to gitolite --- modules/lass/gitolite-base.nix | 1 + modules/lass/sshkeys.nix | 2 ++ 2 files changed, 3 insertions(+) (limited to 'modules/lass') diff --git a/modules/lass/gitolite-base.nix b/modules/lass/gitolite-base.nix index 9fcdbb9e..1448e860 100644 --- a/modules/lass/gitolite-base.nix +++ b/modules/lass/gitolite-base.nix @@ -5,6 +5,7 @@ mutable = false; keys = { lass = config.sshKeys.lass.pub; + uriel = config.sshKeys.uriel.pub; }; rc = '' %RC = ( diff --git a/modules/lass/sshkeys.nix b/modules/lass/sshkeys.nix index 24c05664..f2b0786e 100644 --- a/modules/lass/sshkeys.nix +++ b/modules/lass/sshkeys.nix @@ -6,4 +6,6 @@ ]; config.sshKeys.lass.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== lass@mors"; + + config.sshKeys.uriel.pub = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDExWuRcltGM2FqXO695nm6/QY3wU3r1bDTyCpMrLfUSym7TxcXDSmZSWcueexPXV6GENuUfjJPZswOdWqIo5u2AXw9t0aGvwEDmI6uJ7K5nzQOsXIneGMdYuoOaAzWI8pxZ4N+lIP1HsOYttIPDp8RwU6kyG+Ud8mnVHWSTO13C7xC9vePnDP6b+44nHS691Zj3X/Cq35Ls0ISC3EM17jreucdP62L3TKk2R4NCm3Sjqj+OYEv0LAqIpgqSw5FypTYQgNByxRcIcNDlri63Q1yVftUP1338UiUfxtraUu6cqa2CdsHQmtX5mTNWEluVWO3uUKTz9zla3rShC+d3qvr lass@uriel"; } -- cgit v1.2.3 From 8d8f111d0fff976003038373ea59026ddfe6d741 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 29 May 2015 02:44:54 +0200 Subject: allow more users to do audio --- modules/lass/virtualbox.nix | 2 +- modules/lass/wine.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/lass') diff --git a/modules/lass/virtualbox.nix b/modules/lass/virtualbox.nix index 82d32bb1..02620312 100644 --- a/modules/lass/virtualbox.nix +++ b/modules/lass/virtualbox.nix @@ -12,7 +12,7 @@ in { description = "user for running VirtualBox"; home = "/home/virtual"; useDefaultShell = true; - extraGroups = [ "vboxusers" ]; + extraGroups = [ "vboxusers" "audio" ]; createHome = true; }; }; diff --git a/modules/lass/wine.nix b/modules/lass/wine.nix index b9413d66..8d55da7f 100644 --- a/modules/lass/wine.nix +++ b/modules/lass/wine.nix @@ -13,7 +13,7 @@ in { description = "user for running wine"; home = "/home/wine"; useDefaultShell = true; - extraGroups = []; + extraGroups = [ "audio" ]; createHome = true; }; }; -- cgit v1.2.3 From b07eb816b3d985ceb705cba30fea119e1c956eaa Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:09:29 +0200 Subject: base: add terminfo for urxvt --- modules/lass/base.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/lass') diff --git a/modules/lass/base.nix b/modules/lass/base.nix index 29010dd9..87127fb8 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -24,6 +24,7 @@ environment.systemPackages = with pkgs; [ git most + rxvt_unicode.terminfo #network iptables -- cgit v1.2.3 From da8694ed1197d943a9f635f237f2b2339236f9eb Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:10:06 +0200 Subject: base: allow icmp on all interfaces --- modules/lass/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/lass') diff --git a/modules/lass/base.nix b/modules/lass/base.nix index 87127fb8..3a8d879e 100644 --- a/modules/lass/base.nix +++ b/modules/lass/base.nix @@ -94,10 +94,10 @@ extraCommands = '' iptables -A INPUT -j ACCEPT -m conntrack --ctstate RELATED,ESTABLISHED iptables -A INPUT -j ACCEPT -i lo + iptables -A INPUT -j ACCEPT -p icmp #iptables -N Retiolum iptables -A INPUT -j Retiolum -i retiolum - iptables -A Retiolum -j ACCEPT -p icmp iptables -A Retiolum -j ACCEPT -m conntrack --ctstate RELATED,ESTABLISHED iptables -A Retiolum -j REJECT -p tcp --reject-with tcp-reset iptables -A Retiolum -j REJECT -p udp --reject-with icmp-port-unreachable -- cgit v1.2.3 From 388dfb3035497f5eb6c4ceeef44ba4637c54ab07 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:10:59 +0200 Subject: gitolite: add xmonad-config repo --- modules/lass/gitolite-base.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/lass') diff --git a/modules/lass/gitolite-base.nix b/modules/lass/gitolite-base.nix index 1448e860..b4762995 100644 --- a/modules/lass/gitolite-base.nix +++ b/modules/lass/gitolite-base.nix @@ -33,7 +33,7 @@ 1; ''; - hooks.repoSpecific = { + repoSpecificHooks = { irc-announce = '' #! /bin/sh set -euf @@ -155,8 +155,8 @@ }; customFiles = [ { - filename = ".gitolite/conf/irc-announce.conf"; - content = '' + path = ".gitolite/conf/irc-announce.conf"; + file = '' IRC_NICK="$(hostname)$GL_TID" case "$GL_REPO" in brain|painload|services|load-env|config) -- cgit v1.2.3 From ac6cb36531c47b711839517ad024488c30474017 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 5 Jun 2015 12:55:51 +0200 Subject: vim: change escape timeout --- modules/lass/vim.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/lass') diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix index 1000b8da..e1cff0d2 100644 --- a/modules/lass/vim.nix +++ b/modules/lass/vim.nix @@ -100,6 +100,9 @@ in { "ft specific stuff autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et autocmd BufRead *.hs set ts=4 sts=4 sw=4 et + + "esc timeout + set timeoutlen=1000 ttimeoutlen=0 ''; vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins; -- cgit v1.2.3 From d01439e692476a36ee05e6b06ad75b8081b086d5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 9 Jun 2015 22:33:13 +0200 Subject: games: add user to video group --- modules/lass/games.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/lass') diff --git a/modules/lass/games.nix b/modules/lass/games.nix index 7425aa91..55e85998 100644 --- a/modules/lass/games.nix +++ b/modules/lass/games.nix @@ -13,7 +13,7 @@ in { name = "games"; description = "user playing games"; home = "/home/games"; - extraGroups = [ "audio" ]; + extraGroups = [ "audio" "video" ]; createHome = true; useDefaultShell = true; }; -- cgit v1.2.3