From 7212247563a0d6beba8d6b1b9d93efad1cbcba32 Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Fri, 18 Dec 2020 22:22:53 +0100 Subject: [PATCH] updates --- hjalmar-droneship/i3/config | 444 ++++++++++++++++++++++ hjalmar-droneship/onedrive/config | 2 +- {i3 => hjalmar-mothership/i3}/config | 4 +- i3status/config | 69 ++++ manjaro.md | 5 +- modprobe.d/iwlwifi-hjalmar-droneship.conf | 3 - modprobe.d/iwlwifi.conf | 2 +- nvim/init.vim | 33 +- 8 files changed, 545 insertions(+), 17 deletions(-) create mode 100644 hjalmar-droneship/i3/config rename {i3 => hjalmar-mothership/i3}/config (99%) create mode 100644 i3status/config delete mode 100644 modprobe.d/iwlwifi-hjalmar-droneship.conf diff --git a/hjalmar-droneship/i3/config b/hjalmar-droneship/i3/config new file mode 100644 index 0000000..5065481 --- /dev/null +++ b/hjalmar-droneship/i3/config @@ -0,0 +1,444 @@ +# i3 config file (v4) +# Please see http://i3wm.org/docs/userguide.html for a complete reference! + +# Set mod key (Mod1=, Mod4=) +set $mod Mod4 + +# set terminal +set $term st + +# set default desktop layout (default is tiling) +# workspace_layout tabbed + +# Configure border style +default_border pixel 3 +default_floating_border normal + +# Hide borders +hide_edge_borders none + +# change borders +bindsym $mod+u border none +bindsym $mod+y border pixel 1 +bindsym $mod+n border normal + +# configure some stuff +focus_follows_mouse no +mouse_warping none +workspace_auto_back_and_forth no + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +# font xft:URWGothic-Book 11 +font pango:Noto Sans 11 + +# Use Mouse+$mod to drag floating windows +floating_modifier $mod + +# start a terminal +bindsym $mod+Return exec $term + +# kill focused window +bindsym $mod+Shift+q kill + +# start program launcher +# bindsym $mod+d exec --no-startup-id dmenu_recency +bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30 + +################################################################################################ +## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ## +################################################################################################ + +exec --no-startup-id volumeicon +bindsym $mod+Ctrl+m exec $term -e 'alsamixer' +#exec --no-startup-id pulseaudio +#exec --no-startup-id pa-applet +#bindsym $mod+Ctrl+m exec pavucontrol +################################################################################################ + +bindsym Pause exec amixer -q sset Master 3%+ +bindsym Print exec amixer -q sset Master 3%- +bindsym Scroll_Lock exec amixer -q sset Master toggle +################################################################################################ + +# Screen brightness controls +# bindsym XF86MonBrightnessUp exec "xbacklight -inc 10; notify-send 'brightness up'" +# bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'" + +# enable / disable caps->escape bind +bindsym $mod+F10 exec "setxkbmap -layout no -variant nodeadkeys -option" +bindsym $mod+F11 exec "setxkbmap -layout no -variant nodeadkeys -option 'caps:backspace'" +bindsym $mod+F12 exec "setxkbmap -layout no -variant nodeadkeys -option 'caps:escape'" + +# Start Applications +bindsym $mod+Ctrl+b exec $term -e 'bmenu' +bindsym $mod+F1 exec glances -w +bindsym $mod+F2 exec chromium +bindsym $mod+F3 exec thunar +bindsym $mod+Shift+F3 exec $term -e 'ranger' +bindsym $mod+F4 exec $term -e 'mocp' +bindsym $mod++Shift+F4 exec $term -e 'ncspot' +bindsym $mod+t exec --no-startup-id pkill picom +bindsym $mod+Shift+t exec --no-startup-id picom -b +bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'" +bindsym $mod+Shift+s --release exec --no-startup-id flameshot gui +bindsym $mod+Ctrl+x --release exec --no-startup-id xkill + +# change focus +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+h move left +bindsym $mod+Shift+j move down +bindsym $mod+Shift+k move up +bindsym $mod+Shift+l move right +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# workspace back and forth (with/without active container) +bindsym $mod+b workspace back_and_forth +bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth + +# split orientation +bindsym $mod+bar split h;exec notify-send 'tile horizontally' +bindsym $mod+minus split v;exec notify-send 'tile vertically' +bindsym $mod+q split toggle + +# toggle fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# toggle sticky +bindsym $mod+Shift+s sticky toggle + +# focus the parent container +bindsym $mod+a focus parent + +# move the currently focused window to the scratchpad +# bindsym $mod+Shift+minus move scratchpad + +# Show the next scratchpad window or hide the focused scratchpad window. +# If there are multiple scratchpad windows, this command cycles through them. +# bindsym $mod+minus scratchpad show + +#navigate workspaces next / previous +bindsym $mod+Ctrl+Right workspace next +bindsym $mod+Ctrl+Left workspace prev + +# Workspace names +# to display names or symbols instead of plain workspace numbers you can use +# something like: set $ws1 1:mail +# set $ws2 2: +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "Ins" +set $ws5 "Home" +set $ws6 "PgUp" +set $ws7 "Del" +set $ws8 "End" +set $ws9 "PgDn" + +# switch to workspace +bindsym $mod+1 workspace $ws1 +bindsym $mod+2 workspace $ws2 +bindsym $mod+3 workspace $ws3 +bindsym $mod+Insert workspace $ws4 +bindsym $mod+Home workspace $ws5 +bindsym $mod+Prior workspace $ws6 +bindsym $mod+Delete workspace $ws7 +bindsym $mod+End workspace $ws8 +bindsym $mod+Next workspace $ws9 + +# switch to workspace +workspace $ws1 output HDMI-0 +workspace $ws2 output HDMI-0 +workspace $ws3 output HDMI-0 +workspace $ws4 output HDMI-0 +workspace $ws5 output HDMI-0 +workspace $ws6 output HDMI-0 +workspace $ws7 output HDMI-0 +workspace $ws8 output HDMI-0 +workspace $ws9 output HDMI-0 + +# Move focused container to workspace +bindsym $mod+Ctrl+1 move container to workspace $ws1 +bindsym $mod+Ctrl+2 move container to workspace $ws2 +bindsym $mod+Ctrl+3 move container to workspace $ws3 +bindsym $mod+Ctrl+Insert move container to workspace $ws4 +bindsym $mod+Ctrl+Home move container to workspace $ws5 +bindsym $mod+Ctrl+Prior move container to workspace $ws6 +bindsym $mod+Ctrl+Delete move container to workspace $ws7 +bindsym $mod+Ctrl+End move container to workspace $ws8 +bindsym $mod+Ctrl+Next move container to workspace $ws9 + +# Move to workspace with focused container +bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1 +bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 +bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 +bindsym $mod+Shift+Insert move container to workspace $ws4; workspace $ws4 +bindsym $mod+Shift+Home move container to workspace $ws5; workspace $ws5 +bindsym $mod+Shift+Prior move container to workspace $ws6; workspace $ws6 +bindsym $mod+Shift+Delete move container to workspace $ws7; workspace $ws7 +bindsym $mod+Shift+End move container to workspace $ws8; workspace $ws8 +bindsym $mod+Shift+Next move container to workspace $ws9; workspace $ws9 + +# Open applications on specific workspaces +# assign [class="Thunderbird"] $ws1 +# assign [class="Pale moon"] $ws2 +# assign [class="Pcmanfm"] $ws3 +# assign [class="Skype"] $ws5 + +# Open specific applications in floating mode +for_window [title="alsamixer"] floating enable border pixel 1 +for_window [class="calamares"] floating enable border normal +for_window [class="Clipgrab"] floating enable +for_window [title="File Transfer*"] floating enable +for_window [class="fpakman"] floating enable +for_window [class="Galculator"] floating enable border pixel 1 +for_window [class="GParted"] floating enable border normal +for_window [title="i3_help"] floating enable sticky enable border normal +for_window [class="Lightdm-settings"] floating enable +for_window [class="Lxappearance"] floating enable sticky enable border normal +for_window [class="Manjaro-hello"] floating enable +for_window [class="Manjaro Settings Manager"] floating enable border normal +for_window [title="MuseScore: Play Panel"] floating enable +for_window [class="Nitrogen"] floating enable sticky enable border normal +for_window [class="Oblogout"] fullscreen enable +for_window [class="octopi"] floating enable +for_window [title="About Pale Moon"] floating enable +for_window [class="Pamac-manager"] floating enable +for_window [class="Pavucontrol"] floating enable +for_window [class="qt5ct"] floating enable sticky enable border normal +for_window [class="Qtconfig-qt4"] floating enable sticky enable border normal +for_window [class="Simple-scan"] floating enable border normal +for_window [class="(?i)System-config-printer.py"] floating enable border normal +for_window [class="Skype"] floating enable border normal +for_window [class="Timeset-gui"] floating enable border normal +for_window [class="(?i)virtualbox"] floating enable border normal +for_window [class="Xfburn"] floating enable + +# switch to workspace with urgent window automatically +for_window [urgent=latest] focus + +# reload the configuration file +bindsym $mod+Shift+c reload + +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart + +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" + +# Set shut down, restart and locking features +bindsym $mod+0 mode "$mode_system" +set $mode_system (l)ock, (e)xit, switch_(u)ser, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown +mode "$mode_system" { + bindsym l exec --no-startup-id i3exit lock, mode "default" + bindsym s exec --no-startup-id i3exit suspend, mode "default" + bindsym u exec --no-startup-id i3exit switch_user, mode "default" + bindsym e exec --no-startup-id i3exit logout, mode "default" + bindsym h exec --no-startup-id i3exit hibernate, mode "default" + bindsym r exec --no-startup-id i3exit reboot, mode "default" + bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default" + + # exit system mode: "Enter" or "Escape" + bindsym Return mode "default" + bindsym Escape mode "default" +} + +# Resize window (you can also use the mouse for that) +bindsym $mod+r mode "resize" +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym l resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym j resize shrink height 10 px or 10 ppt + bindsym h resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # exit resize mode: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +# Autostart applications +exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec --no-startup-id nm-applet +exec --no-startup-id nitrogen --restore +exec --no-startup-id xfce4-power-manager +#exec --no-startup-id pamac-tray +#exec --no-startup-id clipit +#exec --no-startup-id start_conky_live_green +exec --no-startup-id xautolock -time 30 -locker blurlock +exec_always --no-startup-id sbxkb +#exec_always --no-startup-id ff-theme-util +exec_always --no-startup-id fix_xcursor +exec_always for id in $(xinput list | grep "pointer" | cut -d '=' -f 2 | cut -f 1); do xinput --set-prop $id 'libinput Accel Profile Enabled' 0, 1; done + +# HB STARTUP ADDITIONS +exec --no-startup-id setxkbmap -layout no -variant nodeadkeys -option "caps:escape" +exec --no-startup-id redshift-gtk +exec --no-startup-id dropbox start & +exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60 +exec --no-startup-id xrandr --output DP-3 --mode 3840x2160 --primary + +# Color palette used for the terminal ( ~/.Xresources file ) +# Colors are gathered based on the documentation: +# https://i3wm.org/docs/userguide.html#xresources +# Change the variable name at the place you want to match the color +# of your terminal like this: +# [example] +# If you want your bar to have the same background color as your +# terminal background change the line 362 from: +# background #14191D +# to: +# background $term_background +# Same logic applied to everything else. +set_from_resource $term_background background +set_from_resource $term_foreground foreground +set_from_resource $term_color0 color0 +set_from_resource $term_color1 color1 +set_from_resource $term_color2 color2 +set_from_resource $term_color3 color3 +set_from_resource $term_color4 color4 +set_from_resource $term_color5 color5 +set_from_resource $term_color6 color6 +set_from_resource $term_color7 color7 +set_from_resource $term_color8 color8 +set_from_resource $term_color9 color9 +set_from_resource $term_color10 color10 +set_from_resource $term_color11 color11 +set_from_resource $term_color12 color12 +set_from_resource $term_color13 color13 +set_from_resource $term_color14 color14 +set_from_resource $term_color15 color15 + +# Start i3bar to display a workspace bar (plus the system information i3status if available) +bar { + i3bar_command i3bar + status_command i3status + position bottom + +## please set your primary output first. Example: 'xrandr --output eDP1 --primary' + + # tray_output HDMI-0 + + bindsym button4 nop + bindsym button5 nop +# font xft:URWGothic-Book 11 + strip_workspace_numbers yes + + colors { + background #222D31 + statusline #F9FAF9 + separator #454947 + +# border backgr. text + focused_workspace #F9FAF9 #16a085 #292F34 + active_workspace #595B5B #353836 #FDF6E3 + inactive_workspace #595B5B #222D31 #EEE8D5 + binding_mode #16a085 #2C2C2C #F9FAF9 + urgent_workspace #16a085 #FDF6E3 #E5201D + } +} + +# hide/unhide i3status bar +bindsym $mod+m bar mode toggle + +# Theme colors +# class border backgr. text indic. child_border + client.focused #556064 #f9ce5c #000000 #FDF6E3 + client.focused_inactive #2F3D44 #2F3D44 #1ABC9C #454948 + client.unfocused #2F3D44 #2F3D44 #1ABC9C #454948 + client.urgent #CB4B16 #FDF6E3 #1ABC9C #268BD2 + client.placeholder #000000 #0c0c0c #ffffff #000000 + + client.background #2B2C2B + +############################# +### settings for i3-gaps: ### +############################# + +# Set inner/outer gaps +gaps inner 14 +gaps outer -2 + +# Additionally, you can issue commands with the following syntax. This is useful to bind keys to changing the gap size. +# gaps inner|outer current|all set|plus|minus +# gaps inner all set 10 +# gaps outer all plus 5 + +# Smart gaps (gaps used if only more than one container on the workspace) +smart_gaps on + +# Smart borders (draw borders around container only if it is not the only container on this workspace) +# on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) +smart_borders on + +# Press $mod+Shift+g to enter the gap mode. Choose o or i for modifying outer/inner gaps. Press one of + / - (in-/decrement for current workspace) or 0 (remove gaps for current workspace). If you also press Shift with these keys, the change will be global for all workspaces. +set $mode_gaps Gaps: (o) outer, (i) inner +set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global) +set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global) +bindsym $mod+Shift+g mode "$mode_gaps" + +mode "$mode_gaps" { + bindsym o mode "$mode_gaps_outer" + bindsym i mode "$mode_gaps_inner" + bindsym Return mode "default" + bindsym Escape mode "default" +} +mode "$mode_gaps_inner" { + bindsym plus gaps inner current plus 5 + bindsym minus gaps inner current minus 5 + bindsym 0 gaps inner current set 0 + + bindsym Shift+plus gaps inner all plus 5 + bindsym Shift+minus gaps inner all minus 5 + bindsym Shift+0 gaps inner all set 0 + + bindsym Return mode "default" + bindsym Escape mode "default" +} +mode "$mode_gaps_outer" { + bindsym plus gaps outer current plus 5 + bindsym minus gaps outer current minus 5 + bindsym 0 gaps outer current set 0 + + bindsym Shift+plus gaps outer all plus 5 + bindsym Shift+minus gaps outer all minus 5 + bindsym Shift+0 gaps outer all set 0 + + bindsym Return mode "default" + bindsym Escape mode "default" +} diff --git a/hjalmar-droneship/onedrive/config b/hjalmar-droneship/onedrive/config index ad3e1b5..f9f02fe 100644 --- a/hjalmar-droneship/onedrive/config +++ b/hjalmar-droneship/onedrive/config @@ -1,2 +1,2 @@ sync_dir="/mnt/OneDrive" -skip_dir="Bilder/Camera Roll|Backup|Datasets|Library|Music|Pictures|Programming/logs|Programming/pysrc|Research - books|Research - papers|Videos" +skip_dir="Programming/logs|Bilder/Camera Roll|Backup|Datasets|Pictures|Videos" diff --git a/i3/config b/hjalmar-mothership/i3/config similarity index 99% rename from i3/config rename to hjalmar-mothership/i3/config index 78b52b3..70eef30 100644 --- a/i3/config +++ b/hjalmar-mothership/i3/config @@ -43,7 +43,7 @@ bindsym $mod+Shift+q kill # start program launcher # bindsym $mod+d exec --no-startup-id dmenu_recency -bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30 -padding 800 +bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi "run#drun" -lines 10 -eh 2 -width 30 ################################################################################################ ## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ## @@ -357,7 +357,7 @@ bar { ## please set your primary output first. Example: 'xrandr --output eDP1 --primary' -# tray_output primary + tray_output primary # tray_output eDP1 bindsym button4 nop diff --git a/i3status/config b/i3status/config new file mode 100644 index 0000000..c7c4664 --- /dev/null +++ b/i3status/config @@ -0,0 +1,69 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +general { + colors = true + interval = 5 +} + +# order += "ipv6" + +order += "cpu_usage" +cpu_usage { + format = " ☢ CPU %usage " +} + +order += "cpu_temperature 0" +cpu_temperature 0 { + format = " %degrees °C " +} + +order += "load" +load { + format = "load %1min" +} + +# order += "wireless wlan0" +# order += "ethernet eth0" +order += "wireless _first_" +wireless _first_ { + # format_up = "  W: (%quality at %essid, %bitrate / %frequency) %ip " + format_up = "  W: (%quality at %essid, %bitrate / %frequency) " + format_down = " no wlan " +} + +order += "ethernet _first_" +ethernet _first_ { + format_up = " lan: %ip %speed " + format_down = " no lan " +} + +order += "disk /" +disk "/" { + format = " SSD ⛁ %avail / %percentage_avail " +} + +order += "disk /mnt/goshHDD/" +disk "/mnt/goshHDD/" { + format = " HDD ⛁ %avail / %percentage_avail " +} + +# order += "battery 0" +battery 0 { + format = "%status %percentage %remaining " +} + +# order += "run_watch DHCP" +run_watch DHCP { + pidfile = "/var/run/dhclient*.pid" +} + +# order += "run_watch VPN" +run_watch VPN { + pidfile = "/var/run/vpnc/pid" +} + +order += "tztime local" +tztime local { + format = " %Y-%m-%d %H:%M:%S " +} diff --git a/manjaro.md b/manjaro.md index 4abb4d3..b6c5b98 100644 --- a/manjaro.md +++ b/manjaro.md @@ -1,7 +1,7 @@ # linux * yay stuff * AUR `sudo pacman -S yay` - * `yay onedrive-abraunegg dropbox slack-desktop ncspot-git rxvt-unicode-truecolor-wide-glyphs` + * `yay -S onedrive-abraunegg dropbox slack-desktop ncspot-git rxvt-unicode-truecolor-wide-glyphs chromium` * applications * helpers `sudo pacman -S zathura-pdf-mupdf trash-cli rofi` * base16 shell `git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell` @@ -54,7 +54,8 @@ * omf install https://github.com/jethrokuan/fzf # ROUTER -* asus merlin - install Diversion, conmon, skynet, scMerlin, uiDivStats +* asus merlin - install conmon, skynet, scMerlin, FlexQOS + + maybe: Diversion + uiDivStats + yazFi * wifi adapter: kill bluetooth and background scans. tools: * **rfkill** (=interact with wireless devices) see blocked `rfkill` * **inxi** (=tool to show stuff) see network drivers `inxi -N` diff --git a/modprobe.d/iwlwifi-hjalmar-droneship.conf b/modprobe.d/iwlwifi-hjalmar-droneship.conf deleted file mode 100644 index a73e2d1..0000000 --- a/modprobe.d/iwlwifi-hjalmar-droneship.conf +++ /dev/null @@ -1,3 +0,0 @@ -#options iwlwifi bt_coex_active=N -options iwlwifi disable_11ax=1 -options iwlmvm power_scheme=1 diff --git a/modprobe.d/iwlwifi.conf b/modprobe.d/iwlwifi.conf index 08c5efb..c0b4c87 100644 --- a/modprobe.d/iwlwifi.conf +++ b/modprobe.d/iwlwifi.conf @@ -1,3 +1,3 @@ options iwlwifi bt_coex_active=N -options iwlwifi disable_11ax=1 +#options iwlwifi disable_11ax=1 options iwlmvm power_scheme=1 diff --git a/nvim/init.vim b/nvim/init.vim index 8017be2..65b13ff 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -16,13 +16,14 @@ let g:coc_global_extensions=[ \ 'coc-explorer', \ 'coc-markmap' \ ] +let g:polyglot_disabled = ['python'] call plug#begin('~/.config/nvim/plugged') " tools Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} Plug 'junegunn/fzf.vim' -Plug 'antoinemadec/coc-fzf', {'branch': 'release'} +Plug 'antoinemadec/coc-fzf', {'branch': 'master'} Plug 'sheerun/vim-polyglot' " language syntax Plug 'tpope/vim-abolish' " better search replace " git @@ -39,8 +40,12 @@ Plug 'farmergreg/vim-lastplace' " When reopen a buffer, puts the cursor wh Plug 'haya14busa/vim-asterisk' " better asterisk motions Plug 'tpope/vim-unimpaired' Plug 'tpope/vim-sensible' +Plug 'dkarter/bullets.vim' +" python +Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} +Plug 'tmhedberg/SimpylFold' +Plug 'jeetsukumaran/vim-pythonsense' " tmux -Plug 'roxma/vim-tmux-clipboard' Plug 'christoomey/vim-tmux-navigator' " integrate movement in tmux and vim " aesthetics Plug 'chriskempson/base16-vim' " base16 themes @@ -51,6 +56,8 @@ Plug 'junegunn/goyo.vim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'junegunn/seoul256.vim' +Plug 'sainnhe/gruvbox-material' +Plug 'skbolton/embark' call plug#end() " ----------------------------------------------------------------------------- @@ -75,6 +82,7 @@ endif let g:seoul256_background=233 " colo seoul256 " colo base16-tomorrow-night +colo gruvbox-material " statusline set cmdheight=2 @@ -82,8 +90,9 @@ let g:airline_powerline_fonts=1 "let g:airline_theme='molokai' "let g:airline_theme='qwq' "let g:airline_theme='badwolf' -let g:airline_theme='silver' +" let g:airline_theme='silver' " let g:airline_theme='raven' +let g:airline_theme='base16_gruvbox_dark_hard' let g:airline#extensions#tabline#enabled=1 let g:airline#extensions#tabline#show_splits=0 let g:airline#extensions#tabline#show_tabs=0 @@ -131,7 +140,11 @@ set smartindent " folds set foldmethod=indent -set foldlevelstart=20 +set foldlevel=2 +set foldnestmax=10 +set nofoldenable +let g:SimpylFold_docstring_preview = 1 +let g:SimpylFold_fold_docstring = 1 " zm/M zr/R increase/increase foldlevel (max) " zo/O zc/C open / close fold (max) " za zA switch fold (small/full) @@ -229,6 +242,7 @@ let g:asterisk#keeppos=1 " stay visual when indenting vnoremap >gv vnoremap (coc-diagnostic-prev) nmap (coc-diagnostic-next) @@ -249,9 +263,11 @@ nmap :TmuxNavigateUp nmap :TmuxNavigateRight " make splits and tabs nnoremap :vsplit -nnoremap :vnew +nnoremap :vsplit +nnoremap § :vnew nnoremap :split -nnoremap :new +nnoremap - :split +nnoremap _ :new nnoremap :tabe % nnoremap :tabnew " buffers and tabs @@ -318,6 +334,7 @@ nmap :CocFzfList symbols --kind Function nmap :CocFzfList symbols --kind Class nmap :Commits nmap :BCommits +nmap :CocFzfList outline nmap :RG nmap :GFiles? nmap :History @@ -359,8 +376,8 @@ endfunction " vim-markdown nmap m (coc-markmap-create) vmap m (coc-markmap-create-v) -let g:vim_markdown_new_list_item_indent=2 -let g:vim_markdown_auto_insert_bullets=1 +let g:vim_markdown_new_list_item_indent=0 +let g:vim_markdown_auto_insert_bullets=0 let g:vim_markdown_conceal=1 let g:vim_markdown_conceal_code_blocks=1 let g:vim_markdown_math=1