From b63fb4494cedc871e97c6d746eeff81bb62659f0 Mon Sep 17 00:00:00 2001
From: Laily <i@laily.net>
Date: Mon, 5 Feb 2024 15:28:56 +0800
Subject: [PATCH] feat: add fish

---
 .gitignore                                |  1 +
 .zshrc                                    |  1 +
 fish/config.fish                          | 43 +++++++++++++++++++++++
 fish/install.sh                           |  4 +++
 nvim/lua/pluginconfig/init.lua            |  1 +
 nvim/lua/pluginconfig/symbols-outline.lua |  1 +
 nvim/lua/pluginconfig/which-key.lua       |  1 +
 nvim/lua/plugins.lua                      |  1 +
 8 files changed, 53 insertions(+)
 create mode 100644 fish/config.fish
 create mode 100644 fish/install.sh
 create mode 100644 nvim/lua/pluginconfig/symbols-outline.lua

diff --git a/.gitignore b/.gitignore
index c359e80..681f50d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ nvim/plugin
 _set_env_*.sh
 _set_env.sh
 log
+cn.sh
diff --git a/.zshrc b/.zshrc
index 8335128..75781cb 100644
--- a/.zshrc
+++ b/.zshrc
@@ -150,3 +150,4 @@ alias sws="swagger serve -F=swagger"
 function gtr(){
   go test -gcflags=all=-l -v -run="$1"
 }
+fpath+=${ZDOTDIR:-~}/.zsh_functions
diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..5ef6095
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,43 @@
+## set environment
+
+# brew
+set -gx HOMEBREW_BREW_GIT_REMOTE "https://mirrors.ustc.edu.cn/brew.git"
+set -gx HOMEBREW_CORE_GIT_REMOTE "https://mirrors.ustc.edu.cn/homebrew-core.git"
+set -gx HOMEBREW_BOTTLE_DOMAIN "https://mirrors.ustc.edu.cn/homebrew-bottles"
+
+# go
+set -gx GOPATH $HOME/go:$HOME/workrepo/go
+set -gx GOPROXY goproxy.cn
+set -gx GOSUMDB "sum.golang.google.cn"
+
+set -gx PATH $PATH $HOME/go/bin 
+set -gx PATH $PATH $HOME/.yarn/bin $HOME/.config/yarn/global/node_modules/.bin
+set -gx PATH $PATH "/usr/local/sbin"
+# add nvim
+set -gx PATH $PATH /usr/local/nvim/bin /usr/local/osx-64/nvim/bin 
+set -gx EDITOR vim
+
+# alias 
+# git
+abbr -a gitb "git branch --show-current | tr -d '\n' | pbcopy"
+abbr -a gci "golangci-lint run -c=~/.dotfile/.golangci.yml ./..."
+abbr -a gmt "go mod tidy"
+abbr -a gtc "go test -gcflags=all=-l -cover ./..."
+abbr -a swg "swag init -o docs -g "
+abbr -a sws "swagger serve -F=swagger"
+
+function gtr
+  go test -gcflags=all=-l -v -run="$1"
+end
+
+
+
+
+
+
+
+
+
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+end
diff --git a/fish/install.sh b/fish/install.sh
new file mode 100644
index 0000000..53a97e3
--- /dev/null
+++ b/fish/install.sh
@@ -0,0 +1,4 @@
+if [ -f "$HOME/.config/fish/config.fish" ]; then
+  mv $HOME/.config/fish/config.fish $HOME/.config/fish/config.fish.bak
+fi
+ln -s $HOME/.dotfile/fish/config.fish $HOME/.config/fish/config.fish
diff --git a/nvim/lua/pluginconfig/init.lua b/nvim/lua/pluginconfig/init.lua
index 0077bc4..2bdb7c6 100644
--- a/nvim/lua/pluginconfig/init.lua
+++ b/nvim/lua/pluginconfig/init.lua
@@ -18,6 +18,7 @@ require('pluginconfig/fzf-lua')
 require('pluginconfig/nvim-tree') -- This plugin must be required somewhere before colorscheme.  Placing it after will break navigation keymappings
 require('pluginconfig/nvim-treesitter')
 require('pluginconfig/rnvimr')
+require('pluginconfig/symbols-outline')
 require('pluginconfig/telescope')
 require('pluginconfig/toggleterm')
 require('pluginconfig/vim-matchup')
diff --git a/nvim/lua/pluginconfig/symbols-outline.lua b/nvim/lua/pluginconfig/symbols-outline.lua
new file mode 100644
index 0000000..e491be1
--- /dev/null
+++ b/nvim/lua/pluginconfig/symbols-outline.lua
@@ -0,0 +1 @@
+require("symbols-outline").setup()
\ No newline at end of file
diff --git a/nvim/lua/pluginconfig/which-key.lua b/nvim/lua/pluginconfig/which-key.lua
index 0981f46..5fb3ca5 100644
--- a/nvim/lua/pluginconfig/which-key.lua
+++ b/nvim/lua/pluginconfig/which-key.lua
@@ -181,6 +181,7 @@ local mappings = {
         L = { "<cmd>Lspsaga show_line_diagnostics<cr>", "Line Diagnostics" },
         k = { "<cmd>: LspRestart<cr>", "restart lsp server" },
         n = { "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", "next diagnostic" },
+        o = { "<cmd>: SymbolsOutline<cr>", "symbols outline" },
         p = { "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", "prev diagnostic" },
         P = { "<cmd>Lspsaga preview_definition<cr>", "Preview Definition" },
         q = { "<cmd>Telescope quickfix<cr>", "Quickfix" },
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 0fc4ad5..01d8373 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -242,6 +242,7 @@ return require("packer").startup(function(use)
         -- TimUntersberger/neogit
         -- folke/lsp-colors.nvim
         -- simrat39/symbols-outline.nvim
+        use 'simrat39/symbols-outline.nvim'
 
         -- Git
         -- use {'tpope/vim-rhubarb', opt = true}