diff --git a/README.md b/README.md index 08d2cb2..025d4b0 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ PRE s |Split panes up and down PRE v |Split panes left and right PRE x |Kill pane PRE h(jkl)|←(↓↑→)Move dividing line -PRE , |Switch to Tmux command line mode +PRE , |Rename window PRE d |Exit Session PRE D |Exit Session PRE 1 |Enter pane 1 @@ -302,6 +302,13 @@ The interface elements of SpaceVim start with [SPC] t or [SPC] T. You can view t - `SPC c l` - toggle comment lines - `SPC c p` - toggle comment paragraphs +#### Search text +- `SPC s J` - Search text under cursor in current project + +#### Help +- `SPC h d k` - Start a input prompt, Then press the key bindings you want to describe + + ## iTerm ### iTerm Solarized Colors diff --git a/Rakefile b/Rakefile index 6bd5b6a..528efd1 100644 --- a/Rakefile +++ b/Rakefile @@ -21,6 +21,7 @@ task :link_files do install_files(Dir.glob('tmux/*')) if want_to_install?('tmux config') install_files(Dir.glob('vimify/*')) if want_to_install?('vimification of command line tools') run %( + rm -rf ~/.tmux/plugins/tpm git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm ) end @@ -37,11 +38,9 @@ task install: %i[submodule_init submodules] do install_rvm_binstubs Rake::Task['link_files'].execute - Rake::Task['install_tools'].execute Rake::Task['install_prezto'].execute Rake::Task['install_spacevim'].execute Rake::Task['install_asdf'].execute - Rake::Task['install_node_modules'].execute install_fonts @@ -82,19 +81,6 @@ task :install_asdf do ) end -desc 'Install tools which are necessary for developers' -task :install_tools do - if macos? - run %( - brew install proxychains-ng - ) - else - run %( - apt install proxychains - ) - end -end - desc 'Prepare necessary components for spacevim/typescript' task :prepare_spacevim_typescript do run %( @@ -288,10 +274,6 @@ def ask(message, values) values[selection] end -def install_node_modules - run('command -v yarn && yarn') -end - def install_prezto puts puts 'Installing Prezto (ZSH Enhancements)...' diff --git a/etc/proxychains.conf b/etc/proxychains.conf deleted file mode 100644 index 1fbb3c5..0000000 --- a/etc/proxychains.conf +++ /dev/null @@ -1,96 +0,0 @@ -# proxychains.conf VER 4 -# -# HTTP, SOCKS4, SOCKS5 tunneling proxifier with DNS. -# - -# The option below identifies how the ProxyList is treated. -# only one option should be uncommented at time, -# otherwise the last appearing option will be accepted -# -#dynamic_chain -# -# Dynamic - Each connection will be done via chained proxies -# all proxies chained in the order as they appear in the list -# at least one proxy must be online to play in chain -# (dead proxies are skipped) -# otherwise EINTR is returned to the app -# -strict_chain -# -# Strict - Each connection will be done via chained proxies -# all proxies chained in the order as they appear in the list -# all proxies must be online to play in chain -# otherwise EINTR is returned to the app -# -#random_chain -# -# Random - Each connection will be done via random proxy -# (or proxy chain, see chain_len) from the list. -# this option is good to test your IDS :) - -# Make sense only if random_chain -#chain_len = 2 - -# Quiet mode (no output from library) -quiet_mode - -# Proxy DNS requests - no leak for DNS data -proxy_dns - -# set the class A subnet number to usefor use of the internal remote DNS mapping -# we use the reserved 224.x.x.x range by default, -# if the proxified app does a DNS request, we will return an IP from that range. -# on further accesses to this ip we will send the saved DNS name to the proxy. -# in case some control-freak app checks the returned ip, and denies to -# connect, you can use another subnet, e.g. 10.x.x.x or 127.x.x.x. -# of course you should make sure that the proxified app does not need -# *real* access to this subnet. -# i.e. dont use the same subnet then in the localnet section -#remote_dns_subnet 127 -#remote_dns_subnet 10 -remote_dns_subnet 224 - -# Some timeouts in milliseconds -tcp_read_time_out 15000 -tcp_connect_time_out 8000 - -# By default enable localnet for loopback address ranges -# RFC5735 Loopback address range -localnet 127.0.0.0/255.0.0.0 -# RFC1918 Private Address Ranges -localnet 10.0.0.0/255.0.0.0 -localnet 172.16.0.0/255.240.0.0 -localnet 192.168.0.0/255.255.0.0 - - -# Example for localnet exclusion -## Exclude connections to 192.168.1.0/24 with port 80 -# localnet 192.168.1.0:80/255.255.255.0 - -## Exclude connections to 192.168.100.0/24 -# localnet 192.168.100.0/255.255.255.0 - -## Exclude connections to ANYwhere with port 80 -# localnet 0.0.0.0:80/0.0.0.0 - -# ProxyList format -# type host port [user pass] -# (values separated by 'tab' or 'blank') -# -# -# Examples: -# -# socks5 192.168.67.78 1080 lamer secret -# http 192.168.89.3 8080 justu hidden -# socks4 192.168.1.49 1080 -# http 192.168.39.93 8080 -# -# -# proxy types: http, socks4, socks5 -# ( auth types supported: "basic"-http "user/pass"-socks ) -# -[ProxyList] -# add proxy here ... -# meanwile -# defaults set to "tor" -socks5 127.0.0.1 1080