From 8a186fd7fd371cd7156d4b77f89446d945567546 Mon Sep 17 00:00:00 2001
From: Alessandro Mauri <alemauri001@gmail.com>
Date: Thu, 16 Apr 2020 21:26:32 +0200
Subject: [PATCH] minor tweaks to configuration

since the gtk update it is safe to re-enable MOZ_ENABLE_WAYLAND in
startw, modified vimrc and added some plugins to micro
---
 .gitignore                        |   1 +
 conf/config/micro/buffers/history | Bin 151 -> 0 bytes
 conf/config/micro/settings.json   |   7 +++++++
 conf/home/vim/.netrwhist          |  12 ------------
 conf/home/vimrc                   |  23 ++++++++++++-----------
 startw                            |   2 +-
 6 files changed, 21 insertions(+), 24 deletions(-)
 delete mode 100644 conf/config/micro/buffers/history
 delete mode 100644 conf/home/vim/.netrwhist

diff --git a/.gitignore b/.gitignore
index c6eb047..49cd511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ err-*
 conf/home/vim/plugged/**
 conf/home/vim/.netrwhist
 conf/config/micro/buffers/**
+conf/config/micro/plug/**
diff --git a/conf/config/micro/buffers/history b/conf/config/micro/buffers/history
deleted file mode 100644
index 3435f57b3044335369bfb48bb618012f0f2d0d8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmd=8-^{|u^uL9Hk%#er69WU!|3)StzX`}^V5kI&Gqd;?q~<ZOxMk+0Ft9u4=jJBn
zrLc$>r<N!r=jY@X6(?t;=B6s7q^2d7=9EaHizk-k=jx^;7G;Z}%M@qk7UZPj5C#Bp
CGBg7K

diff --git a/conf/config/micro/settings.json b/conf/config/micro/settings.json
index f91161c..c564243 100644
--- a/conf/config/micro/settings.json
+++ b/conf/config/micro/settings.json
@@ -15,8 +15,15 @@
     "eofnewline": true,
     "fastdirty": false,
     "fileformat": "unix",
+    "filemanager": true,
+    "filemanager.compressparent": true,
+    "filemanager.foldersfirst": true,
+    "filemanager.openonstart": false,
+    "filemanager.showdotfiles": true,
+    "filemanager.showignored": true,
     "filetype": "unknown",
     "ftoptions": true,
+    "fzf": true,
     "ignorecase": false,
     "indentchar": " ",
     "infobar": true,
diff --git a/conf/home/vim/.netrwhist b/conf/home/vim/.netrwhist
deleted file mode 100644
index ff999ba..0000000
--- a/conf/home/vim/.netrwhist
+++ /dev/null
@@ -1,12 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =8
-let g:netrw_dirhist_8='/home/ale/vimwiki/distro/patches'
-let g:netrw_dirhist_7='/home/ale/vimwiki/distro'
-let g:netrw_dirhist_6='/home/ale/vimwiki'
-let g:netrw_dirhist_5='/home/ale'
-let g:netrw_dirhist_4='/home/ale/vimwiki/distro/defaults'
-let g:netrw_dirhist_3='/home/ale/Documents/projects/ste/src'
-let g:netrw_dirhist_2='/home/ale'
-let g:netrw_dirhist_1='/home/ale/Documents/projects/macrod'
-let g:netrw_dirhist_0='/home/ale/Documents/projects/macrod/.git'
-let g:netrw_dirhist_9='/home/ale/sw/conf/home/vim/plugged/vimwiki/doc'
diff --git a/conf/home/vimrc b/conf/home/vimrc
index cf34e67..e5761ec 100644
--- a/conf/home/vimrc
+++ b/conf/home/vimrc
@@ -17,7 +17,11 @@ Plug 'tpope/vim-surround'
 Plug 'tpope/vim-fugitive'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'ap/vim-css-color'
-Plug 'vimwiki/vimwiki'
+" Plug 'vimwiki/vimwiki'
+" Plug 'lervag/wiki.vim'
+" Plug 'lervag/wiki-ft.vim'
+Plug 'godlygeek/tabular'
+Plug 'plasticboy/vim-markdown'
 
 " List ends here. Plugins become visible to Vim after this call.
 call plug#end()
@@ -26,14 +30,18 @@ call plug#end()
 set number
 set tabstop=4
 set smartcase
+colorscheme darkblue
+
+" Use mouse
+set mouse=a
+set ttymouse=sgr
 
 " Syntax and some plugins
 :filetype plugin on
 :syntax on
 
-" Use mouse
-set mouse=a
-set ttymouse=sgr
+" Set the viki root directory
+" let g:wiki_root = '~/vimwiki'
 
 " lightline is installed so this is not necessary
 set noshowmode
@@ -42,10 +50,3 @@ if !has('gui_running')
 	set t_Co=256
 endif
 
-" NERDTree
-" map <C-t> :NERDTreeToggle<CR>
-
-" Start nerdtree when no file is specified
-" autocmd StdinReadPre * let s:std_in=1
-" autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
-" autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
diff --git a/startw b/startw
index 21d9da3..23f7a77 100755
--- a/startw
+++ b/startw
@@ -67,7 +67,7 @@ done
 # Enable wayland native support
 export _JAVA_AWT_WM_NONREPARENTING=1
 # Breaks gtk dialog box as of 10-04-2020
-# export MOZ_ENABLE_WAYLAND=1
+export MOZ_ENABLE_WAYLAND=1
 export MOZ_WEBRENDER=1
 export SDL_VIDEODRIVER=wayland
 export QT_QPA_PLATFORM=wayland-egl