summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2018-11-3013-129/+246
|\
| * tv xmonad: amixer -> pactltv2018-11-303-8/+12
| * tv xmonad: cleanuptv2018-11-301-66/+11
| * tv bash: redefine <stockholm> for tvtv2018-11-301-0/+2
| * tv bash: use XMONAD_SPAWN_WORKSPACE only for tvtv2018-11-301-8/+12
| * tv xmonad: add shell.nixtv2018-11-301-0/+78
| * lib: add kropstv2018-11-301-0/+1
| * tv: remove systemd aliasestv2018-11-301-5/+0
| * tv xmonad: move to haskell packagestv2018-11-306-34/+97
| * tv pkgs haskell: inittv2018-11-301-0/+20
| * lib: add mapNixDir{,1}tv2018-11-303-14/+19
|/
* xmonad-stockholm: 1.2.0 -> 1.3.0tv2018-11-293-24/+9
* * krops: merge krebs-nixpkgs into krebs-sourcelassulus2018-11-282-6/+2
* Merge remote-tracking branch 'ni/master' into cilassulus2018-11-2814-81/+246
|\
| * tv urlwatch: remove nixostv2018-11-281-5/+0
| * tv xmonad: wait for shutdown to completetv2018-11-282-3/+25
| * tv xmonad: reduce crufttv2018-11-281-43/+1
| * tv xmonad: liftIO -> iotv2018-11-281-2/+2
| * tv xmonad: add currentSystem to executable nametv2018-11-282-3/+3
| * tv fzmenu-urxvt: add internalBordertv2018-11-281-1/+1
| * tv otpmenu: RIPtv2018-11-281-15/+0
| * tv xmonad: use fzmenutv2018-11-283-4/+19
| * tv fzmenu: inittv2018-11-283-0/+116
| * tv xp332: add utsushi-customizedtv2018-11-271-2/+2
| * tv: integrate 5pkgs as overlaytv2018-11-271-2/+8
| * tv querel: drop chromiumtv2018-11-271-3/+0
| * Merge remote-tracking branch 'prism/master'tv2018-11-270-0/+0
| |\
| * | tv disko: init at 16cd458tv2018-11-261-0/+13
| * | tv dnsmasq service: inittv2018-11-262-0/+58
* | | * krops: get nixpkgs from store for cilassulus2018-11-282-0/+4
| |/ |/|
* | Merge remote-tracking branch 'lass/master'makefu2018-11-204-2/+70
|\ \
| * | Merge remote-tracking branch 'ni/master'lassulus2018-11-184-2/+70
|/| | | |/
| * tv vim elixir: b916c00 -> 0a847f0tv2018-11-161-1/+8
| * tv vim: neaten fzf plugintv2018-11-161-2/+2
| * tv vim: set timeoutlen=0tv2018-11-161-0/+1
| * tv vim: M-a edits alternate buffertv2018-11-151-0/+4
| * tv vim: add fzftv2018-11-151-0/+19
| * Merge remote-tracking branch 'prism/master'tv2018-11-142-105/+0
| |\ | |/ |/|
* | remove remaining nin stufflassulus2018-11-112-105/+0
| * ejabberd: replaced by upstreamtv2018-11-131-1/+0
| * tv hc: init at 1.0.0tv2018-11-131-0/+37
| * tv gitrepos: add hctv2018-11-131-0/+1
|/
* Merge remote-tracking branch 'prism/master'tv2018-11-1016-1052/+0
|\
| * 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 'ni/master'lassulus2018-10-231-0/+19
| | |\ \
| * | \ \ 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
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-1/+0
| | |\ \ \ \ \