From e3d33e5af6a7cd961f469be70cb30815cb03f48f Mon Sep 17 00:00:00 2001
From: andreas
Date: Tue, 14 Apr 2020 23:14:12 +0200
Subject: Add parts from 'openbox/rc.xml'. Some cleanup for vimrc.
---
src/openbox/autostart.sh | 12 ++
src/openbox/environment | 7 +
src/openbox/rc.parts.xml | 296 ++++++++++++++++++++++++++++++++++
src/session-init/openbox-autostart.sh | 12 --
src/session-init/openbox-environment | 7 -
src/vi/_gvimrc | 7 +-
src/vi/_vimrc | 18 +--
7 files changed, 325 insertions(+), 34 deletions(-)
create mode 100644 src/openbox/autostart.sh
create mode 100644 src/openbox/environment
create mode 100644 src/openbox/rc.parts.xml
delete mode 100644 src/session-init/openbox-autostart.sh
delete mode 100644 src/session-init/openbox-environment
diff --git a/src/openbox/autostart.sh b/src/openbox/autostart.sh
new file mode 100644
index 0000000..5daf214
--- /dev/null
+++ b/src/openbox/autostart.sh
@@ -0,0 +1,12 @@
+#
+# "~/.config/openbox/autostart.sh"
+#
+
+source ~/.config/user/setup-gui
+
+lxpanel &
+xscreensaver &
+~/.bin/wallpaper-set.sh &
+
+x-terminal-emulator &
+
diff --git a/src/openbox/environment b/src/openbox/environment
new file mode 100644
index 0000000..fded15d
--- /dev/null
+++ b/src/openbox/environment
@@ -0,0 +1,7 @@
+#
+# "~/.config/openbox/environment"
+#
+
+# Make sure launchers (eg gmrun) are able to find custom executables.
+export PATH=~/.bin:$PATH
+
diff --git a/src/openbox/rc.parts.xml b/src/openbox/rc.parts.xml
new file mode 100644
index 0000000..d0d704c
--- /dev/null
+++ b/src/openbox/rc.parts.xml
@@ -0,0 +1,296 @@
+
+
+
+
+
+
+
+
+
+ gmrun
+
+
+
+
+ gmrun
+
+
+
+
+ x-terminal-emulator
+
+
+
+
+ gvim
+
+
+
+
+ x-file-manager
+
+
+
+
+ gnome-system-monitor
+
+
+
+
+ qalculate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ next
+
+
+
+
+ prev
+
+
+
+
+
+
+
+
+
+ 0
+ 50%
+
+
+ Vertical
+
+
+
+
+
+
+ -0
+ 50%
+
+
+ Vertical
+
+
+
+
+
+
+ -0
+ 0
+ 50%
+ 50%
+
+
+
+
+
+
+ 0
+ 0
+ 50%
+ 50%
+
+
+
+
+
+
+ 0
+ -0
+ 50%
+ 50%
+
+
+
+
+
+
+ -0
+ -0
+ 50%
+ 50%
+
+
+
+
+
+
+ 0
+ 50%
+
+
+ Horizontal
+
+
+
+
+
+
+ horizontal
+
+
+ -0
+ 50%
+
+
+
+
+
+
+ 20%
+ 8%
+ 80%
+ 60%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ my-brightness.sh +10
+
+
+
+
+ my-brightness.sh -10
+
+
+
+
+ amixer set Master 5%+
+
+
+
+
+ amixer set Master 5%-
+
+
+
+
+ amixer set Master toggle
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/session-init/openbox-autostart.sh b/src/session-init/openbox-autostart.sh
deleted file mode 100644
index ea406af..0000000
--- a/src/session-init/openbox-autostart.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# "~/.config/openbox/autostart.sh"
-#
-
-source ~/.config/user/startup-gui
-
-lxpanel &
-xscreensaver &
-~/.bin/wallpaper-set.sh
-
-x-terminal-emulator &
-
diff --git a/src/session-init/openbox-environment b/src/session-init/openbox-environment
deleted file mode 100644
index fded15d..0000000
--- a/src/session-init/openbox-environment
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# "~/.config/openbox/environment"
-#
-
-# Make sure launchers (eg gmrun) are able to find custom executables.
-export PATH=~/.bin:$PATH
-
diff --git a/src/vi/_gvimrc b/src/vi/_gvimrc
index 77d17c7..eb1b62f 100644
--- a/src/vi/_gvimrc
+++ b/src/vi/_gvimrc
@@ -2,8 +2,8 @@
set lines=35 columns=100
if has("win32")
- set guifont=DejaVu_Sans_Mono:h11:cANSI
-" set guifont=Consolas:h11:cANSI
+ "set guifont=DejaVu_Sans_Mono:h11:cANSI
+ set guifont=Consolas:h11:cANSI
else
set guifont=Monospace\ 12
endif
@@ -12,8 +12,9 @@ set guioptions-=m " remove Menu bar
set guioptions-=T " remove toolbar
set guioptions-=L " remove left scrollbar
set guioptions-=r "remove right scrollbar
-set mouse=n
+" This is vim! So please stop using that stupid mouse!
+set mouse=n
nnoremap m'
nnoremap g``
diff --git a/src/vi/_vimrc b/src/vi/_vimrc
index 213c6c5..29422ed 100644
--- a/src/vi/_vimrc
+++ b/src/vi/_vimrc
@@ -83,7 +83,6 @@ colorscheme koehler
set nocursorline
set number
set hidden " allows to switch away from unsaved buffer
-"set relativenumber
set linebreak
set hlsearch
set showcmd
@@ -144,21 +143,16 @@ map h
map l
" closeBuffer
-nmap :bp:bd#
-imap :bp:bd#
-vmap :bp:bd#
+nnoremap :bp:bd#
" change cwd to current file
-map cdc :cd %:p:h:pwd
+nnoremap cdc :cd %:p:h:pwd
" Not searchNext. Do only highlight word under cursor.
nmap * *N
-" Execute previous one now
-:cd %:p:h
-
-" save with ctrl-s
-nmap :up
+" save with ctrl-s (useless if term emu catches keymapping)
+nnoremap :up
" commenting
autocmd FileType c,cpp,java,php,javascript,html let b:comment_leader = '//'
@@ -198,7 +192,6 @@ if has("win32")
else
- "map a=strftime('%s')
" Insert hash
inoremap =system("date\|md5sum\|awk '{printf \"%s\",$1}'")
" insert current TS
@@ -207,7 +200,7 @@ else
command OsTerminal !x-terminal-emulator &
command OsFileExplorer !x-file-manager `pwd` &
- command OsIceweasel !iceweasel `pwd` &
+ command OsFirefox !firefox `pwd` &
command OsChromium !chromium `pwd` &
endif
@@ -217,6 +210,7 @@ endif
autocmd FileType html setlocal shiftwidth=2 tabstop=2
autocmd FileType xml setlocal shiftwidth=2 tabstop=2
+autocmd FileType Makefile setl noexpandtab
" typescript
autocmd BufNewFile,BufRead *.ts setlocal ft=javascript
--
cgit v1.1