summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lassul.us/master'makefu2018-11-059-7/+133
|\
| * Merge remote-tracking branch 'ni/master'lassulus2018-10-301-2/+1
| |\
| | * Merge remote-tracking branch 'prism/master'tv2018-10-2711-259/+24
| | |\
| | * | tv x220: add config argumenttv2018-10-231-2/+1
| * | | Merge remote-tracking branch 'ni/master'lassulus2018-10-231-0/+19
| |\| | | | |/ | |/|
| | * tv x220: add tpacpi-battv2018-10-221-0/+13
| | * tv x220: add tp_smapitv2018-10-221-0/+6
| * | 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
| * | nin games: remove dwarf_fortresslassulus2018-10-101-1/+0
| * | Merge remote-tracking branch 'onondaga/master'lassulus2018-10-100-0/+0
| |\ \
| | * | Revert "remove nin"nin2018-10-0918-0/+1157
| * | | nin krops: force testlassulus2018-10-091-0/+1
| * | | Revert "remove nin"lassulus2018-10-0918-0/+1157
| * | | force test in krops.nixlassulus2018-10-092-0/+2
| |/ /
| * | Merge branch '18.09'lassulus2018-10-0933-1176/+321
| |\ \
| | * | remove ninlassulus2018-10-0818-1157/+0
| | * | tv: systemPackages += git-crypttv2018-10-081-0/+1
| | * | j emacs: remove melpaPackages.mmm-modejeschli2018-10-081-1/+0
| | * | j brauerei: +luis @ dev tmuxjeschli2018-10-081-0/+1
| * | | Merge remote-tracking branch 'ni/master'lassulus2018-10-065-26/+262
| |\ \ \
| * | | | force xserver valueslassulus2018-10-062-4/+4
* | | | | Merge remote-tracking branch 'lass/18.09' into 18.09makefu2018-10-0743-1486/+644
|\ \ \ \ \
| * | | | | remove ninlassulus2018-10-0718-1157/+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
| * | | | | | Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-0/+1
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | j brauerei: +luis @ dev tmuxjeschli2018-10-051-0/+1
| * | | | | Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-0716-44/+579
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | tv: add 18.09 compatibilitytv2018-10-0711-2/+304
| | * | | | 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
| | | |_|/ | | |/| |
| | * | | 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
| * | | | j brauerei.r: force lightdm offlassulus2018-10-071-0/+2
| | |_|/ | |/| |
| * | | Merge remote-tracking branch 'enklave/master'lassulus2018-09-295-253/+14
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'origin/master'jeschli2018-09-2520-180/+2
| | |\ \
| | * | | jeschli brauerei: dev user for jeschli and lassjeschli2018-09-251-0/+8
| | * | | jeschli brauerei: krops deployjeschli2018-09-251-0/+5
| | * | | jeschli system: remove blnjeschli2018-09-254-256/+0
| | * | | jeschli xmonad: pc_cellwidth 256 -> 100jeschli2018-09-251-1/+1
| * | | | Merge remote-tracking branch 'gum/master'lassulus2018-09-290-0/+0
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Merge remote-tracking branch 'lass/master'makefu2018-09-261-3/+2
|\ \ \ \ | | |_|/ | |/| |