summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2018-12-2850-263/+646
|\
| * external: remove miaoski wrong subnetlassulus2018-12-261-3/+0
| * l prism: add kmein userlassulus2018-12-261-0/+7
| * external: add kmein pubkeylassulus2018-12-262-0/+3
| * l sqlBackup: fix permissions/folderslassulus2018-12-252-11/+9
| * l websites: add wireguard-key locationlassulus2018-12-251-0/+3
| * l: add nintendo@lassul.uslassulus2018-12-251-0/+1
| * l prism: fix MASQUERADING for externalslassulus2018-12-251-1/+1
| * external: add miaoskilassulus2018-12-251-0/+16
| * l daedalus.w: fix aliaslassulus2018-12-251-1/+1
| * external: set wiregrill ip6lassulus2018-12-251-0/+3
| * nixpkgs: 7e88992 -> b9fa31classulus2018-12-241-3/+3
| * l: add nfs-dl.nixlassulus2018-12-243-0/+9
| * l daedalus: fix typo in ipv6lassulus2018-12-241-2/+8
| * l xmonad: add copyToAll buttonlassulus2018-12-241-4/+3
| * l prism: add wiregrill nfs exportlassulus2018-12-241-0/+22
| * l mors: accept android sdk licenselassulus2018-12-241-0/+1
| * l daedalus: add torbrowser to pkgslassulus2018-12-241-0/+1
| * l daedalus: kill games & steamlassulus2018-12-241-2/+0
| * l wiregrill: remove obsolete ipv4lassulus2018-12-241-3/+0
| * nixpkgs: 5d4a1a3 -> 7e88992lassulus2018-12-191-3/+3
| * external: move tpsw from makefu, add justrautemakefu2018-12-194-56/+53
| * external: sortmakefu2018-12-191-176/+176
| * external: move users from makefu namespace to externalmakefu2018-12-196-16/+23
| * Merge remote-tracking branch 'lass/master'makefu2018-12-1931-86/+156
| |\
| | * l wiregrill: remove newlines from pubkeyslassulus2018-12-181-1/+1
| | * Merge remote-tracking branch 'ni/master'lassulus2018-12-1818-20/+51
| | |\
| | | * tv: configure the wiregrilltv2018-12-189-6/+35
| | | * lass prism: set wiregrill subnets explicitlytv2018-12-181-1/+5
| | | * tv: enable networking.wireless in systemstv2018-12-188-12/+8
| | | * Merge remote-tracking branch 'prism/master'tv2018-12-1864-467/+613
| | | |\
| | | * | tv mu: import x220 configtv2018-12-171-0/+5
| | | * | tv mu: use /dev/sda for devices, not UUIDs^_^tv2018-12-171-5/+2
| | * | | external: add qubasalassulus2018-12-181-0/+28
| | | |/ | | |/|
| | * | l domsen: add alewis.de to sender_domainslassulus2018-12-171-0/+1
| * | | ma bgt/backup.nix: initmakefu2018-12-182-0/+21
| * | | ma support-nixos: initmakefu2018-12-181-0/+1
| * | | ma pkgs.xdcc-dl: initmakefu2018-12-181-0/+195
| * | | ma bump-distrowatch: initmakefu2018-12-174-0/+34
| * | | ma hw/ssd: initmakefu2018-12-172-0/+6
| * | | pkgs.ns-atmosphere-programmer: fix url, use archive.org instead of unstable ...makefu2018-12-161-4/+5
* | | | Merge branch 'master' of prism.r:stockholmjeschli2018-12-1693-1275/+1570
|\ \ \ \ | | |/ / | |/| |
| * | | l domsen: add klabusterbeerelassulus2018-12-161-0/+8
| * | | l baseX: add fzfmenu to pkgslassulus2018-12-161-0/+1
| * | | l skynet.r don't fetch wallpaperlassulus2018-12-161-1/+0
| * | | l littleT: make into blue-hostlassulus2018-12-162-0/+2
| * | | wirelum -> wiregrilllassulus2018-12-168-65/+65
| |/ /
| * | l mail: don't autosign with gpglassulus2018-12-161-1/+1
| * | l browsers: use ff more oftenlassulus2018-12-161-2/+2
| * | l xmonad: use launchlassulus2018-12-161-1/+1