summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2019-02-2622-113/+584
|\
| * Merge remote-tracking branch 'ni/master'lassulus2019-02-164-16/+142
| |\
| | * lib.xml.render-term: quote stringstv2019-02-161-2/+6
| | * lib.xml: inittv2019-02-162-0/+85
| | * tv bash-fzf-history: use overrideDerivationtv2019-02-161-3/+2
| | * lib.warnOldVersion: inittv2019-02-161-0/+5
| | * tv iptables extraTypes: add Retiolumtv2019-02-101-0/+4
| | * tv iptables: add extra{4,6}tv2019-02-101-13/+42
| * | nixpkgs: 168cbb3 -> 9bd45ddlassulus2019-02-161-3/+3
| * | nixpkgs: b01a89d -> 168cbb3lassulus2019-02-121-3/+3
| |/
| * tv xmonad: use launchtv2019-02-091-1/+1
| * tv xmonad: remove unused language extensionstv2019-02-091-4/+0
| * flameshot-once: 1.0.1 -> 1.1.0tv2019-02-093-4/+4
| * flameshot-once: make filenamePattern configurabletv2019-02-091-0/+7
| * tv xmonad: add dbustv2019-02-091-3/+16
| * flameshot-once: add configtv2019-02-093-15/+149
| * flameshot-once: use qt5.qtbasetv2019-02-091-1/+2
| * Merge remote-tracking branch 'ni/master'lassulus2019-02-080-0/+0
| |\
| | * flameshot-once: 1.0.0 -> 1.0.1tv2019-02-071-7/+8
| | * flameshot-once: init at 1.0.0tv2019-02-072-0/+34
| | * tv gitrepos: add flameshot-oncetv2019-02-071-0/+3
| | * Merge remote-tracking branch 'prism/master'tv2019-02-051-0/+25
| | |\
| | * | blessings: 2.1.0 -> 2.2.0tv2019-02-051-4/+5
| | * | tv bash-fzf-history: support unknown timestampstv2019-02-051-0/+5
| | * | tv bash-fzf-history: show timestamptv2019-02-051-2/+5
| | * | tv bash-fzf-history: use array instead of extglobtv2019-02-051-9/+13
| | * | tv bash: add timestamps to histfiletv2019-02-051-0/+1
| | * | tv bash: use fzf-historytv2019-02-051-0/+2
| | * | tv bash-fzf-history: inittv2019-02-051-0/+91
| | * | tv vim todo: form feed ends a blocktv2019-02-031-1/+1
| | * | tv vim todo: allow A-Z in tagstv2019-02-021-1/+1
| | * | tv vim: add TODO fttv2019-02-021-0/+37
| | * | tv vim haskell: isk+='tv2019-02-021-0/+13
| | * | tv vim-syntax-nix-nested: detect .vim".texttv2019-02-021-3/+4
| | * | tv vim-syntax-nix-nested: add writer{Ext,Name}tv2019-02-021-3/+8
| | * | krebs-hosts-*: don't add lines without aliastv2019-02-021-1/+1
| | * | Merge remote-tracking branch 'prism/master'tv2019-02-0222-103/+332
| | |\ \
| | * | | krebs-hosts_combined: inittv2019-01-311-8/+12
| | * | | retiolum-hosts: RIPtv2019-01-313-10/+1
| | * | | krebs-hosts-*: generate from krebs.hoststv2019-01-312-24/+59
| | * | | tv rxvt_unicode: fetch patchtv2019-01-314-48/+10
| * | | | nixpkgs: 97e0d53 -> b01a89dlassulus2019-02-081-3/+3
| * | | | external: actually import palo.nixlassulus2019-02-081-0/+1
| * | | | flameshot-once: 1.0.0 -> 1.0.1tv2019-02-081-7/+8
| * | | | flameshot-once: init at 1.0.0tv2019-02-082-0/+34
| * | | | tv gitrepos: add flameshot-oncetv2019-02-081-0/+3
| * | | | blessings: 2.1.0 -> 2.2.0tv2019-02-081-4/+5
| * | | | tv bash-fzf-history: support unknown timestampstv2019-02-081-0/+5
| * | | | tv bash-fzf-history: show timestamptv2019-02-081-2/+5
| * | | | tv bash-fzf-history: use array instead of extglobtv2019-02-081-9/+13