summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'jeschli2018-10-2682-354/+889
|\
| * l xjail: use sudo again until fixedlassulus2018-10-231-2/+5
| * l krops: add optional target argument to deploylassulus2018-10-231-2/+2
| * l websites lassulus: add lass-mors to auhtorized keyslassulus2018-10-231-2/+3
| * l websites domsen: ensure databases & users existlassulus2018-10-231-0/+6
| * l urxvt: fix saveLineslassulus2018-10-231-1/+1
| * l mail: add notmuch to pkgslassulus2018-10-231-0/+1
| * l prism.r: use new physical.nixlassulus2018-10-231-46/+38
| * l git: add go & newsbot-jslassulus2018-10-231-8/+16
| * nixpkgs: 21293d2 -> 81f5c26lassulus2018-10-181-3/+3
| * Merge remote-tracking branch 'ni/master'lassulus2018-10-182-1/+2
| |\
| | * tv gitrepos: use proper post-receive defaulttv2018-10-111-1/+1
| | * tv vim: add vim-elixirtv2018-10-091-0/+1
| | * tv: systemPackages += git-crypttv2018-10-071-0/+1
| * | l: add eve.rlassulus2018-10-111-0/+38
| * | nin games: remove dwarf_fortresslassulus2018-10-101-1/+0
| * | l vim: show damned NBSPlassulus2018-10-101-0/+4
| * | Merge remote-tracking branch 'onondaga/master'lassulus2018-10-100-0/+0
| |\ \
| | * | Revert "remove nin"nin2018-10-0921-0/+1277
| * | | nin krops: force testlassulus2018-10-091-0/+1
| * | | Revert "remove nin"lassulus2018-10-0921-0/+1277
| * | | ci.nix: test every host in seperate folderlassulus2018-10-091-1/+1
| * | | force test in krops.nixlassulus2018-10-095-0/+5
| |/ /
| * | Reaktor: 0.6.1 -> 0.6.2lassulus2018-10-091-2/+2
| * | Merge branch '18.09'lassulus2018-10-0951-1359/+395
| |\ \
| | * \ Merge remote-tracking branch 'gum/master' into 18.09lassulus2018-10-091-0/+52
| | |\ \
| | | * | ma pkgs.4nxci: initmakefu2018-09-291-0/+52
| | | * | Merge remote-tracking branch 'lass/master'makefu2018-09-271-2/+2
| | | |\ \
| | * | | | update-channel.sh: follow 18.09lassulus2018-10-081-1/+1
| | * | | | nixpkgs: 862fb52 -> 21293d2lassulus2018-10-081-4/+4
| | * | | | remove ninlassulus2018-10-0821-1277/+0
| | * | | | tv: systemPackages += git-crypttv2018-10-081-0/+1
| | * | | | j emacs: remove melpaPackages.mmm-modejeschli2018-10-081-1/+0
| | * | | | krops: import from submoduleslassulus2018-10-082-8/+2
| | * | | | krops: init submodulelassulus2018-10-082-0/+3
| | * | | | j brauerei: +luis @ dev tmuxjeschli2018-10-081-0/+1
| | * | | | repo-sync: remove deprecated isPylassulus2018-10-071-1/+0
| | * | | | Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-0719-71/+331
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | tv: add 18.09 compatibilitytv2018-10-0713-12/+56
| | | * | | tv backups: nomic-pull-querel-home @22:00tv2018-10-071-1/+1
| | | * | | tv xu: import xp-332tv2018-10-071-2/+1
| | | * | | tv xserver: cleanup servicestv2018-10-071-13/+11
| | | * | | hyphenation: RIP; nixpkgs is good enoughtv2018-10-061-17/+0
| | | * | | email-header: 0.3.0 -> 0.4.1-tv1tv2018-10-061-4/+4
| | * | | | l reaktor-coders: RIP ruplassulus2018-10-071-18/+0
| | * | | | j brauerei.r: force lightdm offlassulus2018-10-071-0/+2
| | * | | | buildbot: use dateutillassulus2018-10-071-1/+1
| | * | | | l xmonad: fix minimize with xmonad-contrib 0.15lassulus2018-10-071-2/+3
| | * | | | l vim: remove flake8lassulus2018-10-071-1/+0
| | * | | | l mors.r: use stable nixlassulus2018-10-071-1/+0