From 2ba95a48b9b20ff22eedf789068fc6d49f6012f9 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 11 Oct 2017 00:37:05 +0100 Subject: [PATCH 01/16] git: add gitk config --- git/gitk | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 git/gitk diff --git a/git/gitk b/git/gitk new file mode 100644 index 0000000..67a7152 --- /dev/null +++ b/git/gitk @@ -0,0 +1,62 @@ +set mainfont {sans 9} +set textfont {monospace 9} +set uifont {sans 9 bold} +set tabstop 4 +set findmergefiles 0 +set maxgraphpct 50 +set maxwidth 16 +set cmitmode patch +set wrapcomment none +set autoselect 1 +set autosellen 40 +set showneartags 1 +set maxrefs 20 +set visiblerefs {"master"} +set hideremotes 0 +set showlocalchanges 1 +set datetimeformat {%Y-%m-%d %H:%M:%S} +set limitdiffs 1 +set uicolor #222222 +set want_ttk 0 +set bgcolor #333333 +set fgcolor #eeeeee +set uifgcolor black +set uifgdisabledcolor #999 +set colors {"#00ff00" red blue magenta darkgrey brown orange} +set diffcolors {{#ff5555} #55aa55 #7777ff} +set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} +set markbgcolor #444466 +set diffcontext 3 +set selectbgcolor #555566 +set foundbgcolor yellow +set currentsearchhitbgcolor orange +set extdifftool meld +set perfile_attrs 0 +set headbgcolor #00ff00 +set headfgcolor black +set headoutlinecolor black +set remotebgcolor #ffddaa +set tagbgcolor yellow +set tagfgcolor black +set tagoutlinecolor black +set reflinecolor black +set filesepbgcolor #aaaaaa +set filesepfgcolor black +set linehoverbgcolor #ffff80 +set linehoverfgcolor black +set linehoveroutlinecolor black +set mainheadcirclecolor yellow +set workingfilescirclecolor red +set indexcirclecolor #00ff00 +set circlecolors {white blue gray blue blue} +set linkfgcolor blue +set circleoutlinecolor black +set geometry(main) 1648x986+248+40 +set geometry(state) normal +set geometry(topwidth) 1646 +set geometry(topheight) 225 +set geometry(pwsash0) "470 1" +set geometry(pwsash1) "474 1" +set geometry(botwidth) 490 +set geometry(botheight) 749 +set permviews {} -- 2.49.0 From 75f2dde26d06d513a9c38cfb5afe9d7af99c4b80 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 11 Oct 2017 00:42:14 +0100 Subject: [PATCH 02/16] vim: don't show tabs in man pages --- vim/ftplugin/man.vim | 1 + 1 file changed, 1 insertion(+) create mode 100644 vim/ftplugin/man.vim diff --git a/vim/ftplugin/man.vim b/vim/ftplugin/man.vim new file mode 100644 index 0000000..6f5fe3d --- /dev/null +++ b/vim/ftplugin/man.vim @@ -0,0 +1 @@ +setlocal nolist -- 2.49.0 From 0c381aefdadf002c565fad61d882699554dc3810 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 11 Oct 2017 11:39:06 +0100 Subject: [PATCH 03/16] weechat: update wee-slack submodule --- weechat/python/wee-slack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weechat/python/wee-slack b/weechat/python/wee-slack index 7bf0ea6..31c7e9a 160000 --- a/weechat/python/wee-slack +++ b/weechat/python/wee-slack @@ -1 +1 @@ -Subproject commit 7bf0ea6a4eedc0c98152b3b13f1394676a39d4dd +Subproject commit 31c7e9acde467b8df8efc319fad1971d387b1361 -- 2.49.0 From 05fdc4b5ecc0735e8eb0cd199f9d89ae9e029c3a Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 23 Oct 2017 23:44:21 +0100 Subject: [PATCH 04/16] gdb: add gdbinit and cgdbrc --- Makefile | 4 ++++ cgdb/.gitignore | 2 ++ cgdb/cgdbrc | 30 ++++++++++++++++++++++++++++++ gdbinit | 4 ++++ 4 files changed, 40 insertions(+) create mode 100644 cgdb/.gitignore create mode 100644 cgdb/cgdbrc create mode 100644 gdbinit diff --git a/Makefile b/Makefile index 8af2d32..9b8fe2f 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,10 @@ vim: git clone https://github.com/gmarik/vundle ~/.local/share/vim/vundle .PHONY: vim +gdb: + ln -sfT $(APATH)/gdbinit ~/.gdbinit + ln -sfT $(APATH)/cgdb ~/.cgdb + awesome: ~/.config ln -sfT $(APATH)/awesome ~/.config/awesome .PHONY: awesome diff --git a/cgdb/.gitignore b/cgdb/.gitignore new file mode 100644 index 0000000..3478386 --- /dev/null +++ b/cgdb/.gitignore @@ -0,0 +1,2 @@ +logs +readline_history.txt diff --git a/cgdb/cgdbrc b/cgdb/cgdbrc new file mode 100644 index 0000000..fa2868a --- /dev/null +++ b/cgdb/cgdbrc @@ -0,0 +1,30 @@ +# set autosourcereload +# set cgdbmodekey=ESC +# set color +# set debugwincolor +# set nodisasm +# set executinglinedisplay=longarrow +set hlsearch +set ignorecase +# set selectedlinedisplay=block +# set showmarks +# set noshowdebugcommands +# set syntax=on +# set timeout +# set timeoutlen=1000 +# set ttimeout +# set ttimeoutlen=100 +set tabstop=4 +# set winminheight=0 +# set winminwidth=0 +# set winsplit=even +# set winsplitorientation=horizontal +# set wrapscan + +map r :run +map c :continue +map f :finish +map n :next +map s :step + +map p ip diff --git a/gdbinit b/gdbinit new file mode 100644 index 0000000..9ed8ca0 --- /dev/null +++ b/gdbinit @@ -0,0 +1,4 @@ +set history save on +set print pretty on +set pagination off +# set confirm off -- 2.49.0 From 31036b38da4f923c8afdce37aa87573c37eb8d99 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 23 Oct 2017 23:44:57 +0100 Subject: [PATCH 05/16] conky: remove conky --- Makefile | 3 +- conky/awesome.png | Bin 245 -> 0 bytes conky/chakra.png | Bin 4693 -> 0 bytes conky/functions.lua | 85 ---------------------------- conkyrc | 132 -------------------------------------------- 5 files changed, 2 insertions(+), 218 deletions(-) delete mode 100644 conky/awesome.png delete mode 100644 conky/chakra.png delete mode 100644 conky/functions.lua delete mode 100644 conkyrc diff --git a/Makefile b/Makefile index 9b8fe2f..8892687 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ APATH := $(realpath .) FILES := bin -DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources +DOTFILES := goobookrc msmtp* mutt profile tmux.conf weechat Xresources CONFIGFILES := aliases compton.conf git mpv offlineimap ranger retroarch xbindkeys xkb .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES) @@ -19,6 +19,7 @@ vim: gdb: ln -sfT $(APATH)/gdbinit ~/.gdbinit ln -sfT $(APATH)/cgdb ~/.cgdb +.PHONY: gdb awesome: ~/.config ln -sfT $(APATH)/awesome ~/.config/awesome diff --git a/conky/awesome.png b/conky/awesome.png deleted file mode 100644 index 5b08e5320bbc637d3982e72c7ff2a48d23923cd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 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 Rp$rTR44$rjF6*2UngCjN$rAto diff --git a/conky/functions.lua b/conky/functions.lua deleted file mode 100644 index 4f51702..0000000 --- a/conky/functions.lua +++ /dev/null @@ -1,85 +0,0 @@ ---[[ - - Licensed under GNU General Public License v2 - * (c) 2014, Samir Benmendil - * (c) 2013, Luke Bonham - * (c) 2010-2012, Peter Hofmann - ---]] - -local io = io -local os = { getenv = os.getenv } -local pairs = pairs -local string = { len = string.len, - match = string.match, - format = string.format, - sub = string.sub } - --- Maildir check --- lain.widgets.maildir -local maildir = {} -local newmail - -function conky_mail() - local updates=tonumber(conky_parse('${updates}')) - if newmail and updates % 30 ~= 0 then - return newmail - end - local mailpath = os.getenv("HOME") .. "/mail" - - -- Find pathes to mailboxes. - local dirs = io.popen("find " .. mailpath .. " -type d -name new -or -name cur -prune") - local boxes = {} - for line in dirs:lines() do - -- Strip off leading mailpath. - local acc = string.match(line, mailpath.."/*([^/]+)") - local box = string.match(line, mailpath..'/'..acc.."/*([^/]+)") - if boxes[acc] == nil then - boxes[acc] = {} - end - if boxes[acc][box] == nil then - boxes[acc][box] = {} - end - - -- Find all files in the "new" subdirectory. For each - -- file, print a single character (no newline). Don't - -- match files that begin with a dot. - -- Afterwards the length of this string is the number of - -- new mails in that box. - if line:sub(-3) == 'new' then - local new = io.popen("find " .. line .. " -type f -not -name '.*' -printf a") - cnt_new = string.len(new:read("*all")) - new:close() - if cnt_new > 0 then - boxes[acc][box]['cnt_new'] = string.format("${color e6db74}%5d${color}", cnt_new) - else - boxes[acc][box]['cnt_new'] = string.format("%5d", cnt_new) - end - elseif line:sub(-3) == 'cur' then - local old = io.popen("find " .. line .. " -type f -not -name '*:2,*S*' -printf a") - cnt_old = string.len(old:read("*all")) - old:close() - if cnt_old > 0 then - boxes[acc][box]['cnt_old'] = string.format("${color fd971f}%2d${color}", cnt_old) - else - boxes[acc][box]['cnt_old'] = string.format("%2d", cnt_old) - end - end - end - dirs:close() - - newmail = "" - local accounts = {"gmail"} - local mailboxes = { {"inbox", "chakra"}, - {"youtube", "unimaas"}} - for a, acc in pairs(accounts) do - for b, box in ipairs(mailboxes) do - local boxl = boxes[acc][box[1]] - local boxr = boxes[acc][box[2]] - newmail = newmail .. string.format("%10s:%s/%s", box[1], boxl['cnt_new'], boxl['cnt_old']) - newmail = newmail .. string.format("%11s:%s/%s\n", box[2], boxr['cnt_new'], boxr['cnt_old']) - end - end - newmail = string.sub(newmail, 1 , #newmail - 1) - return newmail -end diff --git a/conkyrc b/conkyrc deleted file mode 100644 index 6eb26d0..0000000 --- a/conkyrc +++ /dev/null @@ -1,132 +0,0 @@ -alignment top_left -gap_x 8 -gap_y 30 -border_width 0 -border_inner_margin 8 - -minimum_size 320 1080 -maximum_width 320 - -default_bar_size 92 6 - -format_human_readable - -use_xft yes -override_utf8_locale yes -xftfont Anonymous Pro:style=Bold:size=11 -text_buffer_size 2048 - -own_window yes -own_window_argb_visual yes -own_window_argb_value 128 -own_window_class Conky -own_window_hints below,skip_taskbar,skip_pager -own_window_transparent no -own_window_type desktop - -draw_borders no -draw_graph_borders yes -draw_outline no -draw_shades yes -default_color white -default_outline_color white -default_shade_color 000000 - -background no -cpu_avg_samples 2 -net_avg_samples 2 -extra_newline no -no_buffers yes -double_buffer yes -out_to_console no -out_to_stderr no -show_graph_range no -show_graph_scale no -stippled_borders 0 -update_interval 2 -uppercase no -use_spacer none - -lua_load ~/.conky/functions.lua - -TEXT -${image ~/.conky/chakra.png -p 10,15 -s 70x70} -${image ~/.conky/awesome.png -p 100,15 -s 70x70}# -${font Droid Sans:style=Bold:size=24}${alignr}${time %R} -${font Droid Sans:style=Bold:size=12}${alignr}${time %a, %e %b %Y}${font} -${font Droid Sans:style=Bold:size=12}${color 75D1FF}SYSTEM${color 1B71CC}$hr${color}${font} -Kernel: ${alignr}${kernel} -Uptime: ${alignr}${uptime} -# |--Updates -Updates: ${alignr}${font Droid Sans:style=Bold:size=10}${execpi 600 checkupdates | wc -l | sed '/^0$/! s/^\(.*\)$/${color 75D1FF}\1${color}/' }${font} Package(s) - -# |--Mail -${font Droid Sans:style=Bold:size=12}${color 75D1FF}MAIL${color 1B71CC}$hr${color}${font} -${lua_parse mail} - -# |--MPD -${font Droid Sans:style=Bold:size=12}${color 75D1FF}MPD${color 1B71CC}$hr${color}${font} - -# |--CPU -${font Droid Sans:style=Bold:size=12}${color 75D1FF}CPU${color 1B71CC}$hr${color}${font} -${color AAAAAA}${exec grep "model name" /proc/cpuinfo | uniq | sed 's/.*: //'}${color} -${if_empty ${cpu cpu1}}${else}Core 0 @ ${color 75D1FF}${alignr 65}${cpu cpu1}%${alignr}${cpubar cpu1 7,150}${color} -${endif}${if_empty ${cpu cpu2}}${else}Core 1 @ ${color 75D1FF}${alignr 65}${cpu cpu2}%${alignr}${cpubar cpu2 7,150}${color} -${endif}${if_empty ${cpu cpu3}}${else}Core 2 @ ${color 75D1FF}${alignr 65}${cpu cpu3}%${alignr}${cpubar cpu3 7,150}${color} -${endif}${if_empty ${cpu cpu4}}${else}Core 3 @ ${color 75D1FF}${alignr 65}${cpu cpu4}%${alignr}${cpubar cpu4 7,150}${color} -${endif}${if_empty ${cpu cpu5}}${else}Core 4 @ ${color 75D1FF}${alignr 65}${cpu cpu5}%${alignr}${cpubar cpu5 7,150}${color} -${endif}${if_empty ${cpu cpu6}}${else}Core 5 @ ${color 75D1FF}${alignr 65}${cpu cpu6}%${alignr}${cpubar cpu6 7,150}${color} -${endif}${if_empty ${cpu cpu7}}${else}Core 6 @ ${color 75D1FF}${alignr 65}${cpu cpu7}%${alignr}${cpubar cpu7 7,150}${color} -${endif}${if_empty ${cpu cpu8}}${else}Core 7 @ ${color 75D1FF}${alignr 65}${cpu cpu8}%${alignr}${cpubar cpu8 7,150}${color} -${endif}${if_empty ${cpu cpu9}}${else}Core 8 @ ${color 75D1FF}${alignr 65}${cpu cpu9}%${alignr}${cpubar cpu9 7,150}${color} -${endif} -# |--MEM -${font Droid Sans:style=Bold:size=12}${color 75D1FF}MEMORY${color 1B71CC}$hr${color}${font} -RAM${alignr}$memperc% -${mem}/${memmax}${alignr}${color 75D1FF}${membar 8,150}${color}# -# |--SWAP -${if_match "${swapmax}" == "0B"} -SWAP${alignr}${swapperc}# -${swap}/${swapmax}${alignr}${color 75D1FF}${swapbar 8,150}${color}# -${endif} - -# |--PROC -${font Droid Sans:style=Bold:size=12}${color 75D1FF}TOP${color 1B71CC}$hr${color}${font} -${color AAAAAA}PROCESS${alignr 120}CPU${alignr 20}RAM${color} -${top name 1}${alignr 80}${top cpu 1}${alignr}${top mem 1} -${top name 2}${alignr 80}${top cpu 2}${alignr}${top mem 2} -${top name 3}${alignr 80}${top cpu 3}${alignr}${top mem 3} -${top name 4}${alignr 80}${top cpu 4}${alignr}${top mem 4} -${top name 5}${alignr 80}${top cpu 5}${alignr}${top mem 5} - -############# -# - NETWORK - # -############### -${font Droid Sans:style=Bold:size=12}${color 75D1FF}NETWORK${color 1B71CC}$hr${color}${font} -Public IP: ${alignr}${execi 1800 ~/bin/whatsmyip}# -${if_up enp3s0} -Local IP: ${alignr}${addr enp3s0} -Upload: ${alignr 10}${upspeed enp3s0}/s${alignr}${color 75D1FF}${upspeedgraph enp3s0 20,150}${color} -${voffset -20}Overall: ${alignr 160}${totalup enp3s0} -Download: ${alignr 10}${downspeed enp3s0}/s${alignr}${color 75D1FF}${downspeedgraph enp3s0 20,150}${color} -${voffset -20}Overall: ${alignr 160}${totaldown enp3s0}${endif}# -${if_up wlp3s0} -Local IP: ${alignr}${addr wlp3s0} -Upload: ${alignr 10}${upspeed wlp3s0}/s${alignr}${color 75D1FF}${upspeedgraph wlp3s0 20,150}${color} -${voffset -20}Overall: ${alignr 160}${totalup wlp3s0} -Download: ${alignr 10}${downspeed wlp3s0}/s${alignr}${color 75D1FF}${downspeedgraph wlp3s0 20,150}${color} -${voffset -20}Overall: ${alignr 160}${totaldown wlp3s0}${endif} - -########## -# - HD - # -########## -${font Droid Sans:style=Bold:size=12}${color 75D1FF}HDD${color 1B71CC}$hr${color}${font} -# |--HD default -Root: ${fs_used_perc /}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /}${color} -Free: ${fs_free /} ${alignr 1}Used: ${fs_used /} -Home: ${fs_used_perc /home}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /home}${color} -Free: ${fs_free /home} ${alignr 1}Used: ${fs_used /home} -${if_mounted /mnt/data}data: ${fs_used_perc /mnt/data}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /mnt/data}${color} -Free: ${fs_free /mnt/data} ${alignr 1}Used: ${fs_used /mnt/data}${endif} -${if_mounted /mnt/Skaro}Skaro: ${fs_used_perc /mnt/Skaro}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /mnt/Skaro}${color} -Free: ${fs_free /mnt/Skaro} ${alignr 1}Used: ${fs_used /mnt/Skaro}${endif} -- 2.49.0 From 5fa95d876f0802a10e0fd4db6f2a6c4bc603b87f Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Fri, 20 Oct 2017 10:10:42 +0100 Subject: [PATCH 06/16] awesome: remove lain dependency --- awesome/rc.lua | 1 - awesome/tags.lua | 21 --------------------- awesome/themes/mlp/theme.lua | 14 -------------- 3 files changed, 36 deletions(-) diff --git a/awesome/rc.lua b/awesome/rc.lua index 9a11324..93a28f0 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -6,7 +6,6 @@ require("awful.autofocus") beautiful = require("beautiful") naughty = require("naughty") menubar = require("menubar") -lain = require("lain") require("awful.remote") -- Error handling {{{1 diff --git a/awesome/tags.lua b/awesome/tags.lua index f79c9d1..8ccc42d 100644 --- a/awesome/tags.lua +++ b/awesome/tags.lua @@ -1,24 +1,3 @@ --- Layouts {{{1 --- Table of layouts to cover with awful.layout.inc, order matters. -layouts = -{ - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, - awful.layout.suit.tile.bottom, - awful.layout.suit.tile.top, - -- lain.layout.uselesspiral, - -- lain.layout.uselesspiral.dwindle, - awful.layout.suit.max, - -- awful.layout.suit.max.fullscreen, - -- awful.layout.suit.magnifier - -- lain.layout.termfair, - -- lain.layout.centerfair, - -- lain.layout.cascade, - -- lain.layout.cascadetile, - -- lain.layout.centerwork, -} - -- Tags {{{1 local mytags = {} local path = beautiful.path diff --git a/awesome/themes/mlp/theme.lua b/awesome/themes/mlp/theme.lua index dda9e05..90f5763 100644 --- a/awesome/themes/mlp/theme.lua +++ b/awesome/themes/mlp/theme.lua @@ -92,20 +92,6 @@ theme.layout_cornernw = theme.path.."/layouts/cornernww.png" theme.layout_cornerne = theme.path.."/layouts/cornernew.png" theme.layout_cornersw = theme.path.."/layouts/cornersww.png" theme.layout_cornerse = theme.path.."/layouts/cornersew.png" --- lain stuff -theme.lain_icons = "/usr/share/awesome/lib/lain/icons/layout/default/" -theme.layout_uselessfairh = theme.path.."/layouts/fairhw.png" -theme.layout_uselessfair = theme.path.."/layouts/fairvw.png" -theme.layout_uselesstilebottom = theme.path.."/layouts/tilebottomw.png" -theme.layout_uselesstileleft = theme.path.."/layouts/tileleftw.png" -theme.layout_uselesstile = theme.path.."/layouts/tilew.png" -theme.layout_uselesstiletop = theme.path.."/layouts/tiletopw.png" -theme.layout_uselessspiral = theme.path.."/layouts/spiralw.png" -theme.layout_uselessdwindle = theme.path.."/layouts/dwindlew.png" -theme.layout_termfair = theme.lain_icons .. "termfairw.png" -theme.layout_cascade = theme.lain_icons .. "cascadew.png" -theme.layout_cascadetile = theme.lain_icons .. "cascadetilew.png" -theme.layout_centerwork = theme.lain_icons .. "centerworkw.png" theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png" -- 2.49.0 From d8a4be5d3f2691d8948919bc1e32f58cbfaf1a2e Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 24 Oct 2017 09:55:45 +0100 Subject: [PATCH 07/16] git: verbose commit --- git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git/config b/git/config index deadf5c..f7e4f40 100644 --- a/git/config +++ b/git/config @@ -39,3 +39,5 @@ rebase = preserve [branch "develop"] rebase = preserve +[commit] + verbose = true -- 2.49.0 From 99ab36799daa2c68e08d737ed7a75ee9214d3635 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 24 Oct 2017 10:03:57 +0100 Subject: [PATCH 08/16] vim: consolidate fswitch settings in c.vim --- vim/ftplugin/c.vim | 9 +++++++-- vim/ftplugin/cpp.vim | 7 ------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/vim/ftplugin/c.vim b/vim/ftplugin/c.vim index 16a9bf6..a4625ac 100644 --- a/vim/ftplugin/c.vim +++ b/vim/ftplugin/c.vim @@ -2,10 +2,15 @@ let b:load_doxygen_syntax = 1 augroup fswitch - au BufEnter *.h let b:fswitchdst = 'c' - au BufEnter *.h let b:fswitchlocs = 'reg:|include.*|source|' + au! + au BufEnter *.h let b:fswitchdst = 'c,cpp' + au BufEnter *.h let b:fswitchlocs = '.,reg:|include.*|src|' au BufEnter *.c let b:fswitchdst = 'h' au BufEnter *.c let b:fswitchlocs = 'reg:|source|include/**|' + au BufEnter *.hpp let b:fswitchdst = 'cpp,c' + au BufEnter *.hpp let b:fswitchlocs = 'reg:|include.*|src|' + au BufEnter *.cpp let b:fswitchdst = 'hpp,h' + au BufEnter *.cpp let b:fswitchlocs = 'reg:|src|include/**|' augroup END nnoremap gd :YcmCompleter GoTo diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim index fabf6b9..4d54b7b 100644 --- a/vim/ftplugin/cpp.vim +++ b/vim/ftplugin/cpp.vim @@ -14,13 +14,6 @@ setlocal cinoptions+=:0 " don't indent case labels " Load the doxygen syntax let b:load_doxygen_syntax = 1 -augroup fswitch - au BufEnter *.hpp let b:fswitchdst = 'cpp,c' - au BufEnter *.hpp let b:fswitchlocs = 'reg:|include.*|src|' - au BufEnter *.cpp let b:fswitchdst = 'hpp,h' - au BufEnter *.cpp let b:fswitchlocs = 'reg:|src|include/**|' -augroup END - let g:switch_const_definitions = \ [ { \ '\%(const \)\@!\([[:alnum:]_:<>]\{-}\) \%(&\)\@!': 'const \1 ', -- 2.49.0 From 2f3ca06a7ff40f2801123ed1d605ac092f5814ae Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 24 Oct 2017 10:05:15 +0100 Subject: [PATCH 09/16] vim: add switches for EXECT/ASSERT in GTest --- vim/ftplugin/cpp.vim | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim index 4d54b7b..5154d62 100644 --- a/vim/ftplugin/cpp.vim +++ b/vim/ftplugin/cpp.vim @@ -14,6 +14,16 @@ setlocal cinoptions+=:0 " don't indent case labels " Load the doxygen syntax let b:load_doxygen_syntax = 1 +let g:switch_custom_definitions = + \ [ + \ ['EXPECT_FALSE', 'EXPECT_TRUE'], + \ ['EXPECT_EQ', 'EXPECT_NE'], + \ ['EXPECT_LT', 'EXPECT_GT'], + \ ['ASSERT_FALSE', 'ASSERT_TRUE'], + \ ['ASSERT_EQ', 'ASSERT_NE'], + \ ['ASSERT_LT', 'ASSERT_GT'] + \ ] + let g:switch_const_definitions = \ [ { \ '\%(const \)\@!\([[:alnum:]_:<>]\{-}\) \%(&\)\@!': 'const \1 ', -- 2.49.0 From 4586ba5f3bb85d36e7a4865ce51d9317a90d8ae4 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 24 Oct 2017 10:06:29 +0100 Subject: [PATCH 10/16] vim: pprint cpp snippet --- vim/ultisnips/cpp.snippets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets index 0113878..329547f 100644 --- a/vim/ultisnips/cpp.snippets +++ b/vim/ultisnips/cpp.snippets @@ -52,6 +52,11 @@ ${3} #endif endsnippet +snippet pprint "Pretty print expression" b +#define PPRINT(x) std::cout << #x " = " << (x) << '\n'; +PPRINT(${VISUAL}${0}) +endsnippet + # # Qt # -- 2.49.0 From fbabf6a55aa8f23d4ae2226c73349eca37ec77ca Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 25 Oct 2017 10:58:27 +0100 Subject: [PATCH 11/16] git: the local ignore file for ag is .ignore --- git/ignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/ignore b/git/ignore index ee5b28e..2c0b3c2 100644 --- a/git/ignore +++ b/git/ignore @@ -9,6 +9,6 @@ build/ # YouCompleteMe .ycm_extra_conf.py* # ag -.agignore +.ignore # OSX .DS_Store -- 2.49.0 From 67224dfbb292a8238564124d6b97b2bdd2826d1f Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 25 Oct 2017 10:58:47 +0100 Subject: [PATCH 12/16] git: ignore all build-*/ directories --- git/ignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/ignore b/git/ignore index 2c0b3c2..e989688 100644 --- a/git/ignore +++ b/git/ignore @@ -5,7 +5,7 @@ # qtcreator project files *.user # build directories -build/ +build-*/ # YouCompleteMe .ycm_extra_conf.py* # ag -- 2.49.0 From 33f3187ce990b48ce747d3dfd36f2a55af053ae3 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Thu, 2 Nov 2017 15:24:07 +0000 Subject: [PATCH 13/16] zsh: add --cherry-mark and --boundary flags to `glgl` --- zsh/aliases/git.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh index d45e56a..9046d08 100644 --- a/zsh/aliases/git.zsh +++ b/zsh/aliases/git.zsh @@ -50,7 +50,7 @@ alias gcount='git shortlog -sn' alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' function glm { glg "${1:-origin}".. } compdef _git glm=git-log -alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' +alias glgl='git log --graph --cherry-mark --boundary --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' alias glgg='git log --stat --graph --max-count=20 --decorate' alias glgga='git log --stat --graph --decorate --all' -- 2.49.0 From 34ec4ebefa10b27275f241bd378f4e4dbc6177b3 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 15 Nov 2017 11:52:02 +0000 Subject: [PATCH 14/16] vim: don't include `/usr/include` in ycm_extra_conf It is included by default when compiling and adding this will change the order and break the build --- vim/ycm_extra_conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index 2bd7b4e..5d6e9f7 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -13,8 +13,6 @@ BASE_FLAGS = [ '-Wall', '-std=c++1z', '-x', 'c++', - '-isystem', '/usr/include', - '-isystem', '/usr/local/include', ] EXTRA_FLAGS = [ -- 2.49.0 From 9d0fa7479f12eed7061303ffce8d0601741e1daa Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 15 Nov 2017 11:53:46 +0000 Subject: [PATCH 15/16] vim: clean up flags in ycm_extra_conf --- vim/ycm_extra_conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index 5d6e9f7..77f13b3 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -9,12 +9,13 @@ import logging import ycm_core import difflib +# flags used when no compilation_db is found BASE_FLAGS = [ - '-Wall', '-std=c++1z', '-x', 'c++', ] +# flags are always added EXTRA_FLAGS = [ '-Wall', '-Wextra', -- 2.49.0 From 57040007d232840cda48a218b5ab0b37742c5cf4 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Wed, 15 Nov 2017 11:59:54 +0000 Subject: [PATCH 16/16] vim: `-Weverything` in ycm_extra_conf --- vim/ycm_extra_conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index 77f13b3..678f3fb 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -19,6 +19,9 @@ BASE_FLAGS = [ EXTRA_FLAGS = [ '-Wall', '-Wextra', + '-Weverything', + '-Wno-c++98-compat', + '-Wno-c++98-compat-pedantic', # '-Wshadow', # '-Werror', # '-Wc++98-compat', -- 2.49.0