diff options
| author | makefu <github@syntax-fehler.de> | 2015-08-23 02:48:35 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-08-23 02:48:35 +0200 |
| commit | 7a1e2f83b242b6779e1590082fbe93a8ed429611 (patch) | |
| tree | 8bfae8a9a2583250d92efbe66d5813b80d73be8e /makefu/1systems | |
| parent | f666c217906382bd63dddc83f7f822c1798c3df7 (diff) | |
makefu: cleanup,refactoring after transfer
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 17 | ||||
| -rw-r--r-- | makefu/1systems/tsp.nix | 3 |
2 files changed, 11 insertions, 9 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index b8ba9289..b6b7a59b 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -7,22 +7,24 @@ imports = [ # Include the results of the hardware scan. ../2configs/base.nix - ../2configs/base-gui.nix + ../2configs/main-laptop.nix #< base-gui + ../2configs/tinc-basic-retiolum.nix #../2configs/sda-crypto-root.nix ../2configs/sda-crypto-root-home.nix - # hardware specifics are in here - ../2configs/tp-x200.nix + ../2configs/zsh-user.nix + ../2configs/exim-retiolum.nix #../2configs/disable_v6.nix - #../2configs/rad1o.nix - #../2configs/exim-retiolum.nix + # hardware specifics are in here + ../2configs/tp-x220.nix ]; - # not working in vm + krebs.build.host = config.krebs.hosts.pornocauster; krebs.build.user = config.krebs.users.makefu; - krebs.build.target = "root@localhost"; + krebs.build.target = "root@pornocauster"; + boot.kernelModules = [ "kvm-intel" ]; @@ -36,7 +38,6 @@ #url = https://github.com/NixOS/nixpkgs; # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L) url = https://github.com/makefu/nixpkgs; - #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe"; rev = "f5fe787f778b872c6b2221598501c9310cb83915"; }; }; diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index 638d2ca8..887778c8 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -11,11 +11,12 @@ ../2configs/tinc-basic-retiolum.nix ../2configs/sda-crypto-root.nix # hardware specifics are in here - ../2configs/tp-x200.nix + ../2configs/tp-x200.nix #< imports tp-x2x0.nix ../2configs/disable_v6.nix ../2configs/rad1o.nix + ../2configs/zsh-user.nix ../2configs/exim-retiolum.nix ]; # not working in vm |