From 5b548acd49067dbc0e7e3cae3dbbe986e97d2868 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Mon, 8 Jun 2020 11:11:42 -0500 Subject: [PATCH] yea --- dot_config/i3/config | 3 +- dot_config/nvim/coc-settings.json | 45 ++++++++++++++---------- dot_config/nvim/init.vim | 2 ++ dot_config/polybar/config | 2 +- dot_local/scripts/executable_passmenu.sh | 1 + dot_local/scripts/executable_rofiwrap.sh | 3 ++ dot_zprofile | 2 ++ dot_zshrc | 9 +++-- 8 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 dot_local/scripts/executable_rofiwrap.sh diff --git a/dot_config/i3/config b/dot_config/i3/config index e628b30..389dbc1 100644 --- a/dot_config/i3/config +++ b/dot_config/i3/config @@ -42,6 +42,7 @@ exec --no-startup-id picom -b exec --no-startup-id feh --bg-fill /home/michael/Pictures/wallpaper.jpg exec --no-startup-id polybar -r michael exec --no-startup-id dunst +exec --no-startup-id i3-msg 'workspace 10; exec thunderbird; exec rocketchat-desktop; workspace_layout tabbed' # Use pactl to adjust volume in PulseAudio. set $refresh_i3status killall -SIGUSR1 i3status @@ -65,7 +66,7 @@ bindsym $mod+Shift+q kill # start dmenu (a program launcher) # bindsym $mod+space exec dmenu_run -bindsym $mod+space exec rofi -show drun -levenshtein-sort +bindsym $mod+space exec $HOME/.local/scripts/rofiwrap.sh # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that # installed. diff --git a/dot_config/nvim/coc-settings.json b/dot_config/nvim/coc-settings.json index 6449dc4..24fa799 100644 --- a/dot_config/nvim/coc-settings.json +++ b/dot_config/nvim/coc-settings.json @@ -1,20 +1,29 @@ { - "python.jediEnabled": false, - "languageserver": { - "ocaml": { - "command": "opam", - "args": [ - "config", - "exec", - "--", - "ocaml-language-server", - "--stdio" - ], - "filetypes": [ - "ocaml", - "reason" - ] - } - } + "python.jediEnabled": false, + "languageserver": { + "ocaml": { + "command": "opam", + "args": [ + "config", + "exec", + "--", + "ocaml-language-server", + "--stdio" + ], + "filetypes": [ + "ocaml", + "reason" + ] + }, + "golang": { + "command": "gopls", + "rootPatterns": [ + "go.mod" + ], + "disableWorkspaceFolders": true, + "filetypes": [ + "go" + ] + } + } } - diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 277859d..27d79d0 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -5,6 +5,7 @@ exe 'source' (stdpath('config') . '/airline.vim') Plug 'neoclide/coc.nvim', {'branch': 'release'} exe 'source' (stdpath('config') . '/coc.vim') +" Plug 'file://'.expand('~/Projects/coc-nvim-rs/') Plug 'preservim/nerdtree' exe 'source' (stdpath('config') . '/nerdtree.vim') @@ -17,6 +18,7 @@ Plug 'GutenYe/json5.vim' Plug 'godlygeek/tabular' Plug 'plasticboy/vim-markdown' + let g:vim_markdown_new_list_item_indent = 2 " Plug 'editorconfig/editorconfig-vim' diff --git a/dot_config/polybar/config b/dot_config/polybar/config index 135d55c..0d844b6 100644 --- a/dot_config/polybar/config +++ b/dot_config/polybar/config @@ -59,7 +59,7 @@ font-3 = Noto Sans CJK JP:size=10:antialias=true;0 modules-left = bspwm i3 modules-center = mpd -modules-right = filesystem xbacklight pulseaudio xkeyboard memory cpu wlan eth temperature date powermenu +modules-right = filesystem xbacklight pulseaudio xkeyboard memory cpu wlan eth temperature battery date powermenu tray-position = right tray-padding = 2 diff --git a/dot_local/scripts/executable_passmenu.sh b/dot_local/scripts/executable_passmenu.sh index faebcd7..a3138d4 100644 --- a/dot_local/scripts/executable_passmenu.sh +++ b/dot_local/scripts/executable_passmenu.sh @@ -14,6 +14,7 @@ password_files=( "${password_files[@]#"$prefix"/}" ) password_files=( "${password_files[@]%.gpg}" ) password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu -levenshtein-sort -i -p "Password for" "$@") +# password=$(printf "%s\n" "${password_files[@]}" | fzf --layout=reverse) [[ -n $password ]] || exit diff --git a/dot_local/scripts/executable_rofiwrap.sh b/dot_local/scripts/executable_rofiwrap.sh new file mode 100644 index 0000000..ad3125a --- /dev/null +++ b/dot_local/scripts/executable_rofiwrap.sh @@ -0,0 +1,3 @@ +#!/bin/bash +source $HOME/.zshrc +exec rofi -show drun -levenshtein-sort diff --git a/dot_zprofile b/dot_zprofile index 2212ddc..19a5f3b 100644 --- a/dot_zprofile +++ b/dot_zprofile @@ -1,5 +1,7 @@ export PATH="$HOME/.cargo/bin:$PATH" +export TERMINAL="/usr/bin/alacritty" +export EDITOR="/usr/bin/nvim" # if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec startx; fi diff --git a/dot_zshrc b/dot_zshrc index d50317c..7cefe65 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -13,7 +13,8 @@ export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src" export EDITOR=nvim source $HOME/.cargo/env -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + export PATH="$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin" [ -f "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" ] && source "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" @@ -23,6 +24,11 @@ autoload -U compinit && compinit -u # opam configuration test -r /home/michael/.opam/opam-init/init.zsh && . /home/michael/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true +function loadnpm() { + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +} + # ssh unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then @@ -33,7 +39,6 @@ fi alias subl="nvim" alias rm="garbage put" alias cm="chezmoi" -alias jrnl=" jrnl" alias kill-gpg-agent="gpgconf --kill gpg-agent" ced() { chezmoi edit $1 && chezmoi -v apply }