merge: work
This commit is contained in:
commit
3dbc1caa6e
@ -22,6 +22,10 @@ vim.cmd("packadd nvim-lspconfig")
|
||||
|
||||
vim.cmd("packadd vim-dirdiff")
|
||||
|
||||
vim.cmd("packadd vim-easy-align")
|
||||
vim.keymap.set("n", "ga", "<Plug>(EasyAlign)<C-x>")
|
||||
vim.keymap.set("x", "ga", "<Plug>(EasyAlign)<C-x>")
|
||||
|
||||
-- variables
|
||||
vim.o.path = vim.o.path .. ",**"
|
||||
vim.o.expandtab = true
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit c04189061a937d5b6bf526c68cd4fbcb1b8cf567
|
||||
Subproject commit bdfcca4af7ac8171e6d4ae4b375aad61ff747429
|
@ -1 +1 @@
|
||||
Subproject commit a2ee5610ae5986797809358c9ace840eca6fd030
|
||||
Subproject commit c170310534b1c037c2173c3bcb000bd60eb25069
|
1
.config/nvim/pack/plugins/opt/vim-easy-align
Submodule
1
.config/nvim/pack/plugins/opt/vim-easy-align
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 12dd6316974f71ce333e360c0260b4e1f81169c3
|
@ -1 +1 @@
|
||||
Subproject commit 3668ec2a82250020ca0c285ef8b277f1385a8085
|
||||
Subproject commit 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -22,3 +22,6 @@
|
||||
[submodule ".pyenv"]
|
||||
path = .pyenv
|
||||
url = https://github.com/pyenv/pyenv.git
|
||||
[submodule ".config/nvim/pack/plugins/opt/vim-easy-align"]
|
||||
path = .config/nvim/pack/plugins/opt/vim-easy-align
|
||||
url = https://github.com/junegunn/vim-easy-align.git
|
||||
|
10
.xinitrc
10
.xinitrc
@ -1,11 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
#xrandr \
|
||||
# --output HDMI-2 --auto --primary \
|
||||
# --output eDP-1 --left-of HDMI-2
|
||||
#
|
||||
## fix touchscreen
|
||||
#xinput --map-to-output 'Raydium Corporation Raydium Touch System' 'eDP-1'
|
||||
xrandr \
|
||||
--output HDMI-2 --auto --primary \
|
||||
--output eDP-1 --left-of HDMI-2
|
||||
|
||||
#exec x-window-manager
|
||||
exec awesome
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
PS="$(docker ps -aq 2> /dev/null)"
|
||||
|
||||
if [ "$?" ] && [ "$EUID" != 0 ]; then
|
||||
if [ "$?" != 0 ] && [ "$EUID" != 0 ]; then
|
||||
sudo -- "$0" "$@"
|
||||
exit
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user