summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master' into pre-mergemakefu2015-11-1437-1516/+394
|\
| * tv: add shell aliases for systemdtv2015-11-101-0/+6
| * tv: setup XDG_RUNTIME_DIR for userstv2015-11-101-0/+8
| * tv vim hs: hi quasi quotestv2015-11-091-0/+4
| * stockholm: overhaul lib generationtv2015-11-091-22/+16
| * Revert "stockholm: check harder if user lib exists"tv2015-11-091-3/+2
| * stockholm: check harder if user lib existstv2015-11-091-2/+3
| * tv lib: bye & thanks for fishtv2015-11-092-27/+0
| * {tv => krebs} git lib & git hookstv2015-11-095-5/+4
| * stockholm: import user lib if it existstv2015-11-092-3/+6
| * tv {lib.git => pkgs.git-hooks} irc-announcetv2015-11-095-169/+175
| * tv git: move old stuff to the museum sectiontv2015-11-092-6/+11
| * tv git: tv_xu has R/W-access to protected repostv2015-11-091-1/+1
| * tv git: add repo xmonad-stockholmtv2015-11-091-0/+1
| * tv: rm crufty comments & spacetv2015-11-092-2/+0
| * xmonad-tv: use xmonad-stockholmtv2015-11-098-802/+5
| * xmonad-stockholm: init at 1.0.0tv2015-11-091-0/+16
| * stockholm: check if default.nix exists before importingtv2015-11-092-1/+3
| * cd: use default krebs.buildtv2015-11-081-15/+0
| * push: 1.1.0 -> 1.1.1tv2015-11-081-4/+3
| * add null moduletv2015-11-081-0/+1
| * tv configs: set NIX_PATHtv2015-11-081-0/+9
| * tv: remove legacy userstv2015-11-086-324/+9
| * xu: add unisontv2015-11-071-0/+2
| * Merge remote-tracking branch 'nomic/master'tv2015-11-076-26/+41
| |\
| | * tv: mv user xr to subtv2015-11-076-26/+38
| | * Merge remote-tracking branch 'cd/master'tv2015-11-074-16/+10
| | |\
| | * | xu nixpkgs: c44a593 -> 7ae05edtv2015-11-071-0/+3
| | | |
| | \ \
| *-. \ \ Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-11-0747-138/+800
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge remote-tracking branch 'cd/master'lassulus2015-11-019-24/+126
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'pnp/master'lassulus2015-11-011-2/+2
| | |\ \ \ \
| | * | | | | l 1 prism: allowUnfree for ts3lassulus2015-11-011-0/+3
| | * | | | | l 1 mors: add hashPassword to systemPackageslassulus2015-11-011-0/+1
| | * | | | | l 1 prism: activate ts3 serverlassulus2015-11-011-0/+1
| | * | | | | l 2: add ts3.nixlassulus2015-11-011-0/+19
| | * | | | | k 3 l: use rsa keys in prismlassulus2015-11-011-2/+2
| | * | | | | l 2 downloading: get rpc-password from secretslassulus2015-10-311-3/+5
| | * | | | | l 2: get ssh-keys via apilassulus2015-10-312-6/+6
| | * | | | | l 1 prism: add git.nixlassulus2015-10-311-0/+1
| * | | | | | tv: move X-based tools to xservertv2015-11-073-14/+7
| * | | | | | Merge remote-tracking branch 'cd/master'tv2015-11-0713-125/+111
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | tv: condense krebs.buildtv2015-11-066-76/+19
| * | | | | | xu: bump ssh keytv2015-11-071-1/+2
| * | | | | | nomic: bump ssh keytv2015-11-071-1/+1
* | | | | | | m 2 vbox: up version numbermakefu2015-11-142-4/+4
* | | | | | | m 1 gum: add swap to server configmakefu2015-11-142-0/+12
* | | | | | | m 1 filepimp: remove legacy importsmakefu2015-11-141-2/+0
* | | | | | | Merge branch 'master' of pnp:stockholmmakefu2015-11-101-0/+6
|\ \ \ \ \ \ \
| * | | | | | | m 1 gum: add chat toolsmakefu2015-11-101-0/+6
* | | | | | | | Merge branch 'master' of pnp:stockholmmakefu2015-11-103-10/+28
|\| | | | | | |