From b5766e6efe39b6aa6f4b2f7e5afbf55e8f4c8762 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sat, 1 Apr 2017 18:45:23 +0100 Subject: [PATCH] Other changes at cadscan (with the ones I want to keep stripped) --- Makefile | 4 +- awesome/widgets/calendar.lua | 2 +- bin/weechat | 3 +- ncmpcpp/bindings | 324 ++++++++++++++++++++++++++++++++-- offlineimap/config | 3 +- offlineimap/utils.py | 1 + systemd/user.conf | 4 + systemd/user/synergy.service | 10 ++ systemd/user/synergys.service | 10 ++ vim/vimrc | 9 +- zshenv | 2 + 11 files changed, 355 insertions(+), 17 deletions(-) create mode 100644 systemd/user.conf create mode 100644 systemd/user/synergy.service create mode 100644 systemd/user/synergys.service diff --git a/Makefile b/Makefile index 327a438..5e09a42 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ APATH := $(realpath .) FILES := bin -DOTFILES := conky* goobookrc msmtp* mutt ncmpcpp profile tmux.conf weechat Xresources xprofile zprofile zshenv zshrc -CONFIGFILES := aliases compton.conf git gnupg mimeo.conf mpd mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh +DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources xprofile zprofile zshenv zshrc +CONFIGFILES := aliases compton.conf git gnupg mimeo.conf mpd mpv ncmpcpp offlineimap ranger retroarch systemd vim xbindkeys xkb zsh .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES) install: $(FILES) $(DOTFILES) $(CONFIGFILES) diff --git a/awesome/widgets/calendar.lua b/awesome/widgets/calendar.lua index cdf58ae..9663872 100644 --- a/awesome/widgets/calendar.lua +++ b/awesome/widgets/calendar.lua @@ -22,7 +22,7 @@ calendar.bg = beautiful.bg_normal or "#FFFFFF" calendar.position = "top_right" calendar.offset = 0 -local calwidget = awful.widget.textclock(" %a %b %d, %k:%M ", 10) +local calwidget = awful.widget.textclock(" %a %b %d, %H:%M ", 10) calwidget:connect_signal("mouse::enter", function () calendar:show(0) end) calwidget:connect_signal("mouse::leave", function () calendar:hide() end) diff --git a/bin/weechat b/bin/weechat index 483fd31..7452473 100755 --- a/bin/weechat +++ b/bin/weechat @@ -1,10 +1,11 @@ #!/usr/bin/zsh jobs -Z weechat +user=ramsi host=rmz.io if [[ "$(hostnamectl --static)" == "$host" ]]; then /usr/bin/weechat "$@" else - autossh -M0 -t $host "tmux -u new-session -As weechat weechat" + autossh -M0 -t $user@$host "LC_CTYPE=en_GB.UTF-8 tmux -u new-session -As weechat weechat" fi diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings index 83ae3d5..dfafba9 100644 --- a/ncmpcpp/bindings +++ b/ncmpcpp/bindings @@ -5,23 +5,79 @@ def_key "q" def_key "ctrl_c" quit +def_key "mouse" + mouse_event + def_key "k" scroll_up def_key "K" - move_sort_order_up - -def_key "K" - move_selected_items_up + select_item + scroll_up def_key "j" scroll_down def_key "J" - move_sort_order_down + select_item + scroll_down -def_key "J" - move_selected_items_down +def_key "[" + scroll_up_album + +def_key "]" + scroll_down_album + +def_key "{" + scroll_up_artist + +def_key "}" + scroll_down_artist + +def_key "page_up" + page_up + +def_key "page_down" + page_down + +def_key "home" + move_home + +def_key "end" + move_end + +def_key "space" + select_item + +def_key "enter" + enter_directory + +def_key "enter" + toggle_output + +def_key "enter" + run_action + +def_key "enter" + play_item + +def_key "space" + add_item_to_playlist + +def_key "space" + toggle_lyrics_update_on_song_change + +def_key "space" + toggle_visualization_type + +def_key "delete" + delete_playlist_items + +def_key "delete" + delete_browser_items + +def_key "delete" + delete_stored_playlist def_key "l" next_column @@ -41,6 +97,21 @@ def_key "h" def_key "h" volume_down +def_key "-" + volume_down + +def_key ":" + execute_command + +def_key "tab" + next_screen + +def_key "shift-tab" + previous_screen + +def_key "f1" + show_help + def_key "!" show_playlist @@ -74,14 +145,245 @@ def_key "&" def_key "*" show_visualizer +def_key "=" + show_clock + +def_key "@" + show_server_info + +def_key "s" + stop + +def_key "p" + pause + +def_key ">" + next + +def_key "<" + previous + +def_key "ctrl-h" + jump_to_parent_directory + +def_key "ctrl-h" + replay_song + +def_key "backspace" + jump_to_parent_directory + +def_key "backspace" + replay_song + +def_key "f" + seek_forward + +def_key "b" + seek_backward + +def_key "r" + toggle_repeat + +def_key "z" + toggle_random + +def_key "y" + save_tag_changes + +def_key "y" + start_searching + +def_key "y" + toggle_single + +def_key "R" + toggle_consume + +def_key "Y" + toggle_replay_gain_mode + +def_key "T" + toggle_add_mode + +def_key "|" + toggle_mouse + +def_key "#" + toggle_bitrate_visibility + +def_key "Z" + shuffle + +def_key "x" + toggle_crossfade + +def_key "X" + set_crossfade + +def_key "u" + update_database + +def_key "ctrl-s" + sort_playlist + +def_key "ctrl-s" + toggle_browser_sort_mode + +def_key "ctrl-s" + toggle_media_library_sort_mode + +def_key "ctrl-r" + reverse_playlist + +def_key "ctrl-_" + select_found_items + +def_key "/" + find + +def_key "/" + find_item_forward + +def_key "?" + find + +def_key "?" + find_item_backward + +def_key "." + next_found_item + +def_key "," + previous_found_item + +def_key "w" + toggle_find_mode + +def_key "e" + edit_song + +def_key "e" + edit_library_tag + +def_key "e" + edit_library_album + +def_key "e" + edit_directory_name + +def_key "e" + edit_playlist_name + +def_key "e" + edit_lyrics + +def_key "i" + show_song_info + +def_key "I" + show_artist_info + +def_key "g" + jump_to_position_in_song + +def_key "l" + show_lyrics + +def_key "ctrl-v" + select_range + +def_key "v" + reverse_selection + +def_key "V" + remove_selection + +def_key "B" + select_album + +def_key "a" + add_selected_items + +def_key "c" + clear_playlist + def_key "c" clear_main_playlist -# def_key "c" -# dummy +def_key "C" + crop_playlist def_key "C" crop_main_playlist -# def_key "C" -# dummy +def_key "m" + move_sort_order_up + +def_key "m" + move_selected_items_up + +def_key "m" + set_visualizer_sample_multiplier + +def_key "n" + move_sort_order_down + +def_key "n" + move_selected_items_down + +def_key "M" + move_selected_items_to + +def_key "A" + add + +def_key "S" + save_playlist + +def_key "o" + jump_to_playing_song + +def_key "G" + jump_to_browser + +def_key "G" + jump_to_playlist_editor + +def_key "~" + jump_to_media_library + +def_key "E" + jump_to_tag_editor + +def_key "U" + toggle_playing_song_centering + +def_key "P" + toggle_display_mode + +def_key "\\" + toggle_interface + +def_key "!" + toggle_separators_between_albums + +def_key "L" + toggle_lyrics_fetcher + +def_key "F" + toggle_fetching_lyrics_in_background + +def_key "ctrl-l" + toggle_screen_lock + +def_key "`" + toggle_library_tag_type + +def_key "`" + refetch_lyrics + +def_key "`" + add_random_items + +def_key "ctrl-p" + set_selected_items_priority diff --git a/offlineimap/config b/offlineimap/config index 5b02023..ce5de7e 100644 --- a/offlineimap/config +++ b/offlineimap/config @@ -47,7 +47,8 @@ nametrans = translocal type = Gmail remoteuser = samir.benmendil@gmail.com nametrans = transremote -# folderfilter = lambda foldername: foldername in ['[Google Mail]/All Mail', '[Google Mail]/Drafts', '[Google Mail]/Bin'] +folderfilter = lambda foldername: foldername in ['cadscan', 'INBOX', '[Google Mail]/Sent', + '[Google Mail]/Drafts', '[Google Mail]/Starred', '[Google Mail]/Bin'] sslcacertfile = /etc/ssl/certs/ca-certificates.crt trashfolder = '[Google Mail]/Bin' spamfolder = '[Google Mail]/Spam' diff --git a/offlineimap/utils.py b/offlineimap/utils.py index 5b6976c..afff70e 100644 --- a/offlineimap/utils.py +++ b/offlineimap/utils.py @@ -18,6 +18,7 @@ def translocal(foldername): top = [ 'inbox' , 'flagged' + , 'cadscan' , 'chakra' , 'unimaas' , 'clementine' diff --git a/systemd/user.conf b/systemd/user.conf new file mode 100644 index 0000000..8f48668 --- /dev/null +++ b/systemd/user.conf @@ -0,0 +1,4 @@ +DefaultEnvironment="XDG_CONFIG_HOME=$HOME/.config" +DefaultEnvironment="XDG_DATA_HOME=$HOME/.local/share" +DefaultEnvironment="XDG_CACHE_HOME=$HOME/.cache" +DefaultEnvironment="SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket" diff --git a/systemd/user/synergy.service b/systemd/user/synergy.service new file mode 100644 index 0000000..ca7ddd1 --- /dev/null +++ b/systemd/user/synergy.service @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Client Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/synergyc --no-daemon --name sb-linux sb-win +Restart=on-failure + +[Install] +WantedBy=default.target diff --git a/systemd/user/synergys.service b/systemd/user/synergys.service new file mode 100644 index 0000000..8a391d8 --- /dev/null +++ b/systemd/user/synergys.service @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Client Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/synergys --no-daemon --no-restart --name sb-linux --config %h/.config/synergy.conf +Restart=on-failure + +[Install] +WantedBy=default.target diff --git a/vim/vimrc b/vim/vimrc index 1674f0f..2fe8780 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -71,6 +71,8 @@ Plugin 'alx741/vinfo' Plugin 'derekwyatt/vim-protodef' Plugin 'ram-z/vim-clang-format' Plugin 'sgeb/vim-diff-fold' +Plugin 'tpope/vim-vinegar' +Plugin 'vimwiki/vimwiki' " needs editing colorscheme " Plugin 'jeaye/color_coded' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp @@ -554,7 +556,7 @@ let g:pymode_rope = 0 let g:pymode_run = 0 let g:pymode_folding = 1 let g:pymode_lint_ignore = "E221,E266,E501" -let g:pymode_lint_cwindow = 0 " don't open cwindow when linting +let g:pymode_lint_cwindow = 1 " don't open cwindow when linting let g:pymode_syntax_space_errors = 0 " don't bother me when I'm typing " signature {{{2 @@ -734,6 +736,11 @@ xmap T Sneak_T omap t Sneak_t omap T Sneak_T +" vim-wiki {{{2 +let default_wiki = {} +let default_wiki.path = '~/wiki' +let g:vimwiki_list = [default_wiki] + " functions {{{1 " Convenient command to see the difference between the current buffer and the diff --git a/zshenv b/zshenv index 9184040..6db5526 100644 --- a/zshenv +++ b/zshenv @@ -16,6 +16,8 @@ if hash systemctl 2>/dev/null; then SSH_AUTH_SOCK fi +export MAKEFLAGS=-j5 + # vim stuff [[ -d "$XDG_CACHE_HOME/vim/backup" ]] || mkdir -p "$XDG_CACHE_HOME"/vim/{backup,undo,view} export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' -- 2.48.1