summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* nixpkgs-unstable: fbfb794 -> 1905f5flassulus2021-06-251-4/+4
* nixpkgs: bad3ccd -> 8112fbelassulus2021-06-251-4/+4
* nixpkgs: 1f91fd1 -> bad3ccdlassulus2021-06-181-4/+4
* external: add ed25519 pubkey of makanek.rlassulus2021-06-161-0/+1
* Merge remote-tracking branch 'gum/master'lassulus2021-06-163-2/+8
|\
| * krebs: init neos, add ssh key to shack infra managersmakefu2021-06-153-2/+8
* | l: clean up packageslassulus2021-06-151-8/+10
|/
* brockman: 3.4.3 -> 3.4.5lassulus2021-06-141-2/+2
* nixpkgs: 60cce7e -> 1f91fd1lassulus2021-06-131-4/+4
* tv xserver: useXFS -> fontPathtv2021-06-101-3/+3
* Merge remote-tracking branch 'prism/master'tv2021-06-10104-470/+722
|\
| * Revert "l mpv: disable autosub for now"lassulus2021-06-091-1/+1
| * wiki: fix old references to krebs.gollumlassulus2021-06-091-3/+3
| * buildbot-classic: fix build on 21.05lassulus2021-06-092-3/+40
| * nixpkgs: 5de44c1 -> 60cce7elassulus2021-06-091-4/+4
| * Revert "buildbot-classic: build with python 3"lassulus2021-06-091-6/+7
| * Merge remote-tracking branch 'lass/master'makefu2021-06-0914-166/+265
| |\
| | * wiki: fix ascii errorlassulus2021-06-091-0/+2
| | * gollum: follow upstreamlassulus2021-06-093-114/+1
| | * mic92: fix key for hydrogenJörg Thalheim2021-06-091-1/+1
| | * mic92: add ed25519 keys for hydrogenJörg Thalheim2021-06-081-0/+1
| | * mic92: new ed25519 key for roseJörg Thalheim2021-06-081-1/+1
| | * mic92: add ed25519 keys for eve/evaJörg Thalheim2021-06-081-0/+3
| | * mic92: add more ed25519 retiolum keysJörg Thalheim2021-06-081-6/+9
| | * mic92: start adding ed25519 as wellJörg Thalheim2021-06-081-0/+2
| | * mic92: fix nardole's public ipsJörg Thalheim2021-06-081-2/+2
| | * mic92: remove anindyaJörg Thalheim2021-06-081-19/+0
| | * mic92: add aendernixJörg Thalheim2021-06-081-0/+24
| | * mic92: nardole: update key + add ip addressesJörg Thalheim2021-06-081-6/+16
| | * bill: add ip addresses + new keyJörg Thalheim2021-06-081-6/+16
| | * mic92: move loki.r to evaJörg Thalheim2021-06-081-1/+1
| | * mic92: change ip address of evaJörg Thalheim2021-06-081-2/+2
| | * Merge remote-tracking branch 'ni/master'lassulus2021-06-082-3/+5
| | |\
| | * | module ergo: initlassulus2021-06-083-0/+150
| | * | Merge remote-tracking branch 'ni/master'lassulus2021-06-081-6/+5
| | |\ \
| | | * | flameshot-once: 1.3.0 -> 1.4.0tv2021-06-081-6/+5
| | * | | nixpkgs-unstable: 7a1fbc3 -> fbfb794lassulus2021-06-071-4/+4
| | * | | nixpkgs: aa57635 -> 5de44c1lassulus2021-06-071-4/+4
| | * | | l radio: fix counting of listenerslassulus2021-06-071-1/+1
| | * | | l radio: stop sharing with xerxeslassulus2021-06-071-1/+1
| | * | | l radio: add mp3 outputlassulus2021-06-071-0/+14
| | * | | l radio: set irc topiclassulus2021-06-071-1/+12
| | * | | l radio: fix starting with 21.05lassulus2021-06-071-2/+2
| | * | | realwallpaper: use imagemagick6 (future lassulus has to understand 7)lassulus2021-06-061-2/+1
| | * | | jeschli enklave.r: disable cilassulus2021-06-061-0/+1
| * | | | ma pkgs.hdl-dump: ripmakefu2021-06-091-33/+0
| * | | | Merge branch '21.05'makefu2021-06-06122-594/+607
| |\ \ \ \
| | * | | | ma bureautomation: disable puppy-proxy for nowmakefu2021-06-061-1/+1
| | * | | | ma pkgs.droidcam: ripmakefu2021-06-061-55/+0
| | * | | | ma x.r: disable xm7370 kmodmakefu2021-06-061-1/+1