8 files changed, 38 insertions, 26 deletions
diff --git a/common-workstation.nix b/common-workstation.nix
index 307abb00..c3dd7555 100644
--- a/common-workstation.nix
+++ b/common-workstation.nix
@@ -44,13 +44,13 @@ in {
     ];
   };
 
-  vuizvui.i3.enable = true;
-  vuizvui.slim.enable = true;
-  vuizvui.vlock.enable = true;
-  vuizvui.zsh.enable = true;
+  vuizvui.user.aszlig.services.i3.enable = true;
+  vuizvui.user.aszlig.services.slim.enable = true;
+  vuizvui.user.aszlig.services.vlock.enable = true;
+  vuizvui.user.aszlig.programs.zsh.enable = true;
 
-  vuizvui.git.enable = true;
-  vuizvui.git.config = {
+  vuizvui.user.aszlig.programs.git.enable = true;
+  vuizvui.user.aszlig.programs.git.config = {
     color.ui = "auto";
     merge.tool = "vimdiff3";
     user.email = "aszlig@redmoonstudios.org";
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 0547059e..57a8a92d 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -137,8 +137,8 @@ with import ../../lib;
   services.xserver.videoDrivers = [ "ati" ];
   services.xserver.xrandrHeads = [ "HDMI-0" "DVI-0" ];
 
-  vuizvui.i3.reverseHeads = true;
-  vuizvui.i3.workspaces."6" = {
+  vuizvui.user.aszlig.services.i3.reverseHeads = true;
+  vuizvui.user.aszlig.services.i3.workspaces."6" = {
     label = "Chromium";
     assign = singleton { class = "^Chromium(?:-browser)?\$"; };
   };
diff --git a/machines/aszlig/mmrnmhrm.nix b/machines/aszlig/mmrnmhrm.nix
index dd87e6d2..3e3cc641 100644
--- a/machines/aszlig/mmrnmhrm.nix
+++ b/machines/aszlig/mmrnmhrm.nix
@@ -55,12 +55,12 @@ with import ../../lib;
   services.xserver.videoDrivers = [ "nouveau" ];
   services.xserver.xrandrHeads = [ "DVI-I-1" "VGA-1" ];
 
-  vuizvui.i3.workspaces."1" = {
+  vuizvui.user.aszlig.services.i3.workspaces."1" = {
     label = "XMPP";
     assign = singleton { class = "^(?:Tkabber|Gajim)\$"; };
   };
 
-  vuizvui.i3.workspaces."3" = {
+  vuizvui.user.aszlig.services.i3.workspaces."3" = {
     label = "Chromium";
     assign = singleton { class = "^Chromium(?:-browser)?\$"; };
   };
diff --git a/modules/user/aszlig/git/default.nix b/modules/user/aszlig/git/default.nix
index 65aefb45..0090b617 100644
--- a/modules/user/aszlig/git/default.nix
+++ b/modules/user/aszlig/git/default.nix
@@ -3,6 +3,8 @@
 with lib;
 
 let
+  cfg = config.vuizvui.user.aszlig.programs.git;
+
   genConf = attrs: let
     escStr = s: "\"${escape [ "\"" "\\" ] s}\"";
     mkVal = v: if isBool v && v  then "true"
@@ -30,13 +32,13 @@ let
   gitPatched = overrideDerivation pkgs.gitFull (git: {
     makeFlags = let
       oldFlags = git.makeFlags or [];
-      newVal = "ETC_GITCONFIG=${config.vuizvui.git.config}";
+      newVal = "ETC_GITCONFIG=${cfg.config}";
     in if isList oldFlags
        then oldFlags ++ [ newVal ]
        else "${oldFlags} ${newVal}";
   });
 in {
-  options.vuizvui.git = {
+  options.vuizvui.user.aszlig.programs.git = {
     enable = mkEnableOption "Git";
 
     config = mkOption {
@@ -62,7 +64,7 @@ in {
     };
   };
 
-  config = mkIf config.vuizvui.git.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [
       gitPatched
       pkgs.gitAndTools.git-remote-hg
diff --git a/modules/user/aszlig/i3/default.nix b/modules/user/aszlig/i3/default.nix
index bca88cca..f1e46b7c 100644
--- a/modules/user/aszlig/i3/default.nix
+++ b/modules/user/aszlig/i3/default.nix
@@ -3,6 +3,7 @@
 with lib;
 
 let
+  cfg = config.vuizvui.user.aszlig.services.i3;
   inherit (config.services.xserver) xrandrHeads;
 
   # The symbols if you press shift and a number key.
@@ -16,7 +17,7 @@ let
   headCount = length xrandrHeads;
   wsPerHead = wsCount / headCount;
   excessWs = wsCount - (headCount * wsPerHead);
-  headModifier = if config.vuizvui.i3.reverseHeads then reverseList else id;
+  headModifier = if cfg.reverseHeads then reverseList else id;
   getHeadAt = elemAt (headModifier xrandrHeads);
 
   mkDefaultWorkspace = number: numberSymbol: {
@@ -31,13 +32,13 @@ let
     };
   };
 
-  wsCfgList = mapAttrsToList (_: getAttr "config") config.vuizvui.i3.workspaces;
+  wsCfgList = mapAttrsToList (_: getAttr "config") cfg.workspaces;
   wsConfig = concatStrings wsCfgList;
   defaultWorkspaces = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols);
 
   conky = import ./conky.nix {
     inherit pkgs;
-    timeout = config.vuizvui.i3.networkTimeout;
+    timeout = cfg.networkTimeout;
   };
 
   mkBar = output: statusCmd: singleton ''
@@ -65,7 +66,7 @@ let
 
 in
 {
-  options.vuizvui.i3 = {
+  options.vuizvui.user.aszlig.services.i3 = {
     enable = mkEnableOption "i3";
 
     workspaces = mkOption {
@@ -101,9 +102,9 @@ in
     };
   };
 
-  config.vuizvui.i3.workspaces = defaultWorkspaces;
+  config.vuizvui.user.aszlig.services.i3.workspaces = defaultWorkspaces;
 
-  config.services.xserver.windowManager = mkIf config.vuizvui.i3.enable {
+  config.services.xserver.windowManager = mkIf cfg.enable {
     default = "i3";
 
     i3.enable = true;
diff --git a/modules/user/aszlig/slim/default.nix b/modules/user/aszlig/slim/default.nix
index ca3ce8c6..e5dea220 100644
--- a/modules/user/aszlig/slim/default.nix
+++ b/modules/user/aszlig/slim/default.nix
@@ -3,10 +3,12 @@
 with lib;
 
 let
-  cfg = config.vuizvui.slim;
+  cfg = config.vuizvui.user.aszlig.services.slim;
   randrHeads = config.services.xserver.xrandrHeads;
 in {
-  options.vuizvui.slim.enable = mkEnableOption "Vuizvui SLiM";
+  options.vuizvui.user.aszlig.services.slim = {
+    enable = mkEnableOption "Vuizvui SLiM";
+  };
 
   config.services.xserver.displayManager.slim = mkIf cfg.enable {
     enable = true;
diff --git a/modules/user/aszlig/vlock/default.nix b/modules/user/aszlig/vlock/default.nix
index 11e9a475..fdf0522f 100644
--- a/modules/user/aszlig/vlock/default.nix
+++ b/modules/user/aszlig/vlock/default.nix
@@ -1,6 +1,8 @@
 { pkgs, config, lib, ... }:
 
 let
+  cfg = config.vuizvui.user.aszlig.services.vlock;
+
   messageFile = pkgs.runCommand "message.cat" {} ''
     echo -en '\e[H\e[2J\e[?25l' > "$out"
     "${pkgs.aacolorize}/bin/aacolorize" \
@@ -24,7 +26,9 @@ let
     '';
   });
 in {
-  options.vuizvui.vlock.enable = lib.mkEnableOption "console lock";
+  options.vuizvui.user.aszlig.services.vlock = {
+    enable = lib.mkEnableOption "console lock";
+  };
 
   config.systemd.sockets.vlock = {
     description = "Console Lock Socket";
@@ -33,7 +37,7 @@ in {
     socketConfig.Accept = true;
   };
 
-  config.systemd.services."vlock@" = lib.mkIf config.vuizvui.vlock.enable {
+  config.systemd.services."vlock@" = lib.mkIf cfg.enable {
     description = "Lock All Consoles";
     serviceConfig.Type = "oneshot";
 
diff --git a/modules/user/aszlig/zsh/default.nix b/modules/user/aszlig/zsh/default.nix
index 4d21e33a..cb8ccd64 100644
--- a/modules/user/aszlig/zsh/default.nix
+++ b/modules/user/aszlig/zsh/default.nix
@@ -2,12 +2,15 @@
 
 with lib;
 
-{
-  options.vuizvui.zsh = {
+let
+  cfg = config.vuizvui.user.aszlig.programs.zsh;
+
+in {
+  options.vuizvui.user.aszlig.programs.zsh = {
     enable = mkEnableOption "zsh";
   };
 
-  config = mkIf config.vuizvui.zsh.enable {
+  config = mkIf cfg.enable {
     environment.shellInit = ''
       export EDITOR="vim"
       export EMAIL="aszlig@redmoonstudios.org"