summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mv nixpkgs: 94941cb -> 56da88amv2017-08-301-1/+1
* dic: 1.0.2 -> 1.1.0tv2017-08-301-3/+4
* Merge remote-tracking branch 'stro/master'tv2017-08-2912-56/+141
|\
| * mv: the future is now!mv2017-08-293-18/+31
| * init hope.rlassulus2017-08-263-0/+76
| * lass umts: no longer use environment.wvdiallassulus2017-08-261-1/+20
| * l mpv: remove unneded moveToDir bindingslassulus2017-08-251-25/+1
| * l mail: t -> tag maillassulus2017-08-251-1/+1
| * l shodan.r: add /home lvlassulus2017-08-251-1/+5
| * l mail: add radio folderlassulus2017-08-251-1/+3
| * l mors.r: enable mongodblassulus2017-08-251-0/+3
| * l mors.r: remove deprecated zalando stufflassulus2017-08-251-9/+0
| * l: open mosh portslassulus2017-08-241-0/+1
* | Merge remote-tracking branch 'prism/master'tv2017-08-2455-126/+709
|\|
| * nixpkgs: 0590ecb -> 51a8326lassulus2017-08-211-1/+1
| * Merge remote-tracking branch 'gum/master'lassulus2017-08-212-0/+16
| |\
| | * ma pkgs: init inkscapemakefu2017-08-162-0/+16
| * | l baseX: add gi to pkgslassulus2017-08-211-0/+1
| * | l pkgs.xmonad: bind brainmenu to M-olassulus2017-08-211-0/+1
| * | l git: allow hooks to be set individuallylassulus2017-08-211-2/+2
| * | l daedalus.r: add kde desktoplassulus2017-08-211-8/+60
| * | l: mors <-> daedaluslassulus2017-08-212-6/+6
| * | l skynet.r: don't suspend on lid closelassulus2017-08-161-0/+4
| * | Merge remote-tracking branch 'gum/master'lassulus2017-08-1639-79/+580
| |\|
| | * 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
| * | l mail: show unread firstlassulus2017-08-161-1/+1
| * | l ircd: remove obsolete netword descriptionlassulus2017-08-161-1/+0