Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of prism:stockholm

Browse Source
This commit is contained in:
makefu 2017-07-16 15:15:21 +02:00
commit 7dbd54880d
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krebs/3modules/krebs/default.nix
View File

@ -68,7 +68,6 @@ in {
} // testHosts; } // testHosts;
users = { users = {
krebs = { krebs = {
mail = "spam@krebsco.de";
pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary
}; };
}; };

1
lass/2configs/baseX.nix
View File

@ -50,6 +50,7 @@ in {
dmenu dmenu
gitAndTools.qgit gitAndTools.qgit
lm_sensors lm_sensors
haskellPackages.hledger
much much
ncdu ncdu
nmap nmap

7
lass/2configs/websites/domsen.nix
View File

@ -28,7 +28,12 @@ in {
(servePage [ "karlaskop.de" ]) (servePage [ "karlaskop.de" ])
(servePage [ "makeup.apanowicz.de" ]) (servePage [ "makeup.apanowicz.de" ])
(servePage [ "pixelpocket.de" ]) (servePage [ "pixelpocket.de" ])
(servePage [ "habsys.de" "habsys.eu" ]) (servePage [
"habsys.de"
"habsys.eu"
"www.habsys.de"
"www.habsys.eu"
])
(serveOwncloud [ "o.ubikmedia.de" ]) (serveOwncloud [ "o.ubikmedia.de" ])
(serveWordpress [ (serveWordpress [
"ubikmedia.de" "ubikmedia.de"