summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* :Merge branch 'master' of prism.r:stockholmjeschli2019-04-02119-1251/+2052
|\
| * l: enable netdata on all hostslassulus2019-03-231-0/+3
| * l blue.r & littleT.r: import syncthinglassulus2019-03-232-0/+2
| * l icarus.r: enable thinkfanlassulus2019-03-231-0/+2
| * syncthing: increase rescanInterval to track upstreamlassulus2019-03-231-1/+1
| * syncthing: wait for service startuplassulus2019-03-231-0/+2
| * syncthing folders: add watch & ignorePerms optionslassulus2019-03-231-0/+18
| * l phone: add syncthing.idlassulus2019-03-231-0/+1
| * l blue: add syncthing.idlassulus2019-03-231-0/+1
| * l littleT: add wiregrill & syncthinglassulus2019-03-231-0/+8
| * l syncthing: use modulelassulus2019-03-225-0/+11
| * l: add syncthing ids for mors, icarus & skynetlassulus2019-03-221-0/+3
| * k: add syncthing modulelassulus2019-03-222-0/+130
| * types host: add syncthing.idlassulus2019-03-221-0/+6
| * Merge remote-tracking branch 'enklave/master'lassulus2019-03-221-1/+2
| |\
| | * Merge branch 'master' of prism.r:stockholm into new-masterjeschli2019-03-21102-1236/+1831
| | |\
| | * | j brauerei: now on i3jeschli2019-03-211-1/+2
| * | | Merge remote-tracking branch 'gum/master'lassulus2019-03-223-2/+26
| |\ \ \
| | * | | power-action module: no need for stockholm/libmakefu2019-03-191-2/+1
| | * | | ma home-manager: add taskwarriormakefu2019-03-131-0/+25
| | * | | Merge remote-tracking branch 'tv/master'makefu2019-03-131-2/+3
| | |\ \ \
| | * | | | ma 0tests/secrets: add adbkey dummymakefu2019-03-131-0/+0
| | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'ni/master'lassulus2019-03-222-2/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | nix-writers: 3.2.0 -> 3.3.0tv2019-03-201-0/+0
| | |/ /
| | * | tv utsushi: 3.48.0 -> 3.54.0tv2019-03-121-2/+2
| | * | tv utsushi: set udev confdirtv2019-03-121-0/+1
| * | | Merge remote-tracking branch 'enklave/master'lassulus2019-03-128-261/+101
| |\ \ \ | | | |/ | | |/|
| | * | j brauerei: -xmomad (is part of windowManager sessionnow )jeschli2019-02-261-9/+0
| | * | j brauerei: -rustc (provoided by rustup)jeschli2019-02-261-1/+3
| | * | j xserver: add dbus magic for xserver (xserver/default.nix not working curren...jeschli2019-02-091-0/+6
| | * | j brauerei: remove not working tokei overridejeschli2019-02-091-8/+1
| | * | j brauerei: remove commented dead codejeschli2019-02-091-1/+13
| | * | j krops: fix directoryjeschli2019-02-091-4/+1
| * | | 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