diff --git a/.config/vim/vim_plug b/.config/vim/vim_plug index 6f4599e..59f2e3f 100644 --- a/.config/vim/vim_plug +++ b/.config/vim/vim_plug @@ -62,22 +62,22 @@ Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' } " Plug 'deoplete-plugins/deoplete-jedi' " --- Auto complete with NCM2 (nvim-completion-manager) -Plug 'ncm2/ncm2' -Plug 'roxma/nvim-yarp' +" Plug 'ncm2/ncm2' +" Plug 'roxma/nvim-yarp' " - NCM2 sources -Plug 'ncm2/ncm2-jedi' " python -Plug 'ncm2/ncm2-racer' " rust +" Plug 'ncm2/ncm2-jedi' " python +" Plug 'ncm2/ncm2-racer' " rust " --- Auto complete with DDC -" Plug 'Shougo/ddc.vim' -" Plug 'vim-denops/denops.vim' -" Plug 'neovim/nvim-lspconfig' -" " - DDC sources -" Plug 'Shougo/ddc-around' -" Plug 'Shougo/ddc-nvim-lsp' -" " - DDC filters -" Plug 'Shougo/ddc-matcher_head' -" Plug 'Shougo/ddc-sorter_rank' +Plug 'Shougo/ddc.vim', { 'branch': 'main' } +Plug 'vim-denops/denops.vim', { 'branch': 'main' } +Plug 'neovim/nvim-lspconfig' +" - DDC sources +Plug 'Shougo/ddc-around', { 'branch': 'main' } +Plug 'Shougo/ddc-nvim-lsp', { 'branch': 'main' } +" - DDC filters +Plug 'Shougo/ddc-matcher_head', { 'branch': 'main' } +Plug 'Shougo/ddc-sorter_rank', { 'branch': 'main' } " --- Indent visualization " Plug 'Yggdroot/indentLine' @@ -126,41 +126,41 @@ call plug#end() " augroup end " --- NCM2 -autocmd BufEnter * call ncm2#enable_for_buffer() -set completeopt=noinsert,menuone,noselect +" autocmd BufEnter * call ncm2#enable_for_buffer() +" set completeopt=noinsert,menuone,noselect -" suppress the annoying 'match x of y', 'The only match' and 'Pattern not -" found' messages -set shortmess+=c +" " suppress the annoying 'match x of y', 'The only match' and 'Pattern not +" " found' messages +" set shortmess+=c -" CTRL-C doesn't trigger the InsertLeave autocmd . map to instead. -inoremap +" " CTRL-C doesn't trigger the InsertLeave autocmd . map to instead. +" inoremap -" When the key is pressed while the popup menu is visible, it only -" hides the menu. Use this mapping to close the menu and also start a new -" line. -inoremap (pumvisible() ? "\\" : "\") +" " When the key is pressed while the popup menu is visible, it only +" " hides the menu. Use this mapping to close the menu and also start a new +" " line. +" inoremap (pumvisible() ? "\\" : "\") -" Use to select the popup menu: -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" +" " Use to select the popup menu: +" inoremap pumvisible() ? "\" : "\" +" inoremap pumvisible() ? "\" : "\" -" wrap existing omnifunc -" Note that omnifunc does not run in background and may probably block the -" editor. If you don't want to be blocked by omnifunc too often, you could -" add 180ms delay before the omni wrapper: -" 'on_complete': ['ncm2#on_complete#delay', 180, -" \ 'ncm2#on_complete#omni', 'csscomplete#CompleteCSS'], -au User Ncm2Plugin call ncm2#register_source({ - \ 'name' : 'css', - \ 'priority': 9, - \ 'subscope_enable': 1, - \ 'scope': ['css','scss'], - \ 'mark': 'css', - \ 'word_pattern': '[\w\-]+', - \ 'complete_pattern': ':\s*', - \ 'on_complete': ['ncm2#on_complete#omni', 'csscomplete#CompleteCSS'], -\ }) +" " wrap existing omnifunc +" " Note that omnifunc does not run in background and may probably block the +" " editor. If you don't want to be blocked by omnifunc too often, you could +" " add 180ms delay before the omni wrapper: +" " 'on_complete': ['ncm2#on_complete#delay', 180, +" " \ 'ncm2#on_complete#omni', 'csscomplete#CompleteCSS'], +" au User Ncm2Plugin call ncm2#register_source({ +" \ 'name' : 'css', +" \ 'priority': 9, +" \ 'subscope_enable': 1, +" \ 'scope': ['css','scss'], +" \ 'mark': 'css', +" \ 'word_pattern': '[\w\-]+', +" \ 'complete_pattern': ':\s*', +" \ 'on_complete': ['ncm2#on_complete#omni', 'csscomplete#CompleteCSS'], +" \ }) " --- NERDTree let NERDTreeShowHidden=1 @@ -238,76 +238,76 @@ hi Conceal ctermfg=0 ctermbg=NONE let g:python_highlight_all = 1 " --- DDC -" " Customize global settings -" " Use around source. -" " https://github.com/Shougo/ddc-around -" call ddc#custom#patch_global('sources', ['around', 'nvimlsp']) +" Customize global settings +" Use around source. +" https://github.com/Shougo/ddc-around +call ddc#custom#patch_global('sources', ['around', 'nvim-lsp']) -" " Use matcher_head and sorter_rank. -" " https://github.com/Shougo/ddc-matcher_head -" " https://github.com/Shougo/ddc-sorter_rank -" call ddc#custom#patch_global('sourceOptions', { -" \ '_': { -" \ 'matchers': ['matcher_head'], -" \ 'sorters': ['sorter_rank']}, -" \ }) +" Use matcher_head and sorter_rank. +" https://github.com/Shougo/ddc-matcher_head +" https://github.com/Shougo/ddc-sorter_rank +call ddc#custom#patch_global('sourceOptions', { + \ '_': { + \ 'matchers': ['matcher_head'], + \ 'sorters': ['sorter_rank']}, + \ }) -" " Change source options -" call ddc#custom#patch_global('sourceOptions', { -" \ 'around': {'mark': 'A'}, -" \ 'nvimlsp': { 'mark': 'lsp', 'forceCompletionPattern': '\.|:|->' }, -" \ }) -" call ddc#custom#patch_global('sourceParams', { -" \ 'around': {'maxSize': 500}, -" \ 'nvimlsp': { 'kindLabels': { 'Class': 'c' } }, -" \ }) +" Change source options +call ddc#custom#patch_global('sourceOptions', { + \ 'around': {'mark': 'A'}, + \ 'nvim-lsp': { 'mark': 'lsp', 'forceCompletionPattern': '\.|:|->' }, + \ }) +call ddc#custom#patch_global('sourceParams', { + \ 'around': {'maxSize': 500}, + \ 'nvim-lsp': { 'kindLabels': { 'Class': 'c' } }, + \ }) -" " Customize settings on a filetype -" call ddc#custom#patch_filetype(['rust'], 'sources', ['around', 'nvimlsp']) -" call ddc#custom#patch_filetype(['c', 'cpp'], 'sources', ['around', 'clangd']) -" call ddc#custom#patch_filetype(['c', 'cpp'], 'sourceOptions', { -" \ 'clangd': {'mark': 'C'}, -" \ }) -" call ddc#custom#patch_filetype('markdown', 'sourceParams', { -" \ 'around': {'maxSize': 100}, -" \ }) +" Customize settings on a filetype +call ddc#custom#patch_filetype(['rust'], 'sources', ['around', 'nvim-lsp']) +call ddc#custom#patch_filetype(['c', 'cpp'], 'sources', ['around', 'clangd']) +call ddc#custom#patch_filetype(['c', 'cpp'], 'sourceOptions', { + \ 'clangd': {'mark': 'C'}, + \ }) +call ddc#custom#patch_filetype('markdown', 'sourceParams', { + \ 'around': {'maxSize': 100}, + \ }) -" " Mappings +" Mappings -" " : completion. -" inoremap -" \ pumvisible() ? '' : -" \ (col('.') <= 1 getline('.')[col('.') - 2] =~# '\s') ? -" \ '' : ddc#manual_complete() +" : completion. +inoremap +\ pumvisible() ? '' : +\ (col('.') <= 1 getline('.')[col('.') - 2] =~# '\s') ? +\ '' : ddc#manual_complete() -" " : completion back. -" inoremap pumvisible() ? '' : '' +" : completion back. +inoremap pumvisible() ? '' : '' -" " Use ddc. -" call ddc#enable() +" Use ddc. +call ddc#enable() " --- nvim-lsp -" lua << EOF -" require'lspconfig'.pyright.setup{} -" local nvim_lsp = require'lspconfig' +lua << EOF +local nvim_lsp = require'lspconfig' -" nvim_lsp.rust_analyzer.setup({ -" settings = { -" ["rust-analyzer"] = { -" assist = { -" importGranularity = "module", -" importPrefix = "by_self", -" }, -" cargo = { -" loadOutDirsFromCheck = true -" }, -" procMacro = { -" enable = true -" }, -" } -" } -" }) -" EOF +nvim_lsp.pyright.setup{} +nvim_lsp.rust_analyzer.setup({ + settings = { + ["rust-analyzer"] = { + assist = { + importGranularity = "module", + importPrefix = "by_self", + }, + cargo = { + loadOutDirsFromCheck = true + }, + procMacro = { + enable = true + }, + } + } +}) +EOF " --- ale let g:ale_fixers = { diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 58c9fae..bdfb118 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -35,8 +35,10 @@ export XMODIFIERS=@im="ibus" export QT_QPA_PLATFORMTHEME="qt5ct" if [[ -n $SSH_CONNECTION ]]; then export VISUAL="vim" + export EDITOR="vim" else export VISUAL="nvim" + export EDITOR="nvim" fi export BROWSER="librewolf" # export BROWSER="waterfox-g3" diff --git a/.local/bin/custom/mcpelauncher-dmenu b/.local/bin/custom/mcpelauncher-dmenu deleted file mode 100755 index f18c24d..0000000 --- a/.local/bin/custom/mcpelauncher-dmenu +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -version=$(find ~/.local/share/mcpelauncher/versions -maxdepth 1 | sort -r | awk '!/ns$/ && !/.ini/' | sed "s/^.*s\///" | dmenu -l 10 -i -p "MCPE Versions") -[ -z $version ] && exit 1 - -gamemoderun mcpelauncher-client -ww 1366 -wh 740 -dg ~/.local/share/mcpelauncher/versions/$version & -sleep 5s && mcpelauncher-rpc "$version" diff --git a/.local/bin/custom/mcpelauncher-rpc b/.local/bin/custom/mcpelauncher-rpc deleted file mode 100755 index fbb2ec9..0000000 --- a/.local/bin/custom/mcpelauncher-rpc +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python3 -import sys, getopt, pypresence, time, psutil -from subprocess import check_output - -# ----- RPC Client ID -RPC = pypresence.Presence("731745989039489036") - -# ----- Functions -def get_pid(name): - return map(int,check_output(["pidof","-s",name]).split()) - -def connect_rpc(): - while True: - try: - RPC.connect() - break - except ConnectionRefusedError as e: - print("Failed to connect to RPC! Trying again in 10 seconds...") - time.sleep(10) - except (FileNotFoundError, AttributeError) as e: - print("RPC failed to connect due to Discord not being opened yet.") - time.sleep(10) - -def check_mcbe(): - # get_pid("mcpelauncher-client") - return 'MINECRAFT MAIN ' in (p.name() for p in psutil.process_iter()) - -def update_rpc(): - RPC.update(details=mcbe_game, large_image='minecraft', large_text=mcbe_ltext, small_image='world', small_text=mcbe_stext, start=start_time) - if debug is True: - print(color.BOLD + '[ ' + color.END + color.GREEN + 'OK' + color.END + color.BOLD + ' ] ' + color.END + 'RPC has been updated.') - time.sleep(5) - -class color: - PURPLE = '\033[95m' - CYAN = '\033[96m' - DARKCYAN = '\033[36m' - BLUE = '\033[94m' - GREEN = '\033[92m' - YELLOW = '\033[93m' - RED = '\033[91m' - BOLD = '\033[1m' - UNDERLINE = '\033[4m' - END = '\033[0m' - -# ----- Command-Line Arguments + Config -debug=False -mcbe_version=str(sys.argv[1]) -mcbe_game=str("v" + mcbe_version) -mcbe_ltext=str("Using Linux MCPE Launcher") -mcbe_ign="Zerogame1432" -mcbe_stext="IGN: " + mcbe_ign -start_time=int(time.time()) - -# ----- Connect to RPC -connect_rpc() - -# ----- Loops -while True: - try: - if check_mcbe() == True or debug == True: - update_rpc() - else: - print(color.BOLD + '[ ' + color.END + color.RED + 'ERROR' + color.END + color.BOLD + ' ] ' + color.END + 'Minecraft is not running') - RPC.close - break - except KeyboardInterrupt as kb: - print('\n' + color.BOLD + '[ ' + color.END + color.RED + 'ERROR' + color.END + color.BOLD + ' ] ' + color.END + 'RPC interrupted, closing...') - RPC.close - break