From dd61675059bcc0afbc735d25f57642fcdd28c727 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Thu, 7 Dec 2023 19:04:17 +0000 Subject: [PATCH] A bunch of things --- .config/fish/config.fish | 13 +++------- .config/fish/fish_variables | 2 +- .config/fish/myfunctions/replacements.fish | 4 +-- .config/kitty/kitty.conf | 29 +++++----------------- .config/nvim/lua/plugins/lazy.lua | 1 - .config/tmux/plugins/tmux | 2 +- .config/tmux/tmux.conf | 3 ++- .ssh/config | 2 +- 8 files changed, 17 insertions(+), 39 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a90e968..b9064b1 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -6,6 +6,8 @@ fish_default_key_bindings set -gx EDITOR nvim set -gx READER mupdf +fish_add_path /opt/homebrew/bin +fish_add_path /opt/homebrew/opt/openjdk@17/bin fish_add_path $HOME/.bun/bin fish_add_path $HOME/go/bin fish_add_path $HOME/.local/share/nvim/mason/bin @@ -25,18 +27,11 @@ source ~/.config/fish/myfunctions/replacements.fish set --export BUN_INSTALL "$HOME/.bun" set --export PATH $BUN_INSTALL/bin $PATH -# >>> conda initialize >>> -# !! Contents within this block are managed by 'conda init' !! -if test -f /home/afonso/miniconda3/bin/conda - eval /home/afonso/miniconda3/bin/conda "shell.fish" "hook" $argv | source -end -# <<< conda initialize <<< -conda deactivate - -direnv hook fish | source # opam configuration source /home/afonso/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true +tmux new-session -A -s main starship init fish | source + diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 93a49eb..f8963bc 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -54,7 +54,7 @@ SETUVAR fish_pager_color_selected_background:\x1d SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d -SETUVAR fish_user_paths:/usr/bin/vendor_perl\x1e/home/afonso/go/bin\x1e/home/afonso/\x2ebun/bin\x1e/var/lib/flatpak/exports/bin\x1e/home/afonso/\x2eghcup/bin\x1e/home/afonso/\x2econfig/emacs/bin\x1e/home/afonso/\x2enix\x2dprofile/bin\x1e/var/lib/snapd/snap/bin\x1e/home/afonso/\x2elocal/share/nvim/mason/bin\x1e/home/afonso/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/afonso/\x2ecargo/bin\x1e/home/afonso/\x2elocal/bin +SETUVAR fish_user_paths:/opt/homebrew/opt/openjdk\x4017/bin\x1e/Users/afonso/\x2elocal/share/nvim/mason/bin\x1e/opt/homebrew/bin\x1e/Users/afonso/\x2elocal/bin\x1e/usr/bin/vendor_perl\x1e/home/afonso/go/bin\x1e/home/afonso/\x2ebun/bin\x1e/var/lib/flatpak/exports/bin\x1e/home/afonso/\x2eghcup/bin\x1e/home/afonso/\x2econfig/emacs/bin\x1e/home/afonso/\x2enix\x2dprofile/bin\x1e/var/lib/snapd/snap/bin\x1e/home/afonso/\x2elocal/share/nvim/mason/bin\x1e/home/afonso/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/afonso/\x2ecargo/bin\x1e/home/afonso/\x2elocal/bin SETUVAR pure_begin_prompt_with_current_directory:true SETUVAR pure_check_for_new_release:false SETUVAR pure_color_at_sign:pure_color_mute diff --git a/.config/fish/myfunctions/replacements.fish b/.config/fish/myfunctions/replacements.fish index e1699c4..9cde63f 100644 --- a/.config/fish/myfunctions/replacements.fish +++ b/.config/fish/myfunctions/replacements.fish @@ -2,10 +2,10 @@ function ls eza --icons -l --sort type $argv end function nvim - /usr/bin/nvim --listen /tmp/nvim.pipe $argv + /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe $argv end function vim - /usr/bin/nvim --listen /tmp/nvim.pipe $argv + /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe $argv end abbr -a find fd abbr -a df duf diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index b662cfe..874cce0 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,33 +1,16 @@ -font_family FiraCode Nerd Font Mono Normal - font_size 14.0 +font_family FiraCode Nerd Font Mono Regular + font_size 16.0 enable_audio_bell no window_padding_width 6 confirm_os_window_close 0 env TERM=xterm-256color +macos_option_as_alt yes +background_opacity 0.90 +hide_window_decorations no -# Multiplexer mappings -#map ctrl+u kitten pass_keys.py neighboring_window bottom ctrl+u -#map ctrl+i kitten pass_keys.py neighboring_window top ctrl+i -#map ctrl+y kitten pass_keys.py neighboring_window left ctrl+y -#map ctrl+o kitten pass_keys.py neighboring_window right ctrl+o -# -#map ctrl+shift+w no_op -#map ctrl+x close_window -#map ctrl+shift+x close_tab -# -#map ctrl+shift+enter no_op -#map ctrl+n new_window -#map ctrl+shift+n new_tab -# -#map ctrl+f toggle_layout stack -# -# Remote control -#allow_remote_control yes -#listen-on unix:@"$(date +%s%N)" - #Project management #map ctrl+space launch --type=overlay fish -ic "kitty @ ls | jq -r '.[0].tabs | map(.title) | .[]' | fzf | xargs -I _ kitty @ focus-tab --match title:_" @@ -39,4 +22,4 @@ include current-theme.conf # BEGIN_KITTY_THEME # Catppuccin-Frappe include current-theme.conf -# END_KITTY_THEME \ No newline at end of file +# END_KITTY_THEME diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index 421e495..ef3d301 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -186,7 +186,6 @@ lazy.setup({ { 'stevearc/oil.nvim', - event = "VeryLazy", config = function() require("oil").setup() end diff --git a/.config/tmux/plugins/tmux b/.config/tmux/plugins/tmux index 89ad057..47e3304 160000 --- a/.config/tmux/plugins/tmux +++ b/.config/tmux/plugins/tmux @@ -1 +1 @@ -Subproject commit 89ad057ebd47a3052d55591c2dcab31be3825a49 +Subproject commit 47e33044b4b47b1c1faca1e42508fc92be12131a diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 9b538c0..953f9dd 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -52,4 +52,5 @@ set -g @continuum-boot 'on' # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -run '~/.tmux/plugins/tpm/tpm' +set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" +run '~/.config/tmux/plugins/tpm/tpm' diff --git a/.ssh/config b/.ssh/config index 1bd80f6..faef381 100644 --- a/.ssh/config +++ b/.ssh/config @@ -9,7 +9,7 @@ Host gon ControlPath ~/.ssh/session.%r@%h:%p ControlPersist 5m -Host search +Host Search ControlMaster auto HostName s7edu2.di.uminho.pt User pg53595