update

tig/tigrc

@@ -57,6 +57,7 @@ bind generic s      view-status
 bind generic S      view-stage
 bind main    C      ?git checkout %(commit)
 bind main    c      ?git cherry-pick %(commit)
+bind main    R      ?git reset --soft %(commit)
 
 # Alt-g で :toggle commit-title-graph
 bind main    <Ctrl-g> :toggle commit-title-graph

tmux/common.tmux.conf

@@ -171,6 +171,8 @@ _mytmux_color_palette_7_white='#c6c8d1'
 _mytmux_color_palette_15_white='#d2d4de'
 _mytmux_color_palette_status_fg='#818596'
 _mytmux_color_palette_status_bg='#17171b'
+_mytmux_color_palette_statusnc_fg='#3e445e'
+_mytmux_color_palette_statusnc_bg='#0f1117'
 
 _mytmux_color_fg=$_mytmux_color_palette_fg
 _mytmux_color_number=$_mytmux_color_palette_3_yellow
@@ -206,14 +208,14 @@ set -g status-interval 1
 set -g status-justify "left"
 
 # 全体のデザイン
-set -g status-style                 "fg=$_mytmux_color_fg,bg=default"
+set -g status-style                 "fg=$_mytmux_color_fg,bg=$_mytmux_color_palette_statusnc_bg"
 # ステータスラインウィンドウ一覧デザイン
-set -g window-status-format         "#[fg=$_mytmux_color_comment] #I #W#{?window_flags,#{window_flags},} #[fg=$_mytmux_color_comment]#{_mytmux_sep_l2}"
-set -g window-status-current-format "#{?copy_cursor_y,#[fg=$_mytmux_color_number],#[fg=$_mytmux_color_statement]}#[bold] #I #W#{?window_flags,#{window_flags},} #[fg=$_mytmux_color_comment]#{_mytmux_sep_l2}"
+set -g window-status-format         "#[fg=$_mytmux_color_comment,bg=$_mytmux_color_palette_statusnc_bg] #I #W#{?window_flags,#{window_flags},} #[fg=$_mytmux_color_comment]#{_mytmux_sep_l2}"
+set -g window-status-current-format "#[bg=$_mytmux_color_palette_statusnc_bg]#{?copy_cursor_y,#[fg=$_mytmux_color_number],#[fg=$_mytmux_color_statement]}#[bold] #I #W#{?window_flags,#{window_flags},} #[fg=$_mytmux_color_comment]#{_mytmux_sep_l2}"
 set -g window-status-separator      ""
 # ステータスライン左側デザイン
 set -g status-left-length           1000
-set -g status-left                  "#{?copy_cursor_y,#[fg=$_mytmux_color_number],#[fg=$_mytmux_color_string]}#[reverse,bold] #S #{?client_prefix,#{_mytmux_sep_l2},#[noreverse]#[bg=$_mytmux_color_palette_status_fg]#{_mytmux_sep_l1}#[fg=$_mytmux_color_palette_status_bg,bg=$_mytmux_color_palette_status_fg]} $USER@#{=15:host} #{?client_prefix,#[fg=$_mytmux_color_string],#[fg=$_mytmux_color_palette_status_fg]}#[bg=default,noreverse]#{_mytmux_sep_l1}"
+set -g status-left                  "#{?copy_cursor_y,#[fg=$_mytmux_color_number],#[fg=$_mytmux_color_string]}#[reverse,bold] #S #{?client_prefix,#{_mytmux_sep_l2},#[noreverse]#[bg=$_mytmux_color_palette_status_fg]#{_mytmux_sep_l1}#[fg=$_mytmux_color_palette_status_bg,bg=$_mytmux_color_palette_status_fg]} $USER@#{=10:host} #{?client_prefix,#{?copy_cursor_y,#[fg=$_mytmux_color_number],#[fg=$_mytmux_color_string]},#[fg=$_mytmux_color_palette_status_fg]}#[bg=default,noreverse]#{_mytmux_sep_l1}"
 # ステータスライン右側デザイン
 set -g status-right-length          1000
 set -g status-right                 "#[fg=$_mytmux_color_comment]#{_mytmux_sep_r2}#[fg=$_mytmux_color_fg] #{cpu_fg_color} CPU:#{cpu_percentage} #{ram_fg_color} RAM:#{ram_percentage} #[fg=$_mytmux_color_palette_status_fg,bg=default]${_mytmux_sep_r1}#[fg=$_mytmux_color_palette_status_bg,bg=$_mytmux_color_palette_status_fg] #(echo $(tmux display -p -F \"#{pane_current_path}\" | $MYDOTFILES/tmux/tmux-path-truncator.sh)) #{?copy_cursor_y,#[fg=$_mytmux_color_number],#[fg=$_mytmux_color_function]}#[bg=$_mytmux_color_palette_status_fg]${_mytmux_sep_r1}#[bg=$_mytmux_color_bg,reverse,bold] %Y/%m/%d(%a)%T "

tmux/tmux-path-truncator.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cat - | sed "s#^$HOME#~#g" |  sed -e 's@\([^/\]\{2\}\)[^/\]*/@\1…/@g' | rev | cut -c 1-40 | rev
+cat - | sed "s#^$HOME#~#g" |  sed -e 's@\([^/\]\{2\}\)[^/\]*/@\1/@g' | rev | cut -c 1-40 | rev

vim/autoload/mymisc/config/fern.vim

@@ -47,6 +47,7 @@ fun! mymisc#config#fern#setup() abort
 
     setlocal nonumber
     setlocal signcolumn=no
+    setlocal norelativenumber
   endf
 
   aug vimrc_fern

vim/init.lua

@@ -1,4 +1,3 @@
-
 vim.cmd('source ~/.vimrc')
 
 
@@ -274,7 +273,7 @@ vim.cmd("autocmd!")
 -- vim.cmd("autocmd CursorHoldI * lua vim.lsp.buf.document_highlight()")
 -- vim.cmd("autocmd CursorMoved * lua vim.lsp.buf.clear_references()")
 vim.cmd("autocmd BufEnter    * lua vim.lsp.inlay_hint.enable()")
-vim.cmd("autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh({ bufnr = 0 })")
+-- vim.cmd("autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh({ bufnr = 0 })")
 vim.cmd("augroup END")
 
 local cmp = require('cmp')
@@ -642,7 +641,7 @@ vim.cmd('nno <Leader>`        :<C-u>Telescope marks<CR>')
 ---@diagnostic disable-next-line: missing-fields
 require("flatten").setup({
     window = {
-        open = "smart",
+        open = "split",
     }
 })
 
@@ -660,9 +659,9 @@ require("noice").setup({
     lsp = {
         -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
         override = {
-            ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-            ["vim.lsp.util.stylize_markdown"] = true,
-            ["cmp.entry.get_documentation"] = false, -- requires hrsh7th/nvim-cmp
+            ["vim.lsp.util.convert_input_to_markdown_lines"] = false,
+            ["vim.lsp.util.stylize_markdown"] = false,
+            ["cmp.entry.get_documentation"] = false
         },
         progress = {
             enabled = true,
@@ -685,7 +684,7 @@ require("noice").setup({
 -- require("fidget").setup {
 --     notification = {
 --         window = {
---             winblend = 0
+--             winblend = 50
 --         }
 --     }
 -- }
@@ -695,7 +694,37 @@ require('gitsigns').setup()
 require('numb').setup()
 
 
--- require('lualine').setup()
+require("bufferline").setup {
+    options = {
+        mode = "tabs", -- set to "tabs" to only show tabpages instead
+        separator_style = "slope",
+        indicator = {
+            style = 'none'
+        },
+        -- diagnostics = "nvim_lsp",
+        hover = {
+            enabled = true,
+            delay = 0,
+            reveal = { 'close' }
+        },
+        offsets = {
+            {
+                filetype = "neo-tree",
+                text = "File Explorer",
+                highlight = "Directory",
+                separator = true -- use a "true" to enable the default, or set your own character
+            }
+        }
+    }
+}
+require('lualine').setup {
+    options = {
+        theme = "auto",
+        component_separators = { left = '', right = '' },
+        section_separators = { left = '', right = '' },
+    }
+}
+
 require('render-markdown').setup({
     heading = {
         -- width = 'block'
@@ -709,13 +738,16 @@ require('render-markdown').setup({
 -- vim.cmd('cal mymisc#patch_highlight_attributes("Title","RenderMarkdownH5Bg",{})')
 -- vim.cmd('cal mymisc#patch_highlight_attributes("Title","RenderMarkdownH6Bg",{})')
 
+require("neo-tree").setup({
+    window = {
+        width = 35,
+        mappings = {
+            -- disable fuzzy finder
+            ["/"] = "noop"
+        }
+    }
+}
+)
 
-
-require("ccc").setup({
-    -- Your preferred settings
-    -- Example: enable highlighter
-    highlighter = {
-        auto_enable = true,
-        lsp = true,
-    },
-})
+vim.cmd('nnoremap <leader>e :Neotree reveal<cr>')
+vim.cmd('nnoremap <leader>E :Neotree reveal<cr>')

vim/scripts/plugin_mgr/plugin-list.vim

@@ -189,14 +189,18 @@ Plug 'puremourning/vimspector'
 " Plug 'ryanoasis/vim-devicons'
 " Plug 'justinmk/vim-dirvish'
 
-Plug 'lambdalisue/fern.vim'
-Plug 'lambdalisue/fern-hijack.vim'
-Plug 'lambdalisue/fern-git-status.vim'
-Plug 'lambdalisue/fern-ssh'
-Plug 'lambdalisue/nerdfont.vim'
-Plug 'lambdalisue/fern-renderer-nerdfont.vim'
-Plug 'lambdalisue/vim-fern-comparator-lexical'
-Plug 'yuki-yano/fern-preview.vim'
+if has('nvim')
+  Plug 'nvim-neo-tree/neo-tree.nvim'
+else
+  Plug 'lambdalisue/fern.vim'
+  Plug 'lambdalisue/fern-hijack.vim'
+  Plug 'lambdalisue/fern-git-status.vim'
+  Plug 'lambdalisue/fern-ssh'
+  Plug 'lambdalisue/nerdfont.vim'
+  Plug 'lambdalisue/fern-renderer-nerdfont.vim'
+  Plug 'lambdalisue/vim-fern-comparator-lexical'
+  Plug 'yuki-yano/fern-preview.vim'
+endif
 
 " Plug 'francoiscabrol/ranger.vim'
 
@@ -332,8 +336,12 @@ Plug 'majutsushi/tagbar', {'on': ['TagbarToggle', 'TagbarOpen']}
 Plug 'AndrewRadev/linediff.vim', {'on': ['Linediff']}
 Plug 'Konfekt/FastFold'
 Plug 'LeafCage/foldCC.vim'
-" Plug 'nvim-lualine/lualine.nvim'
-Plug 'vim-airline/vim-airline'
+if has('nvim')
+  Plug 'akinsho/bufferline.nvim', { 'tag': '*' }
+  Plug 'nvim-lualine/lualine.nvim'
+else
+  Plug 'vim-airline/vim-airline'
+endif
 " Plug 'edkolev/tmuxline.vim'
 Plug 'luochen1990/rainbow', {'on': ['RainbowToggle', 'RainbowToggleOff', 'RainbowToggleOn']}
 " Plug 'junegunn/rainbow_parentheses.vim'
@@ -412,6 +420,9 @@ Plug 'vim-jp/vital.vim'
 Plug 'lambdalisue/vital-Whisky'
 
 Plug 'dstein64/vim-startuptime'
+if has('nvim')
+  " Plug 'stevearc/profile.nvim'
+endif
 Plug 'vim-skk/skkeleton'
 
 Plug 'shun095/revimses'

vim/vimrc.vim

@@ -187,7 +187,7 @@ try
     se smoothscroll                                                           " スムーススクロール(wrapの時にスキップしない)
   endif
   se number                                                                   " 行番号表示
-  se norelativenumber
+  se relativenumber
   se signcolumn=yes                                                           " Gutter行を常に表示
   se hlsearch                                                                 " 文字列検索時にハイライトする
   se incsearch                                                                " 文字入力中に検索を開始
@@ -610,11 +610,11 @@ try
     if has('nvim')
       com! Tig cal mymisc#command_at_destdir(
             \ mymisc#find_project_dir(g:mymisc_projectdir_reference_files),
-            \ [":tabe | call feedkeys('i') | :terminal tig"])
+            \ [":bel split | call feedkeys('i') | :terminal tig"])
     el
       com! Tig cal mymisc#command_at_destdir(
             \ mymisc#find_project_dir(g:mymisc_projectdir_reference_files),
-            \ [":tabe | :terminal ++curwin ++close tig"])
+            \ [":bel split | :terminal ++curwin ++close tig"])
     en
   en
   com! Todo exe 'drop ' . get(g:,'memolist_path',$HOME . '/memo') . '/todo.txt'
@@ -854,7 +854,8 @@ try
           \   'vim',
           \   'sql',
           \   'yaml',
-          \   'json'
+          \   'json',
+          \   'plantuml'
           \ ]
 
     " javaのsyntaxはmarkdownのsyntaxを参照しているので有効にすると再帰ループしてしまう