From 4e7bcf405e7c23a33faf080414476a6fa9c94a0b Mon Sep 17 00:00:00 2001 From: jay Date: Sat, 26 Aug 2023 01:14:03 +0800 Subject: [PATCH] [feat] update --- ...nchange_before_20_install_dev_lang.sh.tmpl | 4 +- home/dot_config/nvim/init.vim.tmpl | 73 +++++-------------- home/dot_config/sway/config | 9 ++- home/dot_zprofile.tmpl | 12 ++- 4 files changed, 32 insertions(+), 66 deletions(-) diff --git a/home/.chezmoiscripts/run_once_onchange_before_20_install_dev_lang.sh.tmpl b/home/.chezmoiscripts/run_once_onchange_before_20_install_dev_lang.sh.tmpl index c50ab0e..5d52ab6 100644 --- a/home/.chezmoiscripts/run_once_onchange_before_20_install_dev_lang.sh.tmpl +++ b/home/.chezmoiscripts/run_once_onchange_before_20_install_dev_lang.sh.tmpl @@ -2,8 +2,8 @@ set -x -GO_VERSION="1.20.3" -NODE_VERSION="18.15.0" +GO_VERSION="1.21.0" +NODE_VERSION="20.5.1" ARCH="{{ .chezmoi.arch }}" OSTYPE="{{ .chezmoi.os }}" diff --git a/home/dot_config/nvim/init.vim.tmpl b/home/dot_config/nvim/init.vim.tmpl index 6de7d7e..cca8074 100644 --- a/home/dot_config/nvim/init.vim.tmpl +++ b/home/dot_config/nvim/init.vim.tmpl @@ -58,6 +58,11 @@ Plug 'kien/tabman.vim' Plug 'tpope/vim-fugitive' Plug 'christoomey/vim-conflicted' +" for neogit +Plug 'NeogitOrg/neogit' +Plug 'nvim-lua/plenary.nvim' +Plug 'nvim-telescope/telescope.nvim' + " for mark Plug 'inkarkat/vim-ingo-library' Plug 'inkarkat/vim-mark' @@ -305,52 +310,6 @@ let g:fzf_history_dir = '~/.local/share/fzf-history' lua << EOF ---[[ -require("tokyonight").setup({ - -- your configuration comes here - -- or leave it empty to use the default settings - style = "moon", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day` - light_style = "day", -- The theme is used when the background is set to light - transparent = true, -- Enable this to disable setting the background color - terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim - styles = { - -- Style to be applied to different syntax groups - -- Value is any valid attr-list value for `:help nvim_set_hl` - comments = { italic = true }, - keywords = { italic = true }, - functions = {}, - variables = {}, - -- Background styles. Can be "dark", "transparent" or "normal" - sidebars = "dark", -- style for sidebars, see below - floats = "dark", -- style for floating windows - }, - sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]` - day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors - hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**. - dim_inactive = false, -- dims inactive windows - lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold - - --- You can override specific color groups to use other groups or a hex color - --- function will be called with a ColorScheme table - ---@param colors ColorScheme - on_colors = function(colors) end, - - --- You can override specific highlights to use other groups or a hex color - --- function will be called with a Highlights and ColorScheme table - ---@param highlights Highlights - ---@param colors ColorScheme - on_highlights = function(highlights, colors) - highlights.CursorLineNr = { - fg = colors.blue5, - bold = true, - } - highlights.LineNr = { - fg = colors.blue, - } - end, -}) -]] --- vim.cmd[[colorscheme tokyonight]] vim.g.nightflyTransparent = true vim.cmd[[colorscheme nightfly]] @@ -407,15 +366,6 @@ require("bufferline").setup{ diagnostics = "nvim_lsp", } } - --- require('tabnine').setup({ --- disable_auto_comment=true, --- accept_keymap="", --- dismiss_keymap = "", --- debounce_ms = 600, --- suggestion_color = {gui = "#808080", cterm = 244}, --- exclude_filetypes = {"TelescopePrompt"} --- }) vim.opt.list = true -- vim.opt.listchars:append "eol:↴" @@ -519,6 +469,13 @@ cmp.setup { }), } +--vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( +-- vim.lsp.diagnostic.on_publish_diagnostics, { +-- virtual_text = false +-- } +--) +vim.diagnostic.config({virtual_text = false, signs = false}) + require'nvim-tree'.setup { auto_reload_on_write = true, disable_netrw = false, @@ -620,7 +577,7 @@ require('aerial').setup({ "Field", "Constant", }, - manage_folds = true, + --manage_folds = true, link_tree_to_folds = false, -- Show box drawing characters for the tree hierarchy show_guides = true, @@ -640,4 +597,8 @@ require('aerial').setup({ -- You probably also want to set a keymap to toggle aerial vim.keymap.set('n', '', 'AerialToggle!') +local neogit = require('neogit') + +neogit.setup {} + EOF diff --git a/home/dot_config/sway/config b/home/dot_config/sway/config index 9c84c5c..f0ae881 100644 --- a/home/dot_config/sway/config +++ b/home/dot_config/sway/config @@ -4,7 +4,7 @@ # # Read `man 5 sway` for a complete reference. -font JetBrainsMono Nerd Font 10 +font JetBrainsMono Nerd Font 12 ### Variables # @@ -43,6 +43,7 @@ exec_always /usr/libexec/xdg-desktop-portal-wlr exec_always kanshi exec dex -a -e sway exec mako +exec udiskie --smart-tray # for sway overview # exec_always rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov -t 100 @@ -52,9 +53,9 @@ exec mako # Example configuration: # exec swayidle -w \ - timeout 300 'swaylock -f -i ~/.config/swaylock/bg.png -s fill' \ + timeout 300 'swaylock -f -i ~/.config/sway/bg2.png -s fill' \ timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ - before-sleep 'swaylock -f -i ~/.config/swaylock/bg.png -s fill' + before-sleep 'swaylock -f -i ~/.config/sway/bg2.png -s fill' # This will lock your screen after 300 seconds of inactivity, then turn off # your displays after another 300 seconds, and turn your screens back on when @@ -106,7 +107,7 @@ input type:touchpad { # Reload the configuration file bindsym $mod+Shift+c reload - bindsym $mod+Shift+x exec swaylock -f -i ~/.config/swaylock/bg.png -s fill + bindsym $mod+Shift+x exec swaylock -f -i ~/.config/sway/bg2.png -s fill # Exit sway (logs you out of your Wayland session) bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' diff --git a/home/dot_zprofile.tmpl b/home/dot_zprofile.tmpl index 706af3d..3a7d6ce 100644 --- a/home/dot_zprofile.tmpl +++ b/home/dot_zprofile.tmpl @@ -68,7 +68,7 @@ function ln-image-tags { function ln-save-image { if [ -z "$1" ]; then echo "usage: ln-save-image " - exit 1 + return 1 fi docker-save --rm -p -o . -i registry.lawsnote.com/$1 @@ -77,21 +77,25 @@ function ln-save-image { function save-image { if [ -z "$1" ]; then echo "usage: save-image " - exit 1 + return 1 fi - tag=$(ln-image-tags "$1" | jq -c -r 'del(.tags[] | select(. == "latest")) | .tags | sort | last') || exit 1 + tag=$(ln-image-tags "$1" | jq -c -r 'del(.tags[] | select(. == "latest")) | .tags | sort | last') || return 1 ln-save-image "$1:$tag" } function minio-size { if [ -z "$1" ]; then echo "usage: minio-size " - exit 1 + return 1 fi mc ls -r --json $1 | jq -s 'map(.size) | add' | numfmt --to=iec-i --suffix=B --padding=7 } +function zfs-usage { + awk '/^size/ { print $1 " " $3 / 1048576 }' < /proc/spl/kstat/zfs/arcstats +} + # The next line updates PATH for the Google Cloud SDK. if [ -f '/home/jay/apps/google-cloud-sdk/path.zsh.inc' ]; then . '/home/jay/apps/google-cloud-sdk/path.zsh.inc'; fi