summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* nixpkgs: 0c5a587 -> cb751f9lassulus2017-12-131-1/+1
* l nixpkgs: b4a0c01 -> cb751f9lassulus2017-12-131-1/+1
* Merge remote-tracking branch 'gum/master'lassulus2017-12-131-21/+0
|\
| * Revert "pkgs.passwdqc-utils: rip"makefu2017-12-121-0/+37
| * pkgs.passwdqc-utils: ripmakefu2017-12-121-37/+0
| * pkgs.apt-cacher-ng: ripmakefu2017-12-121-21/+0
* | Merge remote-tracking branch 'ni/master'lassulus2017-12-133-2/+31
|\ \
| * | tv urlwatch: add nix-difftv2017-12-131-0/+5
| * | haskellPackages.nix-diff: 1.0.0 -> 1.0.0-krebs1tv2017-12-132-1/+22
| * | tv urlwatch: filter simple-evcorr through jqtv2017-12-131-1/+4
* | | l xmonad: add mute toggle buttonlassulus2017-12-131-0/+2
* | | l xmonad: simpleFloat -> simplestFloatlassulus2017-12-131-2/+2
* | | l xmonad: add ewmh compliancelassulus2017-12-131-1/+2
* | | l screengrab: use display from configlassulus2017-12-131-1/+1
* | | l lassul.us: fix acmelassulus2017-12-131-4/+7
* | | l gpd-pocket: remove duplicate tlplassulus2017-12-131-1/+0
* | | l games: add df with tilesetlassulus2017-12-131-1/+1
* | | l: add payeer@lassul.uslassulus2017-12-131-0/+1
* | | l dcso-dev: add go to devs pkgslassulus2017-12-131-0/+4
* | | l dcso-dev: authorize lass-androidlassulus2017-12-131-0/+1
* | | l browsers: use devedition for fflassulus2017-12-131-1/+1
* | | l br: fix scanner iplassulus2017-12-131-1/+1
* | | l: ignore lidswitch only on x220lassulus2017-12-132-4/+5
* | | Merge remote-tracking branch 'ni/master'lassulus2017-12-124-16/+52
|\| |
| * | github: generate ssh_config from APItv2017-12-121-15/+20
| * | cidr2glob: inittv2017-12-121-0/+30
| * | tv urlwatch: watch GitHub Metatv2017-12-121-1/+1
| * | krebs.backup: restartIfChanged = falsetv2017-12-121-0/+1
* | | krebs.repo-sync: restartIfChanged = falselassulus2017-12-121-0/+1
* | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2017-12-1210-0/+777
|\ \ \
| * | | jeschli: +bluetoothjeschli2017-12-121-0/+2
| * | | jeschli:+ retiolum, +lass vimjeschli2017-12-066-102/+571
| * | | Merge branch 'master' of http://cgit.lassul.us/stockholm into klauen-von-lassjeschli2017-12-061-0/+39
| |\ \ \
| * \ \ \ Merge branch 'master' of http://cgit.lassul.us/stockholm into klauen-von-lassjeschli2017-12-066-242/+347
| |\ \ \ \
| * | | | | boomjeschli2017-12-057-0/+306
* | | | | | l prism.r: add jescli stockholm permissionslassulus2017-12-121-0/+9
* | | | | | l deploy: run with --difflassulus2017-12-121-1/+1
* | | | | | l: add xerxes.rlassulus2017-12-116-0/+107
* | | | | | Merge remote-tracking branch 'gum/master'lassulus2017-12-0926-104/+405
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | ma tests: add bgt hidden servicemakefu2017-12-081-0/+1
| * | | | | ma scrape: initmakefu2017-12-082-0/+71
| * | | | | ma tools/games: add pkg2zipmakefu2017-12-081-0/+1
| * | | | | ma tools: add signal-desktopmakefu2017-12-081-0/+1
| * | | | | ma zsh: disable manual completions, enable ctrl-xewqmakefu2017-12-081-6/+9
| * | | | | ma pkgs: do not export devpi-servermakefu2017-12-081-1/+1
| * | | | | ma tools/dev: add stockholmmakefu2017-12-081-0/+2
| * | | | | ma share/omo: cleanupmakefu2017-12-081-10/+4
| * | | | | ma tsp.r: enable touchpadmakefu2017-12-081-0/+2
| * | | | | ma wbob.r: enable bureautomationmakefu2017-12-087-29/+105
| * | | | | ma bgt: add hidden service descriptionmakefu2017-12-081-0/+48