tristan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates to alacritty & vim

Browse Source
This commit is contained in:
Tristan Šneider
2020-11-06 21:35:19 +01:00
parent 2a2e522a6b
commit b0ebd1e0d0
7 changed files with 2580 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.config/alacritty/alacritty.yml
View File

@@ -28,9 +28,6 @@ window:
x: 2 x: 2
y: 0 y: 0
# Display tabs using this many cells (changes require restart)
tabspaces: 4
# When true, bold text is drawn using the bright variant of colors. # When true, bold text is drawn using the bright variant of colors.
draw_bold_text_with_bright_colors: true draw_bold_text_with_bright_colors: true
@@ -56,24 +53,24 @@ draw_bold_text_with_bright_colors: true
font: font:
# The normal (roman) font face to use. # The normal (roman) font face to use.
normal: normal:
family: "xos4 Terminess Powerline" # should be "Menlo" or something on macOS. family: "xos4 Terminus" # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face. # Style can be specified to pick a specific face.
style: Regular style: Regular
# The bold font face # The bold font face
bold: bold:
family: "xos4 Terminess Powerline" # should be "Menlo" or something on macOS. family: "xos4 Terminus" # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face. # Style can be specified to pick a specific face.
style: Bold style: Bold
# The italic font face # The italic font face
italic: italic:
family: "xos4 Terminess Powerline" # should be "Menlo" or something on macOS. family: "xos4 Terminus" # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face. # Style can be specified to pick a specific face.
# style: Italic # style: Italic
# Point size of the font # Point size of the font
size: 12.0 size: 14.0
# Offset is the extra space around each character. offset.y can be thought of # Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing. # as modifying the linespacing, and offset.x as modifying the letter spacing.
@@ -94,6 +91,7 @@ font:
use_thin_strokes: true use_thin_strokes: true
# Should display the render timer # Should display the render timer
debug:
render_timer: false render_timer: false
# Colors (Tomorrow Night Bright) # Colors (Tomorrow Night Bright)
@@ -163,7 +161,7 @@ colors:
# #
# To completely disable the visual bell, set its duration to 0. # To completely disable the visual bell, set its duration to 0.
# #
visual_bell: bell:
animation: EaseOutExpo animation: EaseOutExpo
duration: 0 duration: 0

4
.config/htop/htoprc
View File

@@ -1,7 +1,7 @@
# Beware! This file is rewritten by htop when settings are changed in the interface. # Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly. # The parser is also very primitive, and not human-friendly.
fields=0 48 17 18 38 39 40 2 46 47 49 1 fields=0 48 17 18 38 39 40 2 46 47 49 1
sort_key=46 sort_key=47
sort_direction=1 sort_direction=1
hide_threads=0 hide_threads=0
hide_kernel_threads=1 hide_kernel_threads=1
@@ -12,7 +12,7 @@ show_program_path=1
highlight_base_name=0 highlight_base_name=0
highlight_megabytes=1 highlight_megabytes=1
highlight_threads=1 highlight_threads=1
tree_view=0 tree_view=1
header_margin=1 header_margin=1
detailed_cpu_time=0 detailed_cpu_time=0
cpu_count_from_zero=0 cpu_count_from_zero=0

22
.config/nvim/autoload/plug.vim Executable file → Normal file
View File

@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
endtry endtry
endfunction endfunction
function! s:lazy(plug, opt)
return has_key(a:plug, a:opt) &&
\ (empty(s:to_a(a:plug[a:opt])) ||
\ !isdirectory(a:plug.dir) ||
\ len(s:glob(s:rtp(a:plug), 'plugin')) ||
\ len(s:glob(s:rtp(a:plug), 'after/plugin')))
endfunction
function! plug#end() function! plug#end()
if !exists('g:plugs') if !exists('g:plugs')
return s:err('Call plug#begin() first') return s:err('Call plug#begin() first')
@@ -214,7 +222,7 @@ function! plug#end()
continue continue
endif endif
let plug = g:plugs[name] let plug = g:plugs[name]
if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for') if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
let s:loaded[name] = 1 let s:loaded[name] = 1
continue continue
endif endif
@@ -1011,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
endif endif
let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
" Python version requirement (>= 2.7) " Python version requirement (>= 2.7)
if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
redir => pyv redir => pyv
@@ -1102,7 +1112,7 @@ function! s:update_finish()
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
call s:log4(name, 'Updating submodules. This may take a while.') call s:log4(name, 'Updating submodules. This may take a while.')
let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir) let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
endif endif
let msg = s:format_message(v:shell_error ? 'x': '-', name, out) let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
if v:shell_error if v:shell_error
@@ -1321,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
let name = keys(s:update.todo)[0] let name = keys(s:update.todo)[0]
let spec = remove(s:update.todo, name) let spec = remove(s:update.todo, name)
let new = !isdirectory(spec.dir) let new = empty(globpath(spec.dir, '.git', 1))
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
redraw redraw
@@ -2410,7 +2420,11 @@ function! s:diff()
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
for [k, v] in plugs for [k, v] in plugs
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir) let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
if has_key(v, 'rtp')
let cmd .= ' -- '.s:shellesc(v.rtp)
endif
let diff = s:system_chomp(cmd, v.dir)
if !empty(diff) if !empty(diff)
let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))

2512
.config/nvim/autoload/plug.vim.old Executable file
View File

File diff suppressed because it is too large Load Diff

24
.config/nvim/init.vim
View File

@@ -29,7 +29,7 @@ if !&diff
set cursorline set cursorline
endif endif
set autoindent "Automatic indentation of files set autoindent "Automatic indentation of files
set tabstop=4 softtabstop=4 shiftwidth=4 expandtab "Tab Settings set tabstop=2 softtabstop=2 shiftwidth=2 expandtab "Tab Settings
set nosol set nosol
set fileformats=unix,dos,mac set fileformats=unix,dos,mac
@@ -110,6 +110,11 @@ noremap <Leader>gd :Gvdiff<CR>
noremap <Leader>b :<C-u>split<CR> noremap <Leader>b :<C-u>split<CR>
noremap <Leader>v :<C-u>vsplit<CR> noremap <Leader>v :<C-u>vsplit<CR>
"POLYGLOT
let g:polyglot_disabled = ['css', 'html', 'javascript']
let g:vue_disable_pre_processors=0
"Plugins "Plugins
filetype off filetype off
call plug#begin('~/.config/nvim/bundle') call plug#begin('~/.config/nvim/bundle')
@@ -136,6 +141,8 @@ Plug 'editorconfig/editorconfig-vim'
Plug 'vim-latex/vim-latex' Plug 'vim-latex/vim-latex'
Plug 'noahfrederick/vim-laravel' Plug 'noahfrederick/vim-laravel'
Plug '1995parham/vim-spice' Plug '1995parham/vim-spice'
" Plug 'https://gitlab.com/code-stats/code-stats-vim.git'
"GIT "GIT
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
@@ -160,8 +167,12 @@ Plug 'vim-scripts/octave.vim--'
Plug 'sheerun/vim-polyglot' Plug 'sheerun/vim-polyglot'
Plug 'tristaan/vim-smooth' Plug 'tristaan/vim-smooth'
Plug 'vivien/vim-linux-coding-style' Plug 'vivien/vim-linux-coding-style'
Plug 'sirtaj/vim-openscad'
call plug#end() call plug#end()
"CODESTATS
let g:codestats_api_key = 'SFMyNTY.WW1scmIyNXFZVE16IyNORFUzTnc9PQ.ad9U5r6g8iyXiE4Jlp3vfU_IGSHRwogX1-fXn8PZdBw'
"PYTHON "PYTHON
let g:python_host_prog = '/usr/bin/python2' let g:python_host_prog = '/usr/bin/python2'
let g:python3_host_prog = '/usr/bin/python3' let g:python3_host_prog = '/usr/bin/python3'
@@ -200,10 +211,6 @@ let g:Tex_DefaultTargetFormat='pdf'
let g:Tex_ViewRule_pdf='firefox' let g:Tex_ViewRule_pdf='firefox'
let g:Tex_CompileRule_pdf='pdflatex -shell-escape' let g:Tex_CompileRule_pdf='pdflatex -shell-escape'
"POLYGLOT
let g:polyglot_disabled = ['css', 'html', 'javascript']
let g:vue_disable_pre_processors=0
"ARDUINO "ARDUINO
let g:arduino_dir = '/usr/share/arduino' let g:arduino_dir = '/usr/share/arduino'
@@ -212,7 +219,6 @@ let g:ale_linters = {
\ 'c': ['clang'] \ 'c': ['clang']
\} \}
let g:ale_c_clang_options = '-std=gnu11 -Wall -Wextra -Werror -lusb-1.0 -fexceptions -DNDEBUG' let g:ale_c_clang_options = '-std=gnu11 -Wall -Wextra -Werror -lusb-1.0 -fexceptions -DNDEBUG'
set statusline+=%{ALEGetStatusLine()}
let g:ale_statusline_format = ['⨉ %d', '⚠ %d', '⬥ ok'] let g:ale_statusline_format = ['⨉ %d', '⚠ %d', '⬥ ok']
"STARTIFY "STARTIFY
@@ -260,7 +266,8 @@ let g:lightline = {
\ }, \ },
\ 'mode_map': { 'c': 'NORMAL' }, \ 'mode_map': { 'c': 'NORMAL' },
\ 'active': { \ 'active': {
\ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ] \ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ],
\ 'right': [ [ 'lineinfo' ], [ 'percent', 'codestats' ], [ 'fileformat', 'fileencoding', 'filetype' ] ]
\ }, \ },
\ 'component_function': { \ 'component_function': {
\ 'bufferbefore': 'lightline#buffer#bufferbefore', \ 'bufferbefore': 'lightline#buffer#bufferbefore',
@@ -274,6 +281,7 @@ let g:lightline = {
\ 'filetype': 'LightlineFiletype', \ 'filetype': 'LightlineFiletype',
\ 'fileencoding': 'LightlineFileencoding', \ 'fileencoding': 'LightlineFileencoding',
\ 'mode': 'LightlineMode', \ 'mode': 'LightlineMode',
\ 'codestats': 'CodeStatsXp'
\ }, \ },
\ 'separator': { 'left': '', 'right': '' }, \ 'separator': { 'left': '', 'right': '' },
\ 'subseparator': { 'left': '', 'right': '' } \ 'subseparator': { 'left': '', 'right': '' }
@@ -363,7 +371,7 @@ augroup END
augroup filetypes augroup filetypes
au! au!
au FileType eruby let b:surround_45 = "<%= \r %>" au FileType eruby let b:surround_45 = "<%= \r %>"
au FileType html,css,eruby,php EmmetInstall au FileType html,css,eruby,php,vue EmmetInstall
augroup END augroup END
augroup Vuefix augroup Vuefix

4
.config/polybar/config
View File

@@ -162,8 +162,8 @@ format-mounted = <label-mounted>
format-unmounted = <label-unmounted> format-unmounted = <label-unmounted>
mount-0 = / mount-0 = /
mount-1 = /media
mount-2 = /home mount-2 = /home
mount-1 = /media
spacing = 1 spacing = 1
label-mounted = ${env:LABEL_MOUNTED} label-mounted = ${env:LABEL_MOUNTED}
@@ -235,7 +235,7 @@ animation-packetloss-framerate = 500
[module/wired-network] [module/wired-network]
type = internal/network type = internal/network
interface = enp9s0 interface = enp10s0
interval = 2 interval = 2
udspeed-minwidth = 2 udspeed-minwidth = 2

41
.i3/config
View File

@@ -1,27 +1,32 @@
# T's desktop v3 # T's desktop v3
#exec --no-stratup-id xrandr --output eDP1 --primary --auto #exec --no-stratup-id xrandr --output eDP1 --primary --auto
exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary #exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary
exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh #exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh
exec --no-startup-id compton -G -b #exec --no-startup-id lxqt-policykit-agent
exec --no-startup-id mplayer -fs $HOME/.i3/boot.mp4 #exec --no-startup-id compton -G -b
exec --no-startup-id conky -c $HOME/.config/conky/conkyrc #exec --no-startup-id mplayer -fs $HOME/.i3/boot.mp4
exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360 #exec --no-startup-id conky -c $HOME/.config/conky/conkyrc
exec --no-startup-id synclient TapButton1=1 #exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360
exec xautolock -time 10 -locker $HOME/.i3/scripts/locker.sh #exec --no-startup-id synclient TapButton1=1
exec xautolock -locknow #exec xautolock -time 10 -locker $HOME/.i3/scripts/locker.sh
#exec xautolock -locknow
#DAEMONS #DAEMONS
#exec --no-startup-id urxvtd -q #exec --no-startup-id urxvtd -q
exec --no-startup-id udiskie -t #exec --no-startup-id udiskie -t
exec --no-startup-id nitrogen --restore #exec --no-startup-id nitrogen --restore
exec --no-startup-id dunst #exec --no-startup-id dunst
#exec --no-startup-id mpd #exec --no-startup-id mpd
exec --no-startup-id megasync #exec --no-startup-id megasync
exec --no-startup-id parcellite #exec --no-startup-id parcellite
exec --no-startup-id dunst #exec --no-startup-id dunst
exec --no-startup-id blueman-applet #exec --no-startup-id blueman-applet
#Layout #Layout
exec setxkbmap us altgr-intl #exec setxkbmap us altgr-intl
exec xmodmap $HOME/.i3/custom.map #exec xmodmap $HOME/.i3/custom.map
exec --no-startup-id /usr/lib/gnome-settings-daemon/gsd-xsettings
exec_always --no-startup-id gnome-power-manager
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec --no-startup-id gnome-flashback
font pango: xos4 Terminus, Font Awesome 5 Free, Font Awesome 5 Brands 12 font pango: xos4 Terminus, Font Awesome 5 Free, Font Awesome 5 Brands 12