diff --git a/.gitignore b/.gitignore index a3d1e5a..6565b55 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ # Icon must end with two \r Icon - # Thumbnails ._* @@ -27,6 +26,27 @@ Network Trash Folder Temporary Items .apdisk +# ---- KDE Neon ---- +# KDE directory preferences +.directory + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# ---- IDE ---- # VS Code Artifacts .vscode **state.vscdb @@ -34,6 +54,19 @@ Temporary Items .vscode/extensions/** # Ignore all Files under .vscode/extensions/ !.vscode/extensions/**/*.json # Only json files inside the .vscode/extensions/ folder +# Intellij IDE Artifacts +.idea/ +*.imi +*.jar +*.tar + +# Vim Artifacts +*.swp + +resharper-host/ +tasks/ + +# ---- Programming Languages ---- # Ignore all downloaded node modules node_modules/* @@ -51,24 +84,4 @@ node_modules/* *.jsc **/contents/images **/contents/fonts -*kpluginindex.json - -# Intellij IDE Artifacts -.idea/ -*.imi -*.jar -*.tar -# KDE directory preferences -.directory - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -resharper-host/ -tasks/ +*kpluginindex.json \ No newline at end of file diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/common/.env b/common/.env old mode 100755 new mode 100644 diff --git a/macos/.gitignore b/common/.gitignore similarity index 85% rename from macos/.gitignore rename to common/.gitignore index e731808..6565b55 100644 --- a/macos/.gitignore +++ b/common/.gitignore @@ -7,7 +7,6 @@ # Icon must end with two \r Icon - # Thumbnails ._* @@ -27,6 +26,27 @@ Network Trash Folder Temporary Items .apdisk +# ---- KDE Neon ---- +# KDE directory preferences +.directory + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# ---- IDE ---- # VS Code Artifacts .vscode **state.vscdb @@ -34,6 +54,19 @@ Temporary Items .vscode/extensions/** # Ignore all Files under .vscode/extensions/ !.vscode/extensions/**/*.json # Only json files inside the .vscode/extensions/ folder +# Intellij IDE Artifacts +.idea/ +*.imi +*.jar +*.tar + +# Vim Artifacts +*.swp + +resharper-host/ +tasks/ + +# ---- Programming Languages ---- # Ignore all downloaded node modules node_modules/* @@ -51,22 +84,4 @@ node_modules/* *.jsc **/contents/images **/contents/fonts -*kpluginindex.json - -# Intellij IDE Artifacts -.idea/ -*.imi -*.jar -*.tar - -# KDE directory preferences -.directory - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* \ No newline at end of file +*kpluginindex.json \ No newline at end of file diff --git a/common/.ideavimrc b/common/.ideavimrc index aa9cf49..6d5ac47 100644 --- a/common/.ideavimrc +++ b/common/.ideavimrc @@ -21,6 +21,9 @@ set incsearch " Don't use Ex mode, use Q for formatting. map Q gq +" Copy to and from system clipboard +set clipboard^=unnamed,unnamedplus + " --- Enable IdeaVim plugins https://jb.gg/ideavim-plugins " Highlight copied text @@ -29,6 +32,11 @@ Plug 'machakann/vim-highlightedyank' Plug 'tpope/vim-commentary' " Surround Plugin Plug 'tpope/vim-surround' +" Repeat for Surround +Plug 'tpope/vim-repeat' +" Paragraph Motion +Plug 'dbakker/vim-paragraph-motion' + "" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t "" Map \r to the Reformat Code action diff --git a/common/.vimrc b/common/.vimrc index e7b63f2..9fb67df 100644 --- a/common/.vimrc +++ b/common/.vimrc @@ -16,7 +16,18 @@ set wrap set encoding=utf-8 " Status bar -set laststatus=2 +" set laststatus=2 +" set noshowmode + +" Set color +if !has('gui_running') + set t_Co=256 + set termguicolors + hi LineNr ctermbg=NONE guibg=NONE +endif + +" Comments in Grey color and italic +hi Comment guifg=#5C6370 ctermfg=50 cterm=italic " Vim is based on Vi. Setting `nocompatible` switches from the default " Vi-compatibility mode and enables useful Vim functionality. This @@ -71,6 +82,12 @@ set noerrorbells visualbell t_vb= " sometimes be convenient. set mouse+=a +" Sync vim clipboard with system clipboard +" Works across Linux, MacOS & Windows +" set clipboard^=unnamed,unnamedplus +set clipboard+=unnamedplus +set paste + " Try to prevent bad habits like using the arrow keys for movement. This is " not the only possible bad habit. For example, holding down the h/j/k/l keys " for movement, rather than using more efficient movement commands, is also a @@ -95,3 +112,7 @@ nnoremap zz if filereadable(expand("~/.vimrc.plug")) source ~/.vimrc.plug endif + +" let g:lightline = { 'colorscheme': 'gotham'} +let g:lightline = { 'colorscheme': 'deepspace'} +colorscheme deep-space diff --git a/common/.vimrc.plug b/common/.vimrc.plug index 247c9b1..1a0f947 100644 --- a/common/.vimrc.plug +++ b/common/.vimrc.plug @@ -6,9 +6,18 @@ Plug 'tpope/vim-fugitive' " Surround Plugin Plug 'tpope/vim-surround' +" Repeat for the surround plugin +Plug 'tpope/vim-repeat' + +" Surround Plugin +Plug 'tpope/vim-commentary' + " Sensible options Plug 'tpope/vim-sensible' +" Auto-close brackets +Plug 'rstacruz/vim-closer' + " Highlight Yank Plug 'machakann/vim-highlightedyank' @@ -18,7 +27,29 @@ Plug 'dbakker/vim-paragraph-motion' " Quick Scope " Plug 'unblevable/quick-scope' -" Paragraph Motion -Plug 'dbakker/vim-paragraph-motion' +" Git in the left-side gutter +Plug 'airblade/vim-gitgutter' + +" Rainbow parenthesis +Plug 'junegunn/rainbow_parentheses.vim' + +" Highlight trailing spaces - remove them all with :FixWhitespace +Plug 'bronson/vim-trailing-whitespace' + +"------------Look and Feel------------" +" Status Styles +Plug 'itchyny/lightline.vim' + +" ColorScheme - Challenger-deep +Plug 'challenger-deep-theme/vim', { 'as': 'challenger-deep' } + +" Color Scheme - Iceberg +Plug 'cocopon/iceberg.vim' + +" Color Scheme - Gotham +Plug 'whatyouhide/vim-gotham' + +" Color Scheme - Deep-space +Plug 'tyrannicaltoucan/vim-deep-space' call plug#end() diff --git a/common/.zshrc b/common/.zshrc index da0f114..7148e39 100644 --- a/common/.zshrc +++ b/common/.zshrc @@ -52,12 +52,14 @@ HIST_STAMPS="dd.mm.yyyy" # source ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh plugins=( git + docker history per-directory-history perms sudo systemd - # zsh-syntax-highlighting + zsh-syntax-highlighting + zsh-autosuggestions # exercism ) @@ -101,6 +103,9 @@ setopt HIST_IGNORE_SPACE # Don't add commands that start with whitespac [[ ! -f ~/.env ]] || source ~/.env [[ ! -f ~/.set_path ]] || source ~/.set_path [[ ! -f "$HOME/.cargo/env" ]] || source "$HOME/.cargo/env" +export PYENV_ROOT="$HOME/.pyenv" +command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" PATH=$(pyenv root)/shims:$PATH # Aliases @@ -116,5 +121,5 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr [[ ! -f ~/.config/exercism/exercism_completion.bash ]] || source ~/.config/exercism/exercism_completion.bash -eval "$(ssh-agent -s)" +eval "$(ssh-agent -s)" > /dev/null ulimit -n 10240 \ No newline at end of file diff --git a/kde-neon/.gitignore b/kde-neon/.gitignore deleted file mode 100644 index b1c5d5c..0000000 --- a/kde-neon/.gitignore +++ /dev/null @@ -1,54 +0,0 @@ -# KDE directory preferences -.directory - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -# VS Code Artifacts -.vscode -**state.vscdb -**state.vscdb.backup -.vscode/extensions/** # Ignore all Files under .vscode/extensions/ -!.vscode/extensions/**/*.json # Only json files inside the .vscode/extensions/ folder - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Ignore all downloaded node modules -node_modules/* - - -# Ignore all minified js files -*.min.js - -# Other Files to ignore -**app_stat_v2.db -.ssh/*.pub -**/Package Control.cache -**Cache -*.db -*.qmlc -*.qml -*.jsc -**/contents/images -**/contents/fonts -*kpluginindex.json - -# Intellij IDE Artifacts -.idea/ -*.imi -*.jar -*.tar - -resharper-host/ -tasks/