Update home/.config/electron-flags.conf
Update home/.config/gamemode.ini Update home/.config/gtk-3.0/settings.ini Update home/.config/sunshine/sunshine.conf Update home/.config/sway/config Update home/.config/systemd/user/swayidle.service Update home/.config/waybar/config Update home/.config/waybar/style.css Update home/.gtkrc-2.0 Update home/.local/bin/gamemode-start Update home/.local/bin/gamemode-stop Update home/.local/bin/sunshine-prepare Update home/.local/bin/sunshine-restore Update home/.local/bin/sway Update home/.vim/vimrc Update home/.zshrc
This commit is contained in:
parent
0be2ecef97
commit
fa53413b02
|
@ -1,4 +1,4 @@
|
||||||
--enable-features=VaapiVideoDecoder
|
--enable-features=VaapiVideoDecoder
|
||||||
--enable-features=UseOzonePlatform
|
--enable-features=UseOzonePlatform
|
||||||
--ozone-platform=wayland
|
--ozone-platform-hint=auto
|
||||||
--enable-features=WebRTCPipeWireCapturer
|
--enable-features=WebRTCPipeWireCapturer
|
||||||
|
|
|
@ -1,3 +1,11 @@
|
||||||
|
[gpu]
|
||||||
|
#apply_gpu_optimisations=accept-responsibility
|
||||||
|
#gpu_device=2
|
||||||
|
|
||||||
|
# https://gitlab.freedesktop.org/drm/amd/-/issues/1974
|
||||||
|
#amd_performance_level=high
|
||||||
|
|
||||||
|
|
||||||
[custom]
|
[custom]
|
||||||
start=gamemode-start
|
start=gamemode-start
|
||||||
end=gamemode-stop
|
end=gamemode-stop
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[Settings]
|
[Settings]
|
||||||
gtk-icon-theme-name=Mint-Y-Orange
|
gtk-icon-theme-name=Tela-circle
|
||||||
gtk-theme-name=Matcha-aliz
|
gtk-theme-name=Orchis-Light
|
||||||
gtk-application-prefer-dark-theme=0
|
gtk-application-prefer-dark-theme=0
|
||||||
gtk-font-name=Cantarell 11
|
gtk-font-name=Cantarell 11
|
||||||
gtk-cursor-theme-name=Breeze_Light
|
gtk-cursor-theme-name=Breeze_Light
|
||||||
|
@ -14,3 +14,4 @@ gtk-enable-input-feedback-sounds=1
|
||||||
gtk-xft-antialias=1
|
gtk-xft-antialias=1
|
||||||
gtk-xft-hinting=1
|
gtk-xft-hinting=1
|
||||||
gtk-xft-hintstyle=hintfull
|
gtk-xft-hintstyle=hintfull
|
||||||
|
gtk-xft-rgba=none
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
adapter_name = /dev/dri/by-path/pci-0000:03:00.0-render
|
|
||||||
output_name = 1
|
|
||||||
global_prep_cmd = [{"do":"sunshine-prepare","undo":"sunshine-restore"}]
|
global_prep_cmd = [{"do":"sunshine-prepare","undo":"sunshine-restore"}]
|
||||||
|
output_name = 1
|
||||||
|
adapter_name = /dev/dri/renderD129
|
||||||
|
|
|
@ -38,11 +38,12 @@ for_window [floating] default_border pixel 1
|
||||||
smart_borders on
|
smart_borders on
|
||||||
|
|
||||||
# Gaps
|
# Gaps
|
||||||
gaps inner 16
|
gaps inner 8
|
||||||
gaps outer -8
|
gaps outer -4
|
||||||
smart_gaps on
|
smart_gaps on
|
||||||
|
|
||||||
# Floating mod
|
# Floating mod
|
||||||
|
for_window [floating] shadows enable
|
||||||
for_window [app_id="pavucontrol"] floating 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="org.remmina.Remmina" title="Remmina Remote Desktop Client"] floating enable
|
||||||
for_window [app_id="desktopclient.nextcloud.com.nextcloud"] floating enable
|
for_window [app_id="desktopclient.nextcloud.com.nextcloud"] floating enable
|
||||||
|
@ -64,6 +65,8 @@ for_window [window_type="utility"] floating enable
|
||||||
for_window [window_type="toolbar"] floating enable
|
for_window [window_type="toolbar"] floating enable
|
||||||
for_window [window_type="splash"] 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
|
# https://github.com/ValveSoftware/steam-for-linux/issues/1040
|
||||||
for_window [class="^Steam$" title="^Friends$"] floating enable
|
for_window [class="^Steam$" title="^Friends$"] floating enable
|
||||||
for_window [class="^Steam$" title="Steam - News"] floating enable
|
for_window [class="^Steam$" title="Steam - News"] floating enable
|
||||||
|
@ -89,9 +92,14 @@ for_window [app_id="^.*"] inhibit_idle fullscreen
|
||||||
### Output configuration
|
### Output configuration
|
||||||
output "*" {
|
output "*" {
|
||||||
background ~/.local/share/wallpaper fill
|
background ~/.local/share/wallpaper fill
|
||||||
|
|
||||||
|
adaptive_sync off
|
||||||
|
allow_tearing no
|
||||||
|
max_render_time off
|
||||||
}
|
}
|
||||||
|
|
||||||
set $output1 "LG Electronics LG QHD 0x00051E95"
|
#set $output1 "LG Electronics LG QHD 0x00051E95"
|
||||||
|
set $output1 "Philips Consumer Electronics Company PHL 34M2C8600 AU42410000051"
|
||||||
workspace $ws3 output $output1 VGA-1
|
workspace $ws3 output $output1 VGA-1
|
||||||
workspace $ws4 output $output1 VGA-1
|
workspace $ws4 output $output1 VGA-1
|
||||||
workspace $ws5 output $output1 VGA-1
|
workspace $ws5 output $output1 VGA-1
|
||||||
|
@ -101,25 +109,28 @@ workspace $ws8 output $output1 VGA-1
|
||||||
workspace $ws9 output $output1 VGA-1
|
workspace $ws9 output $output1 VGA-1
|
||||||
workspace sunshine output $output1 VGA-1
|
workspace sunshine output $output1 VGA-1
|
||||||
output $output1 {
|
output $output1 {
|
||||||
position 0 270
|
position 0 0
|
||||||
# we need to explicitly select the mode
|
allow_tearing yes
|
||||||
mode 2560x1440@144Hz
|
|
||||||
adaptive_sync on
|
|
||||||
}
|
}
|
||||||
|
|
||||||
set $output2 "Ancor Communications Inc ASUS VH238 BALMIB547836"
|
set $output2 "Hewlett Packard HP ZR2440w CN44020RJF"
|
||||||
workspace $ws1 output $output2 eDP-1
|
workspace $ws1 output $output2 eDP-1
|
||||||
workspace $ws2 output $output2 eDP-1
|
workspace $ws2 output $output2 eDP-1
|
||||||
output $output2 {
|
output $output2 {
|
||||||
position 2560 0
|
position 3440 0
|
||||||
transform 270
|
transform 270
|
||||||
|
max_render_time 5
|
||||||
}
|
}
|
||||||
|
|
||||||
set $output3 "Sony SONY TV *30 0x01010101"
|
set $output3 "Sony SONY TV *30 0x01010101"
|
||||||
workspace $ws10 output $output3
|
workspace $ws10 output $output3
|
||||||
output $output3 {
|
output $output3 {
|
||||||
mode 3840x2160@120Hz
|
mode 3840x2160@120Hz
|
||||||
adaptive_sync on
|
disable
|
||||||
|
}
|
||||||
|
|
||||||
|
exec "swaymsg create_output"
|
||||||
|
output HEADLESS-1 {
|
||||||
disable
|
disable
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,7 +171,7 @@ input "*" {
|
||||||
bindsym $mod+Return exec $terminal
|
bindsym $mod+Return exec $terminal
|
||||||
|
|
||||||
# thunar
|
# thunar
|
||||||
bindsym $mod+Mod1+Return exec dolphin
|
bindsym $mod+Mod1+Return exec thunar
|
||||||
|
|
||||||
# kill focused window
|
# kill focused window
|
||||||
bindsym $mod+Shift+q kill
|
bindsym $mod+Shift+q kill
|
||||||
|
@ -252,13 +263,15 @@ bindsym $mod+Shift+8 move container to workspace $ws8
|
||||||
bindsym $mod+Shift+9 move container to workspace $ws9
|
bindsym $mod+Shift+9 move container to workspace $ws9
|
||||||
bindsym $mod+Shift+0 move container to workspace $ws10
|
bindsym $mod+Shift+0 move container to workspace $ws10
|
||||||
|
|
||||||
# toggle TV
|
# toggle
|
||||||
bindsym $mod+Alt+0 output $output3 toggle
|
bindsym $mod+Alt+0 exec "swaymsg output DP-3 toggle; swaymsg output DP-4 toggle; swaymsg output HDMI-A-6 toggle;"
|
||||||
|
|
||||||
# Assignation
|
# Assignation
|
||||||
assign [class="^[Ss]lack$"] $ws1
|
assign {
|
||||||
assign [class="^[Dd]iscord$"] $ws1
|
[app_id="[Dd]iscord"] $ws1
|
||||||
#assign [class="^looking-glass-client$"] $ws3
|
[title="Microsoft Teams$"] $ws1
|
||||||
|
[class="steam"] $ws4
|
||||||
|
}
|
||||||
|
|
||||||
# screen
|
# screen
|
||||||
# workspace $ws1 output HDMI-A-2
|
# workspace $ws1 output HDMI-A-2
|
||||||
|
@ -319,6 +332,9 @@ mode "resize" {
|
||||||
bindsym $mod+r mode "resize"
|
bindsym $mod+r mode "resize"
|
||||||
|
|
||||||
### Startup
|
### Startup
|
||||||
|
# setup theme
|
||||||
|
exec_always import-gsettings
|
||||||
|
|
||||||
# reach systemd target
|
# reach systemd target
|
||||||
exec /bin/systemctl --user import-environment
|
exec /bin/systemctl --user import-environment
|
||||||
exec /bin/systemctl --user start sway-session.target
|
exec /bin/systemctl --user start sway-session.target
|
||||||
|
|
|
@ -6,7 +6,7 @@ PartOf=graphical-session.target
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
ExecStart=/usr/bin/swayidle -w \
|
ExecStart=/usr/bin/swayidle -w \
|
||||||
timeout 1200 'echo RELOADAGENT | gpg-connect-agent; swaylock -f' \
|
timeout 1800 'echo RELOADAGENT | gpg-connect-agent; swaylock -f' \
|
||||||
timeout 600 'swaymsg "output * dpms off"' \
|
timeout 600 'swaymsg "output * dpms off"' \
|
||||||
resume 'swaymsg "output * dpms on"' \
|
resume 'swaymsg "output * dpms on"' \
|
||||||
before-sleep 'echo RELOADAGENT | gpg-connect-agent; swaylock -f'
|
before-sleep 'echo RELOADAGENT | gpg-connect-agent; swaylock -f'
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{
|
{
|
||||||
"layer": "top", // Waybar at top layer
|
"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)
|
"height": 23, // Waybar height (to be removed for auto height)
|
||||||
|
"output": ["DP-3", "HDMI-A-6", "HEADLESS-1"],
|
||||||
// Choose the order of the modules
|
// Choose the order of the modules
|
||||||
"modules-left": ["sway/workspaces", "sway/mode"],
|
"modules-left": ["sway/workspaces", "sway/mode"],
|
||||||
"modules-center": [],
|
"modules-center": [],
|
||||||
|
@ -10,7 +11,7 @@
|
||||||
// Modules configuration
|
// Modules configuration
|
||||||
"sway/workspaces": {
|
"sway/workspaces": {
|
||||||
"disable-scroll": true,
|
"disable-scroll": true,
|
||||||
"all-outputs": false,
|
"all-outputs": true,
|
||||||
"format": "{name}"
|
"format": "{name}"
|
||||||
},
|
},
|
||||||
"sway/mode": {
|
"sway/mode": {
|
||||||
|
|
|
@ -26,8 +26,11 @@ label, button {
|
||||||
font-weight: 900;
|
font-weight: 900;
|
||||||
}
|
}
|
||||||
|
|
||||||
#custom-spotify, #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-vpn {
|
#custom-spotify, #clock, #battery, #network, #cpu, #memory, #temperature, #backlight, #pulseaudio, #custom-vpn {
|
||||||
padding: 0 10px;
|
padding: 0 10px;
|
||||||
|
/*
|
||||||
|
margin-left: 15px
|
||||||
|
*/
|
||||||
border-left: 1px dotted #ebdbb2;
|
border-left: 1px dotted #ebdbb2;
|
||||||
border-radius: 6.5px;
|
border-radius: 6.5px;
|
||||||
}
|
}
|
||||||
|
@ -42,6 +45,37 @@ label, button {
|
||||||
color: white;
|
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 {
|
#tray {
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
|
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
|
||||||
|
|
||||||
include "/home/marchambault/.gtkrc-2.0.mine"
|
include "/home/marchambault/.gtkrc-2.0.mine"
|
||||||
gtk-theme-name="Matcha-aliz"
|
gtk-theme-name="Orchis-Light"
|
||||||
gtk-icon-theme-name="Mint-Y-Orange"
|
gtk-icon-theme-name="Tela-circle"
|
||||||
gtk-font-name="Cantarell 11"
|
gtk-font-name="Cantarell 11"
|
||||||
gtk-cursor-theme-name="Breeze_Light"
|
gtk-cursor-theme-name="Breeze_Light"
|
||||||
gtk-cursor-theme-size=0
|
gtk-cursor-theme-size=0
|
||||||
|
@ -16,3 +16,4 @@ gtk-enable-input-feedback-sounds=1
|
||||||
gtk-xft-antialias=1
|
gtk-xft-antialias=1
|
||||||
gtk-xft-hinting=1
|
gtk-xft-hinting=1
|
||||||
gtk-xft-hintstyle="hintfull"
|
gtk-xft-hintstyle="hintfull"
|
||||||
|
gtk-xft-rgba="none"
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
xrandr --output "$(xrandr | grep '+0+' | grep -Eo '^DP-[0-9]')" --primary
|
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,5 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
systemctl --user start gammastep
|
swaymsg 'output "DP-4" enable'
|
||||||
|
swaymsg 'output * adaptive_sync off'
|
||||||
|
|
||||||
|
#systemctl --user start gammastep
|
||||||
sudo systemctl start docker
|
sudo systemctl start docker
|
||||||
|
|
||||||
|
sudo bash -c 'echo auto >/sys/class/drm/card2/device/power_dpm_force_performance_level'
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
width="${SUNSHINE_CLIENT_WIDTH:-1920}"
|
||||||
|
height="${SUNSHINE_CLIENT_HEIGHT:-1080}"
|
||||||
|
fps="${SUNSHINE_CLIENT_FPS:-60}"
|
||||||
|
|
||||||
pkill --signal SIGUSR1 swaylock
|
pkill --signal SIGUSR1 swaylock
|
||||||
xrandr --output DP-4 --primary
|
swaymsg output '*' disable
|
||||||
swaymsg output HDMI-A-2 disable
|
# steam deck is 16:10
|
||||||
swaymsg workspace sunshine
|
swaymsg output HEADLESS-1 mode "$width"x"$height"@"$fps"Hz position 0 0 transform 0 enable
|
||||||
|
swaymsg workspace 4
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
swaymsg output HDMI-A-2 enable
|
swaymsg reload
|
||||||
swaymsg workspace back_and_forth
|
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,30 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
import-gsettings() {
|
import-gsettings() {
|
||||||
# usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
|
# usage: import-gsettings
|
||||||
expression=""
|
config="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini"
|
||||||
for pair in "$@"; do
|
if [ ! -f "$config" ]; then exit 1; fi
|
||||||
IFS=:; set -- $pair
|
|
||||||
expressions="$expressions -e 's:^$2=(.*)$:gsettings set org.gnome.desktop.interface $1 \1:e'"
|
gnome_schema="org.gnome.desktop.interface"
|
||||||
done
|
gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')"
|
||||||
IFS=
|
icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')"
|
||||||
eval sed -E $expressions "${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini >/dev/null
|
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"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WLR_RENDERER=vulkan
|
||||||
# list DRM device priority
|
# list DRM device priority
|
||||||
# Set intel graphics as lowest priority
|
# Set intel graphics as high priority
|
||||||
# https://github.com/swaywm/sway/wiki#i-have-a-multi-gpu-setup-like-intelnvidia-or-intelamd-and-sway-does-not-start
|
# 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/:$//')"
|
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
|
# temporary fix
|
||||||
# # https://github.com/swaywm/sway/issues/4763
|
# # 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)
|
# disable hardware cursor (cause mouse to stutter on my setup)
|
||||||
#export WLR_NO_HARDWARE_CURSORS=1
|
#export WLR_NO_HARDWARE_CURSORS=1
|
||||||
|
@ -28,17 +34,15 @@ export XDG_SESSION_TYPE=wayland
|
||||||
# Qt
|
# Qt
|
||||||
#export DESKTOP_SESSION=gnome
|
#export DESKTOP_SESSION=gnome
|
||||||
#export QT_STYLE_OVERRIDE=gtk
|
#export QT_STYLE_OVERRIDE=gtk
|
||||||
#export QT_QPA_PLATFORMTHEME=gtk2
|
export QT_QPA_PLATFORMTHEME=gtk3
|
||||||
export QT_AUTO_SCREEN_SCALE_FACTOR=0
|
export QT_AUTO_SCREEN_SCALE_FACTOR=0
|
||||||
#export QT_QPA_PLATFORM=wayland-egl
|
#export QT_QPA_PLATFORM=wayland-egl
|
||||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||||
|
|
||||||
# GTK
|
# GTK
|
||||||
export CLUTTER_BACKEND=wayland
|
export CLUTTER_BACKEND=wayland
|
||||||
import-gsettings \
|
export GTK_THEME=Orchis
|
||||||
gtk-theme:gtk-theme-name \
|
import-gsettings
|
||||||
icon-theme:gtk-icon-theme-name \
|
|
||||||
cursor-theme:gtk-cursor-theme-name
|
|
||||||
|
|
||||||
# Elementary/EFL
|
# Elementary/EFL
|
||||||
export ECORE_EVAS_ENGINE=wayland_egl
|
export ECORE_EVAS_ENGINE=wayland_egl
|
||||||
|
@ -54,4 +58,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
export MOZ_ENABLE_WAYLAND=1
|
export MOZ_ENABLE_WAYLAND=1
|
||||||
export MOZ_DBUS_REMOTE=1
|
export MOZ_DBUS_REMOTE=1
|
||||||
|
|
||||||
|
# Electron
|
||||||
|
export ELECTRON_OZONE_PLATFORM_HINT=auto
|
||||||
|
|
||||||
exec /usr/bin/sway $@
|
exec /usr/bin/sway $@
|
||||||
|
|
|
@ -31,7 +31,7 @@ set updatetime=500
|
||||||
set ignorecase
|
set ignorecase
|
||||||
set smartcase
|
set smartcase
|
||||||
" Clipboard
|
" Clipboard
|
||||||
set clipboard^=unnamed,unnamedplus
|
"set clipboard^=unnamed,unnamedplus
|
||||||
|
|
||||||
" Remap arrow keys
|
" Remap arrow keys
|
||||||
noremap <Up> <NOP>
|
noremap <Up> <NOP>
|
||||||
|
@ -49,62 +49,72 @@ augroup resCur
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
" Plugins
|
" Plugins
|
||||||
let deinpath=$HOME.'/.vim/bundle/repos/github.com/Shougo/dein.vim'
|
" Install vim-plug if not found
|
||||||
let pluginpath=$HOME.'/.vim/bundle'
|
if empty(glob('~/.vim/autoload/plug.vim'))
|
||||||
let &rtp.=','.deinpath
|
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
|
||||||
|
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||||
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
|
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
|
filetype plugin indent on
|
||||||
syntax enable
|
syntax enable
|
||||||
|
|
||||||
" Automatically install plugins
|
|
||||||
if dein#check_install()
|
|
||||||
call dein#install()
|
|
||||||
endif
|
|
||||||
|
|
||||||
" Color scheme
|
" Color scheme
|
||||||
colorscheme spacegray
|
colorscheme spacegray
|
||||||
" 16 millions colors
|
" 16 millions colors
|
||||||
|
@ -118,19 +128,7 @@ set t_ZH=[3m
|
||||||
set t_ZR=[23m
|
set t_ZR=[23m
|
||||||
|
|
||||||
" deoplete
|
" 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
|
" supertab
|
||||||
let g:SuperTabDefaultCompletionType = "<c-n>"
|
let g:SuperTabDefaultCompletionType = "<c-n>"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# If you come from bash you might have to change your $PATH.
|
# If you come from bash you might have to change your $PATH.
|
||||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
export PATH=$HOME/go/bin:$HOME/bin:/usr/local/bin:$PATH
|
||||||
|
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH="$HOME/.config/zsh/oh-my-zsh/"
|
export ZSH="$HOME/.config/zsh/oh-my-zsh/"
|
||||||
|
@ -86,3 +86,6 @@ source $ZSH/oh-my-zsh.sh
|
||||||
# Example aliases
|
# Example aliases
|
||||||
# alias zshconfig="mate ~/.zshrc"
|
# alias zshconfig="mate ~/.zshrc"
|
||||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
# 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