From 28a673a4673b627ca5932a96ee0ddc67f9abd156 Mon Sep 17 00:00:00 2001 From: Alexander Kiryukhin Date: Wed, 13 Jul 2022 17:01:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20dotfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 - .gitmodules | 9 +- Makefile | 50 + brew_inventory.md | 15 +- git/config | 8 +- install.sh | 8 - nvim/coc-settings.json | 9 - nvim/init.vim | 205 ---- zsh/antigen.zsh | 2057 ++++++++++++++++++++++++++++++++++++++++ zsh/completion.zsh | 177 ++++ zsh/omz | 1 - zsh/p10k | 1 + zsh/p10k.zsh | 1705 +++++++++++++++++++++++++++++++++ zsh/zshrc | 166 ++-- 14 files changed, 4102 insertions(+), 311 deletions(-) delete mode 100644 .gitignore create mode 100644 Makefile delete mode 100755 install.sh delete mode 100644 nvim/coc-settings.json delete mode 100644 nvim/init.vim create mode 100644 zsh/antigen.zsh create mode 100644 zsh/completion.zsh delete mode 160000 zsh/omz create mode 160000 zsh/p10k create mode 100644 zsh/p10k.zsh diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1d0b119..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -nvim/plugged/ - diff --git a/.gitmodules b/.gitmodules index 6aa735f..4238383 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "oh-my-zsh"] - path = zsh/omz - url = https://github.com/ohmyzsh/ohmyzsh -[submodule "zsh/omz"] - path = zsh/omz - url = https://github.com/ohmyzsh/ohmyzsh.git +[submodule "zsh/p10k"] + path = zsh/p10k + url = https://gitrepo.ru/NeonXP/powerlevel10k.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0bec4bf --- /dev/null +++ b/Makefile @@ -0,0 +1,50 @@ +pwd = $(shell pwd) +osver=$(shell lsb_release -sr) +oscodename=$(shell lsb_release -sc) +arch=$(shell dpkg --print-architecture) + +.PHONY: all +all: /usr/bin/docker /usr/bin/go /usr/bin/nvim dotfiles golibs + +# Docker install +.PHONY: /usr/bin/docker +/usr/bin/docker: + + sudo apt-get install ca-certificates curl + sudo install -m 0755 -d /etc/apt/keyrings + sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + sudo chmod a+r /etc/apt/keyrings/docker.asc + + echo "deb [arch=$(arch) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(oscodename) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + sudo apt update + sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + +# Go install +.PHONY: /usr/bin/go +/usr/bin/go: + sudo add-apt-repository ppa:longsleep/golang-backports + sudo apt install golang-go + +.PHONY: golibs +golibs: /usr/bin/go + go install github.com/goreleaser/goreleaser@latest + go install github.com/mkchoi212/fac@latest + +# Neovim +.PHONY: /usr/bin/nvim +/usr/bin/nvim: + sudo add-apt-repository -r ppa:neovim-ppa/stable + sudo apt install neovim + +# dotfiles +.PHONY: dotfiles +dotfiles: ~/.gitconfig ~/.gitignore ~/.config/zsh ~/.zshrc + +~/.gitconfig: + @ln -s $(pwd)/git/config ~/.gitconfig || true +~/.gitignore: + @ln -s $(pwd)/git/ignore ~/.gitignore || true +~/.config/zsh: + @ln -s $(pwd)/zsh ~/.config/zsh || true +~/.zshrc: + @ln -s $(pwd)/zsh/zshrc ~/.zshrc || true \ No newline at end of file diff --git a/brew_inventory.md b/brew_inventory.md index 7529184..261a673 100644 --- a/brew_inventory.md +++ b/brew_inventory.md @@ -10,7 +10,6 @@ Inventory created at: пятница, 7 января 2022 г. 03:53:45 (MSK) - [x] cmake: Cross-platform make - [x] exa: Modern replacement for 'ls' - [x] fac: Command line User Interface for fixing git conflicts -- [x] fish: User-friendly command-line shell for UNIX-like operating systems - [x] fzf: Command-line fuzzy finder written in Go - [x] git: Distributed revision control system - [x] git-delta: Syntax-highlighting pager for git and diff output @@ -22,11 +21,9 @@ Inventory created at: пятница, 7 января 2022 г. 03:53:45 (MSK) - [x] lima: Linux virtual machines - [x] micro: Modern and intuitive terminal-based text editor - [x] mosh: Remote terminal application -- [x] mutt: Mongrel of mail user agents (part elm, pine, mush, mh, etc.) - [x] neovim: Ambitious Vim-fork focused on extensibility and agility - [x] node: Platform built on V8 to build network applications - [x] openttd: Simulation game based upon Transport Tycoon Deluxe -- [x] phpunit: Programmer-oriented testing framework for PHP - [x] podman: Tool for managing OCI containers and pods - [x] pomodoro: Pomodoro timer for nerds - [x] rabbitmq-c: C AMQP client library for RabbitMQ @@ -40,16 +37,9 @@ Inventory created at: пятница, 7 января 2022 г. 03:53:45 (MSK) ## Casks -- [x] bitwarden: (failed to read homepage information) -- [x] firefox-developer-edition: (failed to read homepage information) - [x] font-fira-mono: (failed to read homepage information) - [x] font-fira-mono-nerd-font: (failed to read homepage information) -- [x] goland: (failed to read homepage information) -- [x] iterm2-beta: (failed to read homepage information) - [x] josm: (failed to read homepage information) -- [x] notion: (failed to read homepage information) -- [x] raycast: (failed to read homepage information) -- [x] robo-3t: (failed to read homepage information) - [x] telegram: (failed to read homepage information) - [x] vscodium: (failed to read homepage information) - [x] yandex: (failed to read homepage information) @@ -57,9 +47,7 @@ Inventory created at: пятница, 7 января 2022 г. 03:53:45 (MSK) ## Installed taps - [x] adrianmihalko/ch340g-ch34g-ch34x-mac-os-x-driver -- [x] caskroom/fonts -- [x] d12frosted/emacs-plus -- [x] gcenx/wine +- [x] homebrew/cask-fonts - [x] go-swagger/go-swagger - [x] golangci/tap - [x] goreleaser/tap @@ -74,7 +62,6 @@ Inventory created at: пятница, 7 января 2022 г. 03:53:45 (MSK) - [x] mongodb/brew - [x] neonxp/tap - [x] osx-cross/avr -- [x] railwaycat/emacsmacport - [x] skyjake/lagrange - [x] tinygo-org/tools - [x] wtfutil/wtfutil diff --git a/git/config b/git/config index ffab2d5..3326f60 100644 --- a/git/config +++ b/git/config @@ -1,7 +1,7 @@ [user] name = Alexander Kiryukhin - email = a.kiryukhin@mail.ru - signingkey = 1F234ED9217CA16DE1ACBA686DF7A2910D0699E9 + email = i@neonxp.ru + signingkey = 35E33E1AB7776B39 [alias] co = checkout @@ -105,8 +105,8 @@ submodulesummary = true [sendemail] - smtpserver = smtp.mail.ru - smtpuser = a.kiryukhin@mail.ru +# smtpserver = smtp.mail.ru +# smtpuser = a.kiryukhin@mail.ru smtpserverport = 25 smtpencryption = tls diff --git a/install.sh b/install.sh deleted file mode 100755 index f13c444..0000000 --- a/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -ln -s $(pwd)/nvim ${HOME}/.config/nvim -ln -s $(pwd)/git/config ${HOME}/.gitconfig -ln -s $(pwd)/git/ignore ${HOME}/.gitignore -ln -s $(pwd)/zsh/omz ${HOME}/.oh-my-zsh -ln -s $(pwd)/zsh/zshrc ${HOME}/.zshrc - diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json deleted file mode 100644 index cbac8e1..0000000 --- a/nvim/coc-settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "languageserver": { - "golang": { - "command": "gopls", - "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], - "filetypes": ["go"] - } - } -} diff --git a/nvim/init.vim b/nvim/init.vim deleted file mode 100644 index c5665d7..0000000 --- a/nvim/init.vim +++ /dev/null @@ -1,205 +0,0 @@ -syntax on -set ruler " Show the line and column numbers of the cursor. -set formatoptions+=o " Continue comment marker in new lines. -set textwidth=0 " Hard-wrap long lines as you type them. -set modeline " Enable modeline. -"set esckeys " Cursor keys in insert mode. -set linespace=0 " Set line-spacing to minimum. -set nojoinspaces " Prevents inserting two spaces after punctuation on a join (J) -" More natural splits -set splitbelow " Horizontal split below current. -set splitright " Vertical split to right of current. -if !&scrolloff - set scrolloff=3 " Show next 3 lines while scrolling. -endif -if !&sidescrolloff - set sidescrolloff=5 " Show next 5 columns while side-scrolling. -endif -set display+=lastline -set nostartofline " Do not jump to first character with page commands. -set noerrorbells " No beeps -set backspace=indent,eol,start " Makes backspace key more powerful. -set showcmd " Show me what I'm typing -set showmode " Show current mode. -set noswapfile " Don't use swapfile -set nobackup " Don't create annoying backup files -set encoding=utf-8 " Set default encoding to UTF-8 -set autowrite " Automatically save before :next, :make etc. -set autoread " Automatically reread changed files without asking me anything -set laststatus=2 -set fileformats=unix,dos,mac " Prefer Unix over Windows over OS 9 formats -set showmatch " Do not show matching brackets by flickering -set incsearch " Shows the match while typing -set hlsearch " Highlight found searches -set ignorecase " Search case insensitive... -set smartcase " ... but not when search pattern contains upper case characters -set gdefault " Use 'g' flag by default with :s/foo/bar/. -set magic " Use 'magic' patterns (extended regular expressions). - -" Use to clear the highlighting of :set hlsearch. -if maparg('', 'n') ==# '' - nnoremap :nohlsearch -endif - -" Search and Replace -nmap s :%s//g - -" Leader key is like a command prefix. -"let mapleader='z' -"let maplocalleader='\' - -let g:python_host_prog="/usr/local/bin/python2.7" - -let g:session_autosave = 'yes' -let g:session_autoload = 'yes' -let g:session_default_to_last = 1 - -" set cursorcolumn -nmap -vmap x - -" Plugins here -call plug#begin('~/.config/nvim/plugged') -Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" Plug 'Shougo/deoplete.nvim' -Plug 'Valloric/YouCompleteMe' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'Chiel92/vim-autoformat' -Plug 'scrooloose/nerdtree' -Plug 'terryma/vim-multiple-cursors' -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -Plug 'junegunn/fzf.vim' -Plug 'crusoexia/vim-monokai' -Plug 'projekt0n/github-nvim-theme' -Plug 'neovim/nvim-lspconfig' -Plug 'nvim-treesitter/nvim-treesitter' - -Plug 'mfussenegger/nvim-dap' -Plug 'rcarriga/nvim-dap-ui' -Plug 'theHamsta/nvim-dap-virtual-text' -Plug 'ray-x/guihua.lua' " float term, codeaction and codelens gui support - -Plug 'ray-x/go.nvim' -call plug#end() -lua <