flake.nix

@@ -14,14 +14,7 @@
     };
   };
 
-  outputs = inputs @ {
+  outputs = inputs@{ self, nixpkgs, flake-parts, rust-overlay, ttp, ... }:
-    self,
-    nixpkgs,
-    flake-parts,
-    rust-overlay,
-    ttp,
-    ...
-  }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
@@ -30,12 +23,8 @@
         "aarch64-darwin"
       ];
 
-      perSystem = {
+      perSystem = { self', pkgs, system, ... }:
-        self',
+        let
-        pkgs,
-        system,
-        ...
-      }: let
           rustPkgs = import nixpkgs {
             inherit system;
             overlays = [ (import rust-overlay) ];
@@ -43,7 +32,8 @@
           rustToolchain = rustPkgs.rust-bin.stable.latest.default.override {
             extensions = [ "rust-src" "rust-analyzer" "clippy" "rustfmt" ];
           };
-      in {
+        in
+        {
           packages = {
             default = self'.packages.iota;
             iota = pkgs.rustPlatform.buildRustPackage {
@@ -81,25 +71,20 @@
         };
 
       flake = {
-        nixosModules.default = {
+        nixosModules.default = { config, pkgs, lib, ... }:
-          config,
+          let
-          pkgs,
-          lib,
-          ...
-        }: let
             cfg = config.services.iota;
             defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default or (throw "iota: no pre-built package for system ${pkgs.stdenv.hostPlatform.system}");
 
-          configFile =
+            configFile = if cfg.settingsFile != null then cfg.settingsFile else
-            if cfg.settingsFile != null
+              pkgs.writeText "iota-config.json" (builtins.toJSON cfg.settings);
-            then cfg.settingsFile
-            else pkgs.writeText "iota-config.json" (builtins.toJSON cfg.settings);
 
-          descriptionText = "Tensamin Iota";
+            descriptionText = "Iota Service"
-          #+ lib.optionalString cfg.useTmux " (attach TUI: tmux -S ${cfg.dataDir}/tmux.sock attach -t iota)";
+              + lib.optionalString cfg.useTmux " (attach TUI: tmux -S ${cfg.dataDir}/tmux.sock attach -t iota)";
-        in {
+          in
+          {
             options.services.iota = {
-            enable = lib.mkEnableOption "Enable the Iota service.";
+              enable = lib.mkEnableOption "the Iota service";
 
               dataDir = lib.mkOption {
                 type = lib.types.str;
@@ -176,62 +161,39 @@
                 home = cfg.dataDir;
                 createHome = true;
                 description = "Iota service user";
-              shell = pkgs.bash;
               };
 
               users.groups.iota = { };
 
-            systemd.services.iota = let
+              systemd.services.iota = {
-              iotaTmuxCmd = pkgs.writeShellScript "iota-tmux-cmd" ''
-                mkdir -p ${cfg.dataDir}
-                echo "[$(date)] Running Iota..."
-                ${cfg.package}/bin/iota
-                status=$?
-                echo ""
-                echo "[$(date)] Iota exited with status: $status"
-                echo "Press any key to exit..."
-                read -r -n 1
-                exit $status
-              '';
-            in {
                 description = descriptionText;
                 wantedBy = [ "multi-user.target" ];
                 after = [ "network.target" ];
+                path = [ pkgs.tmux pkgs.bash pkgs.coreutils pkgs.systemd ];
 
-              serviceConfig =
+                serviceConfig = {
-                {
+                  Type = if cfg.useTmux then "forking" else "simple";
-                  Type = "simple";
                   User = "iota";
                   Group = "iota";
                   WorkingDirectory = cfg.dataDir;
 
-                  ExecStart =
+                  ExecStart = if cfg.useTmux then
-                    if cfg.useTmux
-                    then
                     pkgs.writeShellScript "iota-start" ''
-                        set -e
+                      ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock new-session -d -s iota \
-                        export TMUX_TMPDIR=${cfg.dataDir}
+                        "${pkgs.bash}/bin/bash -lc 'exec > >(${pkgs.coreutils}/bin/tee -a ${cfg.dataDir}/iota-output.log >(${pkgs.systemd}/bin/systemd-cat -t iota-daemon)) 2>&1; ${cfg.package}/bin/iota; status=$?; printf \"\nProcess exited with status %s. Press any key to close this tmux session...\" \"\$status\"; read -r -n 1; exit \"\$status\"'"
-                        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}
-                        ${pkgs.coreutils}/bin/chown iota:iota ${cfg.dataDir}
-
-                        echo "[iota-start] Creating tmux session..."
-                        if ! ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock new-session -d -s iota "${iotaTmuxCmd}"; then
-                          echo "[iota-start] ERROR: tmux new-session failed"
-                          exit 1
-                        fi
-                        echo "[iota-start] tmux session created, waiting..."
-                        echo "[iota-start] Run 'tmux -S ${cfg.dataDir}/tmux.sock attach -t iota' to attach to the tmux session."
-
-                        while ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock has-session -t iota 2>/dev/null; do
-                          sleep 2
-                        done
-                        echo "[iota-start] tmux session ended"
                     ''
-                    else "${cfg.package}/bin/iota";
+                  else
+                    "${cfg.package}/bin/iota";
+
+                  ExecStop = if cfg.useTmux then
+                    (pkgs.writeShellScript "iota-stop" ''
+                      ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock kill-session -t iota 2>/dev/null || true
+                    '')
+                  else
+                    null;
 
                   ExecStartPre = [
-                    ("+"
+                    ("+" + pkgs.writeShellScript "iota-setup" ''
-                      + pkgs.writeShellScript "iota-setup" ''
                       mkdir -p ${cfg.dataDir}/certs
 
                       ${lib.optionalString (cfg.certFile != null) "ln -sf ${cfg.certFile} ${cfg.dataDir}/certs/cert.pem"}
@@ -240,6 +202,10 @@
                       install -m 644 ${configFile} ${cfg.dataDir}/config.json
 
                       chown -R iota:iota ${cfg.dataDir}
+
+                      ${lib.optionalString cfg.useTmux ''
+                        echo "Iota started under tmux. Attach with: tmux -S ${cfg.dataDir}/tmux.sock attach -t iota" >&2
+                      ''}
                     '')
                   ];
 
@@ -265,8 +231,7 @@
                     "TTP_BIND=${cfg.ttpBind}"
                     "BIND_ADDRESS=${cfg.bindAddress}"
                   ];
-                }
+                } // lib.optionalAttrs (cfg.environmentFiles != [ ]) {
-                // lib.optionalAttrs (cfg.environmentFiles != []) {
                   EnvironmentFile = cfg.environmentFiles;
                 };
               };

iota-util/src/file_util.rs

@@ -149,8 +149,9 @@ pub fn get_children(path: &str) -> Vec<String> {
 }
 
 pub fn get_directory() -> String {
-    std::env::current_dir()
+    let exe = std::env::current_exe().unwrap_or_else(|_| PathBuf::from("."));
-        .unwrap_or_else(|_| PathBuf::from("."))
+    exe.parent()
+        .unwrap_or(Path::new("."))
         .to_string_lossy()
         .to_string()
 }