diff --git a/moc/config b/moc/config index 99e3665..3c3138a 100644 --- a/moc/config +++ b/moc/config @@ -1,3 +1,42 @@ ReadTags = no -Theme = manjaro Keymap = keymap +Sort = FileName +ShowStreamErrors = no +Mp3IgnoreCRCErrors = yes +Repeat = no +Shuffle = no +AutoNext = yes +FormatString = "%(n:%n :)%(a:%a - :)%(t:%t:)%(A: \(%A\):)" +OutputBuffer = 2048 +InputBuffer = 512 +Prebuffering = 64 +SoundDriver = JACK:ALSA:OSS +JackOutLeft = "alsa_pcm:playback_1" +JackOutRight = "alsa_pcm:playback_2" +OSSDevice = /dev/dsp +OSSMixerDevice = /dev/mixer +OSSMixerChannel1 = pcm +OSSMixerChannel2 = master +AlsaMixer1 = PCM +AlsaMixer2 = Master +AlsaDevice = default +ShowHiddenFiles = no +StartInMusicDir = no +HideFileExtension = no +ShowFormat = yes +ShowTime = IfAvailable +XTerms = xterm +XTerms += xterm-colour:xterm-color +XTerms += xterm-256colour:xterm-256color +XTerms += rxvt:rxvt-unicode +XTerms += rxvt-unicode-256colour:rxvt-unicode-256color +XTerms += eterm +Theme = transparent-background +UseMmap = no +SavePlaylist = yes +SyncPlaylist = yes +ASCIILines = no +TagsCacheSize = 256 +FollowPlayedFile = yes +CanStartInPlaylist = yes +OnSongChange = "/usr/lib/lastfmsubmitd/lastfmsubmit --artist %a --title %t --length %d --album %b" diff --git a/moc/keymap b/moc/keymap index 41dcd0a..5de25cc 100644 --- a/moc/keymap +++ b/moc/keymap @@ -1,63 +1,22 @@ -# Example keymap file -# To define your own keys for MOC commands, create a keymap file in the ~/.moc/ -# directory and add options Keymap = FILE in ~/.moc/config -# -# The format of this file is: -# Lines beginning with # are comments. -# Blank lines are ignored. -# Every other line is expected to be in format: -# -# COMMAND = [KEY ...] -# -# The key can be: -# - just a char, like i, L, ", * -# - CTRL-KEY sequence: ^k (CTRL-k), ^4 -# - ALT-KEY (meta sequence): M-j (ALT-j), M-% -# - Special keys: -# DOWN -# UP -# LEFT -# RIGHT -# HOME -# BACKSPACE -# DEL -# INS -# ENTER -# PAGE_UP -# PAGE_DOWN -# TAB -# END -# KEYPAD_CENTER -# SPACE -# ESCAPE -# F1 - F12 -# -# Maximum number of keys for one command is 5. -# -# Omitting the key for a command will disassociate the key from the command. -# -# Default key configuration for MOC (and a list of all available commands): - -go = ENTER l -go_up = h +go = ENTER menu_down = j DOWN menu_up = k UP -menu_page_down = ^f ^d PAGE_DOWN -menu_page_up = ^b ^u PAGE_UP +menu_page_down = ^f PAGE_DOWN +menu_page_up = ^b PAGE_UP menu_first_item = J HOME menu_last_item = K END -next = L -previous = H quit_client = q quit = Q stop = s +next = f +previous = b pause = SPACE toggle_read_tags = T toggle_shuffle = S toggle_repeat = R toggle_auto_next = X -toggle_menu = TAB -toggle_layout = ^l +toggle_menu = ^W +toggle_layout = L add_file = a add_directory = A @@ -66,63 +25,65 @@ delete_from_playlist = d save_playlist = w go_to_playing_file = g go_to_a_directory = G +playlist_full_paths = +plist_move_up = ^p +plist_move_down = ^n -volume_down_1 = < -volume_up_1 = > -volume_down_5 = , -volume_up_5 = . -seek_forward = RIGHT -seek_backward = LEFT -seek_forward_fast = ] -seek_backward_fast = [ -hide_message = I -refresh = ^r -reload = r -toggle_hidden_files = ^h +remove_dead_entries = Y +volume_down_1 = < +volume_up_1 = > +volume_down_5 = , +volume_up_5 = . +seek_forward = l RIGHT +seek_backward = h LEFT +seek_forward_fast = ] +seek_backward_fast = [ +hide_message = I +refresh = ^l +reload = r +toggle_hidden_files = H +go_to_music_directory = m search_menu = / help = ? -toggle_show_time = t -toggle_show_format = F -cancel = ^x ESCAPE -go_url = o -go_to_music_directory = m -theme_menu = V +toggle_show_time = t +toggle_show_format = F +go_up = U +next_search = n +cancel = ^x ESCAPE +go_url = o +mark_start = ' +mark_end = " -plist_move_up = -plist_move_down = -plist_add_stream = -# div crap -# history_up = UP -# history_down = DOWN -# toggle_softmixer = M -# playlist_full_paths = -# remove_dead_entries = Y -# next_search = n -# mark_start = ' -# mark_end = " -# toggle_mixer = x -# toggle_equalizer = E -# equalizer_refresh = e -# clear_queue = Z -# delete_to_start = ^u -# delete_to_end = ^k -# equalizer_prev = -# equalizer_next = -# toggle_make_mono = -# show_lyrics = -# enqueue_file = -# -# exec_command1 = F1 -# exec_command2 = F2 -# exec_command3 = F3 -# exec_command4 = F4 -# exec_command5 = F5 -# exec_command6 = F6 -# exec_command7 = F7 -# exec_command8 = F8 -# exec_command9 = F9 -# exec_command10 = F10 +plist_add_stream = ^u +toggle_mixer = x +# for softmixer +toggle_softmixer = M +history_up = UP +history_down = DOWN +delete_to_start = ^u +delete_to_end = ^k +theme_menu = V + +toggle_equalizer = E +equalizer_refresh = e +equalizer_prev = +equalizer_next = +toggle_make_mono = +show_lyrics = +enqueue_file = +clear_queue = Z + +exec_command1 = F1 +exec_command2 = F2 +exec_command3 = F3 +exec_command4 = F4 +exec_command5 = F5 +exec_command6 = F6 +exec_command7 = F7 +exec_command8 = F8 +exec_command9 = F9 +exec_command10 = F10 # Key bindings for directories: defaults are Shift-number # shift 1 = ! = Fastdir1 @@ -146,9 +107,3 @@ volume_60 = M-6 volume_70 = M-7 volume_80 = M-8 volume_90 = M-9 - -# The following commands are available but not assigned to any keys by -# default: -# -# toggle_percent Switch on/off play progress bar time percentage -# diff --git a/nvim/init.lua b/nvim/init.lua index a62011d..45ac4cd 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -232,11 +232,11 @@ require("packer").startup { noremap = true, buffer = true, - ["n "] = { + ["n "] = { expr = true, [[&diff ? "]c" : "lua require('gitsigns.actions').next_hunk()"]] }, - ["n "] = { + ["n "] = { expr = true, [[&diff ? "[c" : "lua require('gitsigns.actions').prev_hunk()"]] }, @@ -561,10 +561,6 @@ require("packer").startup { [''] = cmp.mapping.complete() }) }) - cmp.setup.cmdline('/', { - mapping = cmp.mapping.preset.cmdline(), - sources = {{name = 'buffer'}} - }) cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), sources = cmp.config.sources({{name = 'path'}}, {{name = 'cmdline'}})