diff --git a/nvim/init.vim b/nvim/init.vim new file mode 100644 index 0000000..943850b --- /dev/null +++ b/nvim/init.vim @@ -0,0 +1,56 @@ +set nocompatible +set showmatch +set ignorecase +set hlsearch +set incsearch +"set expandtab +set tabstop=4 +set softtabstop=4 +set shiftwidth=4 +set number +syntax on +set clipboard=unnamedplus +set cursorline +set ttyfast +set noswapfile +"set wildmode=longest,list +set background=dark +set t_Co=256 +set mouse= +set laststatus=2 +set termguicolors +set noshowmode + +call plug#begin() +Plug 'junegunn/vim-easy-align' +Plug 'sheerun/vim-polyglot' +Plug 'jiangmiao/auto-pairs' +Plug 'ap/vim-css-color' +Plug 'wakatime/vim-wakatime' +Plug 'psliwka/vim-smoothie' +Plug 'joshdick/onedark.vim' +Plug 'junegunn/rainbow_parentheses.vim' +Plug 'mhinz/vim-startify' +Plug 'vim-airline/vim-airline' +Plug 'nvim-tree/nvim-web-devicons' +Plug 'nvim-lua/plenary.nvim' +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} +Plug 'nvim-telescope/telescope.nvim', { 'branch': '0.1.x' } +Plug 'nvim-telescope/telescope-file-browser.nvim' +call plug#end() + + + +colorscheme onedark + +let mapleader = ";" +let g:startify_custom_header = 'startify#fortune#boxed(["Hello Thomas"])' + +" Telescope +nnoremap ff Telescope find_files +nnoremap bb Telescope buffers +nnoremap tt Telescope file_browser +nnoremap fg Telescope live_grep +nnoremap fh Telescope help_tags + +lua require'nvim-treesitter.configs'.setup{highlight={enable=true}} diff --git a/AlienBLoodTerminator.config b/themes/AlienBLoodTerminator.config similarity index 100% rename from AlienBLoodTerminator.config rename to themes/AlienBLoodTerminator.config diff --git a/AlienBlood.colorscheme b/themes/AlienBlood.colorscheme similarity index 100% rename from AlienBlood.colorscheme rename to themes/AlienBlood.colorscheme diff --git a/vim-commands.txt b/vim-commands.txt new file mode 100644 index 0000000..d74d595 --- /dev/null +++ b/vim-commands.txt @@ -0,0 +1,14 @@ +TMUX + C-b - : split horiz + C-b \ : split vert + + tmux ls : view all sessions + +TELESCOPE + C-v : open in vertical split + Leader-ff: find files + Leader-bb: view and select buffers + Leader-tt: view dir tree view + Leader-fg: live grep + + diff --git a/vscode/keybindings.json b/vscode/keybindings.json index e883de6..9bde33b 100644 --- a/vscode/keybindings.json +++ b/vscode/keybindings.json @@ -50,24 +50,43 @@ "key": "ctrl+right", "command": "workbench.action.toggleAuxiliaryBar" }, + // { + // "key": "x x", + // "command": "extension.vim_ctrl+t", + // "when": "editorTextFocus && vim.active && vim.use && !inDebugRepl" + // }, { - "key": "tab", - "command": "selectNextSuggestion", - "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + "key": "ctrl+t", + "command": "-extension.vim_ctrl+t", + "when": "editorTextFocus && vim.active && vim.use && !inDebugRepl" }, { - "key": "down", - "command": "-selectNextSuggestion", - "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" - }, - { - "key": "ctrl+tab", - "command": "selectPrevSuggestion", - "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" - }, - { - "key": "up", - "command": "-selectPrevSuggestion", - "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + "key": "ctrl+x", + "command": "-extension.vim_ctrl+x", + "when": "editorTextFocus && vim.active && vim.use && !inDebugRepl" } + // { + // "key": "tab", + // "command": "selectNextSuggestion", + // "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + // }, + // { + // "key": "down", + // "command": "-selectNextSuggestion", + // "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + // }, + // { + // "key": "ctrl+tab", + // "command": "selectPrevSuggestion", + // "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + // }, + // { + // "key": "up", + // "command": "-selectPrevSuggestion", + // "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + // }, + // { + // "key": "shift+g+c", + // "command": "editor.action.commentLine" + // } ] diff --git a/vscode/settings.json b/vscode/settings.json index f62dc87..3ae96e3 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,52 +1,107 @@ { - "editor.fontFamily": "PragmataPro Mono Liga", - "editor.fontLigatures": true, - "editor.fontSize": 16, - "editor.fontWeight": 400, - "editor.formatOnPaste": false, - "editor.wordWrap": "on", - "editor.cursorBlinking": "smooth", - "editor.smoothScrolling": true, - "editor.formatOnSave": true, - "editor.bracketPairColorization.enabled": true, - "terminal.integrated.fontFamily": "PragmataPro Mono Liga", - "terminal.integrated.fontSize": 15, - "terminal.integrated.tabs.enabled": true, - "debug.console.fontFamily": "PragmataPro Mono Liga", - "debug.console.fontSize": 15, - "explorer.confirmDelete": false, - "workbench.list.smoothScrolling": true, - "workbench.startupEditor": "none", - "workbench.colorCustomizations": { - "scrollbar.shadow": "#ffffff00" + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "diffEditor.codeLens": true, - "git.mergeEditor": false, - "npm.enableRunFromFolder": true, - "security.workspace.trust.untrustedFiles": "open", - "files.trimFinalNewlines": true, - "vim.statusBarColorControl": false, - "vim.leader": "/", - "vim.useSystemClipboard": true, - "vim.highlightedyank.enable": true, - "vim.highlightedyank.color": "#18e00040", - "meridian.ignoreDirs": ["_img", "_scripts", "_meta", "posts"], - "markdown-preview-github-styles.colorTheme": "light", - "markdown.experimental.editor.pasteLinks.enabled": true, - "markdown.experimental.updateLinksOnFileMove.enabled": "prompt", - "markdown.experimental.validate.fileLinks.enabled": "warning", - "markdown.experimental.validate.referenceLinks.enabled": "warning", - "liveServer.settings.donotShowInfoMsg": true, - "explorer.confirmDragAndDrop": false, "[jsonc]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter", + "editor.formatOnSave": true + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[shellscript]": { + "editor.defaultFormatter": "shakram02.bash-beautify" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "debug.console.fontFamily": "Jetbrains Mono", + "debug.console.fontSize": 14, + "debug.onTaskErrors": "debugAnyway", + "diffEditor.codeLens": true, + "editor.bracketPairColorization.enabled": true, + "editor.cursorBlinking": "smooth", + "editor.fontFamily": "Jetbrains Mono Medium", + "editor.fontLigatures": true, + "editor.fontSize": 14, + // "editor.fontWeight": 700, + "editor.formatOnPaste": false, + "editor.formatOnSave": true, + // "editor.lineHeight": 1.3, + "editor.minimap.enabled": true, + "editor.smoothScrolling": true, + "editor.stickyScroll.enabled": true, "editor.tokenColorCustomizations": { "textMateRules": [ { "scope": "comment", "settings": { - "fontStyle": "" + "fontStyle": "italic" + } + }, + // { + // "name": "Underline", + // "scope": [], + // "settings": { + // "fontStyle": "underline" + // } + // }, + { + "name": "Italic", + "scope": [ + "variable.parameter.ts", + "variable.parameter.js", + "storage.type.function", + "storage.type.class", + "markup.italic", + "markup.bold string", + "punctuation.definition.comment" + ], + "settings": { + "fontStyle": "italic" + } + }, + { + "name": "Bold", + "scope": [ + "meta.definition.function", + "entity.name.type.class", + "entity.name.section.markdown", + "markdown.heading", + "markup.bold", + "markup.heading | markup.heading entity.name", + "markup.heading.markdown punctuation.definition.heading.markdown", + "markup.bold markup.italic", + "markup.italic markup.bold", + "markup.quote markup.bold", + "markup.bold markup.italic string", + "markup.italic markup.bold string", + "markup.quote markup.bold string", + "string.other.link.title.markdown" + ], + "settings": { + "fontStyle": "bold" } }, { @@ -54,49 +109,117 @@ "settings": { "foreground": "#327f77" } + }, + { + "scope": [ + "keyword.control.shell", + "keyword.control.do.shell", + "keyword.control.then.shell", + "keyword.control.elif.shell" + ], + "settings": { + "fontStyle": "underline" + } + }, + { + "scope": ["entity.name.function.shell", "meta.shebang.shell"], + "settings": { + "fontStyle": "bold" + } + }, + { + "scope": ["storage.type.function.shell"], + "settings": { + "fontStyle": "" + } } ] }, - "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "editor.minimap.enabled": true, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "gitlens.currentLine.scrollable": false, + "editor.wordWrap": "on", + "explorer.confirmDelete": false, + // "markdown.styles": [ + // "https://tbishop.s3.eu-west-2.amazonaws.com/vscode-markdown-styles.css" + // ], + "explorer.confirmDragAndDrop": false, + "files.insertFinalNewline": true, + "git.mergeEditor": false, "gitlens.advanced.messages": { "suppressGitMissingWarning": true }, - "npm.keybindingsChangedWarningShown": true, - "debug.onTaskErrors": "debugAnyway", - "editor.stickyScroll.enabled": true, + "gitlens.currentLine.scrollable": false, "gitlens.views.branches.branches.layout": "list", - "files.insertFinalNewline": true, - "workbench.iconTheme": "bearded-icons", - "workbench.colorTheme": "Alien Blood ", - "[shellscript]": { - "editor.defaultFormatter": "shakram02.bash-beautify" + "markdown.preview.scrollEditorWithPreview": false, + "markdown.preview.scrollPreviewWithEditor": true, + "markdown-preview-github-styles.colorTheme": "light", + "markdown.experimental.editor.pasteLinks.enabled": true, + "markdown.updateLinksOnFileMove.enabled": "prompt", + "markdown.validate.enabled": true, + "markdown.validate.fileLinks.enabled": "error", + "markdown.validate.fileLinks.markdownFragmentLinks": "error", + "npm.enableRunFromFolder": true, + "security.workspace.trust.untrustedFiles": "open", + "terminal.integrated.fontFamily": "Jetbrains Mono", + "terminal.integrated.fontSize": 14, + "terminal.integrated.tabs.enabled": true, + "vim.highlightedyank.enable": true, + "vim.leader": "/", + "vim.statusBarColorControl": false, + "vim.useSystemClipboard": true, + "workbench.colorCustomizations": { + "scrollbar.shadow": "#ffffff00" + // "terminal.background": "#0f1610" }, - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "workbench.iconTheme": "eq-material-theme-icons-deepforest", + "workbench.list.smoothScrolling": true, + "workbench.startupEditor": "none", + "workbench.editor.enablePreview": false, + "terminal.integrated.allowChords": false, + "telemetry.telemetryLevel": "off", + "aws.telemetry": false, + "yaml.customTags": [ + "ApplicationResourceGroup", + "ResourceGroupName", + "!GetAtt", + "!Sub", + "!And", + "!And sequence", + "!If", + "!If sequence", + "!Not", + "!Not sequence", + "!Equals", + "!Equals sequence", + "!Or", + "!Or sequence", + "!FindInMap", + "!FindInMap sequence", + "!Base64", + "!Join", + "!Join sequence", + "!Cidr", + "!Ref", + "!Sub sequence", + "!GetAZs", + "!ImportValue", + "!ImportValue sequence", + "!Select", + "!Select sequence", + "!Split", + "!Split sequence" + ], + "files.exclude": { + "**/__pycache__": true }, -"[markdown]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "github.copilot.enable": { + "*": true, + "plaintext": false, + "markdown": false, + "scminput": false }, + "editor.fontVariations": true, + "totalTypeScript.hideAllTips": false, + "totalTypeScript.hideBasicTips": true, + "eslint.run": "onSave", + "totalTypeScript.hiddenTips": ["passing-generics-to-types", "typeof"], + "workbench.colorTheme": "Alien Blood " } diff --git a/zsh/zshrc b/zsh/zshrc index 48bfc38..854059f 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -2,16 +2,16 @@ export ZSH="/home/thomas/.oh-my-zsh" alias vim="nvim" alias cat="bat" -alias grep="rg" +alias grep="rg" alias xhd="cd /run/media/thomas" -alias cs-update="/home/thomas/repos/computer_science/_scripts/auto_save.sh" -alias cs-query="/home/thomas/repos/computer_science/_scripts/query.sh" +alias cs-update="/home/thomas/repos/eolas/_scripts/auto_save.sh" +alias cs-query="/home/thomas/repos/eolas/_scripts/query.sh" # Set properties based on OS ZSH_THEME=spaceship -SPACESHIP_TIME_SHOW=false +SPACESHIP_TIME_SHOW=true SPACESHIP_PROMPT_ASYNC=true -SPACESHIP_CHAR_SYMBOL="▶ " +SPACESHIP_CHAR_SYMBOL="▶ " plugins=(git npm zsh-autosuggestions zsh-syntax-highlighting) # Search against /home/thomas/repos/computer_science @@ -27,3 +27,16 @@ source $ZSH/oh-my-zsh.sh export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init --path)" + +prompt_end() { + if [[ -n $CURRENT_BG ]]; then + echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR" + else + echo -n "%{%k%}" + fi + echo -n "\n%{%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{%f%}" + CURRENT_BG='' +}