summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'enklave/master'lassulus2020-04-231-1/+1
|\
| * j ublock-origin: licenses.gnu3 -> licenses.gpl3Jeschli2020-04-221-1/+1
* | charybis: use not deprecated user/group syntaxlassulus2020-04-231-4/+3
* | Merge remote-tracking branch 'gum/20.03'lassulus2020-04-234-7/+12
|\ \
| * | ma virtualbox: re-enable extensionpackmakefu2020-04-221-1/+1
| * | ma 2 default: use stable kernel instead of latestmakefu2020-04-221-1/+1
| * | 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
* | | types: remove last deprecated string typelassulus2020-04-221-2/+2
* | | Merge remote-tracking branch 'gum/20.03'lassulus2020-04-227-12/+13
|\| |
| * | ma default: accept acme termsmakefu2020-04-221-0/+4
| * | Merge remote-tracking branch 'lass/20.03' into 20.03makefu2020-04-222-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
| |\ \ \ \
| * | | | | ma zsh.nix: mirage -> sxivmakefu2020-04-222-1/+2
| * | | | | ma urxvtd: rxvt_unicode_with-plugins -> rxvt_unicode-with-pluginsmakefu2020-04-221-1/+1
* | | | | | l baseX: set windowManager.default -> defaultSessionlassulus2020-04-221-1/+1
* | | | | | l xjail: remove deprecated string usagelassulus2020-04-221-5/+5
* | | | | | lib types: remove deprecated string usagelassulus2020-04-221-1/+1
* | | | | | l mors.r: remove umts module stufflassulus2020-04-221-10/+0
* | | | | | remove brockman from submoduleslassulus2020-04-222-3/+0
* | | | | | Merge remote-tracking branch 'ni/master'lassulus2020-04-220-0/+0
|\ \ \ \ \ \
| * | | | | | krops: 1.20.0 -> 1.21.0tv2020-04-191-0/+0
* | | | | | | l: add ppp.nixlassulus2020-04-222-0/+33
* | | | | | | l network-manager: disable modem-managerlassulus2020-04-221-12/+0
* | | | | | | l: rip umts modulelassulus2020-04-222-113/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge remote-tracking branch 'enklave/master' into 20.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 remote-tracking branch 'gum/20.03' into 20.03lassulus2020-04-2212-14/+91
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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
* | | | | | l prism.r: remove onondagalassulus2020-04-221-20/+0
* | | | | | Merge remote-tracking branch 'enklave/master' into 20.03lassulus2020-04-221-1/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
[cgit] Unable to lock slot /tmp/cgit/6f200000.lock: No such file or directory (2)