No more trailing spaces. Minor fixes. Start X automatically on tty1
This commit is contained in:
parent
304cee8e85
commit
3553bc147f
|
@ -116,8 +116,13 @@ myawesomemenu = {
|
||||||
{ "quit", function() awesome.quit() end}
|
{ "quit", function() awesome.quit() end}
|
||||||
}
|
}
|
||||||
lock = function()
|
lock = function()
|
||||||
|
-- Sync disks before lock (just in case)
|
||||||
awful.util.spawn("sync")
|
awful.util.spawn("sync")
|
||||||
awful.util.spawn("xautolock -locknow")
|
|
||||||
|
-- Lock screen
|
||||||
|
awful.util.spawn("xdg-screensaver lock")
|
||||||
|
--awful.util.spawn("xautolock -locknow")
|
||||||
|
--awful.util.spawn("xlock")
|
||||||
end
|
end
|
||||||
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
|
mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
|
||||||
{ "open terminal", terminal },
|
{ "open terminal", terminal },
|
||||||
|
@ -720,6 +725,7 @@ local function remove_client(tabl, c)
|
||||||
if index then
|
if index then
|
||||||
table.remove(tabl, index)
|
table.remove(tabl, index)
|
||||||
if #tabl == 0 then
|
if #tabl == 0 then
|
||||||
|
awful.util.spawn("xset s blank")
|
||||||
awful.util.spawn("xset s on")
|
awful.util.spawn("xset s on")
|
||||||
awful.util.spawn("xset +dpms")
|
awful.util.spawn("xset +dpms")
|
||||||
naughty.notify({ preset = naughty.config.presets.low,
|
naughty.notify({ preset = naughty.config.presets.low,
|
||||||
|
@ -733,6 +739,7 @@ client.connect_signal("property::fullscreen", function(c)
|
||||||
if c.fullscreen then
|
if c.fullscreen then
|
||||||
table.insert(fullscreened_clients, c)
|
table.insert(fullscreened_clients, c)
|
||||||
if #fullscreened_clients == 1 then
|
if #fullscreened_clients == 1 then
|
||||||
|
awful.util.spawn("xset s noblank")
|
||||||
awful.util.spawn("xset s off")
|
awful.util.spawn("xset s off")
|
||||||
awful.util.spawn("xset -dpms")
|
awful.util.spawn("xset -dpms")
|
||||||
naughty.notify({
|
naughty.notify({
|
||||||
|
@ -758,10 +765,9 @@ awful.util.spawn_with_shell("run-once nm-applet")
|
||||||
awful.util.spawn_with_shell("run-once 'nextcloud --background'")
|
awful.util.spawn_with_shell("run-once 'nextcloud --background'")
|
||||||
awful.util.spawn_with_shell("run-once 'udiskie --tray --notify --automount'")
|
awful.util.spawn_with_shell("run-once 'udiskie --tray --notify --automount'")
|
||||||
awful.util.spawn_with_shell("run-once 'mpd /home/lanxu/.config/mpd/mpd.conf'")
|
awful.util.spawn_with_shell("run-once 'mpd /home/lanxu/.config/mpd/mpd.conf'")
|
||||||
|
awful.util.spawn_with_shell("run-once 'xscreensaver -no-splash'")
|
||||||
--awful.util.spawn_with_shell("run-once conky")
|
--awful.util.spawn_with_shell("run-once conky")
|
||||||
--awful.util.spawn_with_shell("run-once dropboxd")
|
|
||||||
--awful.util.spawn_with_shell("run-once light-locker")
|
--awful.util.spawn_with_shell("run-once light-locker")
|
||||||
--awful.util.spawn_with_shell("run-once xscreensaver -no-splash")
|
|
||||||
--awful.util.spawn_with_shell("run-once firefox-developer-edition")
|
--awful.util.spawn_with_shell("run-once firefox-developer-edition")
|
||||||
--awful.util.spawn_with_shell("run-once firefox")
|
--awful.util.spawn_with_shell("run-once firefox")
|
||||||
|
|
||||||
|
|
|
@ -9,3 +9,5 @@ lain/
|
||||||
ranger/bookmarks
|
ranger/bookmarks
|
||||||
ranger/history
|
ranger/history
|
||||||
ranger/tagged
|
ranger/tagged
|
||||||
|
|
||||||
|
i3blocks
|
||||||
|
|
30
.vimrc
30
.vimrc
|
@ -15,8 +15,8 @@ Plug 'rust-lang/rust.vim', {'for': 'rust'}
|
||||||
"Plug 'racer-rust/vim-racer', {'for': 'rust'}
|
"Plug 'racer-rust/vim-racer', {'for': 'rust'}
|
||||||
|
|
||||||
" Syntax checking
|
" Syntax checking
|
||||||
Plug 'Valloric/YouCompleteMe' " alternative #1, full-blown
|
"Plug 'Valloric/YouCompleteMe' " alternative #1, full-blown
|
||||||
"Plug 'w0rp/ale',
|
Plug 'w0rp/ale',
|
||||||
|
|
||||||
" Useful plugins
|
" Useful plugins
|
||||||
Plug 'Raimondi/delimitMate'
|
Plug 'Raimondi/delimitMate'
|
||||||
|
@ -64,6 +64,8 @@ set autoindent " Automatically indent
|
||||||
set cindent " Indentation for c
|
set cindent " Indentation for c
|
||||||
set number " Add line numbers
|
set number " Add line numbers
|
||||||
set hlsearch " Highlight search
|
set hlsearch " Highlight search
|
||||||
|
set modeline
|
||||||
|
set modelines=5
|
||||||
"set sessionoptions=blank,buffers,curdir,folds,globals,help,localoptions,options,resize,tabpages,winsize,winpos
|
"set sessionoptions=blank,buffers,curdir,folds,globals,help,localoptions,options,resize,tabpages,winsize,winpos
|
||||||
set autochdir " Change directory automatically
|
set autochdir " Change directory automatically
|
||||||
"set backupdir=~/.vim/temp/ " Save temporary backups to temp dir
|
"set backupdir=~/.vim/temp/ " Save temporary backups to temp dir
|
||||||
|
@ -142,15 +144,23 @@ let g:UltiSnipsJumpForwardTrigger="<c-b>"
|
||||||
let g:UltiSnipsJumpBackwardTrigger="<c-z>"
|
let g:UltiSnipsJumpBackwardTrigger="<c-z>"
|
||||||
|
|
||||||
augroup lexical
|
augroup lexical
|
||||||
autocmd!
|
autocmd!
|
||||||
autocmd FileType markdown,mkd call lexical#init()
|
autocmd FileType markdown,mkd call lexical#init()
|
||||||
autocmd FileType textile call lexical#init()
|
autocmd FileType textile call lexical#init()
|
||||||
autocmd FileType text call lexical#init({ 'spell': 0 })
|
autocmd FileType text call lexical#init({ 'spell': 0 })
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
let g:ale_linters = {
|
let g:ale_linters = {
|
||||||
\ 'javascript': ['standard'],
|
\'javascript': ['standard'],
|
||||||
\ 'vue': ['standard --plugin html "**/*.{js,vue}"']
|
\'vue': ['standard --plugin html "**/*.{js,vue}"'],
|
||||||
\}
|
\'jsx': ['standard --plugin html "**/*.{js,jsx}"'],
|
||||||
let g:racer_experimental_completer = 1
|
\'rust': ['cargo']
|
||||||
|
\}
|
||||||
|
let b:ale_fixers = {
|
||||||
|
\'*': ['remove_trailing_lines', 'trim_whitespace'],
|
||||||
|
\'rust': ['rustfmt']
|
||||||
|
\}
|
||||||
|
let g:ale_fix_on_save = 1
|
||||||
|
let g:ale_completion_enabled = 1
|
||||||
|
|
||||||
set completeopt+=preview
|
set completeopt+=preview
|
||||||
|
|
|
@ -56,3 +56,8 @@ export PATH="${HOME}/.cargo/bin:$PATH"
|
||||||
|
|
||||||
# Caffe
|
# Caffe
|
||||||
export CAFFE_DIR="${HOME}/Koodit/github/caffe/build/install"
|
export CAFFE_DIR="${HOME}/Koodit/github/caffe/build/install"
|
||||||
|
|
||||||
|
# Start X on tty1 automatically
|
||||||
|
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
|
||||||
|
exec startx
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user