From e76d1ec15a49d57d503f41facc18bf4daea16a40 Mon Sep 17 00:00:00 2001 From: Blake Ridgway Date: Sat, 28 May 2022 23:21:21 -0500 Subject: [PATCH] working on dotfile cleanup --- README.md | 4 +++ dotfiles/post_install_fed | 10 ++++---- dotfiles/vimrc | 16 +++++------- dotfiles/zshrc | 53 +++------------------------------------ 4 files changed, 19 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index f101b8d..a5ec403 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,7 @@ This is a collection of items I use when I setup a fresh install. # Docker # dotfiles + + +*Things to Remember* +`~/.oh-my-zsh/custom/themes/powerlevel10k/gitstatus/install -f` diff --git a/dotfiles/post_install_fed b/dotfiles/post_install_fed index bcfd46f..16b5476 100644 --- a/dotfiles/post_install_fed +++ b/dotfiles/post_install_fed @@ -62,8 +62,8 @@ for flatpak_name in ${FLATPAK_LIST[@]}; do fi done -git submodule init -git submodule update --recursive +# git submodule init +# git submodule update --recursive echo ############ echo # Protonup # @@ -94,14 +94,14 @@ echo # Installing Rust # echo ################### # Install Rust -curl https://sh.rustup.rs -sSf | sh +# curl https://sh.rustup.rs -sSf | sh echo ###################### echo # Setting up SSH Key # echo ###################### # SSH Key Gen -ssh-keygen -t ed25519 -C ${USER}@$(hostname --fqdn) +# ssh-keygen -t ed25519 -C ${USER}@$(hostname --fqdn) echo ###################### echo # Installing OhMyZSH # @@ -172,7 +172,7 @@ sudo dnf install \ sudo dnf copr enable gloriouseggroll/mesa-aco # Enable fsync kernel -sudo dnf copr enable sentry/kernel-fsync +# sudo dnf copr enable sentry/kernel-fsync sudo dnf update --refresh diff --git a/dotfiles/vimrc b/dotfiles/vimrc index 45fa1d4..9ee49e0 100755 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -17,12 +17,12 @@ call plug#begin('~/.vim/plugged/') Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " ctrl+p :FZF + " vim floaterm + Plug 'voldikss/vim-floaterm' + " vim colorscheme Plug 'sainnhe/edge' - " Rust Language Support - Plug 'rust-lang/rust.vim' - " Go Language Support Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } @@ -77,14 +77,15 @@ call plug#begin('~/.vim/plugged/') Plug 'artur-shaik/vim-javacomplete2' Plug 'dansomething/vim-eclim' - if has('nvim') Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } else Plug 'Shougo/deoplete.nvim' Plug 'roxma/nvim-yarp' - endif + Plug 'roxma/vim-hug-neovim-rpc' + endif + Plug 'Shougo/neosnippet' Plug 'Shougo/neosnippet-snippets' @@ -577,11 +578,6 @@ let g:indentLine_char = '│' autocmd! BufWritePost,BufEnter * Neomake let g:deoplete#enable_at_startup = 1 -let g:deoplete#omni_patterns = {} -let g:deoplete#omni_patterns.java = '[^. *\t]\.\w*' -let g:deoplete#sources = {} -let g:deoplete#sources._ = [] -let g:deoplete#file#enable_buffer_path = 1 let g:AutoClosePumvisible = {"ENTER": "", "ESC": ""} diff --git a/dotfiles/zshrc b/dotfiles/zshrc index df7a55f..188419e 100755 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -12,11 +12,8 @@ export ZSH=$HOME/.oh-my-zsh export GOPATH=$HOME/go export PATH=$PATH:/usr/local/go/bin -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. -# ZSH_THEME="dracula" +GITSTATUS_LOG_LEVEL=DEBUG + ZSH_THEME="powerlevel10k/powerlevel10k" POWERLEVEL9K_MODE="nerdfont-complete" DEFAULT_USER="bridgway" @@ -35,67 +32,28 @@ POWERLEVEL9K_BATTERY_LOW_FOREGROUND='white' POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND='black' POWERLEVEL9K_BATTERY_DISCONNECTED_BACKGROUND='218' - plugins=(git) # User configuration export PATH="$PATH:$HOME/.cabal/bin:/opt/cabal/1.22/bin:/opt/ghc/7.10.3/bin:$HOME/.rvm/gems:$HOME/.rvm/bin:$HOME/bin:/usr/local/bin:/usr/local/nwjs:/usr/local/var/postgres" -# export MANPATH="/usr/local/man:$MANPATH" - [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" source $ZSH/oh-my-zsh.sh source $HOME/dotfiles/aliases.zsh -source $HOME/.cargo/env +# source $HOME/.cargo/env -# Force add ssh keys on terminal startup, and turn on ssh-agent -# eval "$(ssh-agent -s)" -# This is for Starship -# eval "$(starship init zsh)" +eval "$(ssh-agent -s)" ssh-add -A 2>/dev/null; -# You may need to manually set your language environment -#export LANG="en_US" -#export LC_ALL=$LANG.UTF-8 - # Set preferred editor export EDITOR='vim' KEYTIMEOUT=1 -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='vim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# ssh -# export SSH_KEY_PATH="~/.ssh/dsa_id" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" export CPLUS_INCLUDE_PATH=/usr/local/include -# Python Variables -# VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python3 -# source /usr/local/bin/virtualenvwrapper.sh - -# brew install zsh-syntax-highlighting -# source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -export PATH="/usr/local/opt/mysql@5.6/bin:$PATH" - [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" @@ -110,9 +68,6 @@ function code { open -a "Visual Studio Code" "$argPath" fi } -# export PATH="$HOME/.rbenv/bin:$PATH" -# eval "$(rbenv init -)" -# export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH" # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh