Merge branch 'master' into neovim-vim

calibre/gui.json

@@ -0,0 +1,15 @@
+{
+  "grid view visible": true,
+  "cover_grid_show_title": true,
+  "tag_browser_splitter_horizontal_state": [
+    false,
+    200
+  ],
+  "book_details_splitter_horizontal_state": [
+    true,
+    320
+  ],
+  "toolbar_icon_size": "small",
+  "toolbar_text": "auto",
+  "show_splash_screen": false
+}

calibre/gui.py.json

@@ -0,0 +1,7 @@
+{
+  "main_window_geometry": {
+    "__class__": "bytearray",
+    "__value__": "AdnQywACAAAAAAAAAAABhAAABPIAAAQ3AAAAAAAAAakAAATyAAAENwAAAAAAAAAAB4A="
+  },
+  "disable_animations": true
+}

calibre/viewer.json

@@ -0,0 +1,6 @@
+{
+  "viewer_window_geometry": {
+    "__class__": "bytearray", 
+    "__value__": "AdnQywACAAAAAAAAAAABKQAABM8AAAQ3AAAAAAAAAU4AAATPAAAENwAAAAAAAAAAB4A="
+  }
+}

calibre/viewer.py.json

@@ -0,0 +1,13 @@
+{
+  "cols_per_screen_landscape": 2,
+  "cols_per_screen_migrated": true,
+  "side_margin": 52,
+  "background_color": "#f2f0e9",
+  "text_color": "#383226",
+  "serif_family": "Bookerly",
+  "sans_family": "Amazon Ember",
+  "hyphenate": true,
+  "hyphenate_default_lang": "en_us",
+  "copy_bookmarks_to_file": false,
+  "remember_window_size": true
+}

nvim/defaults.vim

@@ -0,0 +1,13 @@
+" Some settings Vim has on its defaults.vim that NeoVim hasn't set by default
+
+if has('mouse')
+	set mouse=a
+endif
+
+augroup vimStartup
+	au!
+	autocmd BufReadPost *
+		\ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+		\ |   exe "normal! g`\""
+		\ | endif
+augroup END

nvim/ginit.vim

@@ -1,7 +1,7 @@
 call rpcnotify(1, 'Gui', 'Font', 'Fira Code 9')
 
 if exists('g:GtkGuiLoaded')
-	NGPreferDarkTheme on
+	call rpcnotify(1, 'Gui', 'Command', 'PreferDarkTheme', 'on')
 endif
 
 " Restore theme's background on GUI

nvim/init.vim

@@ -1,10 +1,7 @@
 " Baco's NeoVim init file
 
 " Some defaults to start with
-"   from: runtime! defaults.vim and runtime! vimrc_example.vim
-if has('mouse')
-	set mouse=a
-endif
+runtime! defaults.vim
 if !has('vms') && has('persistent_undo')
 	set undofile  " keep an undo file (undo changes after closing)
 endif
@@ -28,7 +25,7 @@ if has('autocmd')
 	autocmd FileType c setlocal tabstop=8 shiftwidth=8 softtabstop=0
 
 	" Ensure spelling is loaded when writting text
-	autocmd FileType gitcommit setlocal spell
+	autocmd FileType gitcommit setlocal spell nonumber
 endif
 
 " Extras
@@ -67,7 +64,7 @@ packadd onedark.vim
 if has('autocmd') && !has('gui_running')
 	augroup colorset
 		autocmd!
-		autocmd ColorScheme * silent!
+		autocmd ColorScheme onedark silent!
 			\ call onedark#extend_highlight('Normal', {'bg': {'gui': 'NONE'}})
 	augroup END
 endif

tmux/plugins/tpm

@@ -0,0 +1 @@
+Subproject commit 476f6ca69922c9e67c408ae92dff0eb0ccb8ee51

vim/vimrc

@@ -27,7 +27,7 @@ if has('autocmd')
 	autocmd FileType c setlocal tabstop=8 shiftwidth=8 softtabstop=0
 
 	" Ensure spelling is loaded when writting text
-	autocmd FileType gitcommit setlocal spell
+	autocmd FileType gitcommit setlocal spell nonumber
 endif
 
 " Extras