diff --git a/home/home.nix b/home/home.nix index ca45aaa..8f08377 100644 --- a/home/home.nix +++ b/home/home.nix @@ -669,9 +669,9 @@ in { output = [ "DP-1" "eDP-1" ]; position = if laptop then "bottom" else "top"; height = 15; - width = if laptop then 1400 else 2200; + width = if laptop then 1450 else 2200; # Choose the order of the modules "custom/wintitle", - modules-left = [ "hyprland/workspaces" "hyprland/window" ]; + modules-left = [ "niri/workspaces" "niri/window" ]; modules-center = [ "clock" ]; modules-right = [ "cpu" "memory" "pulseaudio" "backlight" "battery" "tray" ]; @@ -679,12 +679,12 @@ in { margin-bottom = if laptop then 4 else 0; margin-left = 6; margin-right = 6; - "hyprland/window" = { format = "{title}"; icon = true; }; + "niri/window" = { format = "{title}"; icon = true; }; workspaces = { format = " {name} "; }; - "hyprland/workspaces" = { + "niri/workspaces" = { format = "{icon}"; format-icons = { - "1" = ""; + "main" = ""; "2" = ""; "3" = "󰈙"; "4" = "󰭹"; @@ -825,7 +825,7 @@ in { padding-bottom: 2px; padding-left: 5px; padding-right: 5px; - margin-right: 50px; + margin-right: 0px; background: @backtransparent; box-shadow: 5px 5px 4px 4px #202020; border-radius: 20px; diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 2c904df..d478029 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -62,18 +62,23 @@ in # enable = true; settings = { prefer-no-csd = true; - binds = with config.lib.niri.actions; { - "XF86AudioRaiseVolume".action.spawn = ["volup"]; - "XF86AudioLowerVolume".action.spawn = ["voldown"]; - "Super+E".action.spawn = "nu nirilof emacs 'emacslient -c'"; + binds = with config.lib.niri.actions; let + in { + "XF86AudioRaiseVolume".action.spawn = ["pamixer" "--allow-boost" "-i" "5"]; + "XF86AudioLowerVolume".action.spawn = ["pamixer" "--allow-boost" "-d" "5"]; + "Super+E".action.spawn = ["${pkgs.nushell}/bin/nu" "/home/chris/nirilof emacs 'emacslient -c'"]; "Super+Return".action.spawn = "alacritty"; - "Super+B".action.spawn = "nu nirilof org.qutebrowser.qutebrowser qutebrowser"; + "Super+B".action = spawn ["${pkgs.nushell}/bin/nu" "/home/chris/nirilof org.qutebrowser.qutebrowser qutebrowser"]; "Super+Space".action.spawn = "cosmic-launcher"; + "Super+V".action= spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi-wayland}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"]; + "Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btm"]; + "Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "pulsemixer"]; "Super+Shift+Q".action = quit; "Super+O".action = toggle-overview; "Super+F".action = fullscreen-window; "Super+Shift+F".action = toggle-windowed-fullscreen; "Super+C".action = close-window; + "Super+Shift+C".action = center-window; "Super+P".action.spawn = "/home/chris/bin/rbw.sh"; "Super+Left".action = focus-column-left; "Super+H".action = focus-column-left; @@ -83,10 +88,15 @@ in "Super+Shift+L".action = move-column-right; "Super+Ctrl+L".action = set-column-width "+10%"; "Super+Ctrl+H".action = set-column-width "-10%"; - "Super+M".action = set-column-width "95%"; + "Super+M".action = maximize-column; + "Super+W".action = switch-preset-column-width; + "Super+Comma".action = consume-or-expel-window-left; + "Super+Period".action = consume-or-expel-window-right; }; spawn-at-startup = [ + { argv = ["${pkgs.xwayland-satellite}/bin/xwayland-satellite"]; } { argv = ["waybar"]; } + { argv = ["cosmic-osd"]; } { argv = ["kwalled6"]; } { argv = ["swww-daemon"]; } { argv = ["rbw-agent"]; } @@ -122,11 +132,27 @@ in } { matches = [{app-id = "com.system76.CosmicFiles";}]; - open-on-workspace = "main"; + open-floating = true; + } + { + matches = [{app-id = "btm";}]; + open-floating = true; + default-column-width.proportion = 0.7; + default-window-height.proportion = 0.7; + } + { + matches = [{app-id = "pulsemixer";}]; open-floating = true; } ]; layout = { + center-focused-column = "never"; + preset-column-widths = [ + { proportion = 1. / 3.; } + { proportion = 1. / 2.; } + { proportion = 2. / 3.; } + { proportion = 1. / 1.; } + ]; gaps = 15; struts = { bottom = 5; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 4a4b6d4..8af0df5 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -174,6 +174,7 @@ wireguard-tools # cosmic-ext-examine cosmic-settings + xwayland-satellite aider-chat wgsl-analyzer ];