Compare commits
No commits in common. "7ac08713c8784218b78ccb928907f96522467542" and "2c3d0287a2af4aa022dff52684c5b5e20b75a092" have entirely different histories.
7ac08713c8
...
2c3d0287a2
9 changed files with 9 additions and 635 deletions
2
.bashrc
2
.bashrc
|
|
@ -57,7 +57,7 @@ alias gs='git status'
|
||||||
# less used aliases
|
# less used aliases
|
||||||
wttr()
|
wttr()
|
||||||
{
|
{
|
||||||
curl -H "Accept-Language: ${LANG%_*}" wttr.in/"${1:-Kontula}"
|
curl -H "Accept-Language: ${LANG%_*}" wttr.in/"${1:-Nancy}"
|
||||||
}
|
}
|
||||||
|
|
||||||
PATH="$PATH:$HOME/.local/bin"
|
PATH="$PATH:$HOME/.local/bin"
|
||||||
|
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
if status is-interactive
|
|
||||||
# Commands to run in interactive sessions can go here
|
|
||||||
|
|
||||||
function fish_user_key_bindings
|
|
||||||
# Execute this once per mode that emacs bindings should be used in
|
|
||||||
fish_default_key_bindings -M insert
|
|
||||||
|
|
||||||
# Then execute the vi-bindings so they take precedence when there's a conflict.
|
|
||||||
# Without --no-erase fish_vi_key_bindings will default to
|
|
||||||
# resetting all bindings.
|
|
||||||
# The argument specifies the initial mode (insert, "default" or visual).
|
|
||||||
fish_vi_key_bindings --no-erase insert
|
|
||||||
end
|
|
||||||
|
|
||||||
function fish_greeting
|
|
||||||
fastfetch
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# export NVM_DIR="$HOME/.nvm"
|
|
||||||
# [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && . "/opt/homebrew/opt/nvm/nvm.sh" # This loads nvm
|
|
||||||
# [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && . "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
|
|
||||||
|
|
||||||
export PATH="$PATH:/Applications/Postgres.app/Contents/Versions/latest/bin"
|
|
||||||
|
|
||||||
export PATH="$PATH:/Users/kapnoc/pkg/flutter/bin"
|
|
||||||
|
|
||||||
export PATH=":$HOME/.cargo/bin:$PATH:$HOME/.local/bin"
|
|
||||||
|
|
||||||
export EDITOR='nvim'
|
|
||||||
export PAGER='less -R'
|
|
||||||
|
|
||||||
export GPG_TTY=(tty)
|
|
||||||
|
|
||||||
# common use aliases
|
|
||||||
alias ..='cd ..'
|
|
||||||
alias cl='clear'
|
|
||||||
alias ll='ls -l'
|
|
||||||
alias la='ls -la'
|
|
||||||
alias ne='emacs -nw'
|
|
||||||
alias vv='nvim'
|
|
||||||
alias vimr='/Applications/VimR.app/Contents/Resources/vimr'
|
|
||||||
alias aled="startx -- vt1"
|
|
||||||
|
|
||||||
# git aliases
|
|
||||||
alias ga='git add'
|
|
||||||
alias gc='git checkout'
|
|
||||||
alias gco='git commit'
|
|
||||||
alias gd='git diff'
|
|
||||||
alias gl='git log'
|
|
||||||
alias gpl='git pull'
|
|
||||||
alias gps='git push'
|
|
||||||
alias gs='git status'
|
|
||||||
|
|
||||||
function wttr -a location
|
|
||||||
set -q location[1]; or set location "Helsinki"
|
|
||||||
curl -H "Accept-Language: $LANG" "wttr.in/$location?u"
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# less used aliases
|
|
||||||
# wttr()
|
|
||||||
# {
|
|
||||||
# curl -H "Accept-Language: ${LANG%_*}" wttr.in/"${1:-Helsinki}"
|
|
||||||
# }
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
# name: RobbyRussel
|
|
||||||
#
|
|
||||||
# You can override some default options in your config.fish:
|
|
||||||
# set -g theme_display_git_untracked no
|
|
||||||
|
|
||||||
function _git_branch_name
|
|
||||||
echo (command git symbolic-ref HEAD 2> /dev/null | sed -e 's|^refs/heads/||')
|
|
||||||
end
|
|
||||||
|
|
||||||
function _is_git_dirty
|
|
||||||
set -l show_untracked (git config --bool bash.showUntrackedFiles)
|
|
||||||
set -l untracked
|
|
||||||
if [ "$theme_display_git_untracked" = 'no' -o "$show_untracked" = 'false' ]
|
|
||||||
set untracked '--untracked-files=no'
|
|
||||||
end
|
|
||||||
echo (command git status -s --ignore-submodules=dirty $untracked 2> /dev/null)
|
|
||||||
end
|
|
||||||
|
|
||||||
function fish_prompt
|
|
||||||
set -l last_status $status
|
|
||||||
set -l cyan (set_color -o cyan)
|
|
||||||
set -l yellow (set_color -o yellow)
|
|
||||||
set -l red (set_color -o red)
|
|
||||||
set -l blue (set_color -o blue)
|
|
||||||
set -l green (set_color -o green)
|
|
||||||
set -l normal (set_color normal)
|
|
||||||
|
|
||||||
if test $last_status = 0
|
|
||||||
set arrow "$green➜ "
|
|
||||||
else
|
|
||||||
set arrow "$red➜ "
|
|
||||||
end
|
|
||||||
set -l cwd $cyan(basename (prompt_pwd))
|
|
||||||
|
|
||||||
if [ (_git_branch_name) ]
|
|
||||||
set -l git_branch $red(_git_branch_name)
|
|
||||||
set git_info "$blue git:($git_branch$blue)"
|
|
||||||
|
|
||||||
if [ (_is_git_dirty) ]
|
|
||||||
set -l dirty "$yellow ✗"
|
|
||||||
set git_info "$git_info$dirty"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
echo -n -s $arrow ' ' $cwd $git_info $normal ' '
|
|
||||||
end
|
|
||||||
|
|
@ -1,334 +0,0 @@
|
||||||
# -*- conf -*-
|
|
||||||
|
|
||||||
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
|
|
||||||
# term=foot (or xterm-256color if built with -Dterminfo=disabled)
|
|
||||||
term=xterm-256color
|
|
||||||
# login-shell=no
|
|
||||||
|
|
||||||
# app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode
|
|
||||||
# title=foot
|
|
||||||
# locked-title=no
|
|
||||||
|
|
||||||
font=Hack-Regular:size=10:antialias=true:autohint=false
|
|
||||||
font=UbuntuMono:antialias=true:autohint=false:size=12
|
|
||||||
# font-bold=<bold variant of regular font>
|
|
||||||
# font-italic=<italic variant of regular font>
|
|
||||||
# font-bold-italic=<bold+italic variant of regular font>
|
|
||||||
# font-size-adjustment=0.5
|
|
||||||
# line-height=<font metrics>
|
|
||||||
# letter-spacing=0
|
|
||||||
# horizontal-letter-offset=0
|
|
||||||
# vertical-letter-offset=0
|
|
||||||
# underline-offset=<font metrics>
|
|
||||||
# underline-thickness=<font underline thickness>
|
|
||||||
# strikeout-thickness=<font strikeout thickness>
|
|
||||||
# box-drawings-uses-font-glyphs=no
|
|
||||||
# dpi-aware=no
|
|
||||||
|
|
||||||
# initial-window-size-pixels=700x500 # Or,
|
|
||||||
initial-window-size-chars=110x32
|
|
||||||
# initial-window-mode=windowed
|
|
||||||
# pad=0x0 # optionally append 'center'
|
|
||||||
# resize-by-cells=yes
|
|
||||||
# resize-keep-grid=yes
|
|
||||||
# resize-delay-ms=100
|
|
||||||
|
|
||||||
# bold-text-in-bright=no
|
|
||||||
# word-delimiters=,│`|:"'()[]{}<>
|
|
||||||
# selection-target=primary
|
|
||||||
# workers=<number of logical CPUs>
|
|
||||||
# utmp-helper=/usr/lib/utempter/utempter # When utmp backend is ‘libutempter’ (Linux)
|
|
||||||
# utmp-helper=/usr/libexec/ulog-helper # When utmp backend is ‘ulog’ (FreeBSD)
|
|
||||||
|
|
||||||
[environment]
|
|
||||||
# name=value
|
|
||||||
|
|
||||||
[bell]
|
|
||||||
# urgent=no
|
|
||||||
# notify=no
|
|
||||||
# visual=no
|
|
||||||
# command=
|
|
||||||
# command-focused=no
|
|
||||||
|
|
||||||
[scrollback]
|
|
||||||
# lines=1000
|
|
||||||
# multiplier=3.0
|
|
||||||
# indicator-position=relative
|
|
||||||
# indicator-format=""
|
|
||||||
|
|
||||||
[url]
|
|
||||||
# launch=xdg-open ${url}
|
|
||||||
# label-letters=sadfjklewcmpgh
|
|
||||||
# osc8-underline=url-mode
|
|
||||||
# protocols=http, https, ftp, ftps, file, gemini, gopher
|
|
||||||
# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
|
|
||||||
|
|
||||||
[cursor]
|
|
||||||
# style=block
|
|
||||||
# color=<inverse foreground/background>
|
|
||||||
color = 2e3440 d8dee9
|
|
||||||
# blink=no
|
|
||||||
# blink-rate=500
|
|
||||||
# beam-thickness=1.5
|
|
||||||
# underline-thickness=<font underline thickness>
|
|
||||||
|
|
||||||
[mouse]
|
|
||||||
# hide-when-typing=no
|
|
||||||
# alternate-scroll-mode=yes
|
|
||||||
|
|
||||||
[touch]
|
|
||||||
# long-press-delay=400
|
|
||||||
|
|
||||||
[colors]
|
|
||||||
alpha=0.9
|
|
||||||
# background=242424
|
|
||||||
# foreground=ffffff
|
|
||||||
# flash=7f7f00
|
|
||||||
# flash-alpha=0.5
|
|
||||||
|
|
||||||
## Normal/regular colors (color palette 0-7)
|
|
||||||
# regular0=242424 # black
|
|
||||||
# regular1=f62b5a # red
|
|
||||||
# regular2=47b413 # green
|
|
||||||
# regular3=e3c401 # yellow
|
|
||||||
# regular4=24acd4 # blue
|
|
||||||
# regular5=f2affd # magenta
|
|
||||||
# regular6=13c299 # cyan
|
|
||||||
# regular7=e6e6e6 # white
|
|
||||||
|
|
||||||
## Bright colors (color palette 8-15)
|
|
||||||
# bright0=616161 # bright black
|
|
||||||
# bright1=ff4d51 # bright red
|
|
||||||
# bright2=35d450 # bright green
|
|
||||||
# bright3=e9e836 # bright yellow
|
|
||||||
# bright4=5dc5f8 # bright blue
|
|
||||||
# bright5=feabf2 # bright magenta
|
|
||||||
# bright6=24dfc4 # bright cyan
|
|
||||||
# bright7=ffffff # bright white
|
|
||||||
|
|
||||||
## dimmed colors (see foot.ini(5) man page)
|
|
||||||
# dim0=<not set>
|
|
||||||
# ...
|
|
||||||
# dim7=<not-set>
|
|
||||||
|
|
||||||
## The remaining 256-color palette
|
|
||||||
# 16 = <256-color palette #16>
|
|
||||||
# ...
|
|
||||||
# 255 = <256-color palette #255>
|
|
||||||
|
|
||||||
## Misc colors
|
|
||||||
# selection-foreground=<inverse foreground/background>
|
|
||||||
# selection-background=<inverse foreground/background>
|
|
||||||
# jump-labels=<regular0> <regular3> # black-on-yellow
|
|
||||||
# scrollback-indicator=<regular0> <bright4> # black-on-bright-blue
|
|
||||||
# search-box-no-match=<regular0> <regular1> # black-on-red
|
|
||||||
# search-box-match=<regular0> <regular3> # black-on-yellow
|
|
||||||
# urls=<regular3>
|
|
||||||
|
|
||||||
# theme: Nord
|
|
||||||
# author: Arctic Ice Studio <development@arcticicestudio.com>, Sven Greb <code@svengreb.de>
|
|
||||||
# description: „Nord“ — An arctic, north-bluish color palette
|
|
||||||
#
|
|
||||||
# this specific foot theme is based on nord-alacritty:
|
|
||||||
# https://github.com/arcticicestudio/nord-alacritty/blob/develop/src/nord.yml
|
|
||||||
|
|
||||||
# foreground = d8dee9
|
|
||||||
# background = 2e3440
|
|
||||||
#
|
|
||||||
# # selection-foreground = d8dee9
|
|
||||||
# # selection-background = 4c566a
|
|
||||||
#
|
|
||||||
# regular0 = 3b4252
|
|
||||||
# regular1 = bf616a
|
|
||||||
# regular2 = a3be8c
|
|
||||||
# regular3 = ebcb8b
|
|
||||||
# regular4 = 81a1c1
|
|
||||||
# regular5 = b48ead
|
|
||||||
# regular6 = 88c0d0
|
|
||||||
# regular7 = e5e9f0
|
|
||||||
#
|
|
||||||
# bright0 = 4c566a
|
|
||||||
# bright1 = bf616a
|
|
||||||
# bright2 = a3be8c
|
|
||||||
# bright3 = ebcb8b
|
|
||||||
# bright4 = 81a1c1
|
|
||||||
# bright5 = b48ead
|
|
||||||
# bright6 = 8fbcbb
|
|
||||||
# bright7 = eceff4
|
|
||||||
#
|
|
||||||
# dim0 = 373e4d
|
|
||||||
# dim1 = 94545d
|
|
||||||
# dim2 = 809575
|
|
||||||
# dim3 = b29e75
|
|
||||||
# dim4 = 68809a
|
|
||||||
# dim5 = 8c738c
|
|
||||||
# dim6 = 6d96a5
|
|
||||||
# dim7 = aeb3bb
|
|
||||||
|
|
||||||
|
|
||||||
##### custom monokai pro light
|
|
||||||
|
|
||||||
background = faf4f2
|
|
||||||
foreground = 29242a
|
|
||||||
|
|
||||||
regular0 = 403E41
|
|
||||||
bright0 = 727072
|
|
||||||
regular1 = e16032
|
|
||||||
bright1 = e16032
|
|
||||||
regular2 = 269d69
|
|
||||||
bright2 = 269d69
|
|
||||||
regular3 = cc7a0a
|
|
||||||
bright3 = cc7a0a
|
|
||||||
regular4 = 2257a0
|
|
||||||
bright4 = 2257a0
|
|
||||||
regular5 = 7058be
|
|
||||||
bright5 = 7058be
|
|
||||||
regular6 = 1c8ca8
|
|
||||||
bright6 = 1c8ca8
|
|
||||||
regular7 = CCCCCA
|
|
||||||
bright7 = CCCCCA
|
|
||||||
|
|
||||||
|
|
||||||
# mis-ordered monokai pro light
|
|
||||||
#regular0 = 403E41
|
|
||||||
#regular1 = e14775
|
|
||||||
#regular2 = e16032
|
|
||||||
#regular3 = 269d69
|
|
||||||
#regular4 = cc7a0a
|
|
||||||
#regular5 = 7058be
|
|
||||||
#regular6 = 1c8ca8
|
|
||||||
#regular7 = CCCCCA
|
|
||||||
#bright0 = 727072
|
|
||||||
#bright1 = e14775
|
|
||||||
#bright2 = e16032
|
|
||||||
#bright3 = 269d69
|
|
||||||
#bright4 = cc7a0a
|
|
||||||
#bright5 = 7058be
|
|
||||||
#bright6 = 1c8ca8
|
|
||||||
#bright7 = CCCCCA
|
|
||||||
|
|
||||||
#regular0=403E41
|
|
||||||
#regular1=FF6188
|
|
||||||
#regular2=A9DC76
|
|
||||||
#regular3=FFD866
|
|
||||||
#regular4=FC9867
|
|
||||||
#regular5=AB9DF2
|
|
||||||
#regular6=78DCE8
|
|
||||||
#regular7=FCFCFA
|
|
||||||
#bright0=727072
|
|
||||||
#bright1=FF6188
|
|
||||||
#bright2=A9DC76
|
|
||||||
#bright3=FFD866
|
|
||||||
#bright4=FC9867
|
|
||||||
#bright5=AB9DF2
|
|
||||||
#bright6=78DCE8
|
|
||||||
#bright7=FCFCFA
|
|
||||||
|
|
||||||
|
|
||||||
[csd]
|
|
||||||
# preferred=server
|
|
||||||
# size=26
|
|
||||||
# font=<primary font>
|
|
||||||
# color=<foreground color>
|
|
||||||
# hide-when-maximized=no
|
|
||||||
# double-click-to-maximize=yes
|
|
||||||
# border-width=0
|
|
||||||
# border-color=<csd.color>
|
|
||||||
# button-width=26
|
|
||||||
# button-color=<background color>
|
|
||||||
# button-minimize-color=<regular4>
|
|
||||||
# button-maximize-color=<regular2>
|
|
||||||
# button-close-color=<regular1>
|
|
||||||
|
|
||||||
[key-bindings]
|
|
||||||
# scrollback-up-page=Shift+Page_Up
|
|
||||||
# scrollback-up-half-page=none
|
|
||||||
# scrollback-up-line=none
|
|
||||||
# scrollback-down-page=Shift+Page_Down
|
|
||||||
# scrollback-down-half-page=none
|
|
||||||
# scrollback-down-line=none
|
|
||||||
# scrollback-home=none
|
|
||||||
# scrollback-end=none
|
|
||||||
# clipboard-copy=Control+Shift+c XF86Copy
|
|
||||||
# clipboard-paste=Control+Shift+v XF86Paste
|
|
||||||
# primary-paste=Shift+Insert
|
|
||||||
# search-start=Control+Shift+r
|
|
||||||
# font-increase=Control+plus Control+equal Control+KP_Add
|
|
||||||
# font-decrease=Control+minus Control+KP_Subtract
|
|
||||||
# font-reset=Control+0 Control+KP_0
|
|
||||||
# spawn-terminal=Control+Shift+n
|
|
||||||
# minimize=none
|
|
||||||
# maximize=none
|
|
||||||
# fullscreen=none
|
|
||||||
# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
|
|
||||||
# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
|
|
||||||
# pipe-selected=[xargs -r firefox] none
|
|
||||||
# pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard
|
|
||||||
# show-urls-launch=Control+Shift+o
|
|
||||||
# show-urls-copy=none
|
|
||||||
# show-urls-persistent=none
|
|
||||||
# prompt-prev=Control+Shift+z
|
|
||||||
# prompt-next=Control+Shift+x
|
|
||||||
# unicode-input=Control+Shift+u
|
|
||||||
# noop=none
|
|
||||||
|
|
||||||
[search-bindings]
|
|
||||||
# cancel=Control+g Control+c Escape
|
|
||||||
# commit=Return
|
|
||||||
# find-prev=Control+r
|
|
||||||
# find-next=Control+s
|
|
||||||
# cursor-left=Left Control+b
|
|
||||||
# cursor-left-word=Control+Left Mod1+b
|
|
||||||
# cursor-right=Right Control+f
|
|
||||||
# cursor-right-word=Control+Right Mod1+f
|
|
||||||
# cursor-home=Home Control+a
|
|
||||||
# cursor-end=End Control+e
|
|
||||||
# delete-prev=BackSpace
|
|
||||||
# delete-prev-word=Mod1+BackSpace Control+BackSpace
|
|
||||||
# delete-next=Delete
|
|
||||||
# delete-next-word=Mod1+d Control+Delete
|
|
||||||
# extend-char=Shift+Right
|
|
||||||
# extend-to-word-boundary=Control+w Control+Shift+Right
|
|
||||||
# extend-to-next-whitespace=Control+Shift+w
|
|
||||||
# extend-line-down=Shift+Down
|
|
||||||
# extend-backward-char=Shift+Left
|
|
||||||
# extend-backward-to-word-boundary=Control+Shift+Left
|
|
||||||
# extend-backward-to-next-whitespace=none
|
|
||||||
# extend-line-up=Shift+Up
|
|
||||||
# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
|
|
||||||
# primary-paste=Shift+Insert
|
|
||||||
# unicode-input=none
|
|
||||||
# quit=none
|
|
||||||
# scrollback-up-page=Shift+Page_Up
|
|
||||||
# scrollback-up-half-page=none
|
|
||||||
# scrollback-up-line=none
|
|
||||||
# scrollback-down-page=Shift+Page_Down
|
|
||||||
# scrollback-down-half-page=none
|
|
||||||
# scrollback-down-line=none
|
|
||||||
# scrollback-home=none
|
|
||||||
# scrollback-end=none
|
|
||||||
|
|
||||||
[url-bindings]
|
|
||||||
# cancel=Control+g Control+c Control+d Escape
|
|
||||||
# toggle-url-visible=t
|
|
||||||
|
|
||||||
[text-bindings]
|
|
||||||
# \x03=Mod4+c # Map Super+c -> Ctrl+c
|
|
||||||
|
|
||||||
[mouse-bindings]
|
|
||||||
# scrollback-up-mouse=BTN_WHEEL_BACK
|
|
||||||
# scrollback-down-mouse=BTN_WHEEL_FORWARD
|
|
||||||
# font-increase=Control+BTN_WHEEL_BACK
|
|
||||||
# font-decrease=Control+BTN_WHEEL_FORWARD
|
|
||||||
# selection-override-modifiers=Shift
|
|
||||||
# primary-paste=BTN_MIDDLE
|
|
||||||
# select-begin=BTN_LEFT
|
|
||||||
# select-begin-block=Control+BTN_LEFT
|
|
||||||
# select-extend=BTN_RIGHT
|
|
||||||
# select-extend-character-wise=Control+BTN_RIGHT
|
|
||||||
# select-word=BTN_LEFT-2
|
|
||||||
# select-word-whitespace=Control+BTN_LEFT-2
|
|
||||||
# select-quote = BTN_LEFT-3
|
|
||||||
# select-row=BTN_LEFT-4
|
|
||||||
|
|
||||||
# vim: ft=dosini
|
|
||||||
|
|
@ -1,105 +0,0 @@
|
||||||
local vim = vim
|
|
||||||
local Plug = vim.fn['plug#']
|
|
||||||
|
|
||||||
vim.call('plug#begin')
|
|
||||||
|
|
||||||
Plug 'tpope/vim-repeat'
|
|
||||||
Plug 'tpope/vim-commentary'
|
|
||||||
Plug 'tpope/vim-surround'
|
|
||||||
Plug 'jiangmiao/auto-pairs'
|
|
||||||
Plug 'mbbill/undotree'
|
|
||||||
|
|
||||||
Plug 'ibhagwan/fzf-lua'
|
|
||||||
|
|
||||||
Plug 'itchyny/lightline.vim'
|
|
||||||
|
|
||||||
-- js/ts/...
|
|
||||||
Plug 'pangloss/vim-javascript'
|
|
||||||
Plug 'leafgarland/typescript-vim'
|
|
||||||
Plug 'peitalin/vim-jsx-typescript'
|
|
||||||
|
|
||||||
-- html
|
|
||||||
Plug 'mattn/emmet-vim'
|
|
||||||
|
|
||||||
Plug('neoclide/coc.nvim', {['branch'] = 'release'})
|
|
||||||
|
|
||||||
-- style
|
|
||||||
Plug 'loctvl842/monokai-pro.nvim'
|
|
||||||
|
|
||||||
vim.call('plug#end')
|
|
||||||
|
|
||||||
|
|
||||||
vim.g.coc_global_extensions = { 'coc-tsserver', 'coc-html', 'coc-json', 'coc-pyright' }
|
|
||||||
|
|
||||||
-- coc
|
|
||||||
vim.cmd([[if isdirectory('./node_modules') && isdirectory('./node_modules/prettier')
|
|
||||||
let g:coc_global_extensions += ['coc-prettier']
|
|
||||||
endif]])
|
|
||||||
|
|
||||||
-- disabled eslint in favor of xo
|
|
||||||
vim.cmd([[if isdirectory('./node_modules') && isdirectory('./node_modules/eslint')
|
|
||||||
let g:coc_global_extensions += ['coc-eslint']
|
|
||||||
endif]])
|
|
||||||
|
|
||||||
-- coc shortcuts
|
|
||||||
vim.cmd([[inoremap <silent><expr> <C-y>y coc#pum#visible() ? coc#pum#confirm() : "\<CR>"]])
|
|
||||||
vim.cmd([[nnoremap <silent> gK :call CocAction('doHover')<CR>]])
|
|
||||||
vim.cmd([[nmap <silent> gd <Plug>(coc-definition)]])
|
|
||||||
vim.cmd([[nmap <silent> gy <Plug>(coc-type-definition)]])
|
|
||||||
vim.cmd([[nmap <silent> gr <Plug>(coc-references)]])
|
|
||||||
vim.cmd([[nmap <silent> [g <Plug>(coc-diagnostic-prev)]])
|
|
||||||
vim.cmd([[nmap <silent> ]g <Plug>(coc-diagnostic-next)]])
|
|
||||||
vim.cmd([[nnoremap <silent> <space>d :<C-u>CocList diagnostics<cr>]])
|
|
||||||
vim.cmd([[nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr>]])
|
|
||||||
vim.cmd([[nmap <leader>do <Plug>(coc-codeaction)]])
|
|
||||||
vim.cmd([[nmap <leader>rn <Plug>(coc-rename)]])
|
|
||||||
vim.cmd([[nmap <leader>xo :!npx xo --fix %<CR>]])
|
|
||||||
|
|
||||||
|
|
||||||
local fzflua = require('fzf-lua')
|
|
||||||
fzflua.setup{
|
|
||||||
files = {
|
|
||||||
find_opts = [[\( -path "*/build/*" -o -path "*/.git/*" -o -path "*/node_modules/*" \) -prune -false -o -type f]],
|
|
||||||
fd_opts = [[--color=never --hidden --type f --type l --exclude "(.git|node_modules)"]],
|
|
||||||
},
|
|
||||||
grep = {
|
|
||||||
grep_opts = [[--exclude-dir=node_modules --exclude-dir=build --exclude-dir=.git --binary-files=without-match --line-number --recursive --color=auto -e]],
|
|
||||||
rg_opts = [[--glob '!{**/node_modules/,**/build/,.git/} --column --line-number --no-heading --color=always --smart-case --max-columns=4096 -e']]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
vim.keymap.set('n', '<leader>ff', fzflua.files, { desc = 'fzf-lua find files' })
|
|
||||||
vim.keymap.set('n', '<leader>fg', fzflua.live_grep, { desc = 'fzf-lua live grep' })
|
|
||||||
vim.keymap.set('n', '<leader>fb', fzflua.buffers, { desc = 'fzf-lua buffers' })
|
|
||||||
|
|
||||||
-- style
|
|
||||||
vim.g.t_Co = 256
|
|
||||||
vim.cmd.colorscheme('monokai-pro-light')
|
|
||||||
vim.g.lightline = { colorscheme = 'monokaipro', mode_map = { n = 'N', i = 'I', R = 'R', v = 'V', V = 'VL', c = 'C', s = 'S', S = 'SL', t = 'T' }, active = { left = { { 'mode', 'paste' }, { 'readonly', 'relativepath', 'modified' } } } }
|
|
||||||
|
|
||||||
-- select last paste in visual mode
|
|
||||||
vim.cmd([[nnoremap <expr> gb '`[' . strpart(getregtype(), 0, 1) . '`]']])
|
|
||||||
|
|
||||||
vim.bo.undofile=true
|
|
||||||
|
|
||||||
vim.cmd([[
|
|
||||||
" autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
|
|
||||||
" autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/
|
|
||||||
|
|
||||||
" js/ts/...
|
|
||||||
autocmd Filetype javascript setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype typescript setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype json setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype typescriptreact setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype html setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype htmldjango setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype scss setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype css setlocal ts=2 sw=2 expandtab
|
|
||||||
autocmd Filetype python setlocal ts=4 sts=4 sw=4 expandtab
|
|
||||||
]])
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
25
.vimrc
25
.vimrc
|
|
@ -35,8 +35,7 @@ let g:coc_global_extensions = [
|
||||||
\ 'coc-tsserver',
|
\ 'coc-tsserver',
|
||||||
\ 'coc-html',
|
\ 'coc-html',
|
||||||
\ 'coc-json',
|
\ 'coc-json',
|
||||||
\ 'coc-pyright',
|
\ 'coc-pyright'
|
||||||
\ 'coc-rust-analyzer'
|
|
||||||
\ ]
|
\ ]
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
@ -47,17 +46,16 @@ let g:UltiSnipsExpandTrigger="<tab>"
|
||||||
|
|
||||||
|
|
||||||
" coc
|
" coc
|
||||||
if isdirectory('./node_modules') && isdirectory('./node_modules/prettier')
|
" if isdirectory('./node_modules') && isdirectory('./node_modules/prettier')
|
||||||
let g:coc_global_extensions += ['coc-prettier']
|
" let g:coc_global_extensions += ['coc-prettier']
|
||||||
endif
|
" endif
|
||||||
|
"
|
||||||
" disabled eslint in favor of xo
|
" disabled eslint in favor of xo
|
||||||
if isdirectory('./node_modules') && isdirectory('./node_modules/eslint')
|
" if isdirectory('./node_modules') && isdirectory('./node_modules/eslint')
|
||||||
let g:coc_global_extensions += ['coc-eslint']
|
" let g:coc_global_extensions += ['coc-eslint']
|
||||||
endif
|
" endif
|
||||||
|
|
||||||
" coc shortcuts
|
" coc shortcuts
|
||||||
inoremap <silent><expr> <C-y>y coc#pum#visible() ? coc#pum#confirm() : "\<CR>"
|
|
||||||
nnoremap <silent> gK :call CocAction('doHover')<CR>
|
nnoremap <silent> gK :call CocAction('doHover')<CR>
|
||||||
nmap <silent> gd <Plug>(coc-definition)
|
nmap <silent> gd <Plug>(coc-definition)
|
||||||
nmap <silent> gy <Plug>(coc-type-definition)
|
nmap <silent> gy <Plug>(coc-type-definition)
|
||||||
|
|
@ -104,9 +102,6 @@ nnoremap <expr> gb '`[' . strpart(getregtype(), 0, 1) . '`]'
|
||||||
|
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
|
|
||||||
set conceallevel=0
|
|
||||||
let g:indentLine_setConceal = 0
|
|
||||||
|
|
||||||
" js/ts/...
|
" js/ts/...
|
||||||
autocmd Filetype javascript setlocal ts=2 sw=2 expandtab
|
autocmd Filetype javascript setlocal ts=2 sw=2 expandtab
|
||||||
autocmd Filetype typescript setlocal ts=2 sw=2 expandtab
|
autocmd Filetype typescript setlocal ts=2 sw=2 expandtab
|
||||||
|
|
@ -118,9 +113,6 @@ autocmd Filetype scss setlocal ts=2 sw=2 expandtab
|
||||||
autocmd Filetype css setlocal ts=2 sw=2 expandtab
|
autocmd Filetype css setlocal ts=2 sw=2 expandtab
|
||||||
autocmd Filetype python setlocal ts=4 sts=4 sw=4 expandtab
|
autocmd Filetype python setlocal ts=4 sts=4 sw=4 expandtab
|
||||||
|
|
||||||
" rust
|
|
||||||
|
|
||||||
|
|
||||||
" PYTHON PROVIDERS {{{
|
" PYTHON PROVIDERS {{{
|
||||||
|
|
||||||
if has('macunix')
|
if has('macunix')
|
||||||
|
|
@ -133,4 +125,3 @@ if has('macunix')
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" lua require('init')
|
|
||||||
|
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
# This file is part of elogind.
|
|
||||||
#
|
|
||||||
# elogind is free software; you can redistribute it and/or modify it under the
|
|
||||||
# terms of the GNU Lesser General Public License as published by the Free
|
|
||||||
# Software Foundation; either version 2.1 of the License, or (at your option)
|
|
||||||
# any later version.
|
|
||||||
#
|
|
||||||
# Entries in this file show the compile time defaults. Local configuration
|
|
||||||
# should be created by either modifying this file, or by creating "drop-ins" in
|
|
||||||
# the logind.conf.d/ subdirectory. The latter is generally recommended.
|
|
||||||
# Defaults can be restored by simply deleting this file and all drop-ins.
|
|
||||||
#
|
|
||||||
# See logind.conf(5) for details.
|
|
||||||
|
|
||||||
[Login]
|
|
||||||
#KillUserProcesses=no
|
|
||||||
#KillOnlyUsers=
|
|
||||||
#KillExcludeUsers=root
|
|
||||||
#InhibitDelayMaxSec=5
|
|
||||||
#UserStopDelaySec=10
|
|
||||||
HandlePowerKey=hibernate
|
|
||||||
#HandlePowerKeyLongPress=ignore
|
|
||||||
#HandleRebootKey=reboot
|
|
||||||
#HandleRebootKeyLongPress=poweroff
|
|
||||||
#HandleSuspendKey=suspend
|
|
||||||
#HandleSuspendKeyLongPress=hibernate
|
|
||||||
#HandleHibernateKey=hibernate
|
|
||||||
#HandleHibernateKeyLongPress=ignore
|
|
||||||
HandleLidSwitch=suspend
|
|
||||||
#HandleLidSwitchExternalPower=suspend
|
|
||||||
#HandleLidSwitchDocked=ignore
|
|
||||||
#PowerKeyIgnoreInhibited=no
|
|
||||||
#SuspendKeyIgnoreInhibited=no
|
|
||||||
#HibernateKeyIgnoreInhibited=no
|
|
||||||
#LidSwitchIgnoreInhibited=yes
|
|
||||||
#RebootKeyIgnoreInhibited=no
|
|
||||||
#HoldoffTimeoutSec=30s
|
|
||||||
#IdleAction=ignore
|
|
||||||
#IdleActionSec=30min
|
|
||||||
#RuntimeDirectorySize=10%
|
|
||||||
#RuntimeDirectoryInodesMax=
|
|
||||||
#RemoveIPC=yes
|
|
||||||
#InhibitorsMax=8192
|
|
||||||
#SessionsMax=8192
|
|
||||||
#StopIdleSessionSec=infinity
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
case $1/$2 in
|
|
||||||
pre/*)
|
|
||||||
# Put here any commands expected to be run when suspending or hibernating.
|
|
||||||
qdbus6 --system org.freedesktop.DisplayManager /org/freedesktop/DisplayManager/Seat0 org.freedesktop.DisplayManager.Seat.SwitchToGreeter
|
|
||||||
;;
|
|
||||||
post/*)
|
|
||||||
# Put here any commands expected to be run when resuming from suspension or thawing from hibernation.
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
case $1/$2 in
|
|
||||||
pre/*)
|
|
||||||
# Put here any commands expected to be run when suspending or hibernating.
|
|
||||||
qdbus6 --system org.freedesktop.DisplayManager /org/freedesktop/DisplayManager/Seat0 org.freedesktop.DisplayManager.Seat.SwitchToGreeter
|
|
||||||
;;
|
|
||||||
post/*)
|
|
||||||
# Put here any commands expected to be run when resuming from suspension or thawing from hibernation.
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
Loading…
Add table
Reference in a new issue