summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma x.r: re-enable virtualbox, fix warningmakefu2020-04-221-2/+6
* nixpkgs: 5272327 -> 1e90c46makefu2020-04-221-3/+3
* ma x.r: giving up on virtualbox againmakefu2020-04-221-1/+1
* ma owncloud: pkgs.nextcloud -> nextcloudmakefu2020-04-221-2/+3
* ma virtualbox: disable extensionPackmakefu2020-04-221-1/+1
* ma default: accept acme termsmakefu2020-04-221-0/+4
* Merge remote-tracking branch 'lass/20.03' into 20.03makefu2020-04-222-1/+0
|\
| * Merge remote-tracking branch 'enklave/master' into 20.0320.03lassulus2020-04-222-1/+0
| |\
| | * Merge branch 'master' of https://cgit.lassul.us/stockholmJeschli2020-04-2229-123/+625
| | |\
| | * | j elisp: update to latest commitJeschli2020-04-221-0/+0
| | * | j reagenzglas: remove haskellJeschli2020-04-221-1/+0
* | | | Merge branch 'master' into 20.03makefu2020-04-221-9/+2
|\ \ \ \
| * | | | rtorrent module: remove 17.03 crutchmakefu2020-04-221-9/+2
* | | | | ma tools/studio: whitelist openssl_1.0.2makefu2020-04-221-0/+3
* | | | | ma wbob-kiosk: set default session to xfcemakefu2020-04-221-1/+1
* | | | | Merge remote-tracking branch 'lass/20.03' into 20.03makefu2020-04-222-21/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'gum/20.03' into 20.03lassulus2020-04-2212-14/+91
| |\ \ \ \
| * | | | | l prism.r: remove onondagalassulus2020-04-221-20/+0
| * | | | | Merge remote-tracking branch 'enklave/master' into 20.03lassulus2020-04-221-1/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | j haskell: remove stylish-haskellJeschli2020-04-211-1/+0
| * | | | | Merge remote-tracking branch 'gum/20.03' into 20.03lassulus2020-04-220-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'gum/20.03' into 20.03lassulus2020-04-225-0/+124
| |\ \ \ \ \ \
| | * | | | | | ma tests: add dummy ebk-notifymakefu2020-04-221-0/+0
| | * | | | | | Merge remote-tracking branch 'lass/20.03' into 20.03makefu2020-04-2183-2065/+1296
| | |\ \ \ \ \ \
| | | * | | | | | remove ninlassulus2020-04-2120-1269/+0
* | | | | | | | | ma zsh.nix: mirage -> sxivmakefu2020-04-222-1/+2
* | | | | | | | | ma urxvtd: rxvt_unicode_with-plugins -> rxvt_unicode-with-pluginsmakefu2020-04-221-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'master' into 20.03makefu2020-04-2212-14/+91
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'lass/master'makefu2020-04-2151-498/+1082
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | ma tools/dev: add hydra-checkmakefu2020-04-211-0/+1
| * | | | | | ma share/omo: enable anime and serienmakefu2020-04-211-0/+12
| * | | | | | ma nur: bump to latest tarballmakefu2020-04-211-2/+2
| * | | | | | ma zsh: use bat as cat but without indentationmakefu2020-04-211-1/+1
| * | | | | | ma ham/the_playlist: initmakefu2020-04-212-0/+60
| * | | | | | ma ham/androidtv: bump python libs to correct versionmakefu2020-04-213-7/+7
| * | | | | | ma gui/base: use lightdm, enable corefonts via fonts.fontsmakefu2020-04-211-4/+6
| * | | | | | ma cgit: add ebk-notifymakefu2020-04-211-0/+1
| * | | | | | ma gum.r: enable feed.euermakefu2020-04-211-0/+1
| | |_|/ / / | |/| | | |
* | | | | | ma tests: add dummy ebk-notifymakefu2020-04-221-0/+0
* | | | | | Merge remote-tracking branch 'lass/20.03' into 20.03makefu2020-04-2283-2072/+1296
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | remove ninlassulus2020-04-2121-1276/+0
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'enklave/master' into 20.03lassulus2020-04-219-274/+178
| |\ \ \ | | | |/ | | |/|
| | * | j emacs: use ./elisp/init.elJeschli2020-04-211-1/+1
| | * | j emacs: stable for bbdb which-keyJeschli2020-04-211-0/+1
| | * | j emacs: add window-purposeJeschli2020-04-211-0/+3
| | * | j reagenzglas: slim -> lightdmJeschli2020-04-211-2/+2
| | * | git-submodules: fix elisp submoduleJeschli2020-04-141-1/+1
| | * | j reagenzglas: touchpad dis/enable by F1/F2.Jeschli2020-04-141-0/+3
| | * | j reagenzglas: add steel bank common lisp (sbcl)Jeschli2020-04-141-0/+1
| | * | j reagenzglas: add gitAndTools.hubJeschli2020-04-141-0/+1