diff options
| -rw-r--r-- | config/fish/config.fish | 24 | ||||
| -rw-r--r-- | config/git/config.darwin | 33 | ||||
| -rw-r--r-- | config/git/config.linux | 7 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 30 |
4 files changed, 87 insertions, 7 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index d84ee46..a58cb12 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -116,10 +116,14 @@ if status is-interactive alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml' # alias nvidia-settings --config="$XDG_CONFIG_HOME"/nvidia/settings - if [ "$(uname)" = 'Linux' ] - alias ls='ls --color=auto -Fh' + if command -qv eza + alias ls='eza --git --git-repos --mounts --classify --icons' else - alias ls='ls -G -Fh' + if [ "$(uname)" = 'Linux' ] + alias ls='ls --color=auto -Fh' + else + alias ls='ls -G -Fh' + end end abbr ll 'ls -l' abbr la 'ls -A' @@ -127,13 +131,23 @@ if status is-interactive abbr lss 'ls -Ssh' # tree - alias tree 'tree -FC' + if command -qv eza + alias tree='ls -T' + alias ti="ls -T --git-ignore" + else + alias tree 'tree -FC' + alias ti="tree --matchdirs -I __pycache__ -I node_modules -I '*.o' -I build" + end abbr t 'tree' abbr ta 'tree -a' abbr t1 'tree -L 1' abbr t2 'tree -L 2' abbr t3 'tree -L 3' - alias ti="tree --matchdirs -I __pycache__ -I node_modules -I '*.o' -I build" + + if command -qv bat + alias cat='bat --theme gruvbox-dark' + set -gx MANPAGER "sh -c 'col -bx | bat --theme gruvbox-dark -l man -p'" + end # git abbr ga 'git add' diff --git a/config/git/config.darwin b/config/git/config.darwin index 7d27b5b..ac89ec5 100644 --- a/config/git/config.darwin +++ b/config/git/config.darwin @@ -1,3 +1,5 @@ +# vim:ft=gitconfig + [user] name = Charles Cabergs email = charles.cabergs@colruytgroup.com @@ -7,11 +9,40 @@ rebase = false [merge] tool = vimdiff + conflictstyle = diff3 [commit] gpgsign = false [init] defaultBranch = master [core] editor = "VIMINIT='' nvim" + pager = delta +[interactive] + diffFilter = delta --color-only --syntax-theme gruvbox-dark +[diff] + colorMoved = default +[delta] + syntax-theme = gruvbox-dark + # side-by-side = true + navigate = true # use n and N to move between diff sections + line-numbers = true -# vim:ft=gitconfig + +# [http] +# sslVerify = false +[credential] + helper = store +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process +[gpg] + format = ssh +[gpg "ssh"] + allowedSignersFile = + +[push] + autoSetupRemote = true +[tag] + sort = v:refname diff --git a/config/git/config.linux b/config/git/config.linux index aea7fb1..a7b8baa 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -1,3 +1,5 @@ +# vim:ft=gitconfig + [user] name = Charles Cabergs email = me@cacharle.xyz @@ -29,8 +31,11 @@ editor = "VIMINIT='' nvim" [safe] directory = * +[push] + autoSetupRemote = true # git push without remote and branch specified +[tag] + sort = v:refname # Sort tag by version instead of ascii sort -# vim:ft=gitconfig [filter "lfs"] required = true clean = git-lfs clean -- %f diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 6d92a76..7319d17 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -14,6 +14,13 @@ return require("packer").startup(function() -- end -- } + use { + 'andymass/vim-matchup', + setup = function() + vim.g.matchup_matchparen_offscreen = { method = "popup" } + end + } + -- Put arguments on multiple lines use { "FooSoft/vim-argwrap", @@ -328,6 +335,22 @@ return require("packer").startup(function() -- end -- } + -- tokyonight color scheme + -- use { + -- "folke/tokyonight.nvim", + -- config = function() + -- vim.opt.termguicolors = true + -- vim.opt.background = "dark" + -- vim.cmd [[ colorscheme tokyonight-moon ]] + -- require("tokyonight").setup({ + -- styles = { + -- comments = { italic = true }, + -- keywords = { italic = true }, + -- }, + -- }) + -- end + -- } + -- status line use { "nvim-lualine/lualine.nvim", @@ -335,6 +358,7 @@ return require("packer").startup(function() config = function() require("lualine").setup { options = { + -- theme = "tokyonight", theme = "gruvbox", -- theme = "nord", icons_enabled = true, @@ -374,6 +398,11 @@ return require("packer").startup(function() highlight = { enable = true }, + matchup = { + enable = true, -- mandatory, false will disable the whole extension + -- disable = { "c", "ruby" }, -- optional, list of language that will be disabled + -- [options] + }, -- indent = { enable = true }, -- TODO: could be neat -- incremental_selection = { @@ -396,6 +425,7 @@ return require("packer").startup(function() requires = { {"nvim-lua/plenary.nvim"}, {"kyazdani42/nvim-web-devicons"}, + {"nvim-telescope/telescope-symbols.nvim"}, { "nvim-telescope/telescope-fzf-native.nvim", run = "make", |