From 6949e7843255206bc642e8f7457c217581c9b556 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Mon, 14 Aug 2023 13:46:13 +0800
Subject: Update

---
 X11/openbox/rc.xml        | 2 +-
 X11/rofi/pass.edit        | 2 +-
 X11/rofi/rofi-pass        | 1 +
 bin/init/load-settings.sh | 2 +-
 init.vim                  | 8 +++-----
 nvim.lua                  | 5 ++++-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index d04e3b1..8ffab47 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -778,7 +778,7 @@
     <keybind key="C-S-R">
       <action name="Reconfigure"/>
     </keybind>
-    <keybind key="W-Escape">
+    <keybind key="W-S-Escape">
       <action name="Execute">
         <command>xkill</command>
       </action>
diff --git a/X11/rofi/pass.edit b/X11/rofi/pass.edit
index 2c0eeea..bfbdc31 100755
--- a/X11/rofi/pass.edit
+++ b/X11/rofi/pass.edit
@@ -16,5 +16,5 @@ fi
 
 # Use detected terminal emulator to edit password
 coproc (
-    $terminal -e pass edit $1 && $(dirname $0)/pass.get $1
+    EDITOR=nvim $terminal -e pass edit $1 && $(dirname $0)/pass.get $1
 )
diff --git a/X11/rofi/rofi-pass b/X11/rofi/rofi-pass
index 498fa62..9e16bc8 100755
--- a/X11/rofi/rofi-pass
+++ b/X11/rofi/rofi-pass
@@ -1,6 +1,7 @@
 #! /bin/bash
 
 export terminal=${terminal:-alacritty}
+export EDITOR=${EDITOR:-vim}
 
 cd $(dirname $0)
 
diff --git a/bin/init/load-settings.sh b/bin/init/load-settings.sh
index 00f8c1e..f82bc88 100755
--- a/bin/init/load-settings.sh
+++ b/bin/init/load-settings.sh
@@ -1,4 +1,4 @@
-trap 'exit.sh' EXIT
+# trap 'exit.sh' EXIT
 
 export SETTING_DIR=${SETTING_DIR:=$HOME/helper}
 export BIN_DIR=~/bin
diff --git a/init.vim b/init.vim
index 6b31c8e..d8b326e 100644
--- a/init.vim
+++ b/init.vim
@@ -35,15 +35,13 @@ source ~/.vim/vim-init/init/init-keymaps.vim
 " 设定 tabsize
 " source ~/.vim/vim-init/init/init-tabsize.vim
 
-" Plugins
+" Set UI theme
+colorscheme desert
 
 " Neovim
 if has('nvim')
   source ~/.config/nvim/nvim.lua
 else
+" Plugin
   source ~/.vim/vim-init/init/init-plugins.vim
 endif
-
-" Set UI theme
-colorscheme desert
-highlight MatchParen cterm=bold ctermbg=none ctermfg=magenta
diff --git a/nvim.lua b/nvim.lua
index ec37482..d281bf4 100644
--- a/nvim.lua
+++ b/nvim.lua
@@ -142,7 +142,7 @@ require('lazy').setup({
     'navarasu/onedark.nvim',
     priority = 1000,
     config = function()
-      vim.cmd.colorscheme 'onedark'
+      -- vim.cmd.colorscheme 'onedark'
     end,
   },
 
@@ -495,6 +495,9 @@ local servers = {
       telemetry = { enable = false },
     },
   },
+  stylelint_lsp = {
+    rootPatterns = {'.stylelintrc'},
+  },
 }
 
 -- Setup neovim lua configuration
-- 
cgit v1.2.3-70-g09d2