summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2020-05-2514-23/+444
|\
| * github-known-hosts: update listtv2020-05-201-10/+26
| * tv xmonad: add flameshot-oncetv2020-05-053-1/+16
| * tv imgur config: inittv2020-05-051-0/+25
| * htgen-imgur: init at 1.0.0tv2020-05-052-0/+238
| * flameshot-once: add imgur supporttv2020-05-051-1/+67
| * flameshot: make imgur URLs configurabletv2020-05-011-0/+41
| * proot: move to override overlaytv2020-05-012-6/+10
| * flameshot-once: 1.2.0 -> 1.3.0tv2020-05-012-3/+4
| * xwaitforwindow: inittv2020-05-011-0/+15
| * htgen: 1.2.2 -> 1.2.3tv2020-04-301-2/+2
* | Merge remote-tracking branch 'gum/master'lassulus2020-05-2513-16/+111
|\ \
| * | ma omo,x.r: disable ipv6 until studio-link issue is resolvedmakefu2020-05-213-10/+24
| * | ma zigbee2mqtt: start up after network is availablemakefu2020-05-211-0/+1
| * | ma home-assistant: requires empty config to start up uimakefu2020-05-212-0/+2
| * | ma ham/androidtv: bump dependency from 0.0.37 to 0.0.38makefu2020-05-211-2/+2
| * | nixpkgs: 5adf2a6 -> f45ccd9makefu2020-05-211-3/+3
| * | Merge remote-tracking branch 'lass/master'makefu2020-05-2127-110/+352
| |\ \
| * | | ma etherpad: update templatemakefu2020-05-021-3/+2
| * | | ma gecloudpad: use config parameters to set baseurlmakefu2020-05-021-1/+4
| * | | ma gum.r: enable etherpad via docker-containermakefu2020-05-024-0/+76
* | | | l: add MX entry for lassul.uslassulus2020-05-251-0/+1
| |/ / |/| |
* | | l hass: add more rooms & automationslassulus2020-05-166-73/+272
* | | nixpkgs: 1e90c46 -> 5adf2a6lassulus2020-05-121-3/+3
* | | l: add home-media.nixlassulus2020-04-273-20/+27
* | | external: add helsinkiajs1242020-04-251-0/+28
* | | Merge remote-tracking branch 'enklave/master'lassulus2020-04-2416-14/+22
|\ \ \ | |/ / |/| |
| * | j i3: hardware.brightnessctl.enable -> systemPackagesJeschli2020-04-231-2/+1
| * | j firefox: overlay from 2configs -> 5pkgs/firefoxJeschli2020-04-2315-12/+21
* | | ma pkgs.tinymediamanager: init at 3.1.5makefu2020-04-241-0/+38
* | | ma home-manager: bump, fix deprecationsmakefu2020-04-233-7/+2
* | | Merge remote-tracking branch 'lass/master' into 20.03makefu2020-04-2312-152/+46
|\ \ \
| * \ \ Merge remote-tracking branch 'gum/20.03'lassulus2020-04-234-15/+8
| |\ \ \
| * \ \ \ 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
| |\ \ \ \
| * | | | | types: remove last deprecated string typelassulus2020-04-221-2/+2
| * | | | | Merge remote-tracking branch 'gum/20.03'lassulus2020-04-227-12/+13
| |\ \ \ \ \
| * | | | | | 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
* | | | | | | ma minimal: consoleKeyMap -> console.keyMapmakefu2020-04-231-1/+1