summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'gitlab-ci'makefu2017-08-224-0/+41
|\ \ \ \
| * | | | gitlab-runner: use PrivateTmp to avoid clash with buildbotmakefu2017-08-161-0/+1
| * | | | gitlab-ci: test envmakefu2017-08-161-0/+1
| * | | | gitlab-runner-shackspace: initmakefu2017-08-163-0/+35
| * | | | gitlab-ci: initmakefu2017-08-161-0/+4
| | |/ / | |/| |
* | | | ma vpngate: add francemakefu2017-08-221-0/+108
* | | | ma vim: update listcharsmakefu2017-08-221-1/+1
* | | | ma wiki-irc-bot: use newsbot-js instead of logstashmakefu2017-08-223-87/+58
* | | | pkgs.newsbot-js: enable patchPhasemakefu2017-08-221-0/+1
* | | | newsbot-js module: add package optionmakefu2017-08-221-1/+6
* | | | ma git: add euer_blogmakefu2017-08-211-0/+1
| |_|/ |/| |
* | | ma pkgs: init inkscapemakefu2017-08-162-0/+16
|/ /
* | ma configs/default: add vim as defaultmakefu2017-08-161-0/+1
* | ma gum: un-hardcode interfacemakefu2017-08-161-10/+14
* | ma docker: add dockertools to systemPackagesmakefu2017-08-161-1/+5
* | ma vim: show tabsmakefu2017-08-161-0/+3
* | ma urlwatch: github-rssmakefu2017-08-161-9/+16
* | ma tools: add jdk and jre to android packagesmakefu2017-08-161-0/+3
* | ma x: allow virtualbox firewallmakefu2017-08-161-0/+9
* | ma jack-on-pulse: depend on sound.targetmakefu2017-08-161-1/+1
* | ma backup: add placeholder for wolf backupmakefu2017-08-161-0/+1
* | ma elchos/search: refactor dyndns codemakefu2017-08-161-3/+14
* | ma sda-crypto-root: add notes for formatting the harddrivemakefu2017-08-161-0/+6
* | ma anon-ftp: replace ftpdirmakefu2017-08-161-1/+1
* | ma share/gum: fix download usermakefu2017-08-161-2/+2
* | ma hw/tp-x230: enable rngd againmakefu2017-08-161-2/+2
* | ma tools/dev: add gimakefu2017-08-161-1/+2
* | ma 5pkgs: cleanupmakefu2017-08-1613-9/+186
* | ma darth: init full-disk-encryptionmakefu2017-08-161-39/+54
* | ma pkgs.cmpforopenssl: initmakefu2017-08-162-0/+96
* | ma lanparty: add sambamakefu2017-08-161-0/+31
* | ma nsupdate-data: initmakefu2017-08-162-0/+56
* | ma tools: add gitFullmakefu2017-08-161-0/+1
* | ma gitlab: initmakefu2017-08-161-0/+39
* | ma gitlab-runner-shackspace: initmakefu2017-08-162-0/+33
* | ma source: bump to 9d4bd6bmakefu2017-08-151-1/+4
|/
* Merge remote-tracking branch 'ni/master'lassulus2017-08-102-5/+9
|\
| * haskell overlay: only override packagestv2017-08-101-3/+7
| * populate: 1.2.1 -> 1.2.2tv2017-08-101-2/+2
* | Merge remote-tracking branch 'ni/master' into HEADlassulus2017-08-103-29/+59
|\|
| * shell: --quiet enables whatsupnixtv2017-08-101-16/+41
| * shell: cleanup use of force_populatetv2017-08-101-2/+2
| * dic: 1.0.1 -> 1.0.2tv2017-08-101-2/+2
| * override all Haskell packagestv2017-08-071-9/+14
* | pkgs.buildbot-classic: f40159404 -> 843463911lassulus2017-08-101-2/+2
* | pkgs.electron-cash: remove unneeded protobuf deplassulus2017-08-101-1/+0
* | ma openvpn-server: initmakefu2017-08-102-0/+111
* | ma source: remove TODOmakefu2017-08-101-2/+1
* | ma awesome: template insert packagesmakefu2017-08-103-11/+15
* | ma git: add stockholm-issuemakefu2017-08-101-0/+3