diff --git a/home/base/server/zellij/default.nix b/home/base/server/zellij/default.nix index e62aaa80..b6db9366 100644 --- a/home/base/server/zellij/default.nix +++ b/home/base/server/zellij/default.nix @@ -1,7 +1,31 @@ -_: { +let + shellAliases = { + "zj" = "zellij"; + }; +in { programs.zellij = { enable = true; }; + # auto start zellij in nushell + programs.nushell.extraConfig = '' + # auto start zellij + if not "ZELLIJ" in $env { + if "ZELLIJ_AUTO_ATTACH" in $env and $env.ZELLIJ_AUTO_ATTACH == "true" { + zellij attach -c + } else { + zellij + } + + # auto exit the shell session when zellij exit + if "ZELLIJ_AUTO_EXIT" in $env and $env.ZELLIJ_AUTO_EXIT == "true" { + exit + } + } + ''; + + # only works in bash/zsh, not nushell + home.shellAliases = shellAliases; + programs.nushell.shellAliases = shellAliases; xdg.configFile."zellij/config.kdl".source = ./config.kdl; } diff --git a/scripts/darwin_set_proxy.py b/scripts/darwin_set_proxy.py index 238006db..437b08b8 100644 --- a/scripts/darwin_set_proxy.py +++ b/scripts/darwin_set_proxy.py @@ -17,12 +17,12 @@ HTTP_PROXY = "http://127.0.0.1:7890" pl = plistlib.loads(NIX_DAEMON_PLIST.read_bytes()) # set http proxy -# pl["EnvironmentVariables"]["HTTP_PROXY"] = HTTP_PROXY -# pl["EnvironmentVariables"]["HTTPS_PROXY"] = HTTP_PROXY +pl["EnvironmentVariables"]["HTTP_PROXY"] = HTTP_PROXY +pl["EnvironmentVariables"]["HTTPS_PROXY"] = HTTP_PROXY # remove http proxy -pl["EnvironmentVariables"].pop("HTTP_PROXY", None) -pl["EnvironmentVariables"].pop("HTTPS_PROXY", None) +# pl["EnvironmentVariables"].pop("HTTP_PROXY", None) +# pl["EnvironmentVariables"].pop("HTTPS_PROXY", None) os.chmod(NIX_DAEMON_PLIST, 0o644) NIX_DAEMON_PLIST.write_bytes(plistlib.dumps(pl))