Merged
This commit is contained in:
commit
63f3dec1b9
|
|
@ -18,7 +18,7 @@ return {
|
|||
|
||||
},
|
||||
mid = {
|
||||
"mpd"
|
||||
--"mpd"
|
||||
},
|
||||
right = {
|
||||
"memory",
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ local menubar = require("menubar")
|
|||
local hotkeys_popup = require("awful.hotkeys_popup")
|
||||
local vicious = require("vicious")
|
||||
local timer = require("gears.timer")
|
||||
local config = require("config_laptop")
|
||||
local config = require("config_desktop")
|
||||
local quake = require("quake")
|
||||
|
||||
-- Enable hotkeys help widget for VIM and other apps
|
||||
|
|
@ -31,16 +31,16 @@ local function round(x)
|
|||
end
|
||||
|
||||
local dropdown = quake:new({
|
||||
app = "termite",
|
||||
argname = "--name %s",
|
||||
app = "alacritty",
|
||||
argname = "--class %s",
|
||||
border = 0,
|
||||
height = 0.37
|
||||
})
|
||||
|
||||
local htop = quake:new({
|
||||
app = "termite",
|
||||
app = "alacritty",
|
||||
name = "QuakeHtop",
|
||||
argname = "--name %s",
|
||||
argname = "--class %s",
|
||||
extra = "-e htop",
|
||||
border = 0,
|
||||
height = 0.13,
|
||||
|
|
@ -48,11 +48,11 @@ local htop = quake:new({
|
|||
})
|
||||
|
||||
local vimpc = quake:new({
|
||||
app = "termite",
|
||||
app = "alacritty",
|
||||
name = "QuakeVimpc",
|
||||
argname = "--name %s",
|
||||
extra = "-e vimpc",
|
||||
border = 0,
|
||||
argname = "--class %s",
|
||||
extra = "-e mpc-rs",
|
||||
border = 0,
|
||||
height = 0.25,
|
||||
width = 0.33,
|
||||
horiz = "center",
|
||||
|
|
@ -62,7 +62,7 @@ local vimpc = quake:new({
|
|||
local onboard = quake:new({
|
||||
app = "onboard",
|
||||
name = "QuakeOnboard",
|
||||
argname = "--name %s",
|
||||
argname = "--class %s",
|
||||
extra = "",
|
||||
border = 0,
|
||||
height = 0.25,
|
||||
|
|
@ -104,7 +104,7 @@ end
|
|||
beautiful.font = "Hack Nerd Font 9"
|
||||
|
||||
-- This is used later as the default terminal and editor to run.
|
||||
terminal = "termite"
|
||||
terminal = "alacritty"
|
||||
editor = os.getenv("EDITOR") or "vim"
|
||||
editor_cmd = terminal .. " -e " .. editor
|
||||
|
||||
|
|
@ -365,17 +365,17 @@ memwidget = wibox.widget.textbox()
|
|||
vicious.cache(vicious.widgets.mem)
|
||||
vicious.register(memwidget, vicious.widgets.mem, format_memory, 1)
|
||||
|
||||
mpdwidget = wibox.widget.textbox()
|
||||
mpdwidget.align = 'center'
|
||||
vicious.cache(vicious.widgets.mpd)
|
||||
vicious.register(mpdwidget, vicious.widgets.mpd, format_mpd)
|
||||
--mpdwidget = wibox.widget.textbox()
|
||||
--mpdwidget.align = 'center'
|
||||
--vicious.cache(vicious.widgets.mpd)
|
||||
--vicious.register(mpdwidget, vicious.widgets.mpd, format_mpd)
|
||||
|
||||
thermalwidget = wibox.widget.textbox()
|
||||
vicious.cache(vicious.widgets.thermal)
|
||||
vicious.register(thermalwidget, vicious.widgets.thermal, format_thermal, 2, config.thermal_zone)
|
||||
|
||||
local widget_table = {
|
||||
["mpd"] = mpdwidget,
|
||||
--["mpd"] = mpdwidget,
|
||||
["memory"] = memwidget,
|
||||
["cpu"] = cpuwidget,
|
||||
["volume"] = volumebox,
|
||||
|
|
@ -641,7 +641,7 @@ local game_mode = false
|
|||
|
||||
function game_mode_start ()
|
||||
if game_mode == true then return else game_mode = true end
|
||||
awful.spawn("killall compton")
|
||||
awful.spawn("killall picom")
|
||||
end_switcher()
|
||||
for s in screen do
|
||||
s.dock_trigger.visible = false
|
||||
|
|
@ -650,7 +650,7 @@ end
|
|||
|
||||
function game_mode_stop ()
|
||||
if game_mode == false then return else game_mode = false end
|
||||
awful.spawn.with_shell("~/.config/compton/launch.sh")
|
||||
awful.spawn.with_shell("~/.config/picom/launch.sh")
|
||||
for s in screen do
|
||||
s.dock_trigger.visible = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -56,6 +56,8 @@ sticker_file "/home/daan/.config/mpd/sticker.sql"
|
|||
#
|
||||
###############################################################################
|
||||
|
||||
connection_timeout "5"
|
||||
|
||||
|
||||
# General music daemon options ################################################
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
sw_volume: 37
|
||||
audio_device_state:1:pulse audio
|
||||
state: stop
|
||||
current: 7
|
||||
random: 0
|
||||
repeat: 0
|
||||
single: 0
|
||||
consume: 0
|
||||
crossfade: 0
|
||||
mixrampdb: 0.000000
|
||||
mixrampdelay: -1.000000
|
||||
playlist_begin
|
||||
0:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/01 I Need Never Get Old.flac
|
||||
1:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/02 Howling at Nothing.flac
|
||||
2:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/03 Trying So Hard Not to Know.flac
|
||||
3:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/04 I’ve Been Failing.flac
|
||||
4:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/05 S.O.B_.flac
|
||||
5:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/06 Wasting Time.flac
|
||||
6:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/07 Thank You.flac
|
||||
7:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/08 Look It Here.flac
|
||||
8:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/09 Shake.flac
|
||||
9:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/10 I’d Be Waiting.flac
|
||||
10:Music/Nathaniel Rateliff & The Night Sweats/Nathaniel Rateliff & The Night Sweats/11 Mellow Out.flac
|
||||
playlist_end
|
||||
|
|
@ -11,20 +11,21 @@ Plug 'jistr/vim-nerdtree-tabs'
|
|||
Plug 'rhysd/vim-clang-format'
|
||||
Plug 'kana/vim-operator-user'
|
||||
Plug 'rust-lang/rust.vim'
|
||||
Plug 'Shougo/deoplete.nvim'
|
||||
Plug 'zchee/deoplete-clang'
|
||||
Plug 'Shougo/neoinclude.vim'
|
||||
Plug 'roxma/nvim-yarp'
|
||||
Plug 'sebastianmarkow/deoplete-rust'
|
||||
Plug 'carlitux/deoplete-flow'
|
||||
"Plug 'Shougo/deoplete.nvim'
|
||||
"Plug 'zchee/deoplete-clang'
|
||||
"Plug 'Shougo/deoplete-clangx'
|
||||
"Plug 'Shougo/neoinclude.vim'
|
||||
"Plug 'roxma/nvim-yarp'
|
||||
"Plug 'sebastianmarkow/deoplete-rust'
|
||||
"Plug 'carlitux/deoplete-flow'
|
||||
Plug 'jpalardy/vim-slime'
|
||||
Plug 'autozimu/LanguageClient-neovim', {
|
||||
\ 'branch': 'next',
|
||||
\ 'do': 'bash install.sh',
|
||||
\ }
|
||||
"Plug 'autozimu/LanguageClient-neovim', {
|
||||
" \ 'branch': 'next',
|
||||
" \ 'do': 'bash install.sh',
|
||||
" \ }
|
||||
Plug 'calviken/vim-gdscript3'
|
||||
Plug 'Shougo/neosnippet'
|
||||
Plug 'Shougo/neosnippet-snippets'
|
||||
"Plug 'Shougo/neosnippet'
|
||||
"Plug 'Shougo/neosnippet-snippets'
|
||||
Plug 'nikvdp/ejs-syntax'
|
||||
Plug 'pangloss/vim-javascript'
|
||||
Plug 'MaxMEllon/vim-jsx-pretty'
|
||||
|
|
@ -39,9 +40,12 @@ Plug 'vim-pandoc/vim-rmarkdown'
|
|||
Plug 'vim-pandoc/vim-pandoc'
|
||||
Plug 'vim-pandoc/vim-pandoc-syntax'
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'jvirtanen/vim-octave'
|
||||
Plug 'tpope/vim-dadbod'
|
||||
Plug 'lervag/vimtex'
|
||||
Plug 'dpelle/vim-LanguageTool'
|
||||
Plug 'sebastianmarkow/deoplete-rust'
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
Plug 'tikhomirov/vim-glsl'
|
||||
Plug 'soli/prolog-vim'
|
||||
call plug#end() " required
|
||||
|
||||
filetype plugin indent on " required
|
||||
|
|
@ -57,20 +61,11 @@ let g:languagetool_jar = "/home/daan/.local/share/languagetool/languagetool-comm
|
|||
|
||||
let g:jsx_ext_required = 0
|
||||
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
let g:deoplete#sources#clang#libclang_path = "/usr/lib/libclang.so"
|
||||
let g:deoplete#sources#clang#clang_header = "/usr/lib/clang"
|
||||
let g:deoplete#sources#rust#racer_binary='/home/daan/.cargo/bin/racer'
|
||||
let g:deoplete#sources#rust#rust_source_path='/home/daan/.local/src/rust/src'
|
||||
|
||||
let g:LanguageClient_serverCommands = {
|
||||
\ 'lua': ['lua-lsp'],
|
||||
\ }
|
||||
let g:LanguageClient_autoStart = 1
|
||||
|
||||
let g:neosnippet#enable_completed_snippet = 1
|
||||
let g:autocomplete_flow#insert_paren_after_function = 0
|
||||
|
||||
let g:languagetool_jar = "~/Documents/LanguageTool-4.9.1/languagetool-commandline.jar"
|
||||
|
||||
set tags+=./.tags
|
||||
|
||||
set nobackup
|
||||
|
|
@ -210,10 +205,21 @@ set tabstop=4
|
|||
set shiftwidth=4
|
||||
set expandtab
|
||||
|
||||
:set number relativenumber
|
||||
:set nu rnu
|
||||
|
||||
:augroup numbertoggle
|
||||
: autocmd!
|
||||
: autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
|
||||
: autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
||||
:augroup END
|
||||
|
||||
:command WQ wq
|
||||
:command Wq wq
|
||||
:command W w
|
||||
:command Q q
|
||||
:command WQa wqa
|
||||
:command Wqa wqa
|
||||
|
||||
let g:C_Mapfeader = ','
|
||||
nnoremap <cr> :noh<CR><CR>:<backspace>
|
||||
|
|
@ -233,5 +239,20 @@ let g:deoplete#enable_smart_case = 1
|
|||
imap <expr><CR> pumvisible() ? deoplete#close_popup() : "\<CR>"
|
||||
:tnoremap <Esc> <C-\><C-n>
|
||||
|
||||
inoremap <silent><expr> <TAB>
|
||||
\ pumvisible() ? coc#_select_confirm() :
|
||||
\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
|
||||
\ <SID>check_back_space() ? "\<TAB>" :
|
||||
\ coc#refresh()
|
||||
|
||||
function! s:check_back_space() abort
|
||||
let col = col('.') - 1
|
||||
return !col || getline('.')[col - 1] =~# '\s'
|
||||
endfunction
|
||||
|
||||
let g:coc_snippet_next = '<tab>'
|
||||
|
||||
nnoremap <C-f> :Files<cr>
|
||||
|
||||
set completeopt=menu,noinsert
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#!/usr/bin/env sh
|
||||
!/usr/bin/env sh
|
||||
|
||||
# Terminate already running picom instances
|
||||
Terminate already running picom instances
|
||||
killall -q picom
|
||||
|
||||
# Wait until the processes have been shut down
|
||||
Wait until the processes have been shut down
|
||||
while pgrep -u $UID -x picom > /dev/null; do sleep 1; done
|
||||
|
||||
picom --config ~/.config/picom/picom.conf -b
|
||||
|
|
|
|||
|
|
@ -25,12 +25,15 @@ fade-in-step = 0.03;
|
|||
fade-out-step = 0.03;
|
||||
fade-exclude = [ ];
|
||||
backend = "glx";
|
||||
glx-no-stencil = true;
|
||||
glx-no-rebind-pixmap = true;
|
||||
xrender-sync-fence = "true";
|
||||
mark-wmwin-focused = true;
|
||||
mark-ovredir-focused = true;
|
||||
detect-rounded-corners = true;
|
||||
detect-client-opacity = true;
|
||||
refresh-rate = 0;
|
||||
vsync = false;
|
||||
vsync = true;
|
||||
dbe = false;
|
||||
focus-exclude = [ "class_g = 'Cairo-clock'" ];
|
||||
detect-transient = true;
|
||||
|
|
|
|||
|
|
@ -99,7 +99,13 @@ let s:mac_gui = has('gui_macvim') && has('gui_running')
|
|||
let s:is_win = has('win32')
|
||||
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
|
||||
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
|
||||
let s:me = resolve(expand('<sfile>:p'))
|
||||
if s:is_win && &shellslash
|
||||
set noshellslash
|
||||
let s:me = resolve(expand('<sfile>:p'))
|
||||
set shellslash
|
||||
else
|
||||
let s:me = resolve(expand('<sfile>:p'))
|
||||
endif
|
||||
let s:base_spec = { 'branch': 'master', 'frozen': 0 }
|
||||
let s:TYPE = {
|
||||
\ 'string': type(''),
|
||||
|
|
@ -110,10 +116,42 @@ let s:TYPE = {
|
|||
let s:loaded = get(s:, 'loaded', {})
|
||||
let s:triggers = get(s:, 'triggers', {})
|
||||
|
||||
if s:is_win
|
||||
function! s:plug_call(fn, ...)
|
||||
let shellslash = &shellslash
|
||||
try
|
||||
set noshellslash
|
||||
return call(a:fn, a:000)
|
||||
finally
|
||||
let &shellslash = shellslash
|
||||
endtry
|
||||
endfunction
|
||||
else
|
||||
function! s:plug_call(fn, ...)
|
||||
return call(a:fn, a:000)
|
||||
endfunction
|
||||
endif
|
||||
|
||||
function! s:plug_getcwd()
|
||||
return s:plug_call('getcwd')
|
||||
endfunction
|
||||
|
||||
function! s:plug_fnamemodify(fname, mods)
|
||||
return s:plug_call('fnamemodify', a:fname, a:mods)
|
||||
endfunction
|
||||
|
||||
function! s:plug_expand(fmt)
|
||||
return s:plug_call('expand', a:fmt, 1)
|
||||
endfunction
|
||||
|
||||
function! s:plug_tempname()
|
||||
return s:plug_call('tempname')
|
||||
endfunction
|
||||
|
||||
function! plug#begin(...)
|
||||
if a:0 > 0
|
||||
let s:plug_home_org = a:1
|
||||
let home = s:path(fnamemodify(expand(a:1), ':p'))
|
||||
let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
|
||||
elseif exists('g:plug_home')
|
||||
let home = s:path(g:plug_home)
|
||||
elseif !empty(&rtp)
|
||||
|
|
@ -121,7 +159,7 @@ function! plug#begin(...)
|
|||
else
|
||||
return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
|
||||
endif
|
||||
if fnamemodify(home, ':t') ==# 'plugin' && fnamemodify(home, ':h') ==# s:first_rtp
|
||||
if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp
|
||||
return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.')
|
||||
endif
|
||||
|
||||
|
|
@ -139,6 +177,16 @@ function! s:define_commands()
|
|||
if !executable('git')
|
||||
return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.')
|
||||
endif
|
||||
if has('win32')
|
||||
\ && &shellslash
|
||||
\ && (&shell =~# 'cmd\.exe' || &shell =~# 'powershell\.exe')
|
||||
return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.')
|
||||
endif
|
||||
if !has('nvim')
|
||||
\ && (has('win32') || has('win32unix'))
|
||||
\ && (!has('multi_byte') || !has('iconv'))
|
||||
return s:err('Vim needs +iconv, +multi_byte features on Windows to run shell commands.')
|
||||
endif
|
||||
command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>])
|
||||
command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(<bang>0, [<f-args>])
|
||||
command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0)
|
||||
|
|
@ -334,11 +382,11 @@ function! s:progress_opt(base)
|
|||
\ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
|
||||
endfunction
|
||||
|
||||
if s:is_win
|
||||
function! s:rtp(spec)
|
||||
return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||
endfunction
|
||||
function! s:rtp(spec)
|
||||
return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||
endfunction
|
||||
|
||||
if s:is_win
|
||||
function! s:path(path)
|
||||
return s:trim(substitute(a:path, '/', '\', 'g'))
|
||||
endfunction
|
||||
|
|
@ -350,11 +398,28 @@ if s:is_win
|
|||
function! s:is_local_plug(repo)
|
||||
return a:repo =~? '^[a-z]:\|^[%~]'
|
||||
endfunction
|
||||
else
|
||||
function! s:rtp(spec)
|
||||
return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
|
||||
|
||||
" Copied from fzf
|
||||
let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0)
|
||||
function! s:wrap_cmds(cmds)
|
||||
return map([
|
||||
\ '@echo off',
|
||||
\ 'setlocal enabledelayedexpansion']
|
||||
\ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
|
||||
\ + ['endlocal'],
|
||||
\ printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage))
|
||||
endfunction
|
||||
|
||||
function! s:batchfile(cmd)
|
||||
let batchfile = s:plug_tempname().'.bat'
|
||||
call writefile(s:wrap_cmds(a:cmd), batchfile)
|
||||
let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0})
|
||||
if &shell =~# 'powershell\.exe'
|
||||
let cmd = '& ' . cmd
|
||||
endif
|
||||
return [batchfile, cmd]
|
||||
endfunction
|
||||
else
|
||||
function! s:path(path)
|
||||
return s:trim(a:path)
|
||||
endfunction
|
||||
|
|
@ -554,7 +619,7 @@ function! plug#(repo, ...)
|
|||
try
|
||||
let repo = s:trim(a:repo)
|
||||
let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
|
||||
let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??'))
|
||||
let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??'))
|
||||
let spec = extend(s:infer_properties(name, repo), opts)
|
||||
if !has_key(g:plugs, name)
|
||||
call add(g:plugs_order, name)
|
||||
|
|
@ -574,7 +639,7 @@ function! s:parse_options(arg)
|
|||
elseif type == s:TYPE.dict
|
||||
call extend(opts, a:arg)
|
||||
if has_key(opts, 'dir')
|
||||
let opts.dir = s:dirpath(expand(opts.dir))
|
||||
let opts.dir = s:dirpath(s:plug_expand(opts.dir))
|
||||
endif
|
||||
else
|
||||
throw 'Invalid argument type (expected: string or dictionary)'
|
||||
|
|
@ -585,7 +650,7 @@ endfunction
|
|||
function! s:infer_properties(name, repo)
|
||||
let repo = a:repo
|
||||
if s:is_local_plug(repo)
|
||||
return { 'dir': s:dirpath(expand(repo)) }
|
||||
return { 'dir': s:dirpath(s:plug_expand(repo)) }
|
||||
else
|
||||
if repo =~ ':'
|
||||
let uri = repo
|
||||
|
|
@ -738,7 +803,7 @@ function! s:finish_bindings()
|
|||
endfunction
|
||||
|
||||
function! s:prepare(...)
|
||||
if empty(getcwd())
|
||||
if empty(s:plug_getcwd())
|
||||
throw 'Invalid current working directory. Cannot proceed.'
|
||||
endif
|
||||
|
||||
|
|
@ -794,31 +859,28 @@ endfunction
|
|||
|
||||
function! s:chsh(swap)
|
||||
let prev = [&shell, &shellcmdflag, &shellredir]
|
||||
if s:is_win
|
||||
set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
|
||||
elseif a:swap
|
||||
if !s:is_win && a:swap
|
||||
set shell=sh shellredir=>%s\ 2>&1
|
||||
endif
|
||||
return prev
|
||||
endfunction
|
||||
|
||||
function! s:bang(cmd, ...)
|
||||
let batchfile = ''
|
||||
try
|
||||
let [sh, shellcmdflag, shrd] = s:chsh(a:0)
|
||||
" FIXME: Escaping is incomplete. We could use shellescape with eval,
|
||||
" but it won't work on Windows.
|
||||
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||
if s:is_win
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||
let cmd = s:shellesc(batchfile)
|
||||
let [batchfile, cmd] = s:batchfile(cmd)
|
||||
endif
|
||||
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
||||
execute "normal! :execute g:_plug_bang\<cr>\<cr>"
|
||||
finally
|
||||
unlet g:_plug_bang
|
||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||
if s:is_win
|
||||
if s:is_win && filereadable(batchfile)
|
||||
call delete(batchfile)
|
||||
endif
|
||||
endtry
|
||||
|
|
@ -897,7 +959,7 @@ function! s:checkout(spec)
|
|||
let output = s:system('git rev-parse HEAD', a:spec.dir)
|
||||
if !v:shell_error && !s:hash_match(sha, s:lines(output)[0])
|
||||
let output = s:system(
|
||||
\ 'git fetch --depth 999999 && git checkout '.s:esc(sha).' --', a:spec.dir)
|
||||
\ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
|
||||
endif
|
||||
return output
|
||||
endfunction
|
||||
|
|
@ -1015,7 +1077,7 @@ function! s:update_impl(pull, force, args) abort
|
|||
let s:clone_opt = get(g:, 'plug_shallow', 1) ?
|
||||
\ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
|
||||
|
||||
if has('win32unix')
|
||||
if has('win32unix') || has('wsl')
|
||||
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
|
||||
endif
|
||||
|
||||
|
|
@ -1094,7 +1156,7 @@ function! s:update_finish()
|
|||
elseif has_key(spec, 'tag')
|
||||
let tag = spec.tag
|
||||
if tag =~ '\*'
|
||||
let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
|
||||
let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir))
|
||||
if !v:shell_error && !empty(tags)
|
||||
let tag = tags[0]
|
||||
call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
|
||||
|
|
@ -1102,12 +1164,12 @@ function! s:update_finish()
|
|||
endif
|
||||
endif
|
||||
call s:log4(name, 'Checking out '.tag)
|
||||
let out = s:system('git checkout -q '.s:esc(tag).' -- 2>&1', spec.dir)
|
||||
let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir)
|
||||
else
|
||||
let branch = s:esc(get(spec, 'branch', 'master'))
|
||||
call s:log4(name, 'Merging origin/'.branch)
|
||||
let out = s:system('git checkout -q '.branch.' -- 2>&1'
|
||||
\. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only origin/'.branch.' 2>&1')), spec.dir)
|
||||
let branch = get(spec, 'branch', 'master')
|
||||
call s:log4(name, 'Merging origin/'.s:esc(branch))
|
||||
let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1'
|
||||
\. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir)
|
||||
endif
|
||||
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
|
||||
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
|
||||
|
|
@ -1151,7 +1213,7 @@ function! s:job_abort()
|
|||
silent! call job_stop(j.jobid)
|
||||
endif
|
||||
if j.new
|
||||
call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
|
||||
call s:rm_rf(g:plugs[name].dir)
|
||||
endif
|
||||
endfor
|
||||
let s:jobs = {}
|
||||
|
|
@ -1204,22 +1266,17 @@ endfunction
|
|||
|
||||
function! s:spawn(name, cmd, opts)
|
||||
let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
|
||||
\ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '',
|
||||
\ 'new': get(a:opts, 'new', 0) }
|
||||
let s:jobs[a:name] = job
|
||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
||||
if !empty(job.batchfile)
|
||||
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
|
||||
let cmd = s:shellesc(job.batchfile)
|
||||
endif
|
||||
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd
|
||||
let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd]
|
||||
|
||||
if s:nvim
|
||||
call extend(job, {
|
||||
\ 'on_stdout': function('s:nvim_cb'),
|
||||
\ 'on_exit': function('s:nvim_cb'),
|
||||
\ })
|
||||
let jid = jobstart(argv, job)
|
||||
let jid = s:plug_call('jobstart', argv, job)
|
||||
if jid > 0
|
||||
let job.jobid = jid
|
||||
else
|
||||
|
|
@ -1262,9 +1319,6 @@ function! s:reap(name)
|
|||
call s:log(bullet, a:name, empty(result) ? 'OK' : result)
|
||||
call s:bar()
|
||||
|
||||
if has_key(job, 'batchfile') && !empty(job.batchfile)
|
||||
call delete(job.batchfile)
|
||||
endif
|
||||
call remove(s:jobs, a:name)
|
||||
endfunction
|
||||
|
||||
|
|
@ -1354,8 +1408,8 @@ while 1 " Without TCO, Vim stack is bound to explode
|
|||
\ printf('git clone %s %s %s %s 2>&1',
|
||||
\ has_tag ? '' : s:clone_opt,
|
||||
\ prog,
|
||||
\ s:shellesc(spec.uri),
|
||||
\ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
|
||||
\ plug#shellescape(spec.uri, {'script': 0}),
|
||||
\ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 })
|
||||
endif
|
||||
|
||||
if !s:jobs[name].running
|
||||
|
|
@ -1982,19 +2036,29 @@ function! s:update_ruby()
|
|||
EOF
|
||||
endfunction
|
||||
|
||||
function! s:shellesc_cmd(arg)
|
||||
let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
|
||||
let escaped = substitute(escaped, '%', '%%', 'g')
|
||||
let escaped = substitute(escaped, '"', '\\^&', 'g')
|
||||
let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
|
||||
return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
|
||||
function! s:shellesc_cmd(arg, script)
|
||||
let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
|
||||
return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
|
||||
endfunction
|
||||
|
||||
function! s:shellesc(arg)
|
||||
if &shell =~# 'cmd.exe$'
|
||||
return s:shellesc_cmd(a:arg)
|
||||
function! s:shellesc_ps1(arg)
|
||||
return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
|
||||
endfunction
|
||||
|
||||
function! s:shellesc_sh(arg)
|
||||
return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'"
|
||||
endfunction
|
||||
|
||||
function! plug#shellescape(arg, ...)
|
||||
let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {}
|
||||
let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh')
|
||||
let script = get(opts, 'script', 1)
|
||||
if shell =~# 'cmd\.exe'
|
||||
return s:shellesc_cmd(a:arg, script)
|
||||
elseif shell =~# 'powershell\.exe' || shell =~# 'pwsh$'
|
||||
return s:shellesc_ps1(a:arg)
|
||||
endif
|
||||
return shellescape(a:arg)
|
||||
return s:shellesc_sh(a:arg)
|
||||
endfunction
|
||||
|
||||
function! s:glob_dir(path)
|
||||
|
|
@ -2026,23 +2090,23 @@ function! s:format_message(bullet, name, message)
|
|||
endif
|
||||
endfunction
|
||||
|
||||
function! s:with_cd(cmd, dir)
|
||||
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
|
||||
function! s:with_cd(cmd, dir, ...)
|
||||
let script = a:0 > 0 ? a:1 : 1
|
||||
return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd)
|
||||
endfunction
|
||||
|
||||
function! s:system(cmd, ...)
|
||||
let batchfile = ''
|
||||
try
|
||||
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
||||
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||
if s:is_win
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||
let cmd = s:shellesc(batchfile)
|
||||
let [batchfile, cmd] = s:batchfile(cmd)
|
||||
endif
|
||||
return system(cmd)
|
||||
finally
|
||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||
if s:is_win
|
||||
if s:is_win && filereadable(batchfile)
|
||||
call delete(batchfile)
|
||||
endif
|
||||
endtry
|
||||
|
|
@ -2115,7 +2179,7 @@ endfunction
|
|||
|
||||
function! s:rm_rf(dir)
|
||||
if isdirectory(a:dir)
|
||||
call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
|
||||
call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir))
|
||||
endif
|
||||
endfunction
|
||||
|
||||
|
|
@ -2147,7 +2211,7 @@ function! s:clean(force)
|
|||
|
||||
let allowed = {}
|
||||
for dir in dirs
|
||||
let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1
|
||||
let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1
|
||||
let allowed[dir] = 1
|
||||
for child in s:glob_dir(dir)
|
||||
let allowed[child] = 1
|
||||
|
|
@ -2220,11 +2284,11 @@ endfunction
|
|||
function! s:upgrade()
|
||||
echo 'Downloading the latest version of vim-plug'
|
||||
redraw
|
||||
let tmp = tempname()
|
||||
let tmp = s:plug_tempname()
|
||||
let new = tmp . '/plug.vim'
|
||||
|
||||
try
|
||||
let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
|
||||
let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp)))
|
||||
if v:shell_error
|
||||
return s:err('Error upgrading vim-plug: '. out)
|
||||
endif
|
||||
|
|
@ -2365,18 +2429,17 @@ function! s:preview_commit()
|
|||
wincmd P
|
||||
endif
|
||||
setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
|
||||
let batchfile = ''
|
||||
try
|
||||
let [sh, shellcmdflag, shrd] = s:chsh(1)
|
||||
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||
let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||
if s:is_win
|
||||
let batchfile = tempname().'.bat'
|
||||
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||
let cmd = batchfile
|
||||
let [batchfile, cmd] = s:batchfile(cmd)
|
||||
endif
|
||||
execute 'silent %!' cmd
|
||||
finally
|
||||
let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
|
||||
if s:is_win
|
||||
if s:is_win && filereadable(batchfile)
|
||||
call delete(batchfile)
|
||||
endif
|
||||
endtry
|
||||
|
|
@ -2420,9 +2483,11 @@ function! s:diff()
|
|||
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
||||
for [k, v] in plugs
|
||||
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
||||
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
|
||||
let cmd = 'git log --graph --color=never '
|
||||
\ . (s:git_version_requirement(2, 10, 0) ? '--no-show-signature ' : '')
|
||||
\ . join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)'))
|
||||
if has_key(v, 'rtp')
|
||||
let cmd .= ' -- '.s:shellesc(v.rtp)
|
||||
let cmd .= ' -- '.plug#shellescape(v.rtp)
|
||||
endif
|
||||
let diff = s:system_chomp(cmd, v.dir)
|
||||
if !empty(diff)
|
||||
|
|
@ -2470,7 +2535,7 @@ function! s:revert()
|
|||
return
|
||||
endif
|
||||
|
||||
call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch).' --', g:plugs[name].dir)
|
||||
call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir)
|
||||
setlocal modifiable
|
||||
normal! "_dap
|
||||
setlocal nomodifiable
|
||||
|
|
@ -2498,7 +2563,7 @@ function! s:snapshot(force, ...) abort
|
|||
endfor
|
||||
|
||||
if a:0 > 0
|
||||
let fn = expand(a:1)
|
||||
let fn = s:plug_expand(a:1)
|
||||
if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?'))
|
||||
return
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 1c803b36f632c151c755456b68101153f407ec5e
|
||||
Subproject commit 63c59208c1f9eef7068a944f5c3033bd1a348b97
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
export QT_QPA_PLATFORMTHEME="qt5ct"
|
||||
export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.x86_64.json:/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/amd_icd.x86_64.json:/usr/share/vulkan/icd.d/amd_icd.i686.json"
|
||||
|
||||
if [ -d "$HOME/.local/bin" ] ; then
|
||||
PATH="$HOME/.local/bin:$PATH"
|
||||
fi
|
||||
|
||||
if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
|
||||
exec startx
|
||||
exec checkupdates
|
||||
exec startx /home/daan/.config/penrose/start-penrose.sh
|
||||
fi
|
||||
|
|
|
|||
60
.zshrc
60
.zshrc
|
|
@ -124,13 +124,33 @@ export NNN_USE_EDITOR=1
|
|||
export NNN_DE_FILE_MANAGER=dolphin
|
||||
|
||||
export NNN_TMPFILE="/tmp/nnn"
|
||||
export NNN_PLUG="p:preview-tabbed"
|
||||
export NNN_FIFO=/tmp/nnn.fifo
|
||||
|
||||
n () {
|
||||
# Block nesting of nnn in subshells
|
||||
if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then
|
||||
echo "nnn is already running"
|
||||
return
|
||||
fi
|
||||
|
||||
# The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set)
|
||||
# To cd on quit only on ^G, remove the "export" as in:
|
||||
# NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
|
||||
# NOTE: NNN_TMPFILE is fixed, should not be modified
|
||||
export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
|
||||
|
||||
# Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
|
||||
# stty start undef
|
||||
# stty stop undef
|
||||
# stty lwrap undef
|
||||
# stty lnext undef
|
||||
|
||||
n() {
|
||||
nnn "$@"
|
||||
|
||||
if [ -f $NNN_TMPFILE ]; then
|
||||
. $NNN_TMPFILE
|
||||
rm $NNN_TMPFILE
|
||||
if [ -f "$NNN_TMPFILE" ]; then
|
||||
. "$NNN_TMPFILE"
|
||||
rm -f "$NNN_TMPFILE" > /dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -174,12 +194,6 @@ alias syu="yay -Syu"
|
|||
alias s="yay -S $@"
|
||||
alias r="yay -R $@"
|
||||
|
||||
# Code
|
||||
|
||||
c() {
|
||||
code $PWD &
|
||||
}
|
||||
|
||||
# Git
|
||||
|
||||
alias ga="git add ."
|
||||
|
|
@ -215,6 +229,13 @@ alias ant="JAVA_HOME=/usr/lib/jvm/java-11-openjdk ant"
|
|||
|
||||
source "tp"
|
||||
|
||||
alias ls=exa
|
||||
alias l="exa -l"
|
||||
|
||||
alias c="alacritty --hold -e zsh & disown"
|
||||
|
||||
alias ds4="bluetoothctl power on && sudo ds4drv --hidraw --udp"
|
||||
|
||||
twitch() {
|
||||
$BROWSER "https://twitch.tv/popout/$1/chat" &
|
||||
mpv "https://twitch.tv/$1"
|
||||
|
|
@ -227,9 +248,24 @@ zoommode() {
|
|||
pactl load-module module-null-source source_name=null
|
||||
}
|
||||
|
||||
alias ls=exa
|
||||
alias l="exa -l"
|
||||
copy() {
|
||||
echo "${PWD}/${1}" | xclip -i
|
||||
}
|
||||
|
||||
paste() {
|
||||
cp "$(xclip -o)" .
|
||||
}
|
||||
|
||||
subfix() {
|
||||
for file in *.srt; do
|
||||
mv "$file" "$(basename "$file" .srt).srt.gz"
|
||||
done
|
||||
gzip -d *.srt.gz
|
||||
}
|
||||
|
||||
wakezolder() {
|
||||
wol -p 8009 -i 192.168.1.200 d4:3d:7e:fc:0e:32
|
||||
}
|
||||
|
||||
# /!\ do not use with zsh-autosuggestions
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ input () {
|
|||
}
|
||||
|
||||
output () {
|
||||
factorio --mod-directory $PACK_DIR/$1
|
||||
mangohud factorio --mod-directory $PACK_DIR/$1 &
|
||||
#mangohud /home/daan/Games/Factorio/Stable2/bin/x64/factorio --mod-directory $PACK_DIR/$1
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue