added environment.systemPath and improved zsh options

3 files changed, 16 insertions, 9 deletions

diff --git a/modules/environment.nix b/modules/environment.nix
index 58a5e25..37cd652 100644
--- a/modules/environment.nix
+++ b/modules/environment.nix
@@ -31,6 +31,15 @@ in {
       '';
     };
 
+    environment.systemPath = mkOption {
+      type = types.loeOf types.path;
+      default = [ "$HOME/.nix-profile" "/run/current-system/sw" "/nix/var/nix/profiles/default" "/usr/local" ];
+      description = ''
+        The set of paths that are added to PATH
+      '';
+      apply = x: if isList x then makeBinPath x else x;
+    };
+
     environment.extraOutputsToInstall = mkOption {
       type = types.listOf types.str;
       default = [ ];
@@ -66,11 +75,8 @@ in {
 
   config = {
 
-    system.build.setEnvironment = pkgs.writeText "set-environment"
-      (concatStringsSep "\n" exportVariables);
-
-    system.build.setAliases = pkgs.writeText "set-aliases"
-      (concatStringsSep "\n" aliasCommands);
+    system.build.setEnvironment = concatStringsSep "\n" exportVariables;
+    system.build.setAliases = concatStringsSep "\n" aliasCommands;
 
     system.path = pkgs.buildEnv {
       name = "system-path";
diff --git a/modules/system.nix b/modules/system.nix
index 13744a4..e80f4c9 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -39,7 +39,6 @@ in {
 
     system.build = mkOption {
       internal = true;
-      type = types.attrsOf types.package;
       default = {};
       description = ''
         Attribute set of derivation used to setup the system.
@@ -97,6 +96,8 @@ in {
       # Prevent the current configuration from being garbage-collected.
       ln -sfn /run/current-system /nix/var/nix/gcroots/current-system
 
+      ${cfg.activationScripts.etc.text}
+
       exit $_status
     '';
 
diff --git a/modules/tmux.nix b/modules/tmux.nix
index c54d0a2..18967d2 100644
--- a/modules/tmux.nix
+++ b/modules/tmux.nix
@@ -66,7 +66,7 @@ in {
 
   config = {
 
-    programs.tmux.config = lib.concatStringsSep "\n" tmuxConfigs;
+    programs.tmux.config = concatStringsSep "\n" tmuxConfigs;
 
     programs.tmux.text.login-shell = if stdenv.isDarwin then ''
       set -g default-command "reattach-to-user-namespace ${cfg.loginShell}"
@@ -113,9 +113,9 @@ in {
       bind v split-window -h -c '#{pane_current_path}'
 
       bind -t vi-copy v begin-selection
-    '' + lib.optionalString stdenv.isLinux ''
+    '' + optionalString stdenv.isLinux ''
       bind -t vi-copy y copy-selection
-    '' + lib.optionalString stdenv.isDarwin ''
+    '' + optionalString stdenv.isDarwin ''
       bind -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
     '');