summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2018-01-18 15:04:45 +0100
committerUrbain Vaes <urbain@vaes.uk>2018-01-18 15:04:45 +0100
commitf9b60680e1e2c55d0a93ec0016cfcb0dbfa67f69 (patch)
tree40769c046e7ff5ca4321f1058e741ab10b1b7e4f
parent7e7f85e871b6bcd903950aedefc8a6ae4e14d26e (diff)
Make minor changes
-rw-r--r--ncmpcpp/config493
-rw-r--r--qutebrowser/.config/qutebrowser/config.py14
-rw-r--r--vim/.vimrc20
-rw-r--r--zsh/.zsh/.zprofile4
-rw-r--r--zsh/.zsh/.zshrc1
5 files changed, 26 insertions, 506 deletions
diff --git a/ncmpcpp/config b/ncmpcpp/config
deleted file mode 100644
index bd6220f..0000000
--- a/ncmpcpp/config
+++ /dev/null
@@ -1,493 +0,0 @@
-####################################################
-## this is example configuration file, copy it to ##
-## ~/.ncmpcpp/config and set up your preferences ##
-####################################################
-#
-##### directories ######
-##
-## Directory for storing ncmpcpp related files.
-## Changing it is useful if you want to store
-## everything somewhere else and provide command
-## line setting for alternative location to config
-## file which defines that while launching ncmpcpp.
-##
-#
-ncmpcpp_directory = "~/.ncmpcpp"
-#
-##
-## Directory for storing downloaded lyrics. It
-## defaults to ~/.lyrics since other MPD clients
-## (eg. ncmpc) also use that location.
-##
-#
-#lyrics_directory = "~/.lyrics"
-#
-##### connection settings #####
-#
-## set it in order to make tag editor and renaming files work properly
-#
-
-mpd_host = "192.168.1.44"
-# mpd_host = "192.168.1.12"
-#
-mpd_port = "6600"
-#
-#mpd_music_dir = ""
-#
-#mpd_connection_timeout = "5"
-#
-#mpd_crossfade_time = "5"
-#
-#mpd_communication_mode = "notifications" (polling/notifications)
-#
-##### music visualizer #####
-##
-## Note: In order to make music visualizer work you'll
-## need to use mpd fifo output, whose format parameter
-## has to be set to 44100:16:1 for mono visualization
-## or 44100:16:2 for stereo visualization. Example
-## configuration (it has to be put into mpd.conf):
-##
-## audio_output {
-## type "fifo"
-## name "My FIFO"
-## path "/tmp/mpd.fifo"
-## format "44100:16:2"
-## }
-##
-#
-##
-## If you set format to 44100:16:2, make it 'yes'.
-##
-#
-#visualizer_in_stereo = "no"
-#
-#visualizer_fifo_path = ""
-#
-##
-## Note: Below parameter is needed for ncmpcpp
-## to determine which output provides data for
-## visualizer and thus allow syncing between
-## visualization and sound as currently there
-## are some problems with it.
-##
-#
-#visualizer_output_name = ""
-#
-##
-## Note: Below parameter defines how often ncmpcpp
-## has to "synchronize" visualizer and audio outputs.
-## 30 seconds is optimal value, but if you experience
-## synchronization problems, set it to lower value.
-## Keep in mind that sane values start with >=10.
-##
-#
-#visualizer_sync_interval = "30"
-#
-##
-## Note: To enable spectrum frequency visualization
-## you need to compile ncmpcpp with fftw3 support.
-##
-#
-#visualizer_type = "wave" (spectrum/wave)
-#
-#visualizer_look = "◆│"
-#
-##### system encoding #####
-##
-## ncmpcpp should detect your charset encoding
-## but if it failed to do so, you can specify
-## charset encoding you are using here.
-##
-## Note: You can see whether your ncmpcpp build
-## supports charset detection by checking output
-## of `ncmpcpp --version`.
-##
-## Note: Since MPD uses utf8 by default, setting
-## this option makes sense only if your encoding
-## is different.
-##
-#
-#system_encoding = ""
-#
-##### delays #####
-#
-## delay after playlist highlighting will be disabled (0 = don't disable)
-#
-#playlist_disable_highlight_delay = "5"
-#
-## defines how long various messages are supposed to be visible
-#
-#message_delay_time = "4"
-#
-##### song format #####
-##
-## for song format you can use:
-##
-## %l - length
-## %f - filename
-## %D - directory
-## %a - artist
-## %A - album artist
-## %t - title
-## %b - album
-## %y - year
-## %n - track number (01/12 -> 01)
-## %N - full track info (01/12 -> 01/12)
-## %g - genre
-## %c - composer
-## %p - performer
-## %d - disc
-## %C - comment
-## $R - begin right alignment
-##
-## you can also put them in { } and then it will be displayed
-## only if all requested values are available and/or define alternate
-## value with { }|{ } eg. {%a - %t}|{%f}
-##
-## Note: If you want to set limit on maximal length of a tag, just
-## put the appropriate number between % and character that defines
-## tag type, e.g. to make album take max. 20 terminal cells, use '%20b'.
-##
-## Note: Format that is similar to "%a - %t" (i.e. without any additional
-## braces) is equal to "{%a - %t}", so if one of the tags is missing,
-## you'll get nothing.
-##
-## text can also have different color than the main window has,
-## eg. if you want length to be green, write $3%l$9
-##
-## available values:
-##
-## - 0 - default window color (discards all other colors)
-## - 1 - black
-## - 2 - red
-## - 3 - green
-## - 4 - yellow
-## - 5 - blue
-## - 6 - magenta
-## - 7 - cyan
-## - 8 - white
-## - 9 - end of current color
-##
-## Note: colors can be nested.
-##
-#
-#song_list_format = "{%a - }{%t}|{$8%f$9}$R{$3(%l)$9}"
-#
-#song_status_format = "{{%a{ \"%b\"{ (%y)}} - }{%t}}|{%f}"
-#
-#song_library_format = "{%n - }{%t}|{%f}"
-#
-#tag_editor_album_format = "{(%y) }%b"
-#
-##
-## Note: Below variables are for alternative version of user's interface.
-## Their syntax supports all tags and colors listed above plus some extra
-## markers used for text attributes. They are followed by character '$'.
-## After that you can put:
-##
-## - b - bold text
-## - u - underline text
-## - r - reverse colors
-## - a - use alternative character set
-##
-## If you don't want to use an attribute anymore, just put it again, but
-## this time insert character '/' between '$' and attribute character,
-## e.g. {$b%t$/b}|{$r%f$/r} will display bolded title tag or filename
-## with reversed colors.
-##
-#
-#alternative_header_first_line_format = "$b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b"
-#
-#alternative_header_second_line_format = "{{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}"
-#
-##
-## Note: Below variables also supports
-## text attributes listed above.
-##
-#
-#now_playing_prefix = "$b"
-#
-#now_playing_suffix = "$/b"
-#
-#browser_playlist_prefix = "$2playlist$9 "
-#
-#selected_item_prefix = "$6"
-#
-#selected_item_suffix = "$9"
-#
-## colors are not supported for below variable
-#
-#song_window_title_format = "{%a - }{%t}|{%f}"
-#
-##### columns settings #####
-##
-## syntax of song columns list format is "column column etc."
-##
-## - syntax for each column is:
-##
-## (width of column)[column's color]{displayed tag}
-##
-## Note: Width is by default in %, if you want a column to
-## have fixed size, add 'f' after the value, e.g. (10)[white]{a}
-## will be the column that take 10% of screen (so the real column's
-## width will depend on actual screen size), whereas (10f)[white]{a}
-## will take 10 terminal cells, no matter how wide the screen is.
-##
-## - color is optional (if you want the default one, type [])
-##
-## Note: You can give a column additional attributes by putting appropriate
-## character after displayed tag character. Available attributes are:
-##
-## - r - column will be right aligned
-## - E - if tag is empty, empty tag marker won't be displayed
-##
-## You can also:
-##
-## - give a column custom name by putting it after attributes,
-## separated with character ':', e.g. {lr:Length} gives you
-## right aligned column of lengths named "Length".
-##
-## - define sequence of tags, that have to be displayed in case
-## predecessor is empty in a way similar to the one in classic
-## song format, i.e. using '|' character, e.g. {a|c|p:Owner}
-## creates column named "Owner" that tries to display artist
-## tag and then composer and performer if previous ones are
-## not available.
-##
-#
-#song_columns_list_format = "(7f)[green]{l} (25)[cyan]{a} (40)[]{t|f} (30)[red]{b}"
-#
-##### various settings #####
-#
-##
-## Note: Custom command that will be executed each
-## time song changes. Useful for notifications etc.
-##
-## Attention: It doesn't support song format anymore.
-## Use `ncmpcpp --now-playing SONG_FORMAT` instead.
-##
-#execute_on_song_change = ""
-#
-#playlist_show_remaining_time = "no"
-#
-#playlist_shorten_total_times = "no"
-#
-#playlist_separate_albums = "no"
-#
-#playlist_display_mode = "classic" (classic/columns)
-#
-#browser_display_mode = "classic" (classic/columns)
-#
-#search_engine_display_mode = "classic" (classic/columns)
-#
-#playlist_editor_display_mode = "classic" (classic/columns)
-#
-#discard_colors_if_item_is_selected = "yes"
-#
-#incremental_seeking = "yes"
-#
-#seek_time = "1"
-#
-#autocenter_mode = "no"
-#
-#centered_cursor = "no"
-#
-##
-## Note: You can specify third character which will
-## be used to build 'empty' part of progressbar.
-##
-#progressbar_look = "=>"
-#
-#default_place_to_search_in = "database" (database/playlist)
-#
-#user_interface = "classic" (classic/alternative)
-#
-#media_library_left_column = "a" (possible values: a,y,g,c,p, legend above)
-#
-#default_find_mode = "wrapped" (wrapped/normal)
-#
-#default_space_mode = "add" (add/select)
-#
-#default_tag_editor_left_col = "albums" (albums/dirs)
-#
-#default_tag_editor_pattern = "%n - %t"
-#
-#header_visibility = "yes"
-#
-#statusbar_visibility = "yes"
-#
-#titles_visibility = "yes"
-#
-#header_text_scrolling = "yes"
-#
-#fancy_scrolling = "yes"
-#
-#cyclic_scrolling = "no"
-#
-#lines_scrolled = "2"
-#
-#follow_now_playing_lyrics = "no"
-#
-#fetch_lyrics_for_current_song_in_background = "no"
-#
-#store_lyrics_in_song_dir = "no"
-#
-##
-## Note: If you set this variable, ncmpcpp will try to
-## get info from last.fm in language you set and if it
-## fails, it will fall back to english. Otherwise it will
-## use english the first time.
-##
-## Note: Language has to be expressed as an ISO 639 alpha-2 code.
-##
-#lastfm_preferred_language = ""
-#
-#ncmpc_like_songs_adding = "no" (enabled - add/remove, disabled - always add)
-#
-#show_hidden_files_in_local_browser = "no"
-#
-#display_screens_numbers_on_start = "yes"
-#
-##
-## How shall key_screen_switcher work?
-##
-## - "previous" - switch between current and last used screen
-## - "sequence: 2 -> 9 -> 5" - switch between given sequence of screens.
-##
-## Screen numbers you can use after 'sequence' keyword are:
-##
-## - 1 - help
-## - 2 - playlist
-## - 3 - browser
-## - 4 - search engine
-## - 5 - media library
-## - 6 - playlist editor
-## - 7 - tag editor
-## - 8 - outputs
-## - 9 - visualizer
-## - 10 - clock
-##
-## As you can see, above example will switch between
-## playlist, visualizer and media library screens.
-##
-#screen_switcher_mode = "sequence: 2 -> 3"
-#
-##
-## Default width of locked screen (in %).
-## Acceptable values are from 20 to 80.
-##
-#
-#locked_screen_width_part = "50"
-#
-#ask_for_locked_screen_width_part = "yes"
-#
-##
-## Note: You can define startup screen for ncmpcpp
-## by choosing screen number from the list above.
-##
-#startup_screen = "2"
-#
-#jump_to_now_playing_song_at_start = "yes"
-#
-#ask_before_clearing_main_playlist = "no"
-#
-#clock_display_seconds = "no"
-#
-#display_volume_level = "yes"
-#
-#display_bitrate = "no"
-#
-#display_remaining_time = "no"
-#
-#regular_expressions = "basic" (basic/extended)
-#
-##
-## Note: If below is enabled, ncmpcpp will ignore leading
-## "The" word while sorting items in browser, tags in
-## media library, etc.
-##
-#ignore_leading_the = "no"
-#
-#block_search_constraints_change_if_items_found = "yes"
-#
-#mouse_support = "yes"
-#
-#mouse_list_scroll_whole_page = "yes"
-#
-#empty_tag_marker = "<empty>"
-#
-#tag_editor_extended_numeration = "no"
-#
-#media_library_display_date = "yes"
-#
-#media_library_display_empty_tag = "yes"
-#
-#media_library_disable_two_column_mode = "no"
-#
-#enable_window_title = "yes"
-#
-##
-## Note: You can choose default search mode for search
-## engine. Available modes are:
-##
-## - 1 - use mpd built-in searching (no regexes, pattern matching)
-## - 2 - use ncmpcpp searching (pattern matching with support for regexes,
-## but if your mpd is on a remote machine, downloading big database
-## to process it can take a while
-## - 3 - match only exact values (this mode uses mpd function for searching
-## in database and local one for searching in current playlist)
-##
-#
-#search_engine_default_search_mode = "1"
-#
-##
-## Note: Below variables can allow you to physically
-## remove files and directories from your hdd using
-## ncmpcpp's browser screen.
-##
-#
-#allow_physical_files_deletion = "no"
-#
-#allow_physical_directories_deletion = "no"
-#
-#external_editor = ""
-#
-#use_console_editor = "no" (set to yes, if your editor is console app)
-#
-##### colors definitions #####
-#
-#colors_enabled = "yes"
-#
-#empty_tag_color = "cyan"
-#
-#header_window_color = "default"
-#
-#volume_color = "default"
-#
-#state_line_color = "default"
-#
-#state_flags_color = "default"
-#
-#main_window_color = "yellow"
-#
-#color1 = "white"
-#
-#color2 = "green"
-#
-#main_window_highlight_color = "yellow"
-#
-#progressbar_color = "default"
-#
-#statusbar_color = "default"
-#
-#alternative_ui_separator_color = "black"
-#
-#active_column_color = "red"
-#
-#visualizer_color = "yellow"
-#
-#window_border_color = "green"
-#
-#active_window_border = "red"
-#
diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py
index 0eb7304..ec12a62 100644
--- a/qutebrowser/.config/qutebrowser/config.py
+++ b/qutebrowser/.config/qutebrowser/config.py
@@ -5,8 +5,7 @@
c.downloads.location.prompt = False
c.editor.command = ['urxvt', '-e', 'nvim', '-f', '{}']
c.hints.chars = 'aoeuidhtns'
-c.hints.uppercase = True
-c.statusbar.hide = True
+# c.hints.uppercase = True
c.tabs.favicons.show = False
c.tabs.show = 'multiple'
c.tabs.tabs_are_windows = True
@@ -15,7 +14,6 @@ c.url.default_page = c.url.start_pages[0]
# Bindings for normal mode
config.bind(",b", 'spawn --userscript explorer -b')
-config.bind(",d", 'spawn --userscript dictionary-search')
config.bind(",h", 'spawn --userscript explorer -h')
config.bind(",p", 'spawn --userscript explorer')
config.bind(",t", 'spawn --userscript explorer -t')
@@ -23,10 +21,9 @@ config.bind(",v", 'spawn -d mpv {url}')
config.bind(";v", 'hint links spawn -d mpv {hint-url}')
config.bind("]d", 'set downloads.location.prompt True')
config.bind("[d", 'set downloads.location.prompt False')
-config.unbind("d")
-config.bind("do", 'download-open')
-config.bind("o", 'set-cmd-text -s :spawn --userscript url-from-surfraw')
-config.bind("t", 'set-cmd-text -s :spawn --userscript url-from-surfraw -t')
+config.bind(",do", 'download-open')
+config.bind(",o", 'set-cmd-text -s :spawn --userscript url-from-surfraw')
+config.bind(",O", 'set-cmd-text -s :spawn --userscript url-from-surfraw -t')
config.bind("f", 'hint all current')
# Bindings for insert mode
@@ -52,4 +49,7 @@ c.url.searchengines = {
'ddg': 'https://duckduckgo.com/?q={}',
'google': 'https://www.google.com/search?hl=en&q={}',
'aw': 'https://wiki.archlinux.org/index.php?search={}',
+ 'dic': 'https://dictionary.cambridge.org/dictionary/english/{}',
+ 'tr': 'https://translate.google.com/#en/fr/{}',
+ 'scholar': 'https://scholar.google.com/scholar?q={}',
}
diff --git a/vim/.vimrc b/vim/.vimrc
index 517df88..2afe954 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -11,7 +11,6 @@ let maplocalleader = ","
" }}}
"" Plugins {{{
call plug#begin('~/.vim/plugged')
-" Plug 'kopischke/vim-stay'
Plug 'LnL7/vim-nix'
Plug 'PotatoesMaster/i3-vim-syntax'
@@ -39,7 +38,6 @@ Plug 'kshenoy/vim-signature'
Plug 'lervag/vimtex'
Plug 'machakann/vim-highlightedyank'
Plug 'majutsushi/tagbar'
-Plug 'mhinz/vim-startify'
Plug 'neomake/neomake'
Plug 'scrooloose/nerdtree'
Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
@@ -124,6 +122,14 @@ nnoremap <Leader>gc :Gcommit<cr>
nnoremap <Leader>gr :Gread<cr>
nnoremap <Leader>gd :Gdiff<cr>
+" Heytmux
+function! Call_heytmux(vm)
+ call feedkeys(":'[,']Heytmux ")
+endfunction
+
+nmap <silent> gh :set opfunc=Call_heytmux<cr>g@
+xmap <silent> gh :'<,'>Heytmux<cr>
+
" Iron
let g:iron_map_defaults=0
let g:iron_repl_open_cmd='edit'
@@ -153,13 +159,14 @@ endif
" Airline
let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing', 'mixed-indent-file' ]
-let g:airline#extensions#tabline#show_splits = 0
+let g:airline_symbols_ascii = 1
let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#show_splits = 0
let g:airline#extensions#tabline#tab_nr_type = 1
let g:airline#extensions#tabline#formatter = 'unique_tail'
let g:airline#extensions#tabline#tab_min_count = 2
let g:airline#extensions#tabline#show_buffers = 0
-let g:airline_symbols_ascii = 1
+
" Deoplete
let g:deoplete#enable_at_startup = 1
@@ -247,6 +254,7 @@ set nojoinspaces
set noswapfile
set nowrap
set nowritebackup
+set path=$PWD/**
set shiftwidth=4
set showcmd
set splitright
@@ -352,6 +360,7 @@ augroup vimrc
au FileType dirvish setlocal relativenumber
au FileType tex set spell
augroup END
+
" }}}
"" My search {{{
if executable("ag")
@@ -391,4 +400,5 @@ endfunction
nmap <silent> co/ :call Cycle_searchprg()<cr>
nmap <silent> g/ :set opfunc=My_search<cr>g@
xmap <silent> g/ :call My_search(visualmode())<cr>
-"}}}
+
+" }}}
diff --git a/zsh/.zsh/.zprofile b/zsh/.zsh/.zprofile
index 38e7bb0..e6c4265 100644
--- a/zsh/.zsh/.zprofile
+++ b/zsh/.zsh/.zprofile
@@ -1,5 +1,7 @@
-export EDITOR=vim
+export EDITOR=nvim
+export VISUAL=nvim
export HISTSIZE=1000000
+export SAVEHIST=$HISTSIZE
# Start X automatically
[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
diff --git a/zsh/.zsh/.zshrc b/zsh/.zsh/.zshrc
index 95d0bb0..7bce5fe 100644
--- a/zsh/.zsh/.zshrc
+++ b/zsh/.zsh/.zshrc
@@ -124,5 +124,6 @@ alias rd='cd $(git rev-parse --show-toplevel)'
alias mi='make install'
alias mc='make clean'
alias mca='make clean-all'
+alias -s pdf='xdg-open'
# }}}