diff --git a/.config/nfm/config.ini b/.config/nfm/config.ini.cgt similarity index 85% rename from .config/nfm/config.ini rename to .config/nfm/config.ini.cgt index aca73c4..99ba155 100644 --- a/.config/nfm/config.ini +++ b/.config/nfm/config.ini.cgt @@ -1,6 +1,6 @@ [main] opener = xdg-open; -shell = /usr/bin/fish -c; +shell = <% opt.system "which nu" %> -c; theme = catppuccin-mocha; show-hidden = true; mouse-support = true; diff --git a/cg_opts.lua b/cg_opts.lua index b8f5c5b..a04fb59 100644 --- a/cg_opts.lua +++ b/cg_opts.lua @@ -3,7 +3,7 @@ local opts = {} opts.mzteinit_entries = { { key = "z", label = "river", cmd = { cg.opt.system "which mzteriver" } }, { key = "h", label = "hyprland", cmd = { "Hyprland" } }, - { key = "s", label = "shell", cmd = { "fish" } }, + { key = "s", label = "shell", cmd = { "nu" } }, { key = "l", label = "logout", cmd = { "!quit" } }, { key = "p", label = "shutdown", cmd = { "systemctl", "poweroff" }, quit = true }, { key = "r", label = "reboot", cmd = { "systemctl", "reboot" }, quit = true }, diff --git a/mzte-nv/src/options.zig b/mzte-nv/src/options.zig index b82b0cb..294ab45 100644 --- a/mzte-nv/src/options.zig +++ b/mzte-nv/src/options.zig @@ -13,7 +13,7 @@ pub fn initOptions() !void { var buf: [512]u8 = undefined; // Shell (defaults to mzteinit since that's my login shell) - try opt("fish").setLog("shell", .both); + try opt("nu").setLog("shell", .both); try cmd("syntax on"); diff --git a/scripts/mzteinit/src/env.zig b/scripts/mzteinit/src/env.zig index e8a2763..2768018 100644 --- a/scripts/mzteinit/src/env.zig +++ b/scripts/mzteinit/src/env.zig @@ -41,12 +41,12 @@ pub fn populateEnvironment(env: *std.process.EnvMap) !bool { try env.put(kv[0], try std.fmt.bufPrint(&sbuf, "{s}/{s}", .{ home, kv[1] })); } - // set shell to fish to prevent anything from defaulting to mzteinit - if (try util.findInPath(alloc, "fish")) |fish| { + // set shell to nu to prevent anything from defaulting to mzteinit + if (try util.findInPath(alloc, "nu")) |fish| { defer alloc.free(fish); try env.put("SHELL", fish); } else { - log.warn("fish not found! setting $SHELL to /bin/sh", .{}); + log.warn("nu not found! setting $SHELL to /bin/sh", .{}); try env.put("SHELL", "/bin/sh"); } diff --git a/scripts/mzteinit/src/main.zig b/scripts/mzteinit/src/main.zig index 590a9c8..7885c21 100644 --- a/scripts/mzteinit/src/main.zig +++ b/scripts/mzteinit/src/main.zig @@ -80,7 +80,7 @@ fn tryMain() !void { if (env_map.data.get("MZTEINIT")) |_| { try stdout.writer().writeAll("mzteinit running already, starting shell\n"); try stdout.flush(); - var child = std.ChildProcess.init(launch_cmd orelse &.{"fish"}, alloc); + var child = std.ChildProcess.init(launch_cmd orelse &.{"nu"}, alloc); _ = try child.spawnAndWait(); return; } else {