From 2dee155b68e14cc75059d68246437e32a6ca7e7e Mon Sep 17 00:00:00 2001 From: reidlab Date: Wed, 31 Dec 2025 20:02:21 -0800 Subject: [PATCH] new programs --- hosts/goopnet-interface/default.nix | 2 +- modules/desktop/niri.nix | 17 +++++++---------- modules/software/system/wezterm.nix | 9 +++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 66c6636..2b48f99 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -7,7 +7,7 @@ hm.home.packages = with pkgs; [ # archives - zip xz unrar unzip p7zip zstd + zip xz unrar unzip p7zip zstd lrzip # utils ffmpeg ripgrep ripgrep-all jq libqalculate imagemagick pandoc # dev diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index 89d7c6b..bc686be 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -224,11 +224,8 @@ in { clip-to-geometry = true; } { - matches = [ - { app-id = "^org\.wezfurlong\.wezterm$"; } - ]; - # see earlier shadow config; this is here because it's a transparent window, special case - shadow.draw-behind-window = false; + matches = [ { app-id = "^org\.wezfurlong\.wezterm$"; } ]; + shadow.draw-behind-window = false; # transparent bg } { matches = [ @@ -318,7 +315,10 @@ in { # also for some reason int literals aren't accepted # so multiply by 1.0 to make it a float { - matches = [ { namespace = "^rofi$"; } ]; + matches = [ + { namespace = "^rofi$"; } + { namespace = "^waybar$"; } + ]; geometry-corner-radius = allCorners (config.modules.desktop.fonts.fonts.monospace.size * 1.0); # its 1em, so } { @@ -329,10 +329,6 @@ in { matches = [ { namespace = "^notifications$"; } ]; geometry-corner-radius = allCorners (config.hm.services.dunst.settings.global.corner_radius * 1.0); } - { - matches = [ { namespace = "^waybar$"; } ]; - geometry-corner-radius = allCorners (config.modules.desktop.fonts.fonts.monospace.size * 1.0); # its 1em, so - } ]; binds = with config.hm.lib.niri.actions; let @@ -441,6 +437,7 @@ in { "XF86AudioPlay".action = sh "${lib.getExe pkgs.playerctl} play-pause"; "XF86AudioNext".action = sh "${lib.getExe pkgs.playerctl} next"; + "Mod+Shift+C".action = sh "${lib.getExe pkgs.hyprpicker} -a"; "Mod+V".action = sh "${config.modules.desktop.cliphist.summonScript}"; "Mod+Shift+Control+T".action = toggle-debug-tint; diff --git a/modules/software/system/wezterm.nix b/modules/software/system/wezterm.nix index d360bb8..8f96a9f 100644 --- a/modules/software/system/wezterm.nix +++ b/modules/software/system/wezterm.nix @@ -30,14 +30,15 @@ in { config.font = wezterm.font '${fonts.monospace.family}' -- this is a hack to get the font size to be the same as the bitmap font -- the size is in px, but wezterm uses pt, so we use a conversion + -- TODO: support non-bitmaps and variable dpi better blah blah blah config.font_size = ${toString fonts.monospace.size} / (4 / 3) + config.adjust_window_size_when_changing_font_size = false config.freetype_load_flags = 'MONOCHROME' config.enable_wayland = true config.use_fancy_tab_bar = false - -- TODO: tiling acting WACK. these just make it even worse - --config.use_resize_increments = true - --config.initial_cols = 120 - --config.initial_rows = 40 + config.use_resize_increments = true + config.initial_cols = 120 + config.initial_rows = 40 config.window_background_opacity = 0.8 ${config.modules.desktop.themes.wezterm or ""}