From 4963155ccb8c1d159d67bbb28ff15dd276ecbea5 Mon Sep 17 00:00:00 2001 From: jwy Date: Thu, 26 Sep 2024 16:52:37 -0400 Subject: [PATCH] Turned on mouse support for tmux Fixed some indentation styling issues --- dots/config/bspwm/sxhkdrc | 4 ++-- nix-config/home/neovim.nix | 33 ++++++++++++++++----------------- nix-config/home/tmux.nix | 4 ++-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dots/config/bspwm/sxhkdrc b/dots/config/bspwm/sxhkdrc index 0d21c0f3a..b2e08f621 100644 --- a/dots/config/bspwm/sxhkdrc +++ b/dots/config/bspwm/sxhkdrc @@ -45,9 +45,9 @@ alt + @space ~button2 jgmenu --csv-file=~/.config/bspwm/scripts/menu.txt --config-file=~/.config/bspwm/jgmenurc --at-pointer -# Scratchpad +# Scratchpad / note pad super + alt + o - tdrop -a -w 70% -h 35% -y 0 -x 15% --class scratch alacritty --class=scratch + tdrop -a -w 70% -h 55% -y 0 -x 15% --class scratch alacritty --class=scratch # Power off, Reboot, Log out, Lockscreen, kill an app ctrl + super + alt + {p,r,q,l,k} diff --git a/nix-config/home/neovim.nix b/nix-config/home/neovim.nix index faf4729ba..c9d9744e6 100644 --- a/nix-config/home/neovim.nix +++ b/nix-config/home/neovim.nix @@ -60,8 +60,8 @@ in { bufferline.enable = true; comment.enable = true; cmp = { - enable = true; - autoEnableSources = true; + enable = true; + autoEnableSources = true; }; cmp-buffer.enable = true; cmp-nvim-lsp.enable = true; @@ -78,33 +78,32 @@ in { }; luasnip.enable = true; lsp = { - enable = true; - servers = { - bashls.enable = true; -# cssls.enable = true; + enable = true; + servers = { + bashls.enable = true; + # cssls.enable = true; docker-compose-language-service.enable = true; dockerls.enable = true; # html.enable = true; # jsonls.enable = true; - lua-ls.enable = true; + lua-ls.enable = true; marksman.enable = true; nil-ls.enable = true; - nixd.enable = true; + nixd.enable = true; nginx-language-server.enable = true; phpactor.enable = true; - pyright.enable = true; + pyright.enable = true; rust-analyzer = { - enable = true; - installRustc = true; - installCargo = true; - }; + enable = true; + installRustc = true; + installCargo = true; + }; sqls.enable = true; - tailwindcss.enable = true; - tsserver.enable = true; + tailwindcss.enable = true; + tsserver.enable = true; yamlls.enable = true; zls.enable = true; - }; - + }; }; lsp-lines.enable = true; mini = { diff --git a/nix-config/home/tmux.nix b/nix-config/home/tmux.nix index 003b2f58c..c0e00f5a7 100644 --- a/nix-config/home/tmux.nix +++ b/nix-config/home/tmux.nix @@ -57,8 +57,7 @@ in bind-key -n C-l select-pane -R bind-key -n C-S-F2 new-session - bind-key "o" run-shell "sesh connect \"$( - sesh list | fzf-tmux -p 55%,60% \ + bind-key "o" run-shell "sesh connect \"$(sesh list | fzf-tmux -p 55%,60% \ --no-sort --ansi --border-label ' sesh ' --prompt '⚡ ' \ --header ' ^a all ^t tmux ^g configs ^x zoxide ^d tmux kill ^f find' \ --bind 'tab:down,btab:up' \ @@ -108,6 +107,7 @@ in set -g set-clipboard on # use system clipboard set -g status-position top # macOS / darwin style setw -g mode-keys vi + set-option -g mouse on set -g @fzf-url-fzf-options '-p 60%,30% --prompt=" " --border-label=" Open URL "' set -g @fzf-url-history-limit '2000'