about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-18 14:36:11 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-03-18 14:36:11 +0100
commitbe4dbbc339433d0de03f801c1c1223b1cd26330d (patch)
tree13a4029b7dd5cc28ebea27bdf7c1b7e5353557c2
parentbd32a45879d4099d0dbb8f0f493b2c888d047d9c (diff)
aszlig/profiles: Move zsh config into "base".
I want to have a useful zsh configuration on all of my machines, so
let's not only enable it for the workstation profile.

Also, this removes a redundant zsh reference in the systemPackages of
the base profile.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--modules/user/aszlig/profiles/base.nix2
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix1
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index b264cdd3..4083150c 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -40,6 +40,7 @@ in {
     '';
 
     vuizvui.user.aszlig.programs.vim.enable = true;
+    vuizvui.user.aszlig.programs.zsh.enable = true;
 
     services.nixosManual.showManual = false;
 
@@ -55,7 +56,6 @@ in {
       vlock
       wget
       xz
-      zsh
     ];
 
     nixpkgs.config = import ../../../../nixpkgs/config.nix;
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 8286fcd6..14f21617 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -53,7 +53,6 @@ in {
     vuizvui.user.aszlig.services.vlock.enable = true;
 
     vuizvui.user.aszlig.programs.gajim.enable = true;
-    vuizvui.user.aszlig.programs.zsh.enable = true;
 
     vuizvui.user.aszlig.programs.git.enable = true;
     vuizvui.user.aszlig.programs.git.config = {