summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/env13
-rw-r--r--.config/nvim/init.vim2
-rw-r--r--.config/nvim/plug-config/airline.vim12
-rw-r--r--.config/nvim/plug.vim3
-rw-r--r--.config/nvim/settings.vim2
-rw-r--r--.config/zsh/.zshrc22
-rw-r--r--.config/zsh/alias.zsh44
-rw-r--r--.config/zsh/plugins.zsh18
-rwxr-xr-x.local/bin/mpview2
-rw-r--r--.zshenv2
10 files changed, 98 insertions, 22 deletions
diff --git a/.config/env b/.config/env
index 8883d71..4fecc7c 100644
--- a/.config/env
+++ b/.config/env
@@ -1,3 +1,16 @@
+# env
+# ========================
+# ===== ===============
+# ====== ================
+# ====== ================
+# ====== ==== ==== ==
+# ====== === == = =
+# ====== === = == =
+# = === === = == ====
+# = === === = == = =
+# == ===== ==== ==
+# ========================
+
# PATH
export PATH="$HOME"/.local/bin:"$PATH":/usr/local/llvm11/bin
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 4c7d5c2..e810fe3 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -20,7 +20,7 @@ source /home/jozan/.config/nvim/bindings.vim
source /home/jozan/.config/nvim/sidebars.vim
source /home/jozan/.config/nvim/langs.vim
source /home/jozan/.config/nvim/plug-config/airline.vim
-source /home/jozan/.config/nvim/plug-config/coc.vim
+" source /home/jozan/.config/nvim/plug-config/coc.vim
source /home/jozan/.config/nvim/plug-config/floaterm.vim
source /home/jozan/.config/nvim/plug-config/nerd-commenter.vim
source /home/jozan/.config/nvim/plug-config/org.vim
diff --git a/.config/nvim/plug-config/airline.vim b/.config/nvim/plug-config/airline.vim
index 868d910..7fe7088 100644
--- a/.config/nvim/plug-config/airline.vim
+++ b/.config/nvim/plug-config/airline.vim
@@ -1,6 +1,4 @@
" Airline
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#tabline#fnamemod = ':t'
let g:airline_detect_modified = 1
let g:airline_detect_paste = 1
let g:airline_detect_crypt = 1
@@ -8,5 +6,15 @@ let g:airline_theme = 'base16_default'
let g:airline_powerline_fonts = 1
let g:airline_symbols_ascii = 1
let g:airline#parts#ffenc#skip_expected_string = 'utf-8[unix]'
+let g:airline#extensions#battery#enabled = 1
+let g:airline#extensions#coc#enabled = 1
+let airline#extensions#coc#warning_symbol = 'W:'
+let airline#extensions#coc#error_symbol = 'E:'
+let g:airline#extensions#tagbar#enabled = 0
+let g:airline#extensions#tabline#fnamemod = ':t'
let g:airline#extensions#cursormode#enabled = 1
+let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#tabline#buffer_idx_mode = 1
+" let g:airline#extensions#tabline#left_sep = ' '
+" let g:airline#extensions#tabline#left_alt_sep = '|'
+let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim
index 027cae5..543058a 100644
--- a/.config/nvim/plug.vim
+++ b/.config/nvim/plug.vim
@@ -6,6 +6,7 @@ Plug 'jceb/vim-orgmode'
Plug 'jiangmiao/auto-pairs'
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
+Plug 'lambdalisue/battery.vim'
Plug 'liuchengxu/vim-which-key'
Plug 'luochen1990/rainbow'
Plug 'mbbill/undotree'
@@ -13,7 +14,7 @@ Plug 'mg979/vim-visual-multi'
Plug 'mhinz/vim-signify'
Plug 'mhinz/vim-startify'
Plug 'morhetz/gruvbox'
-Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
+" Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
Plug 'paretje/nvim-man'
Plug 'preservim/tagbar'
Plug 'preservim/nerdcommenter'
diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim
index 4d0894c..1826e2e 100644
--- a/.config/nvim/settings.vim
+++ b/.config/nvim/settings.vim
@@ -30,3 +30,5 @@ let mapleader="\\"
let maplocalleader="\\"
" Disables automatic commenting on newline:
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
+set statusline=...%{battery#component()}...
+let g:battery#update_statusline = 1 " For statusline.
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 7145cb3..b879c3c 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,10 +1,22 @@
-export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
+# .zshrc
+# ========================
+# ===== ===============
+# ====== ================
+# ====== ================
+# ====== ==== ==== ==
+# ====== === == = =
+# ====== === = == =
+# = === === = == ====
+# = === === = == = =
+# == ===== ==== ==
+# ========================
autoload -U colors && colors
HISTSIZE=5000
SAVEHIST=5000
HISTFILE=$XDG_CONFIG_HOME/zsh/history
+
autoload -U history-search-end
zle -N history-beginning-search-backward-end history-search-end
zle -N history-beginning-search-forward-end history-search-end
@@ -28,8 +40,6 @@ bindkey -M menuselect 'l' vi-forward-char
bindkey -v "^?" backward-delete-char
bindkey -v "^[[A" history-beginning-search-backward
bindkey -v "^[[B" history-beginning-search-forward
-# bindkey -v "^K" history-beginning-search-backward
-# bindkey -v "^J" history-beginning-search-forward
bindkey -M vicmd "k" history-beginning-search-backward
bindkey -M vicmd "j" history-beginning-search-forward
@@ -38,8 +48,8 @@ bindkey "^e" edit-command-line
[ -f "$ZDOTDIR/alias.zsh" ] && source $ZDOTDIR/alias.zsh
[ -f "$ZDOTDIR/plugins.zsh" ] && source $ZDOTDIR/plugins.zsh
-[ -f "$HOME/Packages/fzf/shell/completion.zsh" ] && source $HOME/Packages/fzf/shell/completion.zsh
-[ -f "$HOME/Packages/fzf/shell/key-bindings.zsh" ] && source $HOME/Packages/fzf/shell/key-bindings.zsh
+[ -f "$HOME/.local/packs/fzf/shell/completion.zsh" ] && source $HOME/.local/packs/fzf/shell/completion.zsh
+[ -f "$HOME/.local/packs/fzf/shell/key-bindings.zsh" ] && source $HOME/.local/packs/fzf/shell/key-bindings.zsh
globalias() {
if [[ $LBUFFER =~ '^[a-z0-9]+$' ]]; then
@@ -56,4 +66,4 @@ bindkey -v "^ " magic-space
bindkey -M isearch " " magic-space
PROMPT="%B%{$fg[red]%}%M %{$fg[blue]%}%c%{$fg[red]%}%%%{$reset_color%} "
-RPROMPT="${RPROMPT}"'%{$fg_bold[red]%}%(?..%?)%{$reset_color%} $(gitprompt)'
+RPROMPT="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh
index 783a780..25f8fb2 100644
--- a/.config/zsh/alias.zsh
+++ b/.config/zsh/alias.zsh
@@ -1,16 +1,31 @@
+# alias.zsh
+# ========================
+# ===== ===============
+# ====== ================
+# ====== ================
+# ====== ==== ==== ==
+# ====== === == = =
+# ====== === = == =
+# = === === = == ====
+# = === === = == = =
+# == ===== ==== ==
+# ========================
+
alias ls='exa -l'
alias c='clear'
alias less='less --tabs 4'
alias bc='clear; bc -l'
-alias emacs='emacs -nw'
alias mkf='gmake fclean'
alias mkc='gmake clean'
alias mk='gmake -j5'
alias web='w3m https://duckduckgo.com/'
+alias mpv='mpv --audio-channels=stereo'
alias cp='cp -iv'
alias mv='mv -iv'
alias rm='rm -v'
alias ln='ln -v'
+alias df='df -h'
+alias du='du -h'
alias mkdir='mkdir -v'
alias rmdir='rmdir -v'
alias chmod='chmod -v'
@@ -20,26 +35,39 @@ alias diff='colordiff'
alias tree='tree -C'
alias yt='straw-viewer --api=auto'
alias gyt='gtk-straw-viewer'
-alias dgit='git --git-dir=$HOME/Documents/dotfiles-bsd --work-tree=$HOME'
+alias dgit='git --git-dir=$HOME/docs/dotfiles-bsd --work-tree=$HOME'
alias vim='nvim'
alias gst='git status'
alias ga='git add'
alias gco='git commit -m'
alias gpp='git push'
alias gpo='git push origin'
-alias startdocker='doas service vboxnet restart && docker-machine start docker-home'
+alias startdocker='sudo service vboxnet restart && docker-machine start docker-home'
alias stopdocker='docker-machine stop docker-home'
alias envdocker='eval `docker-machine env docker-home`'
-alias cat='bat'
alias vimz='nvim $(fzf)'
alias v='nvim $(fzf)'
-alias twi='mpv https://twitch.tv/'
+alias pa='cd $HOME/.local/packs && ls'
+alias co='cd $XDG_CONFIG_HOME/ && ls'
+alias bi='cd $HOME/.local/bin && ls'
+twi() {
+ mpview https://twitch.tv/$1;
+}
alias nb='newsboat'
alias mutt='neomutt'
alias nmt='neomutt'
alias sxiv='sxiv -b'
-alias infox='pkg info -x'
-alias search='make -C /usr/ports search name='
+alias pinfo='pkg info -x'
+search() {
+ make -C /usr/ports search name=$1 | grep 'Path:';
+}
alias watch='cmdwatch'
+alias tsd='transmission-daemon'
alias tsm='transmission-remote'
-alias df='df -h'
+alias rsox='sox -t oss default'
+alias calcurse='calcurse -C $XDG_CONFIG_HOME/calcurse -D $XDG_DATA_HOME/calcurse'
+alias abook='abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook'
+alias dosbox='dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf'
+alias svn='svn --config-dir $XDG_CONFIG_HOME/subversion'
+alias gpg2='gpg2 --homedir $XDG_DATA_HOME/gnupg'
+alias yarn='yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config'
diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh
index fec3908..abf7f8b 100644
--- a/.config/zsh/plugins.zsh
+++ b/.config/zsh/plugins.zsh
@@ -1,3 +1,15 @@
-source $HOME/Packages/git-prompt.zsh/git-prompt.zsh
-# source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh >/dev/null
-source $HOME/Packages/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null
+# plugins.zsh
+# ========================
+# ===== ===============
+# ====== ================
+# ====== ================
+# ====== ==== ==== ==
+# ====== === == = =
+# ====== === = == =
+# = === === = == ====
+# = === === = == = =
+# == ===== ==== ==
+# ========================
+
+# source $HOME/Packages/git-prompt.zsh/git-prompt.zsh
+source $HOME/.local/packs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null
diff --git a/.local/bin/mpview b/.local/bin/mpview
index 65fe97e..804a32d 100755
--- a/.local/bin/mpview
+++ b/.local/bin/mpview
@@ -67,6 +67,7 @@ sub main
print 'mpv --ytdl-format=[height<=' . $size . '] ' . $ARGV[0] . "\n";
exec(
'mpv',
+ '--really-quiet',
'--ytdl-format=[height<=' . $size . ']',
$ARGV[0]
);
@@ -75,6 +76,7 @@ sub main
print 'mpv ' . $ARGV[0] . "\n";
exec(
'mpv',
+ '--really-quiet',
$ARGV[0]
);
}
diff --git a/.zshenv b/.zshenv
index 854dfb9..6a18a26 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,3 +1,3 @@
-source $HOME/.profile
+source $HOME/.config/env
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js