Эх сурвалжийг харах

Sync: 2025-12-20 19:40:11

Gabriel Capella 22 цаг өмнө
parent
commit
ce81ec1c16

+ 0 - 5
dots/.config/fish/conf.d/starting_dir.fish

@@ -1,5 +0,0 @@
-set -q fish_most_recent_dir && [ -d "$fish_most_recent_dir" ] && cd "$fish_most_recent_dir"
-
-function save_dir --on-variable PWD
-    set -U fish_most_recent_dir $PWD
-end

+ 1 - 49
dots/.config/fish/config.fish

@@ -4,55 +4,6 @@ export PATH="/usr/local/bin:/bin:/usr/sbin:/sbin:/usr/bin/"
 export PATH="$PATH:$HOME/.node/bin"
 export PATH="$PATH:$HOME/.node/bin"
 export PATH="$PATH:$HOME/go/bin"
 export PATH="$PATH:$HOME/go/bin"
 
 
-# test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
-# set -g fish_user_paths "/usr/local/sbin" $fish_user_paths
-# set -g fish_user_paths "/usr/local/opt/gnu-getopt/bin" $fish_user_paths
-
-# #if status is-interactive
-# #and not set -q TMUX
-# #    exec tmux
-# #end
-
-
-# # The next line updates PATH for the Google Cloud SDK.
-# if [ -f '/Users/gabrielcapella/.g/google-cloud-sdk/path.fish.inc' ]; . '/Users/gabrielcapella/.g/google-cloud-sdk/path.fish.inc'; end
-# set -g fish_user_paths "/usr/local/opt/openssl@1.1/bin" $fish_user_paths
-
-
-# status --is-interactive; and source (rbenv init -|psub)
-
-
-# # Add environment variable COCOS_CONSOLE_ROOT for cocos2d-x
-# export COCOS_CONSOLE_ROOT="/Users/gabrielcapella/cocos2d-x/tools/cocos2d-console/bin"
-# export PATH="$COCOS_CONSOLE_ROOT:$PATH"
-
-# # Add environment variable COCOS_X_ROOT for cocos2d-x
-# export COCOS_X_ROOT="/Users/gabrielcapella"
-# export PATH="$COCOS_X_ROOT:$PATH"
-
-# # Add environment variable COCOS_TEMPLATES_ROOT for cocos2d-x
-# export COCOS_TEMPLATES_ROOT="/Users/gabrielcapella/cocos2d-x/templates"
-# export PATH="$COCOS_TEMPLATES_ROOT:$PATH"
-
-# # Add environment variable ANDROID_SDK_ROOT for cocos2d-x
-export ANDROID_SDK_ROOT="/Users/gabrielcapella/Library/Android/sdk"
-export PATH="$ANDROID_SDK_ROOT:$PATH"
-export PATH="$ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:$PATH"
-export ANDROID_AVD_HOME="$HOME/.android/"
-
-
-# # Add environment variable NDK_ROOT for cocos2d-x
-# export NDK_ROOT="/Users/gabrielcapella/Library/Android/sdk/ndk-bundle/"
-# export PATH="$NDK_ROOT:$PATH"
-
-# # Add environment variable SDKBOX_HOME for sdkbox installer
-# export SDKBOX_HOME="/Users/gabrielcapella/.sdkbox"
-
-# export PATH="/usr/bin/:$PATH"
-function subl;
-	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" $argv;
-end
-
 alias pb='curl -s --data-binary @- https://p.capella.pro/ | awk \'{ print "https://p.capella.pro/"$0; }\' | tee /tmp/pb | pbcopy && cat /tmp/pb'
 alias pb='curl -s --data-binary @- https://p.capella.pro/ | awk \'{ print "https://p.capella.pro/"$0; }\' | tee /tmp/pb | pbcopy && cat /tmp/pb'
 
 
 alias syncdots='curl https://git.capella.pro/capella/dotfiles/raw/master/start | bash -s -- sync'
 alias syncdots='curl https://git.capella.pro/capella/dotfiles/raw/master/start | bash -s -- sync'
@@ -63,3 +14,4 @@ if [ -f '/home/capella/.gcloud/google-cloud-sdk/path.fish.inc' ]; . '/home/capel
 
 
 # npm global packages
 # npm global packages
 set -gx PATH /home/capella/.npm-global/bin $PATH
 set -gx PATH /home/capella/.npm-global/bin $PATH
+set -gx PATH /home/capella/.local/bin $PATH

+ 39 - 0
dots/.config/fish/fish_variables.MKfPab

@@ -0,0 +1,39 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_initialized:3800
+SETUVAR _fish_abbr_l:ls
+SETUVAR fish_color_autosuggestion:555
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Capella
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_most_recent_dir:/home/capella/\x2egcloud/google\x2dcloud\x2dsdk
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_abbreviations:l\x20ls

+ 39 - 0
dots/.config/fish/fish_variables.aIk53a

@@ -0,0 +1,39 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_initialized:3800
+SETUVAR _fish_abbr_l:ls
+SETUVAR fish_color_autosuggestion:555
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Capella
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_most_recent_dir:/home/capella/\x2egcloud/google\x2dcloud\x2dsdk
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_abbreviations:l\x20ls

+ 39 - 0
dots/.config/fish/fish_variables.bvNfZ9

@@ -0,0 +1,39 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_initialized:3800
+SETUVAR _fish_abbr_l:ls
+SETUVAR fish_color_autosuggestion:555
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Capella
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_most_recent_dir:/home/capella/\x2egcloud/google\x2dcloud\x2dsdk
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_abbreviations:l\x20ls

+ 39 - 0
dots/.config/fish/fish_variables.m2VbKw

@@ -0,0 +1,39 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_initialized:3800
+SETUVAR _fish_abbr_l:ls
+SETUVAR fish_color_autosuggestion:555
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Capella
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_most_recent_dir:/home/capella/\x2egcloud/google\x2dcloud\x2dsdk
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_abbreviations:l\x20ls

+ 39 - 0
dots/.config/fish/fish_variables.vjYZqx

@@ -0,0 +1,39 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR __fish_initialized:3800
+SETUVAR _fish_abbr_l:ls
+SETUVAR fish_color_autosuggestion:555
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:bryellow
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:Capella
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_most_recent_dir:/home/capella/\x2egcloud/google\x2dcloud\x2dsdk
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_abbreviations:l\x20ls

+ 15 - 0
dots/.vimrc

@@ -23,7 +23,10 @@ Plugin 'colors'
 Plugin 'jistr/vim-nerdtree-tabs'
 Plugin 'jistr/vim-nerdtree-tabs'
 Plugin 'iwonbigbro/vim-hybrid'
 Plugin 'iwonbigbro/vim-hybrid'
 Plugin 'dense-analysis/ale'
 Plugin 'dense-analysis/ale'
+Plugin 'junegunn/fzf'
 Plugin 'junegunn/fzf.vim'
 Plugin 'junegunn/fzf.vim'
+Plugin 'sheerun/vim-polyglot'
+
 
 
 
 
 call vundle#end()
 call vundle#end()
@@ -99,6 +102,17 @@ let g:NERDTreeDirArrows=0
 """""""""""""""""""""""""""""""""""""
 """""""""""""""""""""""""""""""""""""
 " Golang
 " Golang
 """""""""""""""""""""""""""""""""""""
 """""""""""""""""""""""""""""""""""""
+" Optional: Auto-detect templates within generic .html files
+function! DetectGoHtmlTmpl()
+    if expand('%:e') == "html" && search("{{") != 0
+        setfiletype gohtmltmpl
+    endif
+endfunction
+
+augroup filetypedetect
+    au BufRead,BufNewFile *.html call DetectGoHtmlTmpl()
+augroup END
+
 autocmd Filetype go command! -bang A call go#alternate#Switch(<bang>0, 'edit')
 autocmd Filetype go command! -bang A call go#alternate#Switch(<bang>0, 'edit')
 autocmd Filetype go command! -bang AV call go#alternate#Switch(<bang>0, 'vsplit')
 autocmd Filetype go command! -bang AV call go#alternate#Switch(<bang>0, 'vsplit')
 autocmd Filetype go command! -bang AS call go#alternate#Switch(<bang>0, 'split')
 autocmd Filetype go command! -bang AS call go#alternate#Switch(<bang>0, 'split')
@@ -123,6 +137,7 @@ let g:ale_sign_column_always = 1
 let g:ale_fixers = {
 let g:ale_fixers = {
 \   'go': ['gofmt', 'gofumpt', 'goimports', 'golines', 'trim_whitespace'],
 \   'go': ['gofmt', 'gofumpt', 'goimports', 'golines', 'trim_whitespace'],
 \   'html': ['prettier', 'trim_whitespace'],
 \   'html': ['prettier', 'trim_whitespace'],
+\   'gohtmltmpl': ['prettier'],
 \   'python': [
 \   'python': [
 \       'autoflake',
 \       'autoflake',
 \       'ruff',
 \       'ruff',