added latest changes from setting up x270

7 files changed, 27 insertions, 38 deletions

diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index ad62cd4..a10557e 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -1,4 +1,4 @@
-':/home/lxf/writing/luxagraf/lttr
+':/home/lxf
 d:/home/lxf/documents
 l:/home/lxf/writing/luxagraf
 b:/home/lxf/writing/lbh
diff --git a/.config/ranger/history b/.config/ranger/history
index c548711..f2c6856 100644
--- a/.config/ranger/history
+++ b/.config/ranger/history
@@ -46,5 +46,5 @@ search laptop
 open_with 
 w
 trash
-delete 
 search cau
+delete 
diff --git a/.config/sway/config b/.config/sway/config
index 78222db..c924cf7 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,7 +1,7 @@
 set $mod Mod1
 set $mod2 Mod4
 set $term alacritty
-set $background /mnt/storage/pictures/desktops/mountains_night_sky_dark.jpg
+set $background ~/.mountains_night_sky_dark.jpg
 set $screenshot grim ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 set $screenclip slurp | grim -g - ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 
@@ -28,10 +28,8 @@ bindsym $mod+F12 exec $screenclip
 # background
 output * bg $background fill
 
-input "1739:0:Synaptics_TM3075-002" {
+input "2:7:SynPS/2_Synaptics_TouchPad" {
     natural_scroll enabled
-    tap enabled
-    drag enabled
 }
 # change focus
 bindsym $mod2+j focus left
@@ -203,7 +201,7 @@ input "1:1:AT_Translated_Set_2_keyboard" {
 }
 #exec xrdb ~/.Xresources
 exec --no-startup-id redshift-gtk -l 35.052234:-118.243685 -m randr -t 5700:3600 &
-exec --no-startup-id vivaldi-snapshot &
+exec --no-startup-id vivaldi-snapshot --ozone-platform=wayland --enable-features=UseOzonePlatform,UseSkiaRenderer,Vulkan &
 #exec --no-startup-id urxvt &
 exec --no-startup-id alacritty &
 exec --no-startup-id nextcloud &
@@ -239,5 +237,4 @@ bindsym $mod+n exec alacritty --class 'smsearch' --command bash -c 'notes'
 
 for_window [app_id="^smsearch$"] floating enable, border none, resize set width 80 ppt height 60 ppt, move position 0 px 0 px
 
-exec udevmon -c /home/lxf/.udevmon.yaml >udevmon.log 2>udevmon.err &
 exec_always ~/.config/waybar/waybar.sh
diff --git a/.gitignore b/.gitignore
index 72e8ffc..6fde2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
-*
+.mpd/mpd.log
+.mpd/mpd.pid
+.mpd/mpdstate
+.mutt/offlineimap.pyc
+.newsboat/cache.db
+.newsboat/cache.db.lock
+.vim/bundle/
+.mpd/database
diff --git a/.vimrc b/.vimrc
index aa70fa9..3a682ca 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,8 +11,6 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-surround'
 Bundle 'vim-scripts/multvals.vim'
 Bundle 'altercation/vim-colors-solarized'
-Bundle 'SirVer/ultisnips'
-Bundle 'vim-scripts/taglist.vim'
 Bundle 'vim-scripts/django.vim'
 Bundle 'nelstrom/vim-markdown-folding'
 Bundle 'tpope/vim-markdown'
@@ -24,13 +22,11 @@ Bundle 'reedes/vim-wordy'
 Bundle 'vim-scripts/vim-auto-save'
 Bundle 'tmhedberg/SimpylFold'
 Bundle 'nvie/vim-flake8'
-Bundle 'majutsushi/tagbar'
 Bundle 'francoiscabrol/ranger.vim'
 Bundle 'junegunn/fzf'
 Bundle 'junegunn/fzf.vim'
 Bundle 'chengzeyi/fzf-preview.vim'
 Bundle 'alok/notational-fzf-vim'
-Bundle 'junegunn/goyo.vim'
 call vundle#end()
 filetype plugin indent on
 "}}}
@@ -416,42 +412,17 @@ let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
 let g:SuperTabDefaultCompletionType = '<C-n>'
 
-" better key bindings for UltiSnipsExpandTrigger
-" let g:UltiSnipsExpandTrigger = "<tab>"
-" let g:UltiSnipsJumpForwardTrigger = "<tab>"
-" let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
-"
-" goyo / limelight
-
-" Color name (:help cterm-colors) or ANSI code
-let g:limelight_conceal_ctermfg = 'gray'
-let g:limelight_conceal_ctermfg = 240
-"
-" " Color name (:help gui-colors) or RGB color
-let g:limelight_conceal_guifg = 'DarkGray'
-let g:limelight_conceal_guifg = '#777777'
-"
-
-let g:goyo_width = 105
-let g:goyo_height = '99%'
-let g:goyo_linenr=1
 nnoremap <silent> <c-s> :NV<CR>
 let g:markdown_fold_style = 'nested'
 
 nmap <leader>i :%s/
//g
 nmap <leader># :%s/### /###/g
 
-nmap <Leader>o :Utl openLink underCursor edit<CR>
 imap jj <Esc>
 vmap <silent> <leader>r <esc>:'<,'>:w !espeak &> /dev/null <CR>
 
-"wayland hack:
-"xnoremap "+y :!wl-copy <C-r>"<cr><cr>
-"xnoremap "+y y:call system("wl-copy", @")<cr>
-"nnoremap "+p :let @"=substitute(system("wl-paste --no-newline"), '<C-v><C-m>', '', 'g')<cr>p
 nnoremap "*p :let @"=substitute(system("wl-paste --no-newline --primary"), '<C-v><C-m>', '', 'g')<cr>p
 xnoremap <c-c> y:!wl-copy <C-r>"<cr><cr>gv
 vnoremap <c-c> y:!wl-copy <C-r>"<cr><cr>gv
-"set tags+=tags;$HOME
 
 
diff --git a/caps2esc.service b/caps2esc.service
new file mode 100644
index 0000000..b649a4e
--- /dev/null
+++ b/caps2esc.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=udevmon
+Wants=systemd-udev-caps2esc.service
+After=systemd-udev-caps2esc.service
+
+[Service]
+ExecStart=/usr/bin/nice -n -20 /usr/bin/udevmon -c /etc/udevmon.yaml
+
+[Install]
+WantedBy=multi-user.target
diff --git a/etc/udevmon.yaml b/etc/udevmon.yaml
new file mode 100644
index 0000000..9a1f96b
--- /dev/null
+++ b/etc/udevmon.yaml
@@ -0,0 +1,4 @@
+- JOB: "intercept -g $DEVNODE | caps2esc | uinput -d $DEVNODE"
+  DEVICE:
+    EVENTS:
+      EV_KEY: [KEY_CAPSLOCK, KEY_ESC]