summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2017-10-0746-316/+320
|\
| * l pkgs.xmonad: pointer follows focuslassulus2017-10-051-6/+8
| * l dummy-secrets: add dcsovpnlassulus2017-10-054-0/+0
| * l helios.r: add dcsovpnlassulus2017-10-052-0/+45
| * l gc: deactivate on helioslassulus2017-10-051-1/+1
| * l pass: activate gnupg-agentlassulus2017-10-051-0/+1
| * l helios.r: add certificateFileslassulus2017-10-051-0/+11
| * l helios.r: use nvidia driverslassulus2017-10-051-0/+2
| * l pkgs.xmonad: move keys aroundlassulus2017-10-051-5/+5
| * l pkgs.xmonad: use greedyViewlassulus2017-10-051-1/+1
| * l pkgs.xmonad: add more default workspaceslassulus2017-10-051-1/+1
| * l websites: remove deprecated attributeslassulus2017-10-051-4/+1
| * l hosts: add internet address for inspector & edditlassulus2017-10-051-2/+12
| * l nixpkgs: 07ca7b6 -> 1987983lassulus2017-10-051-1/+1
| * Merge remote-tracking branch 'gum/master'lassulus2017-10-032-17/+31
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2017-10-039-98/+18
| |\ \
| | * | tv mu systemPackages: build KDE locale manuallytv2017-10-031-1/+3
| | * | mv stro nixpkgs: 17.03 -> 17.09tv2017-10-031-2/+2
| | * | tv alnus nixpkgs: 17.03 -> 17.09tv2017-10-031-1/+1
| | * | tv brscan4: init at 0.4.4-4tv2017-10-031-0/+8
| | * | tv gnupg: gnupg21 -> gnupg22tv2017-10-031-1/+1
| | * | tv mfcl2700dn*: RIPtv2017-10-033-90/+0
| | * | tv nixpkgs: 17.03 -> 17.09tv2017-10-031-2/+2
| | * | Merge remote-tracking branch 'prism/master'tv2017-10-0333-88/+113
| | |\ \
| | * | | tv gitrepos: #krebs -> #xxxtv2017-10-011-1/+1
| * | | | l pass: gnupg1 -> gnupglassulus2017-10-031-1/+1
| * | | | l ejabberd: copy tv's stufflassulus2017-10-032-98/+161
| * | | | l websites lass: use addSSLlassulus2017-10-031-29/+3
| * | | | buildbot slave service: clean workingDir on changelassulus2017-10-031-0/+2
| * | | | ircd: raise default_floodcount to 1000lassulus2017-10-031-0/+1
| | |/ / | |/| |
| * | | tinc module: workaround nixpkgs's lib.types.typestv2017-10-031-4/+3
| * | | l weechat: open mosh portlassulus2017-10-031-0/+5
| * | | l sqlBackup: set mysql.dataDir to /var/mysqllassulus2017-10-031-1/+2
| * | | nixpkgs: 670b4e2 -> 07ca7b6lassulus2017-10-031-1/+1
| * | | l copyq: fix startuplassulus2017-10-031-1/+4
| * | | l nixpkgs: b61d084 -> 07ca7b6lassulus2017-10-031-1/+1
| * | | l prism.r: track nginx changeslassulus2017-10-021-1/+6
| * | | l wine: pkgs.wineFull -> pkgs.winelassulus2017-10-021-1/+1
| * | | l ejabberd: RIPlassulus2017-10-022-31/+0
| * | | l nixpkgs: 670b4e2 -> b61d084lassulus2017-10-021-1/+1
| * | | krebs.tinc: import types explicitlylassulus2017-10-021-0/+1
| * | | Revert "l nixpkgs: 670b4e2 -> 5ac8389"lassulus2017-10-021-1/+1
| * | | Merge branch 'master' into staging/17.09lassulus2017-10-014-9/+10
| |\ \ \
| | * | | l hosts: update android rsa keylassulus2017-10-011-1/+1
| * | | | l nixpkgs: 670b4e2 -> 5ac8389lassulus2017-10-011-1/+1
| * | | | Merge branch 'master' into staging/17.09lassulus2017-10-0198-670/+2424
| |\ \ \ \
| * | | | | gitlab-runner: configText -> configFilelassulus2017-09-191-14/+13
| * | | | | nixpkgs 8ed299f -> 670b4e2 (17.09)lassulus2017-09-191-1/+1
| * | | | | l bepasty: forceSSL conflicts with enableSSLlassulus2017-09-191-1/+0
| * | | | | bepasty: pythonPackages.bepasty-server -> bepastylassulus2017-09-191-1/+1