summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'lassulus2018-11-1017-84/+543
|\
| * l ejabberd: allow registrationlassulus2018-11-101-2/+2
| |
| * l sqlBackup: remove mysql_passwordlassulus2018-11-101-1/+0
| |
| * l mail: add nix@lassul.us to nix mllassulus2018-11-101-1/+1
| |
| * l git: chmod +x /var/spoollassulus2018-11-101-0/+4
| |
| * l games: add steam-run & dolphinEmu to pkgslassulus2018-11-101-0/+2
| |
| * l: add neocron@lassul.uslassulus2018-11-101-0/+1
| |
| * l ciko: chmod +xlassulus2018-11-101-0/+4
| |
| * l blue: add l-gen-secretslassulus2018-11-101-0/+1
| |
| * l prism.r: new physical hostlassulus2018-11-101-70/+49
| |
| * l prism.r: remove deprecated grub workaroundlassulus2018-11-101-2/+0
| |
| * l archprism.r: new hfos iplassulus2018-11-102-12/+12
| |
| * realwallpaper: e056328 -> 847faeblassulus2018-11-101-2/+2
| |
| * hotdog.r: remove import of gitlab-runner-shackspacelassulus2018-11-101-1/+0
| |
| * nixpkgs: 06fb025 -> bf7930dlassulus2018-11-051-3/+3
| |
| * Merge branch 'master' of archprism.r:stockholmlassulus2018-11-050-0/+0
| |\
| | * l: prism.r -> archprism.r, new prism.rlassulus2018-11-043-1/+474
| | |
| * | nixpkgs: 81f5c26 -> 06fb025lassulus2018-11-041-3/+3
| | |
| * | l baseX: remove broken pkgs.pushlassulus2018-11-041-1/+0
| | |
| * | l: prism.r -> archprism.r, new prism.rlassulus2018-11-043-1/+474
| |/
* / nixpkgs: 81f5c26 -> 06fb025prism/testprism/cilassulus2018-10-311-3/+3
|/
* Merge remote-tracking branch 'ni/master'lassulus2018-10-303-3/+6
|\
| * Merge remote-tracking branch 'prism/master'tv2018-10-2775-559/+935
| |\
| * | nix-writers: 3.0.0 -> 3.2.0tv2018-10-271-0/+0
| | |
| * | git-preview: add GIT_PREVIEW_MERGE_STRATEGYtv2018-10-231-1/+5
| | |
| * | tv x220: add config argumenttv2018-10-231-2/+1
| | |
* | | l: adopt kruck.r (palo)lassulus2018-10-301-0/+29
| | |
* | | Merge remote-tracking branch 'ni/master'prism/mergelassulus2018-10-231-0/+19
|\| | | |/ |/|
| * tv x220: add tpacpi-battv2018-10-221-0/+13
| |
| * tv x220: add tp_smapitv2018-10-221-0/+6
| |
* | l xjail: use sudo again until fixedlassulus2018-10-231-2/+5
| |
* | l krops: add optional target argument to deploylassulus2018-10-231-2/+2
| |
* | l websites lassulus: add lass-mors to auhtorized keyslassulus2018-10-231-2/+3
| |
* | l websites domsen: ensure databases & users existlassulus2018-10-231-0/+6
| |
* | l urxvt: fix saveLineslassulus2018-10-231-1/+1
| |
* | l mail: add notmuch to pkgslassulus2018-10-231-0/+1
| |
* | l prism.r: use new physical.nixlassulus2018-10-231-46/+38
| |
* | l git: add go & newsbot-jslassulus2018-10-231-8/+16
| |
* | nixpkgs: 21293d2 -> 81f5c26lassulus2018-10-181-3/+3
| |
* | Merge remote-tracking branch 'ni/master'lassulus2018-10-182-1/+2
|\|
| * tv gitrepos: use proper post-receive defaulttv2018-10-111-1/+1
| |
| * tv vim: add vim-elixirtv2018-10-091-0/+1
| |
| * tv: systemPackages += git-crypttv2018-10-071-0/+1
| |
* | l: add eve.rlassulus2018-10-111-0/+38
| |
* | nin games: remove dwarf_fortresslassulus2018-10-101-1/+0
| |
* | l vim: show damned NBSPlassulus2018-10-101-0/+4
| |
* | Merge remote-tracking branch 'onondaga/master'lassulus2018-10-100-0/+0
|\ \
| * | Revert "remove nin"nin2018-10-0921-0/+1277
| | | | | | | | | | | | This reverts commit 62314e64c259bc6bae39e2bd29ecec2c5e5ea262.
* | | nin krops: force testlassulus2018-10-091-0/+1
| | |
* | | Revert "remove nin"lassulus2018-10-0921-0/+1277
| | | | | | | | | | | | This reverts commit 62314e64c259bc6bae39e2bd29ecec2c5e5ea262.