diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index d80f1e0..ce84100 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -10,21 +10,13 @@ "iptables": { "branch": "master", "commit": "0d18b1e468f547dd7e2c494d42bc134a1e0eac7e" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, - "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "multilayout.nvim": { "branch": "main", "commit": "105f22f6329f19a1824f58774d1899f2a69a5e77" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "4c0e3a98465fac963dfde898cc8b878094153a43" }, - "nvim-java": { "branch": "main", "commit": "3d56b7461facb42f135e25b2636bf220a7f0ed42" }, - "nvim-java-core": { "branch": "main", "commit": "229ebcdfa33c75cf746f97c46c2893b2de3626e5" }, - "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" }, - "nvim-java-refactor": { "branch": "main", "commit": "b51a57d862338999059e1d1717df3bc80a3a15c0" }, - "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" }, "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, @@ -39,7 +31,6 @@ "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "quickfix-reflector.vim": { "branch": "master", "commit": "6a6a9e28e1713b9e9db99eec1e6672e5666c01b9" }, - "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua index 39dd18a..1e33c45 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins/init.lua @@ -14,7 +14,5 @@ return { { 'kylechui/nvim-surround', version = '*', event = 'VeryLazy', opts = {} }, { 'lukas-reineke/indent-blankline.nvim', main = 'ibl', opts = {} }, { 'norcalli/nvim-colorizer.lua', opts={ '*' }, dependencies = { 'navarasu/onedark.nvim' } }, - { 'wakatime/vim-wakatime', event = 'VeryLazy' }, { 'williamboman/mason.nvim', opts = {} }, - { dir = '~/.local/share/nvim/preseed/' }, -- 'https://git.netizen.se/vim-preseed', } diff --git a/.config/nvim/lua/plugins/multilayout.lua b/.config/nvim/lua/plugins/multilayout.lua deleted file mode 100644 index 6220119..0000000 --- a/.config/nvim/lua/plugins/multilayout.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - 'mrsobakin/multilayout.nvim', - opts = { - layouts = { - ru = { - -- Names of this layout, as `libukb` reports. - names = { "Russian" }, - from = [[ёйцукенгшщзхъфывапролджэячсмитьбю.Ё"№;:?ЙЦУКЕНГШЩЗХЪ/ФЫВАПРОЛДЖЭЯЧСМИТЬБЮ,]], - to = [[`qwertyuiop[]asdfghjkl;'zxcvbnm,./~@#$^&QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?]], - } - }, - aliases = { - -- Maximum length of default commands aliases. - -- Increasing this value leads to longer startup times. - max_length = 2, - -- Extra commands that you want to alias. - -- They are aliased regardless of `max_length`. - extra = { "sort" }, - }, - -- Whether to use `libukb`. If this is set to false, `langmap` - -- won't automatically switch when your layout does. - use_libukb = true, - -- Path to the `libukb.so`. If `nil`, ukb will be automatically - -- downloaded, builded and installed in the neovim data directory. - libukb_path = nil, - -- Function of type `callback(layout: string)`. Called whenever - -- current keyboard layout changes. - callback = nil, - } -} diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 6b03206..ecceeff 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -44,7 +44,7 @@ ANDROID_HOME="${HOME}/.local/share/android-home" ANDROID_USER_HOME="${HOME}/.local/share/android-home" ANDROID_AVD_HOME="${ANDROID_HOME}/avd" BAT_THEME="TwoDark" -EDITOR="/usr/bin/nvim" +EDITOR="nvim" GNUPGHOME='~/.local/share/gnupg' GOPATH="${HOME}/.local/share/go" GPG_TTY="$(tty)" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 77228fc..907ec3c 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -48,7 +48,7 @@ zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}:ma=48;5;8;38;5;15" # prompt autoload -U colors && colors -PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " +PS1="%B%{$fg[red]%}[%{$fg[yellow]%}wzray%{$fg[green]%}@%{$fg[blue]%}phone %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " # ls aliases