summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma pkgs.esniper: replaced by upstreammakefu2018-10-103-58/+0
* ma pkgs.inkscape: share/extensions solves the issuemakefu2018-10-083-34/+0
* ma printer: use upstream zj-58makefu2018-10-081-5/+5
* nixpkgs: 86fb1e9 -> 86fb1e9makefu2018-10-081-3/+3
* Merge remote-tracking branch 'lass/18.09' into 18.09makefu2018-10-0771-1729/+552
|\
| * remove ninlassulus2018-10-0721-1277/+0
| * Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-071-0/+1
| |\
| | * tv: systemPackages += git-crypttv2018-10-071-0/+1
| * | Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-1/+0
| |\ \
| | * | j emacs: remove melpaPackages.mmm-modejeschli2018-10-071-1/+0
| * | | krops: import from submoduleslassulus2018-10-072-8/+2
| * | | krops: init submodulelassulus2018-10-072-0/+3
| * | | Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-0/+1
| |\| |
| | * | j brauerei: +luis @ dev tmuxjeschli2018-10-051-0/+1
| * | | add charybdis module until it's fixed in 18.09lassulus2018-10-073-1/+112
| * | | 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
| | * | blessings: 1.1.0 -> 1.2.0tv2018-10-061-2/+2
| | * | tv querel: import xp-332tv2018-10-061-7/+3
| | * | tv xp-332: inittv2018-10-061-0/+45
| | * | tv pkgs: init utsushi at 3.48.0tv2018-10-061-0/+206
| | * | tv bash: use XMONAD_SPAWN_WORKSPACE when SHLVL=1tv2018-10-031-5/+7
| | * | tv mu: use brtv2018-10-031-14/+1
| * | | 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
| * | | l games: remove (broken) dwarf fortresslassulus2018-10-071-1/+0
| * | | l vim: remove unstable_nixpkgs hacklassulus2018-10-071-8/+2
| * | | l baseX: remove deprecated nix-repllassulus2018-10-061-1/+0
| * | | nixpkgs: d16a7ab -> 6a3f5bc (18.09)lassulus2018-10-061-3/+3
| * | | l radio: add mors to authorizedKeyslassulus2018-10-061-2/+3
| * | | l git: add nixos-generatorslassulus2018-10-061-0/+4
| * | | l: add ccc@lassul.uslassulus2018-10-061-0/+1
| * | | l prism.r: remove radio.lassul.uslassulus2018-10-061-10/+0
| * | | l mors.r: add adb-sync to pkgslassulus2018-10-041-0/+1
| * | | buildbot-stockholm: test kropslassulus2018-09-291-0/+6
| * | | Merge remote-tracking branch 'enklave/master'lassulus2018-09-297-290/+14
| |\ \ \ | | | |/ | | |/|
| | * | krebs: remove blnjeschli2018-09-251-37/+0
| | * | nix-writers: 3.0.0 -> 3.1.0jeschli2018-09-251-0/+0
| | * | Merge remote-tracking branch 'origin/master'jeschli2018-09-25143-1345/+1930
| | |\ \
| | * | | jeschli brauerei: dev user for jeschli and lassjeschli2018-09-251-0/+8