[Fix] systemd stuff fr this time

flake.nix

@@ -14,8 +14,15 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-parts, rust-overlay, ttp, ... }:
+  outputs = inputs @ {
-    flake-parts.lib.mkFlake { inherit inputs; } {
+    self,
+    nixpkgs,
+    flake-parts,
+    rust-overlay,
+    ttp,
+    ...
+  }:
+    flake-parts.lib.mkFlake {inherit inputs;} {
       systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -23,17 +30,20 @@
         "aarch64-darwin"
       ];
 
-      perSystem = { self', pkgs, system, ... }:
+      perSystem = {
-        let
+        self',
+        pkgs,
+        system,
+        ...
+      }: let
         rustPkgs = import nixpkgs {
           inherit system;
-            overlays = [ (import rust-overlay) ];
+          overlays = [(import rust-overlay)];
         };
         rustToolchain = rustPkgs.rust-bin.stable.latest.default.override {
-            extensions = [ "rust-src" "rust-analyzer" "clippy" "rustfmt" ];
+          extensions = ["rust-src" "rust-analyzer" "clippy" "rustfmt"];
         };
-        in
+      in {
-        {
         packages = {
           default = self'.packages.iota;
           iota = pkgs.rustPlatform.buildRustPackage {
@@ -44,8 +54,8 @@
               lockFile = ./Cargo.lock;
               allowBuiltinFetchGit = true;
             };
-              nativeBuildInputs = with pkgs; [ cmake perl pkg-config ];
+            nativeBuildInputs = with pkgs; [cmake perl pkg-config];
-              buildInputs = with pkgs; [ openssl sqlite ];
+            buildInputs = with pkgs; [openssl sqlite];
             dontUseCmakeConfigure = true;
             preConfigure = ''
               if [ -d ../cargo-vendor-dir/ttp-core-0.1.0 ]; then
@@ -65,26 +75,31 @@
         };
 
         devShells.default = pkgs.mkShell {
-            nativeBuildInputs = with pkgs; [ rustToolchain git cmake perl pkg-config ];
+          nativeBuildInputs = with pkgs; [rustToolchain git cmake perl pkg-config];
-            buildInputs = with pkgs; [ openssl sqlite ];
+          buildInputs = with pkgs; [openssl sqlite];
         };
       };
 
       flake = {
-        nixosModules.default = { config, pkgs, lib, ... }:
+        nixosModules.default = {
-          let
+          config,
+          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 = if cfg.settingsFile != null then cfg.settingsFile else
+          configFile =
-              pkgs.writeText "iota-config.json" (builtins.toJSON cfg.settings);
+            if cfg.settingsFile != null
+            then cfg.settingsFile
+            else pkgs.writeText "iota-config.json" (builtins.toJSON cfg.settings);
 
-            descriptionText = "Iota Service"
+          descriptionText = "Tensamin Iota";
-              + 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 "the Iota service";
+            enable = lib.mkEnableOption "Enable the Iota service.";
 
             dataDir = lib.mkOption {
               type = lib.types.str;
@@ -107,7 +122,7 @@
 
             environmentFiles = lib.mkOption {
               type = lib.types.listOf lib.types.path;
-                default = [ ];
+              default = [];
               description = "Environment files to load for the Iota service.";
             };
 
@@ -143,7 +158,7 @@
 
             settings = lib.mkOption {
               type = lib.types.attrs;
-                default = { };
+              default = {};
               description = "Configuration attributes for Iota, written to config.json.";
             };
 
@@ -161,39 +176,62 @@
               home = cfg.dataDir;
               createHome = true;
               description = "Iota service user";
+              shell = pkgs.bash;
             };
 
-              users.groups.iota = { };
+            users.groups.iota = {};
 
-              systemd.services.iota = {
+            systemd.services.iota = let
+              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" ];
+              wantedBy = ["multi-user.target"];
-                after = [ "network.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 = if cfg.useTmux then
+                  ExecStart =
+                    if cfg.useTmux
+                    then
                       pkgs.writeShellScript "iota-start" ''
-                      ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock new-session -d -s iota \
+                        set -e
-                        "${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\"'"
+                        export TMUX_TMPDIR=${cfg.dataDir}
-                    ''
+                        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}
-                  else
+                        ${pkgs.coreutils}/bin/chown iota:iota ${cfg.dataDir}
-                    "${cfg.package}/bin/iota";
 
-                  ExecStop = if cfg.useTmux then
+                        echo "[iota-start] Creating tmux session..."
-                    (pkgs.writeShellScript "iota-stop" ''
+                        if ! ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock new-session -d -s iota "${iotaTmuxCmd}"; then
-                      ${pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/tmux.sock kill-session -t iota 2>/dev/null || true
+                          echo "[iota-start] ERROR: tmux new-session failed"
-                    '')
+                          exit 1
-                  else
+                        fi
-                    null;
+                        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";
 
                   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"}
@@ -202,24 +240,20 @@
                         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
-                      ''}
                       '')
                   ];
 
                   Restart = "always";
                   RestartSec = "5s";
 
-                  AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+                  AmbientCapabilities = ["CAP_NET_BIND_SERVICE"];
-                  CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+                  CapabilityBoundingSet = ["CAP_NET_BIND_SERVICE"];
 
                   ProtectSystem = "strict";
                   ProtectHome = true;
                   PrivateTmp = true;
                   NoNewPrivileges = true;
-                  ReadWritePaths = [ cfg.dataDir ];
+                  ReadWritePaths = [cfg.dataDir];
                   ProtectKernelTunables = true;
                   ProtectKernelModules = true;
                   ProtectControlGroups = true;
@@ -231,14 +265,15 @@
                     "TTP_BIND=${cfg.ttpBind}"
                     "BIND_ADDRESS=${cfg.bindAddress}"
                   ];
-                } // lib.optionalAttrs (cfg.environmentFiles != [ ]) {
+                }
+                // lib.optionalAttrs (cfg.environmentFiles != []) {
                   EnvironmentFile = cfg.environmentFiles;
                 };
             };
 
             networking.firewall = lib.mkIf cfg.openFirewall {
-                allowedTCPPorts = [ 1984 ];
+              allowedTCPPorts = [1984];
-                allowedUDPPorts = [ 1984 ];
+              allowedUDPPorts = [1984];
             };
           };
         };

iota-util/src/file_util.rs

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