Add an 'init' step

Split the 'activate' script into 'init' and 'activate'.
The goal is to later merge 'init', 'activate', 'open' and the handling
of shell.nix into one script.

Author: Julow

modules/git.nix

@@ -2,7 +2,17 @@
 
 with lib;
 
-let conf = config.git; in
+let
+  conf = config.git;
+
+  sync_remotes = ''
+    # Sync remotes
+    ${pkgs.bash}/bin/bash ${./sync_git_remotes.sh} <<"EOF"
+    ${concatStringsSep "\n" (mapAttrsToList (n: u: "${n} ${u}") conf.remotes)}
+    EOF
+  '';
+
+in
 
 {
   options.git = {
@@ -32,26 +42,20 @@ let conf = config.git; in
   config = mkIf (conf.remotes != {}) {
     buildInputs = with pkgs; [ git ];
 
-    activation_script = ''
-      # Init if not already
-      did_init=0
-      if ! [[ -e .git ]]; then git init; did_init=1; fi
+    init_script = ''
+      git init
+      ${sync_remotes}
+      git fetch --all
+      git checkout --track "${conf.main_remote}/${conf.main_branch}"
+    '';
 
-      # Sync remotes
-      ${pkgs.bash}/bin/bash ${./sync_git_remotes.sh} <<"EOF"
-      ${concatStringsSep "\n" (mapAttrsToList (n: u: "${n} ${u}") conf.remotes)}
-      EOF
+    activation_script = ''
+      ${sync_remotes}
 
       ${if config.git.gitignore == "" then "" else ''
         # Gitignore
-        ln -sf "${builtins.toFile "${config.name}-vimrc" config.git.gitignore}" .git/info/exclude
+        ln -sf "${builtins.toFile "${config.name}-gitignore" conf.gitignore}" .git/info/exclude
       ''}
-
-      # If init, fetch remotes
-      if [[ $did_init -eq 1 ]]; then
-        git fetch --all
-        git checkout --track "${conf.main_remote}/${conf.main_branch}"
-      fi
     '';
 
   };

workspaces

@@ -42,7 +42,12 @@ open_workspace ()
   let ws = import workspaces_nix { inherit pkgs config; }; in
   ws.by_name { inherit wname; }') || wait_input_and_exit "Building of $wname in $2 failed."
 
-  mkdir -p "$p"
+  if ! [[ -d "$p" ]]; then
+    mkdir -p "$p"
+    cd "$p"
+    nix-shell -p "${buildInputs[@]}" --run workspace-init || wait_input_and_exit "Initialisation failed."
+  fi
+
   cd "$p"
   nix-shell -p "${buildInputs[@]}" --run workspace-activate || wait_input_and_exit "Activating failed."
 

workspaces.nix

@@ -11,6 +11,12 @@ let
         description = "Workspace name. Defaults to the attribute name used to define it.";
       };
 
+      init_script = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Run when the workspace is activated for the first time.";
+      };
+
       activation_script = mkOption {
         type = types.lines;
         default = "";
@@ -66,10 +72,11 @@ let
         assert (builtins.hasAttr wname workspaces || throw "Workspace ${wname} not found");
         let
           w = builtins.getAttr wname workspaces;
+          init = pkgs.writeShellScriptBin "workspace-init" w.init_script;
           activate = pkgs.writeShellScriptBin "workspace-activate" w.activation_script;
           open = pkgs.writeShellScriptBin "workspace-open" w.command;
         in
-        w.buildInputs ++ [ activate open ];
+        w.buildInputs ++ [ init activate open ];
     };
 
 in