fix p10k
This commit is contained in:
parent
7482175e83
commit
cf2dc37aac
7 changed files with 325 additions and 425 deletions
|
@ -128,3 +128,7 @@
|
||||||
|
|
||||||
[include]
|
[include]
|
||||||
path = .gitconfig.local
|
path = .gitconfig.local
|
||||||
|
[gpg]
|
||||||
|
format = ssh
|
||||||
|
[user]
|
||||||
|
signingkey = /home/neonxp/.ssh/id_ed25519.pub
|
||||||
|
|
0
nvim/.nvimlog
Normal file
0
nvim/.nvimlog
Normal file
|
@ -1,3 +1,12 @@
|
||||||
|
local fn = vim.fn
|
||||||
|
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
||||||
|
if fn.empty(fn.glob(install_path)) > 0 then
|
||||||
|
packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.cmd [[packadd packer.nvim]]
|
||||||
|
|
||||||
|
|
||||||
require 'options'
|
require 'options'
|
||||||
require 'keymaps'
|
require 'keymaps'
|
||||||
require 'autocommands'
|
require 'autocommands'
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
local map = vim.api.nvim_set_keymap
|
local map = vim.api.nvim_set_keymap
|
||||||
local opts = {noremap = true, silent = true}
|
local opts = {noremap = true, silent = true}
|
||||||
|
|
||||||
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- Tree
|
-- Tree
|
||||||
map('n', '<C-h>', ':NvimTreeToggle<CR>', opts)
|
map('n', '<C-h>', ':NvimTreeToggle<CR>', opts)
|
||||||
|
|
||||||
|
@ -10,10 +12,10 @@ map('n', '<leader>fg', '<cmd>Telescope live_grep<CR>', opts)
|
||||||
map('n', '<leader>fb', '<cmd>Telescope buffers<CR>', opts)
|
map('n', '<leader>fb', '<cmd>Telescope buffers<CR>', opts)
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
--map('n', '<leader>e', vim.diagnostic.open_float, opts)
|
-- map('n', '<leader>e', vim.diagnostic.open_float, opts)
|
||||||
--map('n', '[d', vim.diagnostic.goto_prev, opts)
|
-- map('n', '[d', vim.diagnostic.goto_prev, opts)
|
||||||
--map('n', ']d', vim.diagnostic.goto_next, opts)
|
-- map('n', ']d', vim.diagnostic.goto_next, opts)
|
||||||
--map('n', '<leader>q', vim.diagnostic.setloclist, opts)
|
-- map('n', '<leader>q', vim.diagnostic.setloclist, opts)
|
||||||
|
|
||||||
local on_attach = function(client, bufnr)
|
local on_attach = function(client, bufnr)
|
||||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||||
|
|
|
@ -1,11 +1,3 @@
|
||||||
local fn = vim.fn
|
|
||||||
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
|
||||||
if fn.empty(fn.glob(install_path)) > 0 then
|
|
||||||
packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.cmd [[packadd packer.nvim]]
|
|
||||||
|
|
||||||
return require('packer').startup(function(use)
|
return require('packer').startup(function(use)
|
||||||
use 'wbthomason/packer.nvim'
|
use 'wbthomason/packer.nvim'
|
||||||
use 'nvim-lua/plenary.nvim'
|
use 'nvim-lua/plenary.nvim'
|
||||||
|
|
676
zsh/p10k.zsh
676
zsh/p10k.zsh
File diff suppressed because it is too large
Load diff
43
zsh/zshrc
43
zsh/zshrc
|
@ -10,22 +10,26 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
||||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
source ~/.config/zsh/powerlevel10k/powerlevel10k.zsh-theme
|
||||||
|
source ~/.config/zsh/p10k.zsh
|
||||||
|
|
||||||
antigen bundle zsh-users/zsh-syntax-highlighting
|
antigen bundle zsh-users/zsh-syntax-highlighting
|
||||||
antigen bundle zsh-users/zsh-history-substring-search
|
antigen bundle zsh-users/zsh-history-substring-search
|
||||||
antigen bundle zsh-users/zsh-autosuggestions
|
antigen bundle zsh-users/zsh-autosuggestions
|
||||||
antigen bundle zsh-users/zsh-completions
|
antigen bundle zsh-users/zsh-completions
|
||||||
|
antigen bundle ael-code/zsh-colored-man-pages
|
||||||
|
|
||||||
antigen apply
|
antigen apply
|
||||||
|
|
||||||
# Exports
|
# Exports
|
||||||
|
|
||||||
export PATH=$HOME/.local/bin:/usr/local/bin:$HOME/go/bin:$PATH
|
|
||||||
# export GOROOT=$HOME/work/go
|
# export GOROOT=$HOME/work/go
|
||||||
export GOPATH=$HOME/go
|
export GOPATH=$HOME/go
|
||||||
export GOPROXY=https://proxy.neonxp.ru
|
export GOPROXY=https://proxy.neonxp.ru
|
||||||
export EDITOR="nvim"
|
export EDITOR="nvim"
|
||||||
#export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
|
#export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
|
||||||
|
export PATH=$PATH:$GOPATH/bin
|
||||||
|
export GPG_TTY=$(tty)
|
||||||
export LS_OPTIONS='--color=auto'
|
export LS_OPTIONS='--color=auto'
|
||||||
eval "$(dircolors -b)"
|
eval "$(dircolors -b)"
|
||||||
|
|
||||||
|
@ -46,7 +50,6 @@ alias cp="cp -i" # confirm before overwriting something
|
||||||
alias df="df -h" # human-readable sizes
|
alias df="df -h" # human-readable sizes
|
||||||
alias free="free -m" # show sizes in MB
|
alias free="free -m" # show sizes in MB
|
||||||
alias np="nano -w PKGBUILD"
|
alias np="nano -w PKGBUILD"
|
||||||
alias more=less
|
|
||||||
alias gitu='git add . && git commit && git push'
|
alias gitu='git add . && git commit && git push'
|
||||||
alias g=git
|
alias g=git
|
||||||
|
|
||||||
|
@ -114,16 +117,6 @@ source ~/.config/zsh/conf.d/*.zsh
|
||||||
|
|
||||||
colors
|
colors
|
||||||
|
|
||||||
# Color man pages
|
|
||||||
export LESS_TERMCAP_mb=$"\E[01;32m"
|
|
||||||
export LESS_TERMCAP_md=$"\E[01;32m"
|
|
||||||
export LESS_TERMCAP_me=$"\E[0m"
|
|
||||||
export LESS_TERMCAP_se=$"\E[0m"
|
|
||||||
export LESS_TERMCAP_so=$"\E[01;47;34m"
|
|
||||||
export LESS_TERMCAP_ue=$"\E[0m"
|
|
||||||
export LESS_TERMCAP_us=$"\E[01;36m"
|
|
||||||
export LESS=-R
|
|
||||||
|
|
||||||
|
|
||||||
## Plugins section: Enable fish style features
|
## Plugins section: Enable fish style features
|
||||||
# Use syntax highlighting
|
# Use syntax highlighting
|
||||||
|
@ -166,6 +159,30 @@ bindkey "^[[Z" undo # Shift+tab undo
|
||||||
# ctrl + space accept suggestion
|
# ctrl + space accept suggestion
|
||||||
bindkey "^ " autosuggest-accept
|
bindkey "^ " autosuggest-accept
|
||||||
|
|
||||||
|
dotenv() {
|
||||||
|
if [ $# -eq 0 ]; then
|
||||||
|
[ -f .env.gpg ] && set -- .env.gpg "$@"
|
||||||
|
[ -f .env ] && set -- .env "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
set -a
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
echo "dotenv: Loading $1"
|
||||||
|
case "$1" in
|
||||||
|
*.gpg)
|
||||||
|
eval "$(gpg --quiet --decrypt --yes "$1")"
|
||||||
|
;;
|
||||||
|
*/*)
|
||||||
|
. "$1"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
. "./$1"
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
set +a
|
||||||
|
}
|
||||||
|
|
||||||
# Set terminal window and tab/icon title
|
# Set terminal window and tab/icon title
|
||||||
#
|
#
|
||||||
# usage: title short_tab_title [long_window_title]
|
# usage: title short_tab_title [long_window_title]
|
||||||
|
|
Loading…
Reference in a new issue