Back to tmux?
This commit is contained in:
parent
e581c4533e
commit
84529916c7
7 changed files with 48 additions and 22 deletions
|
@ -31,7 +31,9 @@
|
||||||
"hyprpaper"
|
"hyprpaper"
|
||||||
"mako"
|
"mako"
|
||||||
"eww daemon && eww open bar$EWW_BAR_MON"
|
"eww daemon && eww open bar$EWW_BAR_MON"
|
||||||
"firefox & wezterm &"
|
"firefox"
|
||||||
|
"kitty --single-instance"
|
||||||
|
"wezterm"
|
||||||
(lib.concatStringsSep " " [
|
(lib.concatStringsSep " " [
|
||||||
"swayidle -w"
|
"swayidle -w"
|
||||||
"timeout 300 'notify-send \"Idling in 300 seconds\"'"
|
"timeout 300 'notify-send \"Idling in 300 seconds\"'"
|
||||||
|
@ -126,7 +128,9 @@
|
||||||
bind = [
|
bind = [
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||||
"$mainMod, return, exec, wezterm"
|
"$mainMod, return, exec, wezterm"
|
||||||
"$mainMod SHIFT, return, exec, kitty"
|
"$mainMod SHIFT, return, exec, wezterm"
|
||||||
|
# "$mainMod, return, exec, kitty --single-instance"
|
||||||
|
# "$mainMod SHIFT, return, exec, kitty"
|
||||||
"$mainMod, U, exec, firefox"
|
"$mainMod, U, exec, firefox"
|
||||||
"$mainMod, space, exec, wofi --show drun"
|
"$mainMod, space, exec, wofi --show drun"
|
||||||
"$mainMod, C, killactive,"
|
"$mainMod, C, killactive,"
|
||||||
|
@ -247,11 +251,8 @@
|
||||||
# sensitivity = -0.5
|
# sensitivity = -0.5
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Example windowrule v1
|
|
||||||
# windowrule = float, ^(kitty|firefox)$
|
|
||||||
# Example windowrule v2
|
|
||||||
windowrulev2 = float,class:^.*(kitty|firefox|org.wezfurlong.wezterm).*$
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
||||||
|
windowrulev2 = float,class:^.*(kitty|firefox|org.wezfurlong.wezterm).*$
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,9 +155,8 @@
|
||||||
# kill tab
|
# kill tab
|
||||||
"ctrl+alt+shift+q" = "close_tab";
|
"ctrl+alt+shift+q" = "close_tab";
|
||||||
|
|
||||||
# use zellij for panes
|
"ctrl+shift+j" = "launch --location=hsplit --cwd=current";
|
||||||
# "ctrl+shift+j" = "launch --location=hsplit --cwd=current";
|
"ctrl+shift+l" = "launch --location=vsplit --cwd=current";
|
||||||
# "ctrl+shift+l" = "launch --location=vsplit --cwd=current";
|
|
||||||
|
|
||||||
"ctrl+alt+shift+k" = "move_window up";
|
"ctrl+alt+shift+k" = "move_window up";
|
||||||
"ctrl+alt+shift+h" = "move_window left";
|
"ctrl+alt+shift+h" = "move_window left";
|
||||||
|
|
|
@ -157,6 +157,7 @@
|
||||||
}
|
}
|
||||||
{command = "firefox";}
|
{command = "firefox";}
|
||||||
{command = "wezterm";}
|
{command = "wezterm";}
|
||||||
|
# {command = "kitty --single-instance";}
|
||||||
];
|
];
|
||||||
|
|
||||||
modes = {
|
modes = {
|
||||||
|
@ -202,6 +203,7 @@
|
||||||
# bindsym $mod+shift+space exec wofi --show drun
|
# bindsym $mod+shift+space exec wofi --show drun
|
||||||
"${mod}+control+space" = "exec makoctl dismiss";
|
"${mod}+control+space" = "exec makoctl dismiss";
|
||||||
"${mod}+shift+space" = "exec makoctl invoke";
|
"${mod}+shift+space" = "exec makoctl invoke";
|
||||||
|
# "${mod}+return" = "exec kitty --single-instance";
|
||||||
"${mod}+return" = "exec wezterm";
|
"${mod}+return" = "exec wezterm";
|
||||||
"${mod}+shift+return" = "exec floating-term";
|
"${mod}+shift+return" = "exec floating-term";
|
||||||
"${mod}+shift+alt+return" = "exec kitty";
|
"${mod}+shift+alt+return" = "exec kitty";
|
||||||
|
|
|
@ -11,6 +11,9 @@
|
||||||
unbind C-b
|
unbind C-b
|
||||||
set -g prefix C-s
|
set -g prefix C-s
|
||||||
|
|
||||||
|
set -g default-terminal "tmux-256color"
|
||||||
|
set -g terminal-overrides ",xterm-256color:RGB"
|
||||||
|
|
||||||
set -g update-environment "WAYLAND_DISPLAY DISPLAY"
|
set -g update-environment "WAYLAND_DISPLAY DISPLAY"
|
||||||
|
|
||||||
bind R source-file "$HOME/.tmux.conf" \; display-message "Reloaded $HOME/.tmux.conf"
|
bind R source-file "$HOME/.tmux.conf" \; display-message "Reloaded $HOME/.tmux.conf"
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
'Noto Color Emoji',
|
'Noto Color Emoji',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config.disable_default_key_bindings = true
|
||||||
config.default_cursor_style = 'BlinkingBar'
|
config.default_cursor_style = 'BlinkingBar'
|
||||||
|
|
||||||
config.font = font
|
config.font = font
|
||||||
|
@ -32,6 +33,7 @@
|
||||||
config.use_fancy_tab_bar = false
|
config.use_fancy_tab_bar = false
|
||||||
config.tab_bar_at_bottom = false
|
config.tab_bar_at_bottom = false
|
||||||
config.window_background_opacity = 1.0
|
config.window_background_opacity = 1.0
|
||||||
|
config.enable_kitty_keyboard = true
|
||||||
|
|
||||||
-- config.window_frame.font = config.font
|
-- config.window_frame.font = config.font
|
||||||
-- config.window_frame.font_size = font_size
|
-- config.window_frame.font_size = font_size
|
||||||
|
@ -165,6 +167,11 @@
|
||||||
mods = 'CTRL|SHIFT',
|
mods = 'CTRL|SHIFT',
|
||||||
action = wezterm.action.PasteFrom'PrimarySelection'
|
action = wezterm.action.PasteFrom'PrimarySelection'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key = 't',
|
||||||
|
mods = 'CTRL|SHIFT',
|
||||||
|
action = wezterm.action.SpawnTab'CurrentPaneDomain'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key = 'h',
|
key = 'h',
|
||||||
mods = 'CTRL',
|
mods = 'CTRL',
|
||||||
|
@ -180,17 +187,26 @@
|
||||||
mods = 'CTRL',
|
mods = 'CTRL',
|
||||||
action = wezterm.action.ActivatePaneDirection'Up'
|
action = wezterm.action.ActivatePaneDirection'Up'
|
||||||
},
|
},
|
||||||
-- use zellij for panes
|
{
|
||||||
-- {
|
key = 'j',
|
||||||
-- key = 'j',
|
mods = 'CTRL',
|
||||||
-- mods = 'CTRL|SHIFT',
|
action = wezterm.action.ActivatePaneDirection'Down'
|
||||||
-- action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'}
|
},
|
||||||
-- },
|
{
|
||||||
-- {
|
key = 'p',
|
||||||
-- key = 'l',
|
mods = 'CTRL|SHIFT',
|
||||||
-- mods = 'CTRL|SHIFT',
|
action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'}
|
||||||
-- action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'}
|
},
|
||||||
-- },
|
{
|
||||||
|
key = 'j',
|
||||||
|
mods = 'CTRL|SHIFT',
|
||||||
|
action = wezterm.action.SplitVertical{domain='CurrentPaneDomain'}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key = 'l',
|
||||||
|
mods = 'CTRL|SHIFT',
|
||||||
|
action = wezterm.action.SplitHorizontal{domain='CurrentPaneDomain'}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key = 'l',
|
key = 'l',
|
||||||
mods = 'CTRL|SHIFT|ALT',
|
mods = 'CTRL|SHIFT|ALT',
|
||||||
|
|
|
@ -3,10 +3,12 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
# zellij does not support modern terminal keyboard input:
|
||||||
|
# https://github.com/zellij-org/zellij/issues/735
|
||||||
programs.zellij = {
|
programs.zellij = {
|
||||||
# uses home manager's toKDL generator
|
# uses home manager's toKDL generator
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
# enableFishIntegration = true;
|
||||||
settings = {
|
settings = {
|
||||||
pane_frames = false;
|
pane_frames = false;
|
||||||
simplified_ui = true;
|
simplified_ui = true;
|
||||||
|
@ -27,11 +29,12 @@
|
||||||
};
|
};
|
||||||
layer = binds: (listToAttrs (map binder binds));
|
layer = binds: (listToAttrs (map binder binds));
|
||||||
in {
|
in {
|
||||||
_props = {clear-defaults = true;};
|
# _props = {clear-defaults = true;};
|
||||||
normal = {};
|
normal = {};
|
||||||
locked = layer [
|
locked = layer [
|
||||||
[["Ctrl g"] {SwitchToMode = "Normal";}]
|
[["Ctrl g"] {SwitchToMode = "Normal";}]
|
||||||
[["Ctrl L"] {NewPane = "Right";}]
|
[["Ctrl L"] {NewPane = "Right";}]
|
||||||
|
[["Ctrl Z"] {NewPane = "Right";}]
|
||||||
[["Ctrl J"] {NewPane = "Down";}]
|
[["Ctrl J"] {NewPane = "Down";}]
|
||||||
[["Ctrl h"] {MoveFocus = "Left";}]
|
[["Ctrl h"] {MoveFocus = "Left";}]
|
||||||
[["Ctrl l"] {MoveFocus = "Right";}]
|
[["Ctrl l"] {MoveFocus = "Right";}]
|
||||||
|
@ -468,6 +471,7 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
default_layout = "compact";
|
||||||
theme = "match";
|
theme = "match";
|
||||||
|
|
||||||
themes = {
|
themes = {
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
eza
|
eza
|
||||||
fd
|
fd
|
||||||
file
|
file
|
||||||
|
fzf
|
||||||
gnumake
|
gnumake
|
||||||
gron
|
gron
|
||||||
hexyl
|
hexyl
|
||||||
|
|
Loading…
Reference in a new issue