light color scheme etc
This commit is contained in:
parent
922a25688c
commit
720dad9c35
3 changed files with 36 additions and 20 deletions
|
@ -6,7 +6,7 @@ Plug '~/src/github.com/shelmangroup/nvim-shelman-theme'
|
||||||
|
|
||||||
Plug 'neovim/nvim-lspconfig'
|
Plug 'neovim/nvim-lspconfig'
|
||||||
Plug 'nvim-lua/completion-nvim'
|
Plug 'nvim-lua/completion-nvim'
|
||||||
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " update parsers on update
|
" Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " update parsers on update
|
||||||
Plug 'steelsojka/completion-buffers'
|
Plug 'steelsojka/completion-buffers'
|
||||||
|
|
||||||
Plug 'junegunn/fzf', { 'do': './install --bin' }
|
Plug 'junegunn/fzf', { 'do': './install --bin' }
|
||||||
|
@ -331,7 +331,7 @@ local on_attach = function(client, bufnr)
|
||||||
local opts = { noremap=true, silent=true }
|
local opts = { noremap=true, silent=true }
|
||||||
buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||||
buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
buf_set_keymap('n', 'gd', '<Cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||||
buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
buf_set_keymap('n', 'gh', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||||
-- buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
-- buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||||
|
@ -369,7 +369,7 @@ end
|
||||||
|
|
||||||
-- Use a loop to conveniently both setup defined servers
|
-- Use a loop to conveniently both setup defined servers
|
||||||
-- and map buffer local keybindings when the language server attaches
|
-- and map buffer local keybindings when the language server attaches
|
||||||
local servers = { "gopls", "jdtls", "vimls", "yamlls" }
|
local servers = { "cssls", "gopls", "jdtls", "vimls", "yamlls" }
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup { on_attach = on_attach }
|
nvim_lsp[lsp].setup { on_attach = on_attach }
|
||||||
end
|
end
|
||||||
|
@ -426,7 +426,7 @@ autocmd BufEnter * lua require'completion'.on_attach()
|
||||||
|
|
||||||
lua <<EOF
|
lua <<EOF
|
||||||
require'nvim-treesitter.configs'.setup {
|
require'nvim-treesitter.configs'.setup {
|
||||||
ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
-- ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
||||||
ignore_install = { "javascript" }, -- List of parsers to ignore installing
|
ignore_install = { "javascript" }, -- List of parsers to ignore installing
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true, -- false will disable the whole extension
|
enable = true, -- false will disable the whole extension
|
||||||
|
@ -546,10 +546,10 @@ set termguicolors
|
||||||
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
|
||||||
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
|
||||||
" " undercurl in tmux
|
" " undercurl in tmux
|
||||||
set t_Cs = "\e[4:3m"
|
" set t_Cs = "\e[4:3m"
|
||||||
set t_Ce = "\e[4:0m"
|
" set t_Ce = "\e[4:0m"
|
||||||
|
|
||||||
|
|
||||||
lua require('colorbuddy').colorscheme('shelman-dark')
|
lua require('colorbuddy').colorscheme('shelman-light')
|
||||||
|
|
||||||
map ,l :luafile %<CR>
|
map ,l :luafile %<CR>
|
||||||
|
|
28
.tmux.conf
28
.tmux.conf
|
@ -19,12 +19,14 @@ set -g update-environment "XAUTHORITY DISPLAY WINDOWID SSH_ASKPASS SSH_AGENT_PID
|
||||||
set -g default-command zsh
|
set -g default-command zsh
|
||||||
set -g history-limit 100000
|
set -g history-limit 100000
|
||||||
|
|
||||||
set-option -g default-terminal "xterm-direct"
|
set-option -g default-terminal "tmux-direct"
|
||||||
set -ga terminal-overrides ",*:Tc" # true colous support
|
set -ga terminal-overrides ",*:Tc" # true colous support
|
||||||
set -as terminal-overrides ',*:sitm=\E[3m' # Italics support for older ncurses
|
set -as terminal-overrides ',*:sitm=\E[3m' # Italics support for older ncurses
|
||||||
set -as terminal-overrides ',*:smxx=\E[9m' # Strikeout
|
# set -as terminal-overrides ',*:smxx=\E[9m' # Strikeout
|
||||||
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support
|
set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support
|
||||||
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # under
|
# set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours
|
||||||
|
set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'
|
||||||
|
|
||||||
|
|
||||||
# Key bindings
|
# Key bindings
|
||||||
bind -n M-Left select-pane -L
|
bind -n M-Left select-pane -L
|
||||||
|
@ -71,15 +73,15 @@ set -g status-right '#{?#{==:#W,1},,#[fg=#f7f7f7]#{@starship}#[fg=#212121]▕#[f
|
||||||
set -g set-titles on
|
set -g set-titles on
|
||||||
set -g set-titles-string "#H - #T"
|
set -g set-titles-string "#H - #T"
|
||||||
|
|
||||||
new -s 0 -n 1
|
# new -s 0 -n 1
|
||||||
new-window -n 2
|
# new-window -n 2
|
||||||
new-window -n 3
|
# new-window -n 3
|
||||||
new-window -n 4
|
# new-window -n 4
|
||||||
new-window -n 5
|
# new-window -n 5
|
||||||
new-window -n 6
|
# new-window -n 6
|
||||||
new-window -n 7
|
# new-window -n 7
|
||||||
new-window -n 8
|
# new-window -n 8
|
||||||
new-window -n 9
|
# new-window -n 9
|
||||||
new-window -n 0
|
# new-window -n 0
|
||||||
|
|
||||||
# vim:set ft=tmux:
|
# vim:set ft=tmux:
|
||||||
|
|
14
.zshrc
14
.zshrc
|
@ -168,6 +168,9 @@ command -v linkerd >/dev/null 2>&1 && source <(linkerd completion zsh)
|
||||||
## Flux
|
## Flux
|
||||||
command -v flux >/dev/null 2>&1 && source <(flux completion zsh)
|
command -v flux >/dev/null 2>&1 && source <(flux completion zsh)
|
||||||
|
|
||||||
|
## Tekton cli
|
||||||
|
command -v tkn >/dev/null 2>&1 && source <(tkn completion zsh)
|
||||||
|
|
||||||
## Google Cloud
|
## Google Cloud
|
||||||
[ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc
|
[ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc
|
||||||
|
|
||||||
|
@ -182,6 +185,17 @@ GOPROXY=https://proxy.golang.org/
|
||||||
## Ansible
|
## Ansible
|
||||||
export ANSIBLE_NOCOWS=1
|
export ANSIBLE_NOCOWS=1
|
||||||
|
|
||||||
|
|
||||||
|
## PostgreSQL Operator
|
||||||
|
export PATH=/home/dln/.pgo/pgo:$PATH
|
||||||
|
export PGOUSER=/home/dln/.pgo/pgo/pgouser
|
||||||
|
export PGO_CA_CERT=/home/dln/.pgo/pgo/client.crt
|
||||||
|
export PGO_CLIENT_CERT=/home/dln/.pgo/pgo/client.crt
|
||||||
|
export PGO_CLIENT_KEY=/home/dln/.pgo/pgo/client.key
|
||||||
|
export PGO_APISERVER_URL='https://127.0.0.1:8443'
|
||||||
|
export PGO_NAMESPACE=pgo
|
||||||
|
|
||||||
|
|
||||||
export PATH=$HOME/bin:$PATH
|
export PATH=$HOME/bin:$PATH
|
||||||
|
|
||||||
autoload -U +X bashcompinit && bashcompinit
|
autoload -U +X bashcompinit && bashcompinit
|
||||||
|
|
Loading…
Add table
Reference in a new issue