Compare commits
No commits in common. "fa53413b024f4e07c2217c2dc52a06b82917546a" and "9e2fd9cf24eedfa5fd054782cb69131e20ac900e" have entirely different histories.
fa53413b02
...
9e2fd9cf24
|
|
@ -1,4 +1,4 @@
|
|||
--enable-features=VaapiVideoDecoder
|
||||
--enable-features=UseOzonePlatform
|
||||
--ozone-platform-hint=auto
|
||||
--ozone-platform=wayland
|
||||
--enable-features=WebRTCPipeWireCapturer
|
||||
|
|
|
|||
|
|
@ -1,11 +1,3 @@
|
|||
[gpu]
|
||||
#apply_gpu_optimisations=accept-responsibility
|
||||
#gpu_device=2
|
||||
|
||||
# https://gitlab.freedesktop.org/drm/amd/-/issues/1974
|
||||
#amd_performance_level=high
|
||||
|
||||
|
||||
[custom]
|
||||
start=gamemode-start
|
||||
end=gamemode-stop
|
||||
end=gamemode-stop
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
[Settings]
|
||||
gtk-icon-theme-name=Tela-circle
|
||||
gtk-theme-name=Orchis-Light
|
||||
gtk-icon-theme-name=Mint-Y-Orange
|
||||
gtk-theme-name=Matcha-aliz
|
||||
gtk-application-prefer-dark-theme=0
|
||||
gtk-font-name=Cantarell 11
|
||||
gtk-cursor-theme-name=Breeze_Light
|
||||
|
|
@ -14,4 +14,3 @@ gtk-enable-input-feedback-sounds=1
|
|||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle=hintfull
|
||||
gtk-xft-rgba=none
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
context.exec = [
|
||||
{ path = "pactl" args = "load-module module-combine-sink" }
|
||||
]
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
global_prep_cmd = [{"do":"sunshine-prepare","undo":"sunshine-restore"}]
|
||||
adapter_name = /dev/dri/by-path/pci-0000:03:00.0-render
|
||||
output_name = 1
|
||||
adapter_name = /dev/dri/renderD129
|
||||
global_prep_cmd = [{"do":"sunshine-prepare","undo":"sunshine-restore"}]
|
||||
|
|
|
|||
|
|
@ -38,12 +38,11 @@ for_window [floating] default_border pixel 1
|
|||
smart_borders on
|
||||
|
||||
# Gaps
|
||||
gaps inner 8
|
||||
gaps outer -4
|
||||
gaps inner 16
|
||||
gaps outer -8
|
||||
smart_gaps on
|
||||
|
||||
# Floating mod
|
||||
for_window [floating] shadows enable
|
||||
for_window [app_id="pavucontrol"] floating enable
|
||||
for_window [app_id="org.remmina.Remmina" title="Remmina Remote Desktop Client"] floating enable
|
||||
for_window [app_id="desktopclient.nextcloud.com.nextcloud"] floating enable
|
||||
|
|
@ -65,8 +64,6 @@ for_window [window_type="utility"] floating enable
|
|||
for_window [window_type="toolbar"] floating enable
|
||||
for_window [window_type="splash"] floating enable
|
||||
|
||||
#for_window [class="^steam_app.*"] allow_tearing yes
|
||||
|
||||
# https://github.com/ValveSoftware/steam-for-linux/issues/1040
|
||||
for_window [class="^Steam$" title="^Friends$"] floating enable
|
||||
for_window [class="^Steam$" title="Steam - News"] floating enable
|
||||
|
|
@ -92,14 +89,9 @@ for_window [app_id="^.*"] inhibit_idle fullscreen
|
|||
### Output configuration
|
||||
output "*" {
|
||||
background ~/.local/share/wallpaper fill
|
||||
|
||||
adaptive_sync off
|
||||
allow_tearing no
|
||||
max_render_time off
|
||||
}
|
||||
|
||||
#set $output1 "LG Electronics LG QHD 0x00051E95"
|
||||
set $output1 "Philips Consumer Electronics Company PHL 34M2C8600 AU42410000051"
|
||||
set $output1 "LG Electronics LG QHD 0x00051E95"
|
||||
workspace $ws3 output $output1 VGA-1
|
||||
workspace $ws4 output $output1 VGA-1
|
||||
workspace $ws5 output $output1 VGA-1
|
||||
|
|
@ -109,28 +101,25 @@ workspace $ws8 output $output1 VGA-1
|
|||
workspace $ws9 output $output1 VGA-1
|
||||
workspace sunshine output $output1 VGA-1
|
||||
output $output1 {
|
||||
position 0 0
|
||||
allow_tearing yes
|
||||
position 0 270
|
||||
# we need to explicitly select the mode
|
||||
mode 2560x1440@144Hz
|
||||
adaptive_sync on
|
||||
}
|
||||
|
||||
set $output2 "Hewlett Packard HP ZR2440w CN44020RJF"
|
||||
set $output2 "Ancor Communications Inc ASUS VH238 BALMIB547836"
|
||||
workspace $ws1 output $output2 eDP-1
|
||||
workspace $ws2 output $output2 eDP-1
|
||||
output $output2 {
|
||||
position 3440 0
|
||||
position 2560 0
|
||||
transform 270
|
||||
max_render_time 5
|
||||
}
|
||||
|
||||
set $output3 "Sony SONY TV *30 0x01010101"
|
||||
workspace $ws10 output $output3
|
||||
output $output3 {
|
||||
mode 3840x2160@120Hz
|
||||
disable
|
||||
}
|
||||
|
||||
exec "swaymsg create_output"
|
||||
output HEADLESS-1 {
|
||||
adaptive_sync on
|
||||
disable
|
||||
}
|
||||
|
||||
|
|
@ -171,7 +160,7 @@ input "*" {
|
|||
bindsym $mod+Return exec $terminal
|
||||
|
||||
# thunar
|
||||
bindsym $mod+Mod1+Return exec thunar
|
||||
bindsym $mod+Mod1+Return exec dolphin
|
||||
|
||||
# kill focused window
|
||||
bindsym $mod+Shift+q kill
|
||||
|
|
@ -263,15 +252,13 @@ bindsym $mod+Shift+8 move container to workspace $ws8
|
|||
bindsym $mod+Shift+9 move container to workspace $ws9
|
||||
bindsym $mod+Shift+0 move container to workspace $ws10
|
||||
|
||||
# toggle
|
||||
bindsym $mod+Alt+0 exec "swaymsg output DP-3 toggle; swaymsg output DP-4 toggle; swaymsg output HDMI-A-6 toggle;"
|
||||
# toggle TV
|
||||
bindsym $mod+Alt+0 output $output3 toggle
|
||||
|
||||
# Assignation
|
||||
assign {
|
||||
[app_id="[Dd]iscord"] $ws1
|
||||
[title="Microsoft Teams$"] $ws1
|
||||
[class="steam"] $ws4
|
||||
}
|
||||
assign [class="^[Ss]lack$"] $ws1
|
||||
assign [class="^[Dd]iscord$"] $ws1
|
||||
#assign [class="^looking-glass-client$"] $ws3
|
||||
|
||||
# screen
|
||||
# workspace $ws1 output HDMI-A-2
|
||||
|
|
@ -332,9 +319,6 @@ mode "resize" {
|
|||
bindsym $mod+r mode "resize"
|
||||
|
||||
### Startup
|
||||
# setup theme
|
||||
exec_always import-gsettings
|
||||
|
||||
# reach systemd target
|
||||
exec /bin/systemctl --user import-environment
|
||||
exec /bin/systemctl --user start sway-session.target
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ PartOf=graphical-session.target
|
|||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/swayidle -w \
|
||||
timeout 1800 'echo RELOADAGENT | gpg-connect-agent; swaylock -f' \
|
||||
timeout 1200 'echo RELOADAGENT | gpg-connect-agent; swaylock -f' \
|
||||
timeout 600 'swaymsg "output * dpms off"' \
|
||||
resume 'swaymsg "output * dpms on"' \
|
||||
before-sleep 'echo RELOADAGENT | gpg-connect-agent; swaylock -f'
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
"layer": "top", // Waybar at top layer
|
||||
"position": "bottom", // Waybar position (top|bottom|left|right)
|
||||
// "position": "bottom", // Waybar position (top|bottom|left|right)
|
||||
"height": 23, // Waybar height (to be removed for auto height)
|
||||
"output": ["DP-3", "HDMI-A-6", "HEADLESS-1"],
|
||||
// Choose the order of the modules
|
||||
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||
"modules-center": [],
|
||||
|
|
@ -11,7 +10,7 @@
|
|||
// Modules configuration
|
||||
"sway/workspaces": {
|
||||
"disable-scroll": true,
|
||||
"all-outputs": true,
|
||||
"all-outputs": false,
|
||||
"format": "{name}"
|
||||
},
|
||||
"sway/mode": {
|
||||
|
|
|
|||
|
|
@ -26,11 +26,8 @@ label, button {
|
|||
font-weight: 900;
|
||||
}
|
||||
|
||||
#custom-spotify, #clock, #battery, #network, #cpu, #memory, #temperature, #backlight, #pulseaudio, #custom-vpn {
|
||||
#custom-spotify, #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-vpn {
|
||||
padding: 0 10px;
|
||||
/*
|
||||
margin-left: 15px
|
||||
*/
|
||||
border-left: 1px dotted #ebdbb2;
|
||||
border-radius: 6.5px;
|
||||
}
|
||||
|
|
@ -45,37 +42,6 @@ label, button {
|
|||
color: white;
|
||||
}
|
||||
|
||||
/*
|
||||
#clock {
|
||||
color: #66899d;
|
||||
border-bottom: 2px solid #66899d;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: #527c77;
|
||||
border-bottom: 2px solid #527c77;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
color: #919652;
|
||||
border-bottom: 2px solid #919652;
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: #8d6494;
|
||||
border-bottom: 2px solid #8d6494;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: #b04c50;
|
||||
border-bottom: 2px solid #b04c50;
|
||||
}
|
||||
|
||||
#custom-vpn {
|
||||
border-left: 1px dotted #ebdbb2;
|
||||
border-radius: 6.5px;
|
||||
}
|
||||
*/
|
||||
#tray {
|
||||
margin-left: 5px;
|
||||
font-family: sans-serif;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
|
||||
|
||||
include "/home/marchambault/.gtkrc-2.0.mine"
|
||||
gtk-theme-name="Orchis-Light"
|
||||
gtk-icon-theme-name="Tela-circle"
|
||||
gtk-theme-name="Matcha-aliz"
|
||||
gtk-icon-theme-name="Mint-Y-Orange"
|
||||
gtk-font-name="Cantarell 11"
|
||||
gtk-cursor-theme-name="Breeze_Light"
|
||||
gtk-cursor-theme-size=0
|
||||
|
|
@ -16,4 +16,3 @@ gtk-enable-input-feedback-sounds=1
|
|||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle="hintfull"
|
||||
gtk-xft-rgba="none"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
xrandr --output "$(xrandr | grep '+0+' | grep -Eo '^DP-[0-9]')" --primary
|
||||
#swaymsg 'output "DP-4" disable'
|
||||
#swaymsg 'output * adaptive_sync on'
|
||||
|
||||
#systemctl --user stop gammastep
|
||||
sudo systemctl stop docker.service
|
||||
|
||||
sudo bash -c 'echo high >/sys/class/drm/card2/device/power_dpm_force_performance_level'
|
||||
|
||||
systemctl --user stop gammastep
|
||||
sudo systemctl stop docker.service docker.socket
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
swaymsg 'output "DP-4" enable'
|
||||
swaymsg 'output * adaptive_sync off'
|
||||
|
||||
#systemctl --user start gammastep
|
||||
systemctl --user start gammastep
|
||||
sudo systemctl start docker
|
||||
|
||||
sudo bash -c 'echo auto >/sys/class/drm/card2/device/power_dpm_force_performance_level'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
width="${SUNSHINE_CLIENT_WIDTH:-1920}"
|
||||
height="${SUNSHINE_CLIENT_HEIGHT:-1080}"
|
||||
fps="${SUNSHINE_CLIENT_FPS:-60}"
|
||||
|
||||
pkill --signal SIGUSR1 swaylock
|
||||
swaymsg output '*' disable
|
||||
# steam deck is 16:10
|
||||
swaymsg output HEADLESS-1 mode "$width"x"$height"@"$fps"Hz position 0 0 transform 0 enable
|
||||
swaymsg workspace 4
|
||||
xrandr --output DP-4 --primary
|
||||
swaymsg output HDMI-A-2 disable
|
||||
swaymsg workspace sunshine
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
swaymsg reload
|
||||
|
||||
swaymsg output HDMI-A-2 enable
|
||||
swaymsg workspace back_and_forth
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +1,24 @@
|
|||
#!/bin/bash
|
||||
|
||||
import-gsettings() {
|
||||
# usage: import-gsettings
|
||||
config="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini"
|
||||
if [ ! -f "$config" ]; then exit 1; fi
|
||||
|
||||
gnome_schema="org.gnome.desktop.interface"
|
||||
gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')"
|
||||
icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')"
|
||||
cursor_theme="$(grep 'gtk-cursor-theme-name' "$config" | sed 's/.*\s*=\s*//')"
|
||||
font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
|
||||
gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
|
||||
gsettings set "$gnome_schema" icon-theme "$icon_theme"
|
||||
gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
|
||||
gsettings set "$gnome_schema" font-name "$font_name"
|
||||
# usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
|
||||
expression=""
|
||||
for pair in "$@"; do
|
||||
IFS=:; set -- $pair
|
||||
expressions="$expressions -e 's:^$2=(.*)$:gsettings set org.gnome.desktop.interface $1 \1:e'"
|
||||
done
|
||||
IFS=
|
||||
eval sed -E $expressions "${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini >/dev/null
|
||||
}
|
||||
|
||||
WLR_RENDERER=vulkan
|
||||
# list DRM device priority
|
||||
# Set intel graphics as high priority
|
||||
# Set intel graphics as lowest priority
|
||||
# https://github.com/swaywm/sway/wiki#i-have-a-multi-gpu-setup-like-intelnvidia-or-intelamd-and-sway-does-not-start
|
||||
export WLR_DRM_DEVICES="$(drm_info -j | jq --raw-output 'to_entries[] | [if .value.driver.desc == "Intel Graphics" then 1 else 0 end, .key] | @tsv' | sort | awk '{printf "%s:", $2}' | sed -e 's/:$//')"
|
||||
|
||||
# temporary fix
|
||||
# # https://github.com/swaywm/sway/issues/4763
|
||||
#export WLR_DRM_NO_ATOMIC=1
|
||||
export WLR_DRM_NO_ATOMIC=1
|
||||
|
||||
# disable hardware cursor (cause mouse to stutter on my setup)
|
||||
#export WLR_NO_HARDWARE_CURSORS=1
|
||||
|
|
@ -34,15 +28,17 @@ export XDG_SESSION_TYPE=wayland
|
|||
# Qt
|
||||
#export DESKTOP_SESSION=gnome
|
||||
#export QT_STYLE_OVERRIDE=gtk
|
||||
export QT_QPA_PLATFORMTHEME=gtk3
|
||||
#export QT_QPA_PLATFORMTHEME=gtk2
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=0
|
||||
#export QT_QPA_PLATFORM=wayland-egl
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||
|
||||
# GTK
|
||||
export CLUTTER_BACKEND=wayland
|
||||
export GTK_THEME=Orchis
|
||||
import-gsettings
|
||||
import-gsettings \
|
||||
gtk-theme:gtk-theme-name \
|
||||
icon-theme:gtk-icon-theme-name \
|
||||
cursor-theme:gtk-cursor-theme-name
|
||||
|
||||
# Elementary/EFL
|
||||
export ECORE_EVAS_ENGINE=wayland_egl
|
||||
|
|
@ -58,7 +54,4 @@ export _JAVA_AWT_WM_NONREPARENTING=1
|
|||
export MOZ_ENABLE_WAYLAND=1
|
||||
export MOZ_DBUS_REMOTE=1
|
||||
|
||||
# Electron
|
||||
export ELECTRON_OZONE_PLATFORM_HINT=auto
|
||||
|
||||
exec /usr/bin/sway $@
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash -x
|
||||
|
||||
exec &>/tmp/vortex-skyrimvr-nxm-handler.last.log
|
||||
|
||||
protontricks-launch --appid 611670 "/data/marchambault/Games/steamapps/compatdata/611670/pfx/drive_c/Program Files/Black Tree Gaming Ltd/Vortex/Vortex.exe" -d $@
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Categories=Game;
|
||||
Exec=bash -c '"$HOME/.local/bin/vortex-skyrimvr-nxm-handler" %u
|
||||
Name=Vortex NXM Handler
|
||||
MimeType=x-scheme-handler/nxm;x-scheme-handler/nxm-protocol
|
||||
NoDisplay=true
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ set updatetime=500
|
|||
set ignorecase
|
||||
set smartcase
|
||||
" Clipboard
|
||||
"set clipboard^=unnamed,unnamedplus
|
||||
set clipboard^=unnamed,unnamedplus
|
||||
|
||||
" Remap arrow keys
|
||||
noremap <Up> <NOP>
|
||||
|
|
@ -49,72 +49,62 @@ augroup resCur
|
|||
augroup END
|
||||
|
||||
" Plugins
|
||||
" Install vim-plug if not found
|
||||
if empty(glob('~/.vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
let deinpath=$HOME.'/.vim/bundle/repos/github.com/Shougo/dein.vim'
|
||||
let pluginpath=$HOME.'/.vim/bundle'
|
||||
let &rtp.=','.deinpath
|
||||
|
||||
if dein#load_state(pluginpath)
|
||||
call dein#begin(pluginpath)
|
||||
|
||||
"call dein#add(deinpath)
|
||||
call dein#add('tpope/vim-sensible')
|
||||
|
||||
" Colorscheme
|
||||
call dein#add('https://git.sr.ht/~ackyshake/spacegray.vim')
|
||||
|
||||
" Interface
|
||||
call dein#add('itchyny/lightline.vim')
|
||||
call dein#add('mgee/lightline-bufferline')
|
||||
call dein#add('ryanoasis/vim-devicons')
|
||||
call dein#add('airblade/vim-gitgutter')
|
||||
call dein#add('scrooloose/nerdtree')
|
||||
call dein#add('Yggdroot/indentLine')
|
||||
|
||||
" Movement
|
||||
call dein#add('christoomey/vim-tmux-navigator')
|
||||
"call dein#add('easymotion/vim-easymotion')
|
||||
call dein#add('unblevable/quick-scope')
|
||||
|
||||
" Tools / Commands
|
||||
call dein#add('tpope/vim-surround')
|
||||
call dein#add('jiangmiao/auto-pairs')
|
||||
call dein#add('tpope/vim-endwise')
|
||||
"call dein#add('chrisbra/unicode.vim')
|
||||
call dein#add('ctrlpvim/ctrlp.vim')
|
||||
"call dein#add('junegunn/fzf.vim')
|
||||
call dein#add('tpope/vim-obsession')
|
||||
|
||||
" Linting / Completion
|
||||
call dein#add('w0rp/ale')
|
||||
call dein#add('Shougo/deoplete.nvim')
|
||||
call dein#add('ervandew/supertab')
|
||||
call dein#add('autozimu/LanguageClient-neovim', { 'rev': 'next', 'build': 'bash install.sh'})
|
||||
|
||||
" Language
|
||||
call dein#add('sheerun/vim-polyglot')
|
||||
|
||||
call dein#end()
|
||||
call dein#save_state()
|
||||
endif
|
||||
|
||||
" Run PlugInstall if there are missing plugins
|
||||
autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
|
||||
\| PlugInstall --sync | source $MYVIMRC
|
||||
\| endif
|
||||
|
||||
call plug#begin()
|
||||
Plug 'tpope/vim-sensible'
|
||||
|
||||
" Colorscheme
|
||||
Plug 'https://git.sr.ht/~ackyshake/spacegray.vim'
|
||||
|
||||
" Interface
|
||||
Plug 'itchyny/lightline.vim'
|
||||
Plug 'mgee/lightline-bufferline'
|
||||
Plug 'ryanoasis/vim-devicons'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'scrooloose/nerdtree'
|
||||
Plug 'Yggdroot/indentLine'
|
||||
|
||||
" Movement
|
||||
Plug 'christoomey/vim-tmux-navigator'
|
||||
"Plug 'easymotion/vim-easymotion'
|
||||
Plug 'unblevable/quick-scope'
|
||||
|
||||
" Tools / Commands
|
||||
Plug 'tpope/vim-surround'
|
||||
Plug 'jiangmiao/auto-pairs'
|
||||
Plug 'tpope/vim-endwise'
|
||||
"Plug'chrisbra/unicode.vim'
|
||||
Plug 'ctrlpvim/ctrlp.vim'
|
||||
"Plug 'junegunn/fzf.vim'
|
||||
Plug 'tpope/vim-obsession'
|
||||
|
||||
" Linting / Completion
|
||||
Plug 'w0rp/ale'
|
||||
Plug 'ervandew/supertab'
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
if has('nvim')
|
||||
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
else
|
||||
Plug 'Shougo/deoplete.nvim'
|
||||
Plug 'roxma/nvim-yarp'
|
||||
Plug 'roxma/vim-hug-neovim-rpc'
|
||||
endif
|
||||
Plug 'neoclide/coc-tsserver', {'do': 'yarn install --frozen-lockfile'}
|
||||
Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
|
||||
Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
|
||||
Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile'}
|
||||
Plug 'josa42/coc-go', {'do': 'yarn install --frozen-lockfile'}
|
||||
Plug 'josa42/coc-docker', {'do': 'yarn install --frozen-lockfile'}
|
||||
Plug 'yaegassy/coc-pylsp', {'do': 'yarn install --frozen-lockfile'}
|
||||
|
||||
" Language
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
|
||||
call plug#end()
|
||||
|
||||
filetype plugin indent on
|
||||
syntax enable
|
||||
|
||||
" Automatically install plugins
|
||||
if dein#check_install()
|
||||
call dein#install()
|
||||
endif
|
||||
|
||||
" Color scheme
|
||||
colorscheme spacegray
|
||||
" 16 millions colors
|
||||
|
|
@ -128,7 +118,19 @@ set t_ZH=[3m
|
|||
set t_ZR=[23m
|
||||
|
||||
" deoplete
|
||||
"let g:deoplete#enable_at_startup = 1
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
|
||||
" LanguageClient
|
||||
set hidden
|
||||
let g:LanguageClient_serverCommands = {
|
||||
\ 'python': ['/usr/bin/pyls'],
|
||||
\ 'sh': ['bash-language-server', 'start'],
|
||||
\ 'terraform': ['/usr/bin/terraform-lsp'],
|
||||
\ 'yaml': ['/usr/bin/yaml-language-server'],
|
||||
\ }
|
||||
nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
|
||||
nnoremap <silent> <F12> :call LanguageClient#textDocument_definition()<CR>
|
||||
nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
|
||||
|
||||
" supertab
|
||||
let g:SuperTabDefaultCompletionType = "<c-n>"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# If you come from bash you might have to change your $PATH.
|
||||
export PATH=$HOME/go/bin:$HOME/bin:/usr/local/bin:$PATH
|
||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.config/zsh/oh-my-zsh/"
|
||||
|
|
@ -86,6 +86,3 @@ source $ZSH/oh-my-zsh.sh
|
|||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
export PYENV_ROOT="$HOME/.pyenv"
|
||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
eval "$(pyenv init -)"
|
||||
|
|
|
|||
Loading…
Reference in New Issue