Skip to content

Commit

Permalink
some tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
3ximus committed Oct 12, 2023
1 parent 5f2248f commit 9777b5e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .bash/ble.sh
Submodule ble.sh updated 50 files
+5 −5 .gitignore
+7 −3 GNUmakefile
+0 −346 archive/layer/adapter.sh
+1 −1 contrib
+13 −7 docs/ChangeLog.md
+6 −6 lib/core-complete.sh
+1 −1 lib/core-syntax.sh
+2 −2 lib/keymap.vi.sh
+1 −1 lib/test-bash.sh
+193 −94 lib/test-canvas.GraphemeClusterTest.sh
+9 −2 lib/test-canvas.sh
+26 −0 make/README.md
+1,171 −0 make/canvas.c2w.generate-table.sh
+4 −0 make/canvas.c2w.list-ucsver-detection-codes.sh
+2 −957 make_command.sh
+0 −0 memo/D0589/D0589.test-lc_collate.sh
+0 −0 memo/D0589/D0589.test-printf-s2c.sh
+0 −0 memo/D0589/D0589.test-printf-uXXXX.sh
+0 −0 memo/D0727/D0727.bashrc
+0 −0 memo/D0727/D0727.bashrc2
+0 −0 memo/D0857/D0857.bashrc0
+0 −0 memo/D0857/D0857.bashrc1
+0 −0 memo/D0857/D0857.bashrc2
+6 −6 memo/D0857/D0857.bashrc3
+0 −0 memo/D1038/D1038.test1.0.sh
+0 −0 memo/D1038/D1038.test1.1.inputrc
+0 −0 memo/D1038/D1038.test1.2.inputrc
+0 −0 memo/D1038/D1038.test2.1.inputrc
+0 −0 memo/D1120/D1120.measure.sh
+0 −0 memo/D1120/D1120.resolve1.sh
+0 −0 memo/D1120/D1120.resolve2.sh
+0 −0 memo/D1120/D1120.resolve3.sh
+0 −0 memo/D1302/D1302.benchmark-array-copy.sh
+0 −0 memo/D1302/D1302.benchmark-c2s-cached.sh
+0 −0 memo/D1302/D1302.read-timeout-bash4.1.sh
+0 −0 memo/D1488/D1488.show-mode-line.v1.bashrc
+0 −0 memo/D1488/D1488.show-mode-line.v2.bashrc
+0 −0 memo/D1488/D1488.vim-mode-in-status.bash
+0 −0 memo/D1488/D1488.vimrc
+58 −0 memo/D2062/delay-mc-STOP.patch
+89 −0 memo/D2062/mc-debug.patch
+55 −0 memo/D2069.bashrc
+70 −0 memo/D2070.bashrc
+3 −3 memo/done.txt
+356 −1 note.txt
+141 −127 src/canvas.GraphemeClusterBreak.sh
+223 −220 src/canvas.c2w.sh
+104 −14 src/canvas.sh
+283 −163 src/color.sh
+10 −4 src/edit.sh
15 changes: 3 additions & 12 deletions .tmux.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set -g default-terminal "xterm-256color"
set -g default-terminal "screen-256color"
# set-option -ga terminal-overrides ",*256col*:Tc"
# set-window-option -g alternate-screen on
set -g mouse on
Expand Down Expand Up @@ -178,16 +178,13 @@ set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.tmux/'
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
set -g @plugin 'MunifTanjim/tmux-suspend'
# set -g @plugin 'tmux-plugins/tmux-copycat'
set -g @plugin 'Morantron/tmux-fingers'

set -g @plugin '3ximus/tmux-plugin-uptime'
set -g @plugin '3ximus/tmux-plugin-datetime'
set -g @plugin 'tmux-plugins/tmux-battery'
set -g @plugin '3ximus/tmux-plugin-sysstat'

set -g @plugin 'IngoMeyer441/tmux-easy-motion'

#########################
# Plugin Config

Expand Down Expand Up @@ -218,20 +215,14 @@ set -g @batt_color_charge_primary_tier1 'red,bold'
set -g @sysstat_mem_view_tmpl 'M:#[fg=#{mem.color}]#{mem.pused}'

set -g @fingers-key C-f
set -g @fingers-hint-format "#[fg=red,bold]%s"
set -g @fingers-highlight-format "#[fg=cyan]%s"
set -g @fingers-hint-style "fg=red,bold"
set -g @fingers-highlight-style "fg=cyan"
set -g @fingers-pattern-1 '["].*["]' # match quoted text, useful when files path are quoted
set -g @fingers-pattern-2 "['][^']+[']" # match quoted text, useful when files path are quoted
# generic URL matcher
set -g @fingers-pattern-3 "([a-z][a-z0-9+\-.]*)://(([a-zA-Z0-9._~%!\$&()*+,;=\-]+)?:?([a-zA-Z0-9._~%!\$&()*+,;=\-]+)?@)?([a-z0-9._~%\-]+|\[[a-f0-9:.]+\]|\[v[a-f0-9][a-z0-9._~%!\$&()*+,;=:\-]+\])(:[0-9]+)?(/[a-zA-Z0-9._~%!\$&()*+,;=:@\-]+)*/?"
# pattern for jira tickets
set -g @fingers-pattern-2 "[A-Z][A-Z0-9_]*-[0-9]+"

set -g @easy-motion-prefix "Space"

set -g @extrakto_popup_size '60%'
set -g @extrakto_copy_key tab
set -g @extrakto_insert_key enter

# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/tpm/tpm'
18 changes: 14 additions & 4 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ Plug 'godlygeek/tabular', { 'on': ['Tabularize'] }
Plug 'neoclide/coc.nvim', {'branch': 'release'}

if exists('$TMUX')
Plug 'preservim/vimux'
" Plug 'preservim/vimux'
Plug '3ximus/vimux-tasks'
endif

Plug 'CoderCookE/vim-chatgpt', {'on': ['<Plug>(chatgpt-menu)', 'Ask', 'Review', 'Rewrite', 'Explain', 'Fix', 'Test']}
Expand Down Expand Up @@ -529,6 +530,7 @@ let g:markology_include='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
" Vimux
let g:VimuxPromptString = "$ "
let g:VimuxExpandCommand = 1
" let g:VimuxTaskAutodetect = []

" fzf-checkout
let g:fzf_checkout_git_options = '--sort=-committerdate'
Expand Down Expand Up @@ -640,6 +642,7 @@ let g:user_emmet_mode='inv'
imap <C-e> <plug>(emmet-expand-abbr)
"Vimux
noremap <leader>rt :VimuxTasks<CR>
noremap <leader>rc :VimuxPromptCommand<CR>
noremap <leader>rl :VimuxRunLastCommand<CR>
noremap <leader>rk :VimuxInterruptRunner<CR>
Expand Down Expand Up @@ -785,7 +788,8 @@ if &rtp =~ 'fzf.vim' && glob("~/.vim/plugged/fzf.vim/plugin/fzf.vim")!=#""
if exists('$TMUX')
let g:fzf_layout = { 'tmux': '-p90%,70%' }
else
" let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.8 , 'border': 'sharp'} } " Causes airline gruvbox bug
" Causes airline gruvbox bug
" let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.8 , 'border': 'sharp'} }
let g:fzf_no_term = 1
let g:fzf_layout = { 'down': '30%' }
endif
Expand All @@ -812,7 +816,7 @@ if &rtp =~ 'fzf.vim' && glob("~/.vim/plugged/fzf.vim/plugin/fzf.vim")!=#""
\ call fzf#run({
\ 'source': 'git branch -avv --color',
\ 'sink': function('GitEditBranchFile'),
\ 'options': "'--bind=ctrl-v:execute@printf \">>>> \"@+accept' '--bind=ctrl-s:execute@printf \"&&&& \"@+accept' --prompt 'ViewCurrentFile> ' --ansi --nth=1 --no-info",
\ 'options': "'--bind=ctrl-v:execute@printf \">>>> \"@+accept' '--bind=ctrl-s:execute@printf \"&&&& \"@+accept' --prompt 'ViewCurrentFile> ' --ansi --no-info",
\ 'tmux': '-p60%,40%'})

function! GitEditCommitFile(commit)
Expand All @@ -826,7 +830,7 @@ if &rtp =~ 'fzf.vim' && glob("~/.vim/plugged/fzf.vim/plugin/fzf.vim")!=#""
" TODO preview here is not correct since it doesnt view the file content
" on the selected commit
let l:file = fzf#run(fzf#wrap({'source': 'git ls-tree --name-only -r ' . l:hash, 'sink': '"',
\ 'options': "'--bind=ctrl-v:execute@printf \">>>> \"@+accept' '--bind=ctrl-s:execute@printf \"&&&& \"@+accept' --ansi --nth=1 --prompt 'ViewFile @ ".l:hash."> ' --inline-info --preview '~/.vim/plugged/fzf.vim/bin/preview.sh {}'",
\ 'options': "'--bind=ctrl-v:execute@printf \">>>> \"@+accept' '--bind=ctrl-s:execute@printf \"&&&& \"@+accept' --ansi --prompt 'ViewFile @ ".l:hash."> ' --inline-info --preview '~/.vim/plugged/fzf.vim/bin/preview.sh {}'",
\ 'tmux': '-p80%,70%'}))
if len(l:file) == 0
return
Expand Down Expand Up @@ -1027,6 +1031,12 @@ endif

autocmd FileType vim setlocal foldmethod=marker foldlevel=0

" list staches on fugitive
augroup CustomFugitiveMappings
autocmd!
autocmd FileType fugitive nmap <buffer> czl :G --paginate stash list '--pretty=format:%h %as %<(10)%gd %<(76,trunc)%s'<cr>
augroup END

autocmd FileType python setlocal tabstop=2 shiftwidth=2 softtabstop=2 noexpandtab autoindent "because someone has too much screen space in their eyesight
autocmd FileType python setlocal indentkeys-=<:> " colon will auto indent line in insert mode, remove that behavior
autocmd FileType python setlocal indentkeys-=:
Expand Down
6 changes: 3 additions & 3 deletions styles/slack-gruvbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ document.addEventListener("DOMContentLoaded", function () {
--dt_color-content-sec: #d5c4a1;
--dt_color-content-inv-pry: #8ec07c;
}
.p-ia4_top_nav {
background-color: #282828 !important;
.p-channel_sidebar__channel--selected {
background-color: #3c3836 !important
}
.p-tab_rail {
.p-ia4_top_nav, .p-ia4_channel_list, .p-tab_rail {
background-color: #282828 !important;
}
.p-theme_background {
Expand Down

0 comments on commit 9777b5e

Please sign in to comment.