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

Vim new plugin manager, changed settings, i3 new layout, removed git modules

Browse Source
This commit is contained in:
Tristaan
2018-08-21 16:17:38 +02:00
parent 65c9d816b8
commit 2f48e3a2ce
18 changed files with 2773 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.Xresources
View File

@@ -34,6 +34,7 @@ xterm*faceName: Terminess Powerline:pixelsize=14:style=Regular
! special
urxvt.foreground: #c1c4c2
urxvt.background: #1d1f21
xterm.background: #1d1f21
urxvt.cursorColor: #d2c5bc
! black
URxvt*color0: #1d1f21

19
.config/alacritty/alacritty.yml
View File

@@ -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

17
.config/conky/conkyrc
View File

@@ -69,7 +69,7 @@ color8="FFFFFF",
-------------------------------------
-- API Key
-------------------------------------
template6="484ee5b6fcb17e5fa7ad811962a88e79",
template6="2a44967bd3377edc7fe39db81c72e0d8",
-------------------------------------
@@ -181,19 +181,14 @@ ${voffset -13}${alignr 39}${color1}Mem${color}
\
\
\
${if_existing /proc/net/route wlp3s0}
${voffset -230}${goto 40}${color5}Up: ${color2}${upspeed wlp3s0}${color5}${goto 150}Down: ${color2}${downspeed wlp3s0}
${voffset 10}${goto 40}${upspeedgraph wlp3s0 26,80 FFFFFF FFFFFF}${goto 150}${downspeedgraph wlp3s0 26,80 FFFFFF FFFFFF}
${voffset 9}${goto 40}${color5}Sent: ${color2}${totalup wlp3s0}${color5}${goto 150}Received: ${color2}${totaldown wlp3s0}
${else}
${if_existing /proc/net/route enp0s1}
${voffset -344}${goto 40}${color5}Up: ${color2}${upspeed enp0s1}${color5}${goto 150}Down: ${color2}${downspeed enp0s1}
${voffset 10}${goto 40}${upspeedgraph enp0s1 26,80 FFFFFF FFFFFF}${goto 150}${downspeedgraph enp0s1 26,80 FFFFFF FFFFFF}
${voffset 9}${goto 40}${color5}Sent: ${color2}${totalup enp0s1}${color5}${goto 150}Received: ${color2}${totaldown enp0s1}
${if_existing /proc/net/route enp11s0}
${voffset -230}${goto 40}${color5}Up: ${color2}${upspeed enp11s0}${color5}${goto 150}Down: ${color2}${downspeed enp11s0}
${voffset 10}${goto 40}${upspeedgraph enp11s0 26,80 FFFFFF FFFFFF}${goto 150}${downspeedgraph enp11s0 26,80 FFFFFF FFFFFF}
${voffset 9}${goto 40}${color5}Sent: ${color2}${totalup enp11s0}${color5}${goto 150}Received: ${color2}${totaldown enp11s0}
${else}
${voffset -311}${goto 40}${color5}Network disconnected${color}
${image ~/.harmattan-assets/misc/Transparent/God-Mode/offline.png -p 44,284 -s 16x16}
${endif}${endif}
${endif}
\
\
\

4
.config/htop/htoprc
View File

@@ -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=47
sort_key=46
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=1
tree_view=0
header_margin=1
detailed_cpu_time=0
cpu_count_from_zero=0

1
.config/nvim/.gitignore vendored
View File

@@ -1,2 +1 @@
bundle/*
!bundle/Vundle.vim

0
.config/nvim/autoload/.keep Normal file
View File

2512
.config/nvim/autoload/plug.vim Normal file
View File

File diff suppressed because it is too large Load Diff

1
.config/nvim/bundle/Vundle.vim

Submodule .config/nvim/bundle/Vundle.vim deleted from fcc204205e

108
.config/nvim/init.vim
View File

@@ -3,7 +3,12 @@ set shell=$SHELL
if has("nvim")
set t_8f=^[[38;2;%lu;%lu;%lum " Needed in tmux
set t_8b=^[[48;2;%lu;%lu;%lum " Ditto
set termguicolors
set termguicolors
endif
if empty(glob('~/.config/nvim/autoload/plug.vim'))
silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
set t_Co=256
set t_ut=
@@ -18,8 +23,8 @@ set timeoutlen=400
set hidden "Multiple buffers
set laststatus=2 "Always show status lines
set number numberwidth=2 " Show line number column
set relativenumber " Show numbers relative to current position
set number numberwidth=1 " Show line number column
" set relativenumber " Show numbers relative to current position
if !&diff
set cursorline
endif
@@ -31,10 +36,14 @@ set fileformats=unix,dos,mac
set showcmd "Show command in status bar
set showmatch "Show matching brackets
set noshowmode
set lazyredraw "Put redrawing into buffer
"Swap file off
set noswapfile
"Tags
set tags=./tags;
set wildignore=.svn,CVS,.git,.hg,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.png,*.xpm,*.gif
set incsearch " Incremental search
set hlsearch " Highlight search match
@@ -101,58 +110,61 @@ noremap <Leader>v :<C-u>vsplit<CR>
"Plugins
filetype off
set rtp+=~/.config/nvim/bundle/Vundle.vim
call vundle#begin()
Plugin 'VundleVim/Vundle.vim'
call plug#begin('~/.config/nvim/bundle')
"Interfaces
Plugin 'Shougo/unite.vim'
Plugin 'mhinz/vim-startify'
Plug 'Shougo/unite.vim'
Plug 'mhinz/vim-startify'
Plug 'git-time-metric/gtm-vim-plugin'
"Arduino
Plugin 'z3t0/arduvim'
Plug 'z3t0/arduvim'
"Utilities
Plugin 'Shougo/vimfiler.vim'
Plugin 'wellle/targets.vim'
Plugin 'tpope/vim-surround'
Plugin 'tpope/vim-repeat'
Plugin 'tpope/vim-unimpaired'
Plugin 'tpope/vim-endwise'
Plugin 'alvan/vim-closetag'
Plugin 'moll/vim-bbye'
Plugin 'w0rp/ale'
Plugin 'Shougo/deoplete.nvim'
Plugin 'fishbullet/deoplete-ruby'
Plugin 'Shougo/deoplete-rct'
Plugin 'editorconfig/editorconfig-vim'
Plugin 'vim-latex/vim-latex'
Plug 'Shougo/vimfiler.vim'
Plug 'wellle/targets.vim'
Plug 'tpope/vim-surround'
Plug 'tpope/vim-repeat'
Plug 'tpope/vim-endwise'
Plug 'alvan/vim-closetag'
Plug 'moll/vim-bbye'
Plug 'w0rp/ale'
Plug 'Shougo/deoplete.nvim'
Plug 'fishbullet/deoplete-ruby'
Plug 'Shougo/deoplete-rct'
Plug 'editorconfig/editorconfig-vim'
Plug 'vim-latex/vim-latex'
Plug 'noahfrederick/vim-laravel'
"GIT
Plugin 'tpope/vim-fugitive'
Plugin 'airblade/vim-gitgutter'
Plug 'tpope/vim-fugitive'
Plug 'airblade/vim-gitgutter'
"Ruby and rails
Plugin 'tpope/vim-rails'
Plugin 'tpope/vim-bundler'
Plugin 'tpope/vim-rake'
Plug 'tpope/vim-rails'
"Javascript
" EMMET - HTML autocompletions
Plugin 'mattn/emmet-vim'
Plug 'mattn/emmet-vim'
"syntax, colorscheme, etc. (visuals)
Plugin 'chrisbra/Colorizer'
Plugin 'itchyny/lightline.vim'
Plugin 'mgee/lightline-bufferline'
Plugin 'ryanoasis/vim-devicons'
Plugin 'PotatoesMaster/i3-vim-syntax'
Plugin 'vim-scripts/octave.vim--'
Plugin 'sheerun/vim-polyglot'
Plugin 'tristaan/vim-smooth'
Plugin 'vivien/vim-linux-coding-style'
call vundle#end()
Plug 'chrisbra/Colorizer'
Plug 'itchyny/lightline.vim'
Plug 'mgee/lightline-bufferline'
Plug 'ryanoasis/vim-devicons'
Plug 'PotatoesMaster/i3-vim-syntax'
Plug 'vim-scripts/octave.vim--'
Plug 'sheerun/vim-polyglot'
Plug 'tristaan/vim-smooth'
Plug 'vivien/vim-linux-coding-style'
call plug#end()
"PYTHON
let g:python_host_prog = '/usr/bin/python2'
let g:python3_host_prog = '/usr/bin/python3'
"RUBY
let g:ruby_path = system('rvm current')
"SYNTAX COLORING AND COMPLETION
filetype plugin indent on
@@ -166,6 +178,9 @@ let g:session_autoload = "no"
let g:session_autosave = "no"
let g:session_command_aliases = 1
"GTM
let g:gtm_plugin_status_enabled = 1
"VIMFILER
let g:vimfiler_as_default_explorer = 1
@@ -173,13 +188,14 @@ let g:vimfiler_as_default_explorer = 1
let g:user_emmet_install_global = 0
let g:user_emmet_expandabbr_key = '<C-e>'
let g:deoplete#enable_at_startup = 1
let g:deoplete#sources = [ 'tag', 'buffer' ]
" let g:deoplete#sources = [ 'tag', 'buffer' ]
let deoplete#tag#cache_limit_size = 5000000
"LATEX
let g:tex_flavor='latex'
let g:Tex_DefaultTargetFormat='pdf'
let g:Tex_ViewRule_pdf='firefox'
let g:Tex_CompileRule_pdf='pdflatex -shell-escape'
set iskeyword+=:
"POLYGLOT
@@ -189,6 +205,14 @@ let g:vue_disable_pre_processors=0
"ARDUINO
let g:arduino_dir = '/usr/share/arduino'
"ALE
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
let g:startify_list_order = [
\ [' Most recently used in directory:'],
@@ -337,7 +361,7 @@ augroup END
augroup filetypes
au!
au FileType eruby let b:surround_45 = "<%= \r %>"
"au FileType html,css,eruby EmmetInstall
au FileType html,css,eruby,php EmmetInstall
augroup END
augroup Vuefix

86
.config/termite/config Normal file
View File

@@ -0,0 +1,86 @@
[options]
#allow_bold = true
#audible_bell = false
#clickable_url = true
#dynamic_title = true
font = xos4 Terminess Powerline 16
#fullscreen = true
#geometry = 640x480
#icon_name = terminal
#mouse_autohide = false
#scroll_on_output = false
#scroll_on_keystroke = true
# Length of the scrollback buffer, 0 disabled the scrollback buffer
# and setting it to a negative value means "infinite scrollback"
scrollback_lines = 10000
#search_wrap = true
#urgent_on_bell = true
#hyperlinks = false
# $BROWSER is used by default if set, with xdg-open as a fallback
#browser = xdg-open
# "system", "on" or "off"
#cursor_blink = system
# "block", "underline" or "ibeam"
#cursor_shape = block
# Hide links that are no longer valid in url select overlay mode
#filter_unmatched_urls = true
# Emit escape sequences for extra modified keys
#modify_other_keys = false
# set size hints for the window
#size_hints = false
# "off", "left" or "right"
#scrollbar = off
[colors]
# If both of these are unset, cursor falls back to the foreground color,
# and cursor_foreground falls back to the background color.
#cursor = #dcdccc
#cursor_foreground = #dcdccc
#foreground = #dcdccc
#foreground_bold = #ffffff
background = #1d1f21
# 20% background transparency (requires a compositor)
#background = rgba(63, 63, 63, 0.8)
# If unset, will reverse foreground and background
#highlight = #2f2f2f
# Colors from color0 to color254 can be set
color0 = #1d1f21
color1 = #d73555
color8 = #303030
color9 = #c76484
color2 = #35d755
color10 = #64c784
color3 = #d7d755
color11 = #c7c784
color4 = #3555d7
color12 = #6484c7
color5 = #d755d7
color13 = #7355d7
color6 = #55b7b7
color14 = #84c7c7
color7 = #b7b7b7
color15 = #d7d7d7
[hints]
#font = xos4 Terminus 12
#foreground = #dcdccc
#background = #3f3f3f
#active_foreground = #e68080
#active_background = #3f3f3f
#padding = 2
#border = #3f3f3f
#border_width = 0.5
#roundness = 2.0
# vim: ft=dosini cms=#%s

2
.gitconfig
View File

@@ -19,6 +19,6 @@
co = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
hist = log --pretty=format:\"[%ad] %s%d\" --date=format:'%d.%m.%Y %H:%M:%S'
type = cat-file -t
dump = cat-file -p

6
.gitmodules vendored
View File

@@ -1,9 +1,3 @@
[submodule ".oh-my-zsh"]
path = .oh-my-zsh
url = https://github.com/robbyrussell/oh-my-zsh.git
[submodule ".vim/bundle/Vundle.vim"]
path = .vim/bundle/Vundle.vim
url = https://github.com/VundleVim/Vundle.vim.git
[submodule ".config/nvim/bundle/Vundle.vim"]
path = .config/nvim/bundle/Vundle.vim
url = https://github.com/VundleVim/Vundle.vim

3
.i3/config
View File

@@ -214,8 +214,7 @@ bindsym $mod+Shift+Down move workspace to output down
#//WORKSPACES//#
#--LAYOUTS--#
bindsym $alt+Shift+l exec i3-msg "append_layout $HOME/.i3/layouts/workspace-3.json" && bash $HOME/.i3/scripts/term_runner.sh -d $HOME/build/doc24_backend -d $HOME/build/doc24_backend -d $HOME/build/doc24_backend -d $HOME
bindsym $alt+Shift+l exec $HOME/.i3/scripts/workspace.sh "$HOME/.i3/layouts/workspace-3.json" "$HOME/build/doc24_backend"
#//LAYOUTS//#
# resize window (you can also use the mouse for that)

117
.i3/layouts/workspace-3.json
View File

@@ -1,14 +1,15 @@
// vim:ts=4:sw=4:et
{
// stacked split container with 1 children
// stacked split container with 2 children
"border": "pixel",
"floating": "auto_off",
"layout": "stacked",
"percent": 0.6,
"percent": 0.7,
"type": "con",
"nodes": [
{
"border": "pixel",
"current_border_width": 2,
"border": "none",
"current_border_width": 4,
"floating": "auto_off",
"geometry": {
"height": 768,
@@ -16,12 +17,32 @@
"x": 0,
"y": 0
},
"name": "tristan@T-i3: ~/build",
"percent": 1,
"name": "tristan@T-i3: ~/build/doc24_backend",
"percent": 0.5,
"swallows": [
{
"class": "^Alacritty$",
"instance": "^Alacritty$"
"instance": "^alacritty$"
}
],
"type": "con"
},
{
"border": "none",
"current_border_width": 4,
"floating": "auto_off",
"geometry": {
"height": 768,
"width": 1024,
"x": 0,
"y": 0
},
"name": "i3-save-tree --workspace 3 > ~/.i3/layouts/workspace-3.json",
"percent": 0.5,
"swallows": [
{
"class": "^Alacritty$",
"instance": "^alacritty$"
}
],
"type": "con"
@@ -34,62 +55,12 @@
"border": "pixel",
"floating": "auto_off",
"layout": "splitv",
"percent": 0.4,
"percent": 0.3,
"type": "con",
"nodes": [
{
// tabbed split container with 2 children
"border": "pixel",
"floating": "auto_off",
"layout": "tabbed",
"percent": 0.5,
"type": "con",
"nodes": [
{
"border": "pixel",
"current_border_width": 2,
"floating": "auto_off",
"geometry": {
"height": 768,
"width": 1024,
"x": 0,
"y": 0
},
"name": "tristan@T-i3: ~/build",
"percent": 0.5,
"swallows": [
{
"class": "^Alacritty$",
"instance": "^Alacritty$"
}
],
"type": "con"
},
{
"border": "pixel",
"current_border_width": 4,
"floating": "auto_off",
"geometry": {
"height": 768,
"width": 1024,
"x": 0,
"y": 0
},
"name": "tristan@T-i3: ~/build/doc24_backend",
"percent": 0.5,
"swallows": [
{
"class": "^Alacritty$",
"instance": "^Alacritty$"
}
],
"type": "con"
}
]
},
{
"border": "pixel",
"current_border_width": 2,
"border": "none",
"current_border_width": 4,
"floating": "auto_off",
"geometry": {
"height": 768,
@@ -97,16 +68,34 @@
"x": 0,
"y": 0
},
"name": "nvim .i3/config",
"name": "tristan@T-i3: ~",
"percent": 0.5,
"swallows": [
{
"class": "^Alacritty$",
"instance": "^Alacritty$"
"class": "^Alacritty$"
}
],
"type": "con"
},
{
"border": "none",
"current_border_width": 4,
"floating": "auto_off",
"geometry": {
"height": 768,
"width": 1024,
"x": 0,
"y": 0
},
"name": "tristan@T-i3: ~/build/doc24_backend",
"percent": 0.5,
"swallows": [
{
"class": "^Alacritty$"
}
],
"type": "con"
}
]
}
// vim:ts=4:sw=4:et

2
.i3/scripts/workspace.sh Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/sh
i3-msg "append_layout $1" && bash $HOME/.i3/scripts/term_runner.sh -d "$2" -d "$2" -d "$2" -d "$HOME"

2
.oh-my-zsh

Submodule .oh-my-zsh updated: 2ff9560ad3...a0b8eab5f0

31
.taskrc Normal file
View File

@@ -0,0 +1,31 @@
# [Created by task 2.5.1 5/16/2018 14:14:01]
# Taskwarrior program configuration file.
# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
# 'man task-sync' or 'man taskrc'
# Here is an example of entries that use the default, override and blank values
# variable=foo -- By specifying a value, this overrides the default
# variable= -- By specifying no value, this means no default
# #variable=foo -- By commenting out the line, or deleting it, this uses the default
# Use the command 'task show' to see all defaults and overrides
# Files
data.location=~/.task
# Color theme (uncomment one to use)
#include /usr/share/doc/task/rc/light-16.theme
#include /usr/share/doc/task/rc/light-256.theme
#include /usr/share/doc/task/rc/dark-16.theme
#include /usr/share/doc/task/rc/dark-256.theme
#include /usr/share/doc/task/rc/dark-red-256.theme
#include /usr/share/doc/task/rc/dark-green-256.theme
#include /usr/share/doc/task/rc/dark-blue-256.theme
#include /usr/share/doc/task/rc/dark-violets-256.theme
#include /usr/share/doc/task/rc/dark-yellow-green.theme
#include /usr/share/doc/task/rc/dark-gray-256.theme
#include /usr/share/doc/task/rc/dark-gray-blue-256.theme
include /usr/share/doc/task/rc/solarized-dark-256.theme
#include /usr/share/doc/task/rc/solarized-light-256.theme
#include /usr/share/doc/task/rc/no-color.theme

2
install.sh
View File

@@ -26,6 +26,7 @@ symlink_dotfiles() {
safe_link "$SCRIPT_DIR/.gitconfig"
safe_link "$SCRIPT_DIR/.oh-my-zsh"
safe_link "$SCRIPT_DIR/.zshrc"
safe_link "$SCRIPT_DIR/.taskrc"
for file in .config/*; do
[ ! -e "$dest" ] && ln -fs "${SCRIPT_DIR}/${file}" "${HOME}/${file}"
done
@@ -58,6 +59,5 @@ do
if [ $var == "-l" ]; then
git submodule init && git submodule update
symlink_dotfiles
fi
done