浏览代码

Try to imitate non-mac keys

Andrew Swistak 6 年之前
父节点
当前提交
1e19df573d
共有 2 个文件被更改,包括 57 次插入36 次删除
  1. 34 5
      com.googlecode.iterm2.plist
  2. 23 31
      vimrc

+ 34 - 5
com.googlecode.iterm2.plist

@@ -14,6 +14,10 @@
 	<string>836DEB2C-D0F2-425A-BCA5-D5DAB610D770</string>
 	<key>HotkeyMigratedFromSingleToMulti</key>
 	<true/>
+	<key>LeftCommand</key>
+	<integer>3</integer>
+	<key>LeftOption</key>
+	<integer>7</integer>
 	<key>LoadPrefsFromCustomFolder</key>
 	<true/>
 	<key>NSNavPanelExpandedSizeForOpenMode</key>
@@ -49,12 +53,25 @@
 	</data>
 	<key>NSTableView Supports v2 KeyBingingTable</key>
 	<true/>
+	<key>NSUserKeyEquivalents</key>
+	<dict>
+		<key>New Tab</key>
+		<string>^t</string>
+		<key>New Windows</key>
+		<string>^n</string>
+		<key>Screen</key>
+		<string>@~$p</string>
+	</dict>
 	<key>NSWindow Frame SharedPreferences</key>
-	<string>269 109 796 486 0 0 2560 1417 </string>
+	<string>371 582 1016 512 0 0 2560 1417 </string>
 	<key>NSWindow Frame iTerm Window 0</key>
 	<string>1280 0 1277 1417 0 0 2560 1417 </string>
 	<key>NSWindow Frame iTerm Window 1</key>
-	<string>1280 0 1277 1417 0 0 2560 1417 </string>
+	<string>1280 990 570 427 0 0 2560 1417 </string>
+	<key>NeverWarnAboutShortLivedSessions_836DEB2C-D0F2-425A-BCA5-D5DAB610D770</key>
+	<true/>
+	<key>NeverWarnAboutShortLivedSessions_836DEB2C-D0F2-425A-BCA5-D5DAB610D770_selection</key>
+	<integer>0</integer>
 	<key>New Bookmarks</key>
 	<array>
 		<dict>
@@ -596,17 +613,17 @@
 			<key>Only The Default BG Color Uses Transparency</key>
 			<true/>
 			<key>Option Key Sends</key>
-			<integer>0</integer>
+			<integer>2</integer>
 			<key>Prompt Before Closing 2</key>
 			<false/>
 			<key>Right Option Key Sends</key>
-			<integer>0</integer>
+			<integer>2</integer>
 			<key>Rows</key>
 			<integer>25</integer>
 			<key>Screen</key>
 			<integer>-1</integer>
 			<key>Scrollback Lines</key>
-			<integer>1000</integer>
+			<integer>0</integer>
 			<key>Selected Text Color</key>
 			<dict>
 				<key>Blue Component</key>
@@ -667,6 +684,8 @@
 	<integer>1</integer>
 	<key>NoSyncTimeOfFirstLaunchOfVersionWithTip</key>
 	<real>577034926.07077205</real>
+	<key>PMPrintingExpandedStateForPrint2</key>
+	<false/>
 	<key>PointerActions</key>
 	<dict>
 		<key>Button,1,1,,</key>
@@ -702,6 +721,16 @@
 	</dict>
 	<key>PrefsCustomFolder</key>
 	<string>~/Documents/dotfiles</string>
+	<key>Print In Black And White</key>
+	<true/>
+	<key>RightCommand</key>
+	<integer>8</integer>
+	<key>RightOption</key>
+	<integer>3</integer>
+	<key>SwitchTabModifier</key>
+	<integer>9</integer>
+	<key>SwitchWindowModifier</key>
+	<integer>9</integer>
 	<key>WordCharacters</key>
 	<string>/-+\~_.</string>
 	<key>iTerm Version</key>

+ 23 - 31
vimrc

@@ -100,11 +100,11 @@ nnoremap <silent>   <C-k>   :wincmd k<CR>
 nnoremap <silent>   <C-j>   :wincmd j<CR>
 nnoremap <silent>   <C-h>   :wincmd h<CR>
 nnoremap <silent>   <C-l>   :wincmd l<CR>
-nnoremap <silent>   <D-K>   :wincmd K<CR>
-nnoremap <silent>   <D-J>   :wincmd J<CR>
-nnoremap <silent>   <D-H>   :wincmd H<CR>
-nnoremap <silent>   <D-L>   :wincmd L<CR>
-nnoremap <silent>   <D-T>   :wincmd T<CR>
+nnoremap <silent>   <A-K>   :wincmd K<CR>
+nnoremap <silent>   <A-J>   :wincmd J<CR>
+nnoremap <silent>   <A-H>   :wincmd H<CR>
+nnoremap <silent>   <A-L>   :wincmd L<CR>
+nnoremap <silent>   <A-T>   :wincmd T<CR>
 nnoremap <silent>     +     :wincmd +<CR>
 nnoremap <silent>     _     :wincmd -<CR>
 nnoremap <silent>     )     :wincmd ><CR>
@@ -113,32 +113,32 @@ nnoremap <silent> <leader>r :wincmd r<CR>
 nnoremap <silent> <leader>R :wincmd R<CR>
 
 " Navigate tag stack
-nmap <D-]> <C-]>
-nmap <D-[> <C-T>
+nmap <A-]> <C-]>
+nmap <A-[> <C-T>
 
 " ALt+d to duplicate a line, vmode version is best for SHIFT+V, not the others
 nmap Y y$
-nnoremap <D-d> yyp
-vnoremap <D-d> y<C-o>p
-inoremap <D-d> <C-o>:yank<CR><C-o>:put<CR>
+nnoremap <A-d> yyp
+vnoremap <A-d> y<C-o>p
+inoremap <A-d> <C-o>:yank<CR><C-o>:put<CR>
 
-nnoremap <D-p> "+p
-vnoremap <D-p> "+p
-nnoremap <expr> <silent> <D-y> '"+' . (v:count ? v:count : '') . 'y'
-vnoremap <D-y> "+y
+nnoremap <A-p> "+p
+vnoremap <A-p> "+p
+nnoremap <expr> <silent> <A-y> '"+' . (v:count ? v:count : '') . 'y'
+vnoremap <A-y> "+y
 
 " Move lines of text via Cmd+[jk]
-nnoremap <silent> <D-j> :m+1<CR>==
-nnoremap <silent> <D-k> :m-2<CR>==
-vnoremap <silent> <D-j> :m '>+1<CR>gv=gv
-vnoremap <silent> <D-k> :m '<-2<CR>gv=gv
+nnoremap <silent> <A-j> :m+1<CR>==
+nnoremap <silent> <A-k> :m-2<CR>==
+vnoremap <silent> <A-j> :m '>+1<CR>gv=gv
+vnoremap <silent> <A-k> :m '<-2<CR>gv=gv
 
 " Move text left/right via alt+[hl]
-nnoremap <silent> <D-l> "mx"mp
-nnoremap <silent> <D-h> "mxhh"mp
+nnoremap <silent> <A-l> "mx"mp
+nnoremap <silent> <A-h> "mxhh"mp
 " TODO: Maintain selection
-vnoremap <silent> <D-l> "mx"mp
-vnoremap <silent> <D-h> "mxhh"mp
+vnoremap <silent> <A-l> "mx"mp
+vnoremap <silent> <A-h> "mxhh"mp
 
 " Clear searches so there aren't underlined words.
 nnoremap <silent> <C-i> :nohlsearch<CR>
@@ -212,15 +212,7 @@ map <leader>cc <plug>NERDCommenterToggle
 
 " For some reason, CommentToggle doesn't work unless this is
 " remapped, so remapping it to something I won't ever use.
-map <leader><D-/><space> <plug>NERDCommenterComment
-
-""""""""""""""""""""""""""""""""""""""""
-" UltiSnips
-""""""""""""""""""""""""""""""""""""""""
-
-let g:UltiSnipsExpandTrigger = "<D-C>"
-let g:UltiSnipsJumpForwardTrigger = "<D-W>"
-let g:UltiSnipsJumpBackwardTrigger = "<D-S>"
+map <leader><A-/><space> <plug>NERDCommenterComment
 
 """"""""""""""""""""""""""""
 " TeX Settings