diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 7c21c0c..dd85b2f 100755 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -91,11 +91,8 @@ font: use_thin_strokes: true # Should display the render timer -render_timer: false - -# Use custom cursor colors. If true, display the cursor in the cursor.foreground -# and cursor.background colors, otherwise invert the colors of the cursor. -custom_cursor_colors: false +debug: + render_timer: false # Colors (Tomorrow Night Bright) colors: @@ -192,11 +189,11 @@ mouse_bindings: mouse: double_click: { threshold: 300 } triple_click: { threshold: 300 } + hide_when_typing: true selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>" -hide_cursor_when_typing: false # Style of the cursor # @@ -204,7 +201,8 @@ hide_cursor_when_typing: false # - Block # - Underline # - Beam -cursor_style: Block +cursor: + style: Block # Live config reload (changes require restart) live_config_reload: true diff --git a/.config/alacritty/alacritty_ranger.yml b/.config/alacritty/alacritty_ranger.yml index a0a2040..42d1cc8 100755 --- a/.config/alacritty/alacritty_ranger.yml +++ b/.config/alacritty/alacritty_ranger.yml @@ -16,16 +16,17 @@ env: # Window dimensions in character columns and lines # Falls back to size specified by window manager if set to 0x0. # (changes require restart) -dimensions: - columns: 80 - lines: 24 +window: + dimensions: + columns: 80 + lines: 24 -# Adds this many blank pixels of padding around the window -# Units are physical pixels; this is not DPI aware. -# (change requires restart) -padding: - x: 2 - y: 0 + # Adds this many blank pixels of padding around the window + # Units are physical pixels; this is not DPI aware. + # (change requires restart) + padding: + x: 2 + y: 0 # Display tabs using this many cells (changes require restart) tabspaces: 4 @@ -55,37 +56,37 @@ draw_bold_text_with_bright_colors: true font: # The normal (roman) font face to use. normal: - family: xos4 Terminus # should be "Menlo" or something on macOS. + family: "xos4 Terminess Powerline" # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. style: Regular # The bold font face bold: - family: xos4 Terminus # should be "Menlo" or something on macOS. + family: "xos4 Terminess Powerline" # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. style: Bold # The italic font face italic: - family: xos4 Terminus # should be "Menlo" or something on macOS. + family: "xos4 Terminess Powerline" # should be "Menlo" or something on macOS. # Style can be specified to pick a specific face. # style: Italic # Point size of the font - size: 16.0 + size: 18.0 # 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. offset: - x: 0.0 - y: 0.0 + x: 0 + y: 0 # Glyph offset determines the locations of the glyphs within their cells with # the default being at the bottom. Increase the x offset to move the glyph to # the right, increase the y offset to move the glyph upward. glyph_offset: - x: 0.0 - y: 0.0 + x: 0 + y: 0 # OS X only: use thin stroke font rendering. Thin strokes are suitable # for retina displays, but for non-retina you probably want this set to @@ -95,10 +96,6 @@ font: # Should display the render timer render_timer: false -# Use custom cursor colors. If true, display the cursor in the cursor.foreground -# and cursor.background colors, otherwise invert the colors of the cursor. -custom_cursor_colors: false - # Colors (Tomorrow Night Bright) colors: # Default colors @@ -194,11 +191,11 @@ mouse_bindings: mouse: double_click: { threshold: 300 } triple_click: { threshold: 300 } + hide_when_typing: true selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>" -hide_cursor_when_typing: false # Style of the cursor # @@ -206,7 +203,8 @@ hide_cursor_when_typing: false # - Block # - Underline # - Beam -cursor_style: Block +cursor: + style: Block # Live config reload (changes require restart) live_config_reload: true diff --git a/.config/htop/htoprc b/.config/htop/htoprc index b9f526d..e98b492 100755 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,7 +1,7 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 +sort_key=47 sort_direction=1 hide_threads=0 hide_kernel_threads=1 @@ -12,7 +12,7 @@ show_program_path=1 highlight_base_name=0 highlight_megabytes=1 highlight_threads=1 -tree_view=0 +tree_view=1 header_margin=1 detailed_cpu_time=0 cpu_count_from_zero=0 diff --git a/.config/nvim/autoload/plug.vim b/.config/nvim/autoload/plug.vim old mode 100755 new mode 100644 index 5d2b00e..4e05630 --- a/.config/nvim/autoload/plug.vim +++ b/.config/nvim/autoload/plug.vim @@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...) endtry 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() if !exists('g:plugs') return s:err('Call plug#begin() first') @@ -214,7 +222,7 @@ function! plug#end() continue endif 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 continue 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' endif + let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' + " Python version requirement (>= 2.7) if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 redir => pyv @@ -1102,7 +1112,7 @@ function! s:update_finish() if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && \ (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.') - 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 let msg = s:format_message(v:shell_error ? 'x': '-', name, out) 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 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 ...') redraw @@ -2410,7 +2420,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 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) 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)'))) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 8b1449c..963bc16 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -29,7 +29,7 @@ if !&diff set cursorline endif 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 fileformats=unix,dos,mac @@ -110,6 +110,11 @@ noremap gd :Gvdiff noremap b :split noremap v :vsplit + +"POLYGLOT +let g:polyglot_disabled = ['css', 'html', 'javascript'] +let g:vue_disable_pre_processors=0 + "Plugins filetype off call plug#begin('~/.config/nvim/bundle') @@ -136,6 +141,8 @@ Plug 'editorconfig/editorconfig-vim' Plug 'vim-latex/vim-latex' Plug 'noahfrederick/vim-laravel' Plug '1995parham/vim-spice' +" Plug 'https://gitlab.com/code-stats/code-stats-vim.git' + "GIT Plug 'tpope/vim-fugitive' @@ -160,8 +167,12 @@ Plug 'vim-scripts/octave.vim--' Plug 'sheerun/vim-polyglot' Plug 'tristaan/vim-smooth' Plug 'vivien/vim-linux-coding-style' +Plug 'sirtaj/vim-openscad' call plug#end() +"CODESTATS +let g:codestats_api_key = 'SFMyNTY.WW1scmIyNXFZVE16IyNORFUzTnc9PQ.ad9U5r6g8iyXiE4Jlp3vfU_IGSHRwogX1-fXn8PZdBw' + "PYTHON let g:python_host_prog = '/usr/bin/python2' 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_CompileRule_pdf='pdflatex -shell-escape' -"POLYGLOT -let g:polyglot_disabled = ['css', 'html', 'javascript'] -let g:vue_disable_pre_processors=0 - "ARDUINO let g:arduino_dir = '/usr/share/arduino' @@ -212,7 +219,6 @@ let g:ale_linters = { \ 'c': ['clang'] \} 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'] "STARTIFY @@ -260,7 +266,8 @@ let g:lightline = { \ }, \ 'mode_map': { 'c': 'NORMAL' }, \ 'active': { - \ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ] + \ 'left': [ [ 'mode', 'paste' ], [ 'fugitive', 'filename' ] ], + \ 'right': [ [ 'lineinfo' ], [ 'percent', 'codestats' ], [ 'fileformat', 'fileencoding', 'filetype' ] ] \ }, \ 'component_function': { \ 'bufferbefore': 'lightline#buffer#bufferbefore', @@ -274,6 +281,7 @@ let g:lightline = { \ 'filetype': 'LightlineFiletype', \ 'fileencoding': 'LightlineFileencoding', \ 'mode': 'LightlineMode', + \ 'codestats': 'CodeStatsXp' \ }, \ 'separator': { 'left': '', 'right': '' }, \ 'subseparator': { 'left': '', 'right': '' } @@ -363,7 +371,7 @@ augroup END augroup filetypes au! 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 Vuefix diff --git a/.config/polybar/config b/.config/polybar/config index ab3d635..7dbded4 100755 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -162,8 +162,8 @@ format-mounted = format-unmounted = mount-0 = / -mount-1 = /media mount-2 = /home +mount-1 = /media spacing = 1 label-mounted = ${env:LABEL_MOUNTED} @@ -235,7 +235,7 @@ animation-packetloss-framerate = 500 [module/wired-network] type = internal/network -interface = enp9s0 +interface = enp10s0 interval = 2 udspeed-minwidth = 2 diff --git a/.i3/config b/.i3/config index b55f1bc..67bed3b 100755 --- a/.i3/config +++ b/.i3/config @@ -1,27 +1,32 @@ # T's desktop v3 #exec --no-stratup-id xrandr --output eDP1 --primary --auto -exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary -exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh -exec --no-startup-id compton -G -b -exec --no-startup-id mplayer -fs $HOME/.i3/boot.mp4 -exec --no-startup-id conky -c $HOME/.config/conky/conkyrc -exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360 -exec --no-startup-id synclient TapButton1=1 -exec xautolock -time 10 -locker $HOME/.i3/scripts/locker.sh -exec xautolock -locknow +#exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary +#exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh +#exec --no-startup-id lxqt-policykit-agent +#exec --no-startup-id compton -G -b +#exec --no-startup-id mplayer -fs $HOME/.i3/boot.mp4 +#exec --no-startup-id conky -c $HOME/.config/conky/conkyrc +#exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360 +#exec --no-startup-id synclient TapButton1=1 +#exec xautolock -time 10 -locker $HOME/.i3/scripts/locker.sh +#exec xautolock -locknow #DAEMONS #exec --no-startup-id urxvtd -q -exec --no-startup-id udiskie -t -exec --no-startup-id nitrogen --restore -exec --no-startup-id dunst +#exec --no-startup-id udiskie -t +#exec --no-startup-id nitrogen --restore +#exec --no-startup-id dunst #exec --no-startup-id mpd -exec --no-startup-id megasync -exec --no-startup-id parcellite -exec --no-startup-id dunst -exec --no-startup-id blueman-applet +#exec --no-startup-id megasync +#exec --no-startup-id parcellite +#exec --no-startup-id dunst +#exec --no-startup-id blueman-applet #Layout -exec setxkbmap us altgr-intl -exec xmodmap $HOME/.i3/custom.map +#exec setxkbmap us altgr-intl +#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