summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | ma homeautomation: cleanup, add flurlichtmakefu2018-10-172-92/+102
| * | | ma airdcpp: enable state trackingmakefu2018-10-141-1/+2
| * | | ma omo.r: enable airdcppmakefu2018-10-141-12/+31
| * | | ma events-publisher: bump versionmakefu2018-10-101-2/+2
| * | | ma pkgs.ifdnfc: ripmakefu2018-10-101-45/+0
| * | | ma pkgs.esniper: replaced by upstreammakefu2018-10-103-58/+0
| * | | ma pkgs.inkscape: share/extensions solves the issuemakefu2018-10-083-34/+0
| * | | ma printer: use upstream zj-58makefu2018-10-081-5/+5
| * | | nixpkgs: 86fb1e9 -> 86fb1e9makefu2018-10-081-3/+3
| * | | Merge remote-tracking branch 'lass/18.09' into 18.09makefu2018-10-0771-1729/+552
| |\ \ \
| | * | | remove ninlassulus2018-10-0721-1277/+0
| | * | | Merge remote-tracking branch 'ni/master' into 18.09lassulus2018-10-071-0/+1
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-1/+0
| | |\ \ \ \
| | | * | | | j emacs: remove melpaPackages.mmm-modejeschli2018-10-071-1/+0
| | * | | | | krops: import from submoduleslassulus2018-10-072-8/+2
| | * | | | | krops: init submodulelassulus2018-10-072-0/+3
| | * | | | | Merge remote-tracking branch 'enklave/master' into 18.09lassulus2018-10-071-0/+1
| | |\| | | |
| | | * | | | j brauerei: +luis @ dev tmuxjeschli2018-10-051-0/+1
| | * | | | | add charybdis module until it's fixed in 18.09lassulus2018-10-073-1/+112
| * | | | | | ma pkgs: rip zj-58 and jd-guimakefu2018-10-072-66/+0
| * | | | | | ma pkgs._4nxci: re-package 4nxci's version of mbedtlsmakefu2018-09-301-23/+21
* | | | | | | 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 -> 06fb025lassulus2018-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'lassulus2018-10-231-0/+19
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | tv x220: add tpacpi-battv2018-10-221-0/+13