diff options
| author | makefu <makefu@nixos.dev> | 2015-12-16 12:29:24 +0100 |
|---|---|---|
| committer | makefu <makefu@nixos.dev> | 2015-12-16 12:29:24 +0100 |
| commit | a4abf300d8adea5a454f8664f2de6dd8e9095216 (patch) | |
| tree | fb4fb3f383c0b790beb485d4b923d94b2bfb8ab7 /makefu | |
| parent | 3d26e0b58f4c692f2f412ecc838f0b766b97947e (diff) | |
m 2 main-laptop: use zsh for main-laptop
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 4 | ||||
| -rw-r--r-- | makefu/2configs/main-laptop.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 6f176b7fa..28b77d330 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -6,14 +6,12 @@ { imports = [ # Include the results of the hardware scan. - ../2configs/main-laptop.nix #< base-gui + ../2configs/main-laptop.nix #< base-gui + zsh # Krebs ../2configs/tinc-basic-retiolum.nix #../2configs/disable_v6.nix - # environment - ../2configs/zsh-user.nix # applications diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix index 00a3e73ca..b725f661d 100644 --- a/makefu/2configs/main-laptop.nix +++ b/makefu/2configs/main-laptop.nix @@ -9,6 +9,7 @@ with lib; imports = [ ./base-gui.nix ./fetchWallpaper.nix + ./zsh-user.nix ]; environment.systemPackages = with pkgs;[ vlc |