Compare commits
No commits in common. "92f3484bd0cc0b43a6159eb121611199e4abf42a" and "2c2824a395d05dd27c51e901e6b881446baa0522" have entirely different histories.
92f3484bd0
...
2c2824a395
|
@ -155,7 +155,7 @@ in
|
||||||
bind = $mainMod , M , exec , hyprctl keyword general:layout master
|
bind = $mainMod , M , exec , hyprctl keyword general:layout master
|
||||||
bind = $mainMod , R , exec , rofi -show combi
|
bind = $mainMod , R , exec , rofi -show combi
|
||||||
bind = $mainMod , RETURN , exec , kitty
|
bind = $mainMod , RETURN , exec , kitty
|
||||||
bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new "ts || tn home ~"
|
bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new -A -s home
|
||||||
|
|
||||||
# XF86 keys
|
# XF86 keys
|
||||||
binde = , XF86AudioLowerVolume , exec , pamixer -d 5
|
binde = , XF86AudioLowerVolume , exec , pamixer -d 5
|
||||||
|
|
|
@ -106,6 +106,13 @@ local on_attach_def = function(client, bufnr)
|
||||||
vim.lsp.inlay_hint(bufnr, true)
|
vim.lsp.inlay_hint(bufnr, true)
|
||||||
end, timeout)
|
end, timeout)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
require("lsp_signature").on_attach({
|
||||||
|
bind = true, -- This is mandatory, otherwise border config won't get registered.
|
||||||
|
handler_opts = {
|
||||||
|
border = "rounded",
|
||||||
|
},
|
||||||
|
}, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
local lspconfig_default_options = {
|
local lspconfig_default_options = {
|
||||||
|
|
|
@ -7,7 +7,8 @@ let
|
||||||
tmux-switch = pkgs.writeShellApplication {
|
tmux-switch = pkgs.writeShellApplication {
|
||||||
name = "tmux-switch";
|
name = "tmux-switch";
|
||||||
runtimeInputs = with pkgs; [ tmux ];
|
runtimeInputs = with pkgs; [ tmux ];
|
||||||
text = /* bash */ ''
|
text = ''
|
||||||
|
#!/usr/bin/env bash
|
||||||
if [[ -z ''${TMUX+x} ]]; then
|
if [[ -z ''${TMUX+x} ]]; then
|
||||||
tmux attach -t "$1"
|
tmux attach -t "$1"
|
||||||
else
|
else
|
||||||
|
@ -18,7 +19,7 @@ let
|
||||||
|
|
||||||
tmux-sessionizer = pkgs.writeFishApplication {
|
tmux-sessionizer = pkgs.writeFishApplication {
|
||||||
name = "ts";
|
name = "ts";
|
||||||
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-new gawk ];
|
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch gawk ];
|
||||||
text = readFile ./tmux-sessionizer/script.fish;
|
text = readFile ./tmux-sessionizer/script.fish;
|
||||||
completions = readFile ./tmux-sessionizer/completions.fish;
|
completions = readFile ./tmux-sessionizer/completions.fish;
|
||||||
};
|
};
|
||||||
|
@ -30,17 +31,6 @@ let
|
||||||
completions = readFile ./tmux-attach/completions.fish;
|
completions = readFile ./tmux-attach/completions.fish;
|
||||||
};
|
};
|
||||||
|
|
||||||
tmux-new = pkgs.writeFishApplication {
|
|
||||||
name = "tn";
|
|
||||||
runtimeInputs = with pkgs; [ tmux ];
|
|
||||||
text = /* fish */ ''
|
|
||||||
if ! tmux has-session -t $argv[1] 2> /dev/null
|
|
||||||
tmux new-session -ds $argv[1] -c $argv[2]
|
|
||||||
end
|
|
||||||
|
|
||||||
tmux-switch $argv[1]
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.my.programs.tmux = {
|
options.my.programs.tmux = {
|
||||||
|
@ -70,8 +60,6 @@ in
|
||||||
home-manager.users.moritz.home.packages = [
|
home-manager.users.moritz.home.packages = [
|
||||||
tmux-sessionizer
|
tmux-sessionizer
|
||||||
tmux-attach
|
tmux-attach
|
||||||
tmux-switch
|
|
||||||
tmux-new
|
|
||||||
];
|
];
|
||||||
home-manager.users.moritz.programs = {
|
home-manager.users.moritz.programs = {
|
||||||
tmux = {
|
tmux = {
|
||||||
|
@ -109,7 +97,7 @@ in
|
||||||
if ! fish_is_root_user && test "$TERM_PROGRAM" != 'vscode' && ${insideVariableMissing}
|
if ! fish_is_root_user && test "$TERM_PROGRAM" != 'vscode' && ${insideVariableMissing}
|
||||||
if test -z $tmux_autostarted
|
if test -z $tmux_autostarted
|
||||||
set -x tmux_autostarted true
|
set -x tmux_autostarted true
|
||||||
tn home ~
|
tmux new -A -s home
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -13,4 +13,8 @@ if not test -n "$selected_name"
|
||||||
exit 1
|
exit 1
|
||||||
end
|
end
|
||||||
|
|
||||||
tn "$selected_name" "$selected"
|
if ! tmux has-session -t $selected_name 2> /dev/null
|
||||||
|
tmux new-session -ds $selected_name -c $selected
|
||||||
|
end
|
||||||
|
|
||||||
|
tmux-switch $selected_name
|
||||||
|
|
Loading…
Reference in New Issue