diff --git a/.config/hypr/hyprland.conf.cgt b/.config/hypr/hyprland.conf.cgt index 9e206f5..f99d05a 100644 --- a/.config/hypr/hyprland.conf.cgt +++ b/.config/hypr/hyprland.conf.cgt @@ -13,7 +13,7 @@ input { general { gaps_in = 5 gaps_out = 20 - border_size = 2.5 + border_size = 2 col.active_border = rgba(<% opt.catppuccin.red %>ee) rgba(<% opt.catppuccin.green %>ee) 45deg col.inactive_border = rgba(<% opt.catppuccin.crust %>aa) diff --git a/.config/nushell/config.nu.cgt b/.config/nushell/config.nu.cgt index a54d23f..153696a 100644 --- a/.config/nushell/config.nu.cgt +++ b/.config/nushell/config.nu.cgt @@ -40,7 +40,7 @@ $env.config = { # Run-in-Background function def & [...argv] { # TODO: Use a plugin to track number of running jobs - systemd-run --user ...$argv + systemd-run --user --same-dir ...$argv } # Aliases @@ -48,4 +48,4 @@ def l [path: glob = "."] { ls $path | sort-by type } def ll [path: glob = "."] { ls -la $path | sort-by type } def la [path: glob = "."] { ls -a $path | sort-by type } alias nv = nvim -alias nvide = neovide +alias nvide = & neovide "--no-fork" diff --git a/cg_opts.lua b/cg_opts.lua index a04fb59..46a86af 100644 --- a/cg_opts.lua +++ b/cg_opts.lua @@ -1,9 +1,11 @@ local opts = {} opts.mzteinit_entries = { + -- TODO: the `which` invocations here are a workaround in case the relevant binaries + -- are installed in a directory that mzteinit adds to $PATH, which it currently doesn't handle. { key = "z", label = "river", cmd = { cg.opt.system "which mzteriver" } }, { key = "h", label = "hyprland", cmd = { "Hyprland" } }, - { key = "s", label = "shell", cmd = { "nu" } }, + { key = "s", label = "shell", cmd = { cg.opt.system "which 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/flake.lock b/flake.lock index 740cdaf..7d145b9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { diff --git a/scripts/mzteinit/src/main.zig b/scripts/mzteinit/src/main.zig index 7885c21..62a8cb6 100644 --- a/scripts/mzteinit/src/main.zig +++ b/scripts/mzteinit/src/main.zig @@ -88,7 +88,9 @@ fn tryMain() !void { } if (try env.populateEnvironment(&env_map.data)) { - try env.populateSysdaemonEnvironment(&env_map.data); + env.populateSysdaemonEnvironment(&env_map.data) catch |e| { + std.log.err("failed to set sysdaemon environment: {}", .{e}); + }; } var srv: ?Server = null; @@ -137,6 +139,8 @@ fn tryMain() !void { }); defer alloc.free(entries_config_path); + std.log.info("entries file: {s}", .{entries_config_path}); + var entries_config_file = try std.fs.cwd().openFile(entries_config_path, .{}); defer entries_config_file.close();