summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholm into new-masterjeschli2019-03-21102-1236/+1831
|\
| * Merge remote-tracking branch 'enklave/master'lassulus2019-03-128-261/+101
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2019-03-127-26/+15
| |\ \
| | * | external: add palo-pepe.pubkeytv2019-03-011-0/+3
| | * | Reaktor: 0.7.0 -> 0.7.1tv2019-02-171-2/+2
| | * | tv vim: map <f3> :ShowSyntaxtv2019-02-161-0/+2
| | * | tv vim: add xmodmaptv2019-02-161-0/+4
| | * | tv vim: add todoCommenttv2019-02-161-1/+2
| | * | Revert "tv: add deploy alias"tv2019-02-161-7/+0
| | * | lib.types.filename.check: remove unnecessary ()tv2019-02-161-1/+1
| | * | Revert "tv brscan4: init at 0.4.4-4"tv2019-02-161-8/+0
| | * | Revert "brscan4: init at 0.4.4-4"tv2019-02-162-9/+8
| | * | symlinkJoin: remove compatibilitytv2019-02-161-5/+0
| | * | flameshot-once: default filenamePattern w/o .pngtv2019-02-161-1/+1
| * | | Merge remote-tracking branch 'gum/master'lassulus2019-03-1247-440/+821
| |\ \ \
| | * | | ma nixpkgs.json: bump revisionmakefu2019-03-062-3/+4
| | * | | ma pkgs.init-host: initmakefu2019-03-062-0/+48
| | * | | ma save-diskspace: programs.info -> documentation.infomakefu2019-03-061-2/+2
| | * | | ma x.r: re-enable virtualboxmakefu2019-03-061-1/+1
| | * | | ma crapi.r: split into software and hardware configmakefu2019-03-062-32/+40
| | * | | ma pkgs.ampel: bump revmakefu2019-03-061-3/+3
| | * | | ma homeautomation: update google-muellmakefu2019-03-062-13/+55
| | * | | ma bureautomation: split into filesmakefu2019-03-0616-262/+560
| | * | | ma pkgs.Fluffy: init at 2.7makefu2019-03-041-0/+42
| | * | | ma: add base name to aliases when overridingmakefu2019-02-271-0/+3
| | * | | ma: make extensive use of defaults for inventorymakefu2019-02-2719-126/+65
| * | | | nixpkgs: 4c0be40 -> 8abca4blassulus2019-03-071-3/+3
| * | | | nixpkgs: 9bd45dd -> 4c0be40lassulus2019-03-041-3/+3
| * | | | external: add toastbrot.rJan Heidbrink2019-02-261-0/+30
| |/ / /
| * | | Merge remote-tracking branch 'lass/master'makefu2019-02-2622-113/+584
| |\ \ \
| | * | | Merge remote-tracking branch 'ni/master'lassulus2019-02-164-16/+142
| | |\| |
| | | * | lib.xml.render-term: quote stringstv2019-02-161-2/+6
| | | * | lib.xml: inittv2019-02-162-0/+85
| | | * | tv bash-fzf-history: use overrideDerivationtv2019-02-161-3/+2
| | | * | lib.warnOldVersion: inittv2019-02-161-0/+5
| | | * | tv iptables extraTypes: add Retiolumtv2019-02-101-0/+4
| | | * | tv iptables: add extra{4,6}tv2019-02-101-13/+42
| | * | | nixpkgs: 168cbb3 -> 9bd45ddlassulus2019-02-161-3/+3
| | * | | nixpkgs: b01a89d -> 168cbb3lassulus2019-02-121-3/+3
| | |/ /
| | * | tv xmonad: use launchtv2019-02-091-1/+1
| | * | tv xmonad: remove unused language extensionstv2019-02-091-4/+0
| | * | flameshot-once: 1.0.1 -> 1.1.0tv2019-02-093-4/+4
| | * | flameshot-once: make filenamePattern configurabletv2019-02-091-0/+7
| | * | tv xmonad: add dbustv2019-02-091-3/+16
| | * | flameshot-once: add configtv2019-02-093-15/+149
| | * | flameshot-once: use qt5.qtbasetv2019-02-091-1/+2
| | * | Merge remote-tracking branch 'ni/master'lassulus2019-02-080-0/+0
| | |\ \
| | | * | flameshot-once: 1.0.0 -> 1.0.1tv2019-02-071-7/+8
| | | * | flameshot-once: init at 1.0.0tv2019-02-072-0/+34
| | | * | tv gitrepos: add flameshot-oncetv2019-02-071-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:31:42 +0000