diff options
Diffstat (limited to '.config')
| -rwxr-xr-x | .config/fontconfig/fonts.conf | 25 | ||||
| -rw-r--r-- | .config/git/config | 15 | ||||
| -rw-r--r-- | .config/newsboat/urls | 10 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 155 | ||||
| -rw-r--r-- | .config/python/pythonrc | 2 | ||||
| -rw-r--r-- | .config/shell/aliasrc | 2 | ||||
| -rw-r--r-- | .config/shell/bm-dirs | 7 | ||||
| -rw-r--r-- | .config/shell/eibhear/aliasrc | 43 | ||||
| -rw-r--r-- | .config/shell/eibhear/bm-dirs | 5 | ||||
| -rw-r--r-- | .config/shell/eibhear/bm-files | 4 | ||||
| -rw-r--r-- | .config/shell/eibhear/profile | 20 | ||||
| -rw-r--r-- | .config/shell/profile | 2 |
12 files changed, 132 insertions, 158 deletions
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 761ae00..67b1690 100755 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -1,6 +1,28 @@ <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> + <description>Enable some typographic features of FiraCode font, for all applications.</description> + <match target="font"> + <test name="family" compare="contains" ignore-blanks="true"> + <string>FiraCode Nerd Font</string> + </test> + <edit name="fontfeatures" mode="append"> + <string>cv02</string> + <string>cv06</string> + <string>ss01</string> + <string>cv13</string> + <string>ss05</string> + <string>ss03</string> + <string>cv31</string> + <string>cv29</string> + <string>cv30</string> + <string>ss09</string> + <string>cv25</string> + <string>cv26</string> + <string>cv27</string> + <string>ss07</string> + </edit> + </match> <alias> <family>serif</family> <prefer> @@ -22,6 +44,8 @@ <alias> <family>sans</family> <prefer> + <family>FiraCodeNerdFontMono</family> + <family>FiraCodeNerdFont</family> <family>Libertinus Sans</family> <family>Joy Pixels</family> <family>Noto Color Emoji</family> @@ -31,6 +55,7 @@ <alias> <family>monospace</family> <prefer> + <family>FiraCodeNerdFontMono</family> <family>Noto Sans Mono</family> <family>Libertinus Mono</family> <family>FontAwesome</family> diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..6f7086d --- /dev/null +++ b/.config/git/config @@ -0,0 +1,15 @@ +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection + side-by-side = true + +[merge] + conflictstyle = zdiff3 +[init] + defaultBranch = master diff --git a/.config/newsboat/urls b/.config/newsboat/urls new file mode 100644 index 0000000..497e494 --- /dev/null +++ b/.config/newsboat/urls @@ -0,0 +1,10 @@ +https://lukesmith.xyz/rss.xml +https://videos.lukesmith.xyz/feeds/videos.xml?videoChannelId=2 "~Luke Smith (Videos)" +https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA "~Luke Smith (YouTube)" +https://lindypress.net/rss +https://notrelated.xyz/rss +https://landchad.net/rss.xml +https://based.cooking/index.xml +https://artixlinux.org/feed.php "tech" +https://www.archlinux.org/feeds/news/ "tech" +https://github.com/LukeSmithxyz/voidrice/commits/master.atom "~LARBS dotfiles" diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index 60397ce..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,155 +0,0 @@ -let mapleader ="," - -if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"')) - echo "Downloading junegunn/vim-plug to manage plugins..." - silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ - silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim - autocmd VimEnter * PlugInstall -endif - -map ,, :keepp /<++><CR>ca< -imap ,, <esc>:keepp /<++><CR>ca< - -call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"')) -Plug 'tpope/vim-surround' -Plug 'preservim/nerdtree' -Plug 'junegunn/goyo.vim' -Plug 'jreybert/vimagit' -Plug 'vimwiki/vimwiki' -Plug 'vim-airline/vim-airline' -Plug 'tpope/vim-commentary' -Plug 'ap/vim-css-color' -call plug#end() - -set notermguicolors -set title -set bg=light -set mouse=a -set nohlsearch -set clipboard+=unnamedplus -set noshowmode -set noruler -set laststatus=0 -set noshowcmd -colorscheme vim - -" Some basics: - nnoremap c "_c - filetype plugin on - syntax on - set encoding=utf-8 - set number relativenumber -" Enable autocompletion: - set wildmode=longest,list,full -" Disables automatic commenting on newline: - autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o -" Perform dot commands over visual blocks: - vnoremap . :normal .<CR> -" Goyo plugin makes text more readable when writing prose: - map <leader>f :Goyo \| set bg=light \| set linebreak<CR> -" Spell-check set to <leader>o, 'o' for 'orthography': - map <leader>o :setlocal spell! spelllang=en_us<CR> -" Splits open at the bottom and right, which is non-retarded, unlike vim defaults. - set splitbelow splitright - -" Nerd tree - map <leader>n :NERDTreeToggle<CR> - autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif - let NERDTreeBookmarksFile = stdpath('data') . '/NERDTreeBookmarks' - -" vim-airline - if !exists('g:airline_symbols') - let g:airline_symbols = {} - endif - let g:airline_symbols.colnr = ' C:' - let g:airline_symbols.linenr = ' L:' - let g:airline_symbols.maxlinenr = '☰ ' - -" Shortcutting split navigation, saving a keypress: - map <C-h> <C-w>h - map <C-j> <C-w>j - map <C-k> <C-w>k - map <C-l> <C-w>l - -" Replace ex mode with gq - map Q gq - -" Check file in shellcheck: - map <leader>s :!clear && shellcheck -x %<CR> - -" Open my bibliography file in split - map <leader>b :vsp<space>$BIB<CR> - map <leader>r :vsp<space>$REFER<CR> - -" Replace all is aliased to S. - nnoremap S :%s//g<Left><Left> - -" Compile document, be it groff/LaTeX/markdown/etc. - map <leader>c :w! \| !compiler "%:p"<CR> - -" Open corresponding .pdf/.html or preview - map <leader>p :!opout "%:p"<CR> - -" Runs a script that cleans out tex build files whenever I close out of a .tex file. - autocmd VimLeave *.tex !latexmk -c % - -" Ensure files are read as what I want: - let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} - map <leader>v :VimwikiIndex<CR> - let g:vimwiki_list = [{'path': '~/.local/share/nvim/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] - autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown - autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff - autocmd BufRead,BufNewFile *.tex set filetype=tex - -" Save file as sudo on files that require root permission - cabbrev w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit! - -" Enable Goyo by default for mutt writing - autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo 80 | call feedkeys("jk") - autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo!\|x!<CR> - autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo!\|q!<CR> - -" Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position - autocmd BufWritePre * let currPos = getpos(".") - autocmd BufWritePre * %s/\s\+$//e - autocmd BufWritePre * %s/\n\+\%$//e - autocmd BufWritePre *.[ch] %s/\%$/\r/e " add trailing newline for ANSI C standard - autocmd BufWritePre *neomutt* %s/^--$/-- /e " dash-dash-space signature delimiter in emails - autocmd BufWritePre * cal cursor(currPos[1], currPos[2]) - -" When shortcut files are updated, renew bash and ranger configs with new material: - autocmd BufWritePost bm-files,bm-dirs !shortcuts -" Run xrdb whenever Xdefaults or Xresources are updated. - autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults - autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb % -" Recompile dwmblocks on config edit. - autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks } - -" Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable. -if &diff - highlight! link DiffText MatchParen -endif - -" Function for toggling the bottom statusbar: -let s:hidden_all = 0 -function! ToggleHiddenAll() - if s:hidden_all == 0 - let s:hidden_all = 1 - set noshowmode - set noruler - set laststatus=0 - set noshowcmd - else - let s:hidden_all = 0 - set showmode - set ruler - set laststatus=2 - set showcmd - endif -endfunction -nnoremap <leader>h :call ToggleHiddenAll()<CR> -" Load command shortcuts generated from bm-dirs and bm-files via shortcuts script. -" Here leader is ";". -" So ":vs ;cfz" will expand into ":vs /home/<user>/.config/zsh/.zshrc" -" if typed fast without the timeout. -silent! source ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/shortcuts.vim diff --git a/.config/python/pythonrc b/.config/python/pythonrc deleted file mode 100644 index b32e6b6..0000000 --- a/.config/python/pythonrc +++ /dev/null @@ -1,2 +0,0 @@ -import readline -readline.write_history_file = lambda *args: None diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 35ceae8..2f11a5f 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -58,3 +58,5 @@ alias \ lf="lfub" \ magit="nvim -c MagitOnly" \ ref='shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutenvrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc' + +source "$XDG_CONFIG_HOME"/shell/eibhear/aliasrc diff --git a/.config/shell/bm-dirs b/.config/shell/bm-dirs index 9d212ec..3bb1a67 100644 --- a/.config/shell/bm-dirs +++ b/.config/shell/bm-dirs @@ -4,7 +4,6 @@ cf ${XDG_CONFIG_HOME:-$HOME/.config} D ${XDG_DOWNLOAD_DIR:-$HOME/Downloads} d ${XDG_DOCUMENTS_DIR:-$HOME/Documents} dt ${XDG_DATA_HOME:-$HOME/.local/share} -rr $HOME/.local/src h $HOME m ${XDG_MUSIC_DIR:-$HOME/Music} mn /mnt @@ -12,3 +11,9 @@ pp ${XDG_PICTURES_DIR:-$HOME/Pictures} sc $HOME/.local/bin src $HOME/.local/src vv ${XDG_VIDEOS_DIR:-$HOME/Videos} + +# Maks's +work $HOME/work +agh $HOME/agh +# Work +headlesslims $work/prym-soft/headlesslims diff --git a/.config/shell/eibhear/aliasrc b/.config/shell/eibhear/aliasrc new file mode 100644 index 0000000..7cdcb86 --- /dev/null +++ b/.config/shell/eibhear/aliasrc @@ -0,0 +1,43 @@ +#!/bin/sh +alias eibhear="git --git-dir=$XDG_DATA_HOME/eibhear --work-tree=$HOME" + +alias la="ls -lAhNF --group-directories-first" + +# eval "$(pyenv init - zsh)" +source /usr/share/zsh/site-functions/_pyenv +export PATH="$XDG_DATA_HOME/pyenv/shims:${PATH}" +export PYENV_SHELL=zsh +( command pyenv rehash 2>/dev/null & ) +pyenv() { + local command=${1:-} + [ "$#" -gt 0 ] && shift + case "$command" in + rehash|shell) + eval "$(pyenv "sh-$command" "$@")" + ;; + *) + command pyenv "$command" "$@" + ;; + esac +} + + +# eval "$(nodenv init - zsh)" +export PATH="$XDG_DATA_HOME/nodenv/shims:${PATH}" +export NODENV_SHELL=zsh +source '/usr/lib/nodenv/completions/nodenv.zsh' +( command nodenv rehash 2>/dev/null & ) +nodenv() { + local command + command="${1:-}" + if [ "$#" -gt 0 ]; then + shift + fi + + case "$command" in + rehash|shell) + eval "$(nodenv "sh-$command" "$@")";; + *) + command nodenv "$command" "$@";; + esac +} diff --git a/.config/shell/eibhear/bm-dirs b/.config/shell/eibhear/bm-dirs new file mode 100644 index 0000000..1fd0312 --- /dev/null +++ b/.config/shell/eibhear/bm-dirs @@ -0,0 +1,5 @@ +work $HOME/work +agh $HOME/agh + +# Work +headlesslims $work/prym-soft/headlesslims diff --git a/.config/shell/eibhear/bm-files b/.config/shell/eibhear/bm-files new file mode 100644 index 0000000..b2b0a0c --- /dev/null +++ b/.config/shell/eibhear/bm-files @@ -0,0 +1,4 @@ +bf ${XDG_CONFIG_HOME:-$HOME/.config}/shell/eibhear/bm-file +bd ${XDG_CONFIG_HOME:-$HOME/.config}/shell/eibhear/bm-dirs +cfx ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources +cfb ~/.local/src/dwmblocks/config.h diff --git a/.config/shell/eibhear/profile b/.config/shell/eibhear/profile new file mode 100644 index 0000000..41b17f0 --- /dev/null +++ b/.config/shell/eibhear/profile @@ -0,0 +1,20 @@ +#!/bin/sh +export BROWSER="brave" +export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" +export GNUPGHOME="$XDG_DATA_HOME/gnupg" + +export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" + +export SUDO_ASKPASS="$HOME/.local/bin/maks/dmenudoas" + +export RUSTUP_HOME="$XDG_DATA_HOME/rustup" + +export PYTHON_HISTORY=$XDG_STATE_HOME/python_history +export PYTHONPYCACHEPREFIX=$XDG_CACHE_HOME/python +export PYTHONUSERBASE=$XDG_DATA_HOME/python + +export PYENV_ROOT="$XDG_DATA_HOME"/pyenv +export PATH="$PYENV_ROOT/bin:$PATH" + +export NODENV_ROOT="$XDG_DATA_HOME/nodenv" +export PATH="$NODENV_ROOT/bin:$PATH" diff --git a/.config/shell/profile b/.config/shell/profile index 872e312..595cb29 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -66,6 +66,8 @@ export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm [ ! -f "$XDG_CONFIG_HOME/shell/shortcutrc" ] && setsid -f shortcuts >/dev/null 2>&1 +source "$XDG_CONFIG_HOME"/shell/eibhear/profile + # Start graphical server on user's current tty if not already running. [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC" |