From 759a3f38c9f81f66b56792a4061c12a384a0e966 Mon Sep 17 00:00:00 2001 From: jozamudi Date: Fri, 28 Jun 2024 11:37:08 -0700 Subject: [PATCH] add arsync to sync files with remote server --- .vimrc | 58 ------------- bashrc | 4 +- nvim/lazy-lock.json | 24 ++++++ nvim/lua/plugins/vim-arsync.lua | 22 +++++ nvim/settings.vim | 139 ++++++++++---------------------- tmux/tmux.conf | 4 +- 6 files changed, 95 insertions(+), 156 deletions(-) delete mode 100644 .vimrc create mode 100644 nvim/lazy-lock.json create mode 100644 nvim/lua/plugins/vim-arsync.lua diff --git a/.vimrc b/.vimrc deleted file mode 100644 index e96e340..0000000 --- a/.vimrc +++ /dev/null @@ -1,58 +0,0 @@ -set nocompatible -syntax on -filetype plugin on -set autoread " Set to auto read when a file is changed from the outside -set omnifunc=syntaxcomplete#Complete - -set path+=** -set wildmenu -set showcmd -set wildmode=longest:full,full -set wildoptions=pum -set wildignore+=*/tmp/*,*.so,*.swp,*.zip -set wildignore+=*\\tmp\\*,*.exe - -set number -set number ruler -set showmatch -set ruler -set wrap -set showbreak=↳\ \ -set textwidth=79 -set hidden -set backspace=indent,eol,start - -set hlsearch - -" Rendering -set ttyfast -set laststatus=1 -set t_Co=256 -set background=dark - -set colorcolumn=81 -hi ColorColumn ctermbg=lightgrey guibg=lightgrey - -" Show bad whitespace in an obvious but not obnoxious color -highlight pythonSpaceError ctermbg=darkgreen guibg=darkgreen -highlight BadWhitespace ctermbg=darkgreen guibg=darkgreen -au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\+$/ - -" File settings -au FileType * - \ set tabstop=2 - \ softtabstop=2 - \ shiftwidth=2 - \ textwidth=79 - \ expandtab - \ autoindent - \ smartindent - -"Python Specific Config -au FileType python -\ set fileformat=unix -\ tabstop=4 -\ softtabstop=4 -\ shiftwidth=4 -\ encoding=utf-8 -\ makeprg=flake8\ % diff --git a/bashrc b/bashrc index 3a2c0f4..86c7749 100644 --- a/bashrc +++ b/bashrc @@ -1,3 +1,6 @@ +#!/bin/sh + + ## SET UP PROMPT GREEN="\[$(tput setaf 10)\]" BLUE="\[$(tput setaf 12)\]" @@ -28,4 +31,3 @@ fi alias xfreerdp='xfreerdp +clipboard /dynamic-resolution' alias ssh='ssh -XC' - diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..c064b7c --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,24 @@ +{ + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, + "gruvbox.nvim": { "branch": "main", "commit": "96a8ec336fb48a11cefbd57508888361431aac26" }, + "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "9a686513eaaa13d737d0fec8956a18268ead8b29" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" }, + "nvim-treesitter": { "branch": "master", "commit": "b91ae14fc3bb801c7ea69bc283fe860b32b5163d" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, + "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" } +} \ No newline at end of file diff --git a/nvim/lua/plugins/vim-arsync.lua b/nvim/lua/plugins/vim-arsync.lua new file mode 100644 index 0000000..defbe37 --- /dev/null +++ b/nvim/lua/plugins/vim-arsync.lua @@ -0,0 +1,22 @@ +return { + 'KenN7/vim-arsync', + dependencies = { 'prabirshrestha/async.vim' }, + config = function() + end +} + +--[[ +--Create a .vim-arsync file on the root of your project that contains the following: +remote_host example.com +remote_user john +remote_port 22 +remote_passwd secret +remote_path ~/temp/ +local_path /home/ken/temp/vuetest/ +ignore_path ["build/","test/"] +ignore_dotfiles 1 +auto_sync_up 0 +remote_or_local remote +sleep_before_sync 0 + +--]] diff --git a/nvim/settings.vim b/nvim/settings.vim index 9700ab4..1824b3b 100644 --- a/nvim/settings.vim +++ b/nvim/settings.vim @@ -1,109 +1,56 @@ -set secure " secure modeline processing -set nocompatible " use modern vim, not vi stuff +set nocompatible +syntax on +filetype plugin on +set autoread " Set to auto read when a file is changed from the outside -" mapleader is the key to be used for plugins and other mappings that have -" used in them. You're free to change it, but I've found that space -" works rather well: -"let mapleader="\" " prefix when using in map - -" If you'd like your working directory to change depending on the file you -" open, use 'set acd': -" set acd " current directory follows file being edited - -" Otherwise, use the default we provide here: -set noacd " current directory does not follow file being edited -set autoindent " always set autoindenting on -set backspace=2 whichwrap+=<,>,[,] " backspace and cursor keys wrap to previous/next line -set expandtab " tabs -> spaces (use :retab to force a conversion) -set foldlevel=99 -set foldmethod=indent -set guioptions=cmgtTr -set history=500 " keep x lins of command line history -set hlsearch " highlight things you've searched for -set ignorecase smartcase " case-insensitive (ic) search by default (-> noic is the opposite) - " except: if you search for AStringLikeThis, it will be case sensitive -set imdisable " Disable the IME (gvim and unicode don't play well on different locale) -set incsearch " do incremental searching -set nobackup " disable writing .bak -set novb " ** visual bell, no beeping! ** -set number " line numbering -set numberwidth=5 " the width of the number column in characters -set ruler " show the cursor position all the time -set showcmd " display incomplete commands -set smartindent " smartindent when starting new line -set tabstop=4 shiftwidth=4 autoindent " 4 spaces per tab -set undofile " use undo files to undo your work -set undolevels=10000 " keep this many undo steps available -set undoreload=20000 -set wrap " wrap text at the end of your screen (-> nowrap) - -" Don't show files that match these for tab completion +set path+=** +set wildmenu +set showcmd +set wildmode=longest:full,full +set wildoptions=pum set wildignore+=*/tmp/*,*.so,*.swp,*.zip set wildignore+=*\\tmp\\*,*.exe -" Enable filetype detection, plugins, and indentation -" Scripts used by this may be customized or they fall back to those -" defined at the system level: /usr/share/vim/ -" Example paths below are from psbuild-rhel7. -" The actual full search path can be found with a ``:set runtimepath``. -" -" - filetype: detect the type of file you are editing -" - plugin: enable plugins based on file type -" See for example: /usr/share/vim/vim74/ftplugin/python.vim -" - indent: load indent settings on a per-filetype basis -" See for example: /usr/share/vim/vim74/indent/python.vim -filetype plugin indent on -" Enable syntax highlighting -syntax on -" Don't use Ex mode, use Q for formatting -" If you don't know what it is, Ex mode is likely just going to confuse you. -" I would recommend keeping this setting mapping Q to something else. -map Q gq +set number +set number ruler +set showmatch +set ruler +set wrap +set showbreak=↳\ \ +set textwidth=79 +set hidden +set backspace=indent,eol,start +set hlsearch +set noswapfile -" Python settings. With filetype detection on, these settings will be used -" for all .py files. -au FileType python - \ set tabstop=2 - \ softtabstop=2 - \ shiftwidth=2 - \ textwidth=79 - \ expandtab - \ autoindent - \ fileformat=unix - \ encoding=utf-8 - \ makeprg=flake8\ % +" Rendering +set ttyfast +set laststatus=1 +set t_Co=256 +set background=dark -" General settings for shell/vim scripts, c++, etc. -au FileType sh,vim,cpp,yaml - \ set tabstop=2 - \ softtabstop=2 - \ shiftwidth=2 - \ expandtab - \ autoindent +set colorcolumn=81 +hi ColorColumn ctermbg=lightgrey guibg=lightgrey " Show bad whitespace in an obvious but not obnoxious color highlight pythonSpaceError ctermbg=darkgreen guibg=darkgreen highlight BadWhitespace ctermbg=darkgreen guibg=darkgreen - au BufNewFile,BufRead *.py,*.pyw,*.c,*.h,*.cc,*.hh,*.sh match BadWhitespace /\s\+$/ -set showmatch -set ruler -set wrap - -set showbreak=↳\ \ -set textwidth=79 -set colorcolumn=81 - -set autoindent -set smartindent -set expandtab -set wildmenu -set showcmd -set mouse= - -set clipboard+=unnamedplus - -set pumheight=20 " keep the autocomplete suggestion menu small -set shortmess+=c " don't give ins-completion-menu messages +" File settings +au FileType * + \ set tabstop=2 + \ softtabstop=2 + \ shiftwidth=2 + \ textwidth=79 + \ autoindent + \ smartindent +"Python Specific Config +au FileType python +\ set fileformat=unix +\ tabstop=4 +\ softtabstop=4 +\ shiftwidth=4 +\ encoding=utf-8 +\ makeprg=flake8\ % diff --git a/tmux/tmux.conf b/tmux/tmux.conf index dbd33e8..d7defd5 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -39,4 +39,6 @@ bind c new-window -c "#{pane_current_path}" bind '"' split-window -v -c "#{pane_current_path}" bind % split-window -h -c "#{pane_current_path}" -set -g update-environment "DISPLAY" +set-option -g update-environment "SSH_AUTH_SOCK \ + SSH_CONNECTION \ + DISPLAY "