diff --git a/.install.conf.yaml b/.install.conf.yaml index b4521b02..6c34cc03 100644 --- a/.install.conf.yaml +++ b/.install.conf.yaml @@ -34,3 +34,5 @@ # VS Code ~/Library/Application Support/Code/User/settings.json: vscode/settings.json ~/Library/Application Support/Code/User/keybindings.json: vscode/keybindings.json + # IDEA + ~/.ideavimrc: idea/ideavimrc diff --git a/idea/ideavimrc b/idea/ideavimrc new file mode 100644 index 00000000..100bca25 --- /dev/null +++ b/idea/ideavimrc @@ -0,0 +1,2 @@ +set clipboard+=unnamed " Make yanking copy to clipboard +set visualbell " Turn off the audio beeps (no beeps) diff --git a/karabiner/karabiner.edn b/karabiner/karabiner.edn index 6d744fa4..7fee814d 100644 --- a/karabiner/karabiner.edn +++ b/karabiner/karabiner.edn @@ -30,7 +30,7 @@ :godot-mode {:key :period} :tab-mode {:key :tab} :comma-mode {:key :comma} - :caps_lock-mode {:key :caps_lock} + :caps-mode {:key :caps_lock} :js-mode {:key :period}} :main [{:des "colonkey (shift)" :rules [:semicolon-mode @@ -141,7 +141,7 @@ {:des "wkey (apps)" :rules [:w-mode [:k [:km "open: Safari"]] - [:h [:km "open: Activity Monitor"]] + [:u [:km "open: Activity Monitor"]] [:i [:km "open: Chrome Canary"]] [:g [:km "open: Bee"]] [:t [:km "open: Trello"]] @@ -153,6 +153,7 @@ [:r [:km "open: Fantastical"]] [:e :!OSC1] ; Open Dash [:semicolon [:km "open: Xcode"]] + [:h [:km "open: IntelliJ IDEA"]] [:period [:km "open: SnippetsLab"]] [:f [:km "open: 2do"]] [:j [:km "open: iTerm"]] @@ -412,10 +413,11 @@ [:n :!CTOg] ; Turn on/off notifications [:w :!CSgrave_accent_and_tilde] ; Switch between active windows (go up) [:semicolon :!Cgrave_accent_and_tilde] ; Switch between active windows (go down) - [:i [:km "New SnippetsLab snippet"]] ;[:q :!COequal_sign] - [:m :!CTO2] ; Full screen app + [:b :!CTO2] ; Full screen app [:j :!COslash] ; Show/hide notification centre + [:i [:km "New SnippetsLab snippet"]] + [:m :!CO6] ; Maximize window to next monitor [:period [:km "Break 5 min"]] [:comma [:km "Break 10 min"]] [:l :!CSOd] ; Move window right @@ -445,8 +447,8 @@ [:w [:km "wiki: Rules"]] [:q [:km "wiki: Month"]] [:j :mute] - [:comma [:km "Noizio change"]] - [:period :!TS0] ; Torn on/off Noizio + [:period [:km "Noizio change"]] + [:semicolon :!TS0] ; Torn on/off Noizio [:a [:km "Clone repo to ~/src/clones"]] [:s [:km "Clone repo to ~/src/clones and open with VS Code"]] [:i :display_brightness_decrement] @@ -477,6 +479,7 @@ [:5 :!O5] [:6 :!O6] [:e [:alfred "search subs" "net.deanishe.alfred-reddit"]] + [:b [:alfred "search bookmarks" "net.deanishe.alfred.safari"]] [:r [:alfred "search reddit" "nikivi.search.the.web"]] [:d [:alfred "search packages" "com.sindresorhus.npms"]] [:x [:alfred "search lobsters" "nikivi.search.the.web"]] @@ -545,26 +548,8 @@ ; {:des "godot" ; :rules[:godot-mode ; [:a [:g :o :l :a :n :g :spacekey]]]} ; -> golang - {:des "backkey (todo)" + {:des "backkey (dash)" :rules [:backquote-mode - [:semicolon [:km "Open Focus Trello"]] - [:m [:km "Open Learn Trello"]] - [:r [:km "Open Write Trello"]] - [:period [:km "Open Books Trello"]] - [:comma [:km "Open Research Papers Trello"]] - [:i [:km "Open Ideas Trello"]] - [:o [:km "todo: code"]] - [:n [:km "todo: clean"]] - [:j [:km "todo: empty"]] - [:k [:km "todo: 2Do"]] - [:l [:km "todo: learn"]]]} - {:des "commakey" - :rules [:comma-mode - [:e [:alfred "restart wifi" "nikivi.wifi.tools"]] - [:w [:alfred "toggle wifi" "nikivi.wifi.tools"]] - [:g [:km "Commit my wiki"]]]} - {:des "capskey" - :rules [:caps_lock-mode [:open_bracket :!TOopen_bracket] [:close_bracket :!TOclose_bracket] [:semicolon :!TOsemicolon] @@ -607,4 +592,22 @@ [:7 :!TO7] [:8 :!TO8] [:9 :!TO9] - [:0 :!TO0]]}]} + [:0 :!TO0]]} + {:des "commakey" + :rules [:comma-mode + [:e [:alfred "restart wifi" "nikivi.wifi.tools"]] + [:w [:alfred "toggle wifi" "nikivi.wifi.tools"]] + [:g [:km "Commit my wiki"]]]} + {:des "capskey (todo + trello)" + :rules [:caps-mode + [:m [:km "Open Focus Trello"]] + [:semicolon [:km "Open Learn Trello"]] + [:r [:km "Open Write Trello"]] + [:period [:km "Open Books Trello"]] + [:comma [:km "Open Research Papers Trello"]] + [:i [:km "Open Ideas Trello"]] + [:o [:km "todo: code"]] + [:n [:km "todo: clean"]] + [:j [:km "todo: empty"]] + [:k [:km "todo: 2Do"]] + [:l [:km "todo: learn"]]]}]} diff --git a/nix/darwin.nix b/nix/darwin.nix index a650b3f0..e6a45369 100644 --- a/nix/darwin.nix +++ b/nix/darwin.nix @@ -41,6 +41,13 @@ # python global pkgs.python36Packages.autopep8 #pkgs.python27Packages.autopep8 + + # temp + pkgs.autoconf + pkgs.automake + pkgs.gettext + pkgs.libtool + pkgs.xz ]; diff --git a/nvim/init.vim b/nvim/init.vim index dbfca859..dc079337 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -56,8 +56,8 @@ set mouse=a " Copy selected text with mouse to system clipboard set undofile " Save undos after file closes set wildmode=longest:list,full " Complete longest common string, then each full match set updatetime=250 " If this many milliseconds nothing is typed the swap file will be written to disk -set visualbell " Turn off the audio bell -set clipboard^=unnamed " Copy text to system clipboard +set visualbell " Turn off the audio bell (no beeps) +set clipboard^=unnamed " Make yanking copy to clipboard set gdefault " Always do global substitutions set title " Set terminal title set whichwrap+=<,>,[,] diff --git a/sublime/Preferences.sublime-settings b/sublime/Preferences.sublime-settings index 3759c3ec..fafff289 100644 --- a/sublime/Preferences.sublime-settings +++ b/sublime/Preferences.sublime-settings @@ -110,7 +110,7 @@ "color_scheme": "Packages/ayu/ayu-dark.tmTheme", "dictionary": "Packages/Language - English/en_US.dic", "font_face": "Fira Code", - "font_size": 13, + "font_size": 17, "ignored_packages": [ "Vintage" diff --git a/vscode/settings.json b/vscode/settings.json index 2f44f6e8..53452f21 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -37,7 +37,7 @@ "workbench.settings.enableNaturalLanguageSearch": false, "workbench.colorTheme": "Monokai Night", // window - "window.zoomLevel": 0, + "window.zoomLevel": 1, "window.restoreWindows": "all", "window.title": "${activeEditorMedium}${separator}${rootName}", "window.newWindowDimensions": "maximized",