summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'makefu2016-10-1947-366/+496
|\
| * xu: mount /bkutv2016-10-131-0/+5
| * tv q: print TODOs firsttv2016-10-131-4/+5
| * lib: don't define defaults that require configtv2016-10-134-13/+4
| * krebs lib: move {eq,ne,mod} to libtv2016-10-132-5/+4
| * lib: inline has-default-nixtv2016-10-132-3/+1
| * lib: remove addName*tv2016-10-132-6/+6
| * krebs lib: with libtv2016-10-131-3/+6
| * tv: security.hideProcessInformation = truetv2016-10-131-0/+1
| * Merge remote-tracking branch 'prism/master'tv2016-10-1337-254/+405
| |\
| | * l 2 nixpkgs: 0c022c4 -> 354fd37lassulus2016-10-131-1/+1
| | * l 5 xmonad-lass: use nix-path for i3locklassulus2016-10-131-1/+1
| | * l 2 websites domsen: disable apculassulus2016-10-121-3/+0
| | * l 1 uriel: fix duplicate definition of wirelesslassulus2016-10-121-3/+0
| | * l 1 mors: disable c-base vpnlassulus2016-10-121-1/+1
| | * remove comments from php config, phpfpm errorlassulus2016-10-124-5/+0
| | * l 2 nixpkgs: change url to github/nixoslassulus2016-10-121-1/+1
| | * Merge remote-tracking branch 'prism/master'lassulus2016-10-1119-49/+191
| | |\
| | | * Merge remote-tracking branch 'gum/master'lassulus2016-10-0616-43/+186
| | | |\
| | | * \ Merge remote-tracking branch 'cd/master'lassulus2016-10-061-3/+3
| | | |\ \
| | | * | | l 1 mors: add macchanger to pkgslassulus2016-10-021-0/+2
| | | * | | l 3 umts: remove obsolete commentslassulus2016-10-011-4/+0
| | | * | | l 2 nixpkgs: 3fb009d -> 8a89481lassulus2016-10-011-1/+1
| | | * | | l 2 iodined: open the correct portlassulus2016-10-011-1/+1
| | | * | | l 2 iodined: add -c to running commandlassulus2016-10-011-1/+1
| | | * | | l 1 mors: add iodine to pkgslassulus2016-10-011-0/+1
| | * | | | l 3: add hosts.nixlassulus2016-10-112-0/+13
| | * | | | l 2 websites domsen: use new phpOptionslassulus2016-10-111-16/+7
| | * | | | l 2 zsh: disable zsh as defaultShelllassulus2016-10-111-1/+0
| | * | | | l 5 xmonad-lass: make config more like tv'slassulus2016-10-111-11/+16
| | * | | | l 2 xserver: copy tv's configlassulus2016-10-111-127/+96
| | * | | | l 2 xserver: use browser-select directlylassulus2016-10-111-1/+1
| | * | | | l 2 iodined: iodined -> iodine.serverlassulus2016-10-111-1/+1
| | * | | | l 2: remove obsolete bashrc codelassulus2016-10-111-9/+0
| | * | | | l 2: add populate to pkgslassulus2016-10-111-0/+1
| | * | | | l 2: useChroot -> useSandboxlassulus2016-10-111-1/+1
| | * | | | l 1 mors: add thunderbird to pkgslassulus2016-10-111-0/+1
| | * | | | l 1 mors: disable docker (k 5 needs fixing)lassulus2016-10-111-2/+2
| | * | | | l 2 nixpkgs: 3fb009d -> 0c022c4lassulus2016-10-111-1/+1
| | * | | | l 2 browsers: refactor, generate more stufflassulus2016-10-111-23/+47
| | * | | | l 1: explicitly add /tmp as tmpfslassulus2016-10-115-0/+26
| * | | | | exim: RIPtv2016-10-131-64/+0
| * | | | | tv nixpkgs: 45b2a6d -> 354fd37tv2016-10-131-1/+1
| |/ / / /
| * | | | tv nixpkgs: 2568ee3 -> 45b2a6dtv2016-10-0812-20/+22
| * | | | tv urlwatch: +nixos-16.09tv2016-10-061-0/+1
| | |/ / | |/| |
| * | | make populate: use proper targettv2016-10-031-3/+3
| |/ /
| * | l 2 tests: add iodinepw.nix to dummy-secretslassulus2016-09-131-0/+1
| * | l 1 uriel: xfcePlugins are not thnarPluginslassulus2016-09-131-3/+0
| * | l 2: add iodined.nix & import in prismlassulus2016-09-132-0/+21
| * | k 4 types: add default value for user.maillassulus2016-09-091-0/+1