merge with github updates

main
Guus van Meerveld 2 years ago
commit d2fea6055b

@ -41,6 +41,5 @@ bindkey "^y" redo
bindkey "^H" backward-kill-word
bindkey "^ " autosuggest-accept
# Powerlevel10k
source ~/.p10k.zsh

@ -1,8 +1,4 @@
--enable-features=WebUIDarkMode,Commander,BackForwardCache:enable_same_site/true,ContentSettingsRedesign,FormControlsRefresh,OmniboxSuggestionButtonRow,ParallelDownloading,QuietNotificationPrompts,ReaderMode,VaapiVideoDecoder
--enable-features=WebUIDarkMode,Commander,BackForwardCache:enable_same_site/true,ContentSettingsRedesign,FormControlsRefresh,OmniboxSuggestionButtonRow,ParallelDownloading,QuietNotificationPrompts,ReaderMode
--force-dark-mode
--force-device-scale-factor=1.2
--use-gl=egl
--disable-features=UseChromeOSDirectVideoDecoder
--ignore-gpu-blocklist
--enable-gpu-rasterization
--enable-zero-copy

@ -1,96 +0,0 @@
command Ws w|so%
let mapleader = " "
" Simple keybinds
nnoremap <silent> <C-s> :w<CR>
nnoremap <silent> <C-q> :q<CR>
inoremap <silent> <C-s> <ESC>:w<CR>
nnoremap <silent> <S-E> :10Term<CR>
nnoremap <silent> <A-Up> :m-2<CR>
nnoremap <silent> <A-Down> :m+1<CR>
" Easy split navigation
nnoremap <C-w> <C-w>w
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
:set tabstop=4
:set relativenumber
:set timeout timeoutlen=500 ttimeoutlen=500
:set clipboard=unnamedplus
let s:fontsize = 12
" Plugins
call plug#begin()
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
Plug 'itchyny/lightline.vim'
Plug 'tpope/vim-eunuch'
Plug 'tpope/vim-surround'
" Nerd tree plugins
Plug 'preservim/nerdtree' |
\ Plug 'Xuyuanp/nerdtree-git-plugin'
Plug 'PhilRunninger/nerdtree-buffer-ops'
Plug 'jistr/vim-nerdtree-tabs'
Plug 'preservim/nerdcommenter'
Plug 'editorconfig/editorconfig-vim'
Plug 'airblade/vim-gitgutter'
Plug 'tpope/vim-fugitive'
Plug 'mattn/emmet-vim'
" Plug 'Valloric/YouCompleteMe'
Plug 'mg979/vim-visual-multi'
Plug 'prettier/vim-prettier', { 'do': 'yarn install --frozen-lockfile --production' }
Plug 'sainnhe/sonokai'
Plug 'ryanoasis/vim-devicons'
Plug 'vimlab/split-term.vim'
Plug 'sirver/UltiSnips'
Plug 'honza/vim-snippets'
" Plug 'thaerkh/vim-workspace'
Plug 'Raimondi/delimitMate'
call plug#end()
" Fzf
nnoremap <silent> <Leader>p :Files<CR>
nnoremap <silent> <Leader>f :Rg<CR>
" Prettier settings
let g:prettier#autoformat = 1
let g:prettier#autoformat_require_pragma = 0
" Vim eunuch setting
nnoremap <silent> <Leader>e :SudoEdit<CR>
nnoremap <silent> <Leader>s :SudoWrite<CR>
" Workspace settings
" let g:workspace_autocreate = 1
" Nerd tree settings
" autocmd VimEnter * NERDTree
let NERDTreeMinimalUI = 1
let NERDTreeDirArrows = 1
let NERDTreeShowHidden = 1
nnoremap <silent> <C-t> :NERDTreeToggle<CR>
nnoremap <silent> <Leader>] :tabn<CR>
nnoremap <silent> <Leader>[ :tabp<CR>
" Lightline config
set noshowmode
" Color scheme
colorscheme sonokai

@ -8,7 +8,7 @@
#
[options]
Architecture = auto
ParallelDownloads = 1
ParallelDownloads = 5
Color
ILoveCandy

@ -1,33 +0,0 @@
[module/spotify]
type = custom/script
tail = true
label-font = 3
format-prefix = 
format = <label>
exec = ~/.config/polybar/scripts/scroll_spotify_status.sh
[module/spotify-prev]
type = custom/script
exec = echo 
format = <label>
click-left = playerctl previous -p spotify
[module/spotify-play-pause]
type = custom/script
exec = echo 
; hook-1 = echo 
; initial = 1
format = <label>
click-left = playerctl play-pause -p spotify
[module/spotify-next]
type = custom/script
exec = echo 
format = <label>
click-left = playerctl next -p spotify

@ -26,7 +26,7 @@ ramp-capacity-10 = 
[module/title]
type = internal/xwindow
label-maxlen = 50
[module/temperature]
type = internal/temperature
@ -77,7 +77,7 @@ label-disconnected =
[module/phone-battery]
type = custom/script
exec = echo " $(mconnectctl show-battery /org/mconnect/device/0 | head -1 | awk '{print $2}')%"
exec = echo " $(mconnectctl show-battery /org/mconnect/device/1 | head -1 | awk '{print $2}')%"
exec-if = ~/.config/polybar/phone-is-connected.sh

@ -1,6 +1,6 @@
#!/bin/bash
connected="$(mconnectctl show-device /org/mconnect/device/0 | sed -n 9,9p | awk '{print $2}')"
connected="$(mconnectctl show-device /org/mconnect/device/1 | sed -n 9,9p | awk '{print $2}')"
if [[ $connected == "false" ]]; then
exit 1

@ -4,6 +4,12 @@ Host github.com
PreferredAuthentications publickey
IdentityFile ~/.ssh/github
Host 78.141.218.172
User git
HostName 78.141.218.172
PreferredAuthentications publickey
IdentityFile ~/.ssh/forgejo
Host gitlab.com
User git
HostName gitlab.com

@ -8,10 +8,7 @@ super + Return
# program launcher
super + @space
rofi -show combi
super + l
kill -9 -1
~/.config/rofi/launchers/type-2/launcher.sh
super + i
kitty