nvim ftplugin cleanup - use local settings

CONFIG/nvim/ftplugin/fugitive.lua

@@ -1,2 +1,2 @@
-vim.o.number = true
-vim.o.relativenumber = true
+vim.opt_local.number = true
+vim.opt_local.relativenumber = true

CONFIG/nvim/ftplugin/javascript.lua

@@ -1,4 +1,4 @@
-vim.o.colorcolumn = "100"
-vim.opt.tabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.softtabstop = 4
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4

CONFIG/nvim/ftplugin/lua.lua

@@ -1,4 +1,4 @@
-vim.o.colorcolumn = "120"
-vim.opt.tabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.softtabstop = 4
+vim.opt_local.colorcolumn = "120"
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4

CONFIG/nvim/ftplugin/markdown.lua

@@ -1,5 +1,5 @@
-vim.o.colorcolumn = ""
-vim.o.wrap = true
-vim.opt.tabstop = 2
-vim.opt.shiftwidth = 2
-vim.opt.softtabstop = 2
+vim.opt_local.colorcolumn = ""
+vim.opt_local.wrap = true
+vim.opt_local.tabstop = 2
+vim.opt_local.shiftwidth = 2
+vim.opt_local.softtabstop = 2

CONFIG/nvim/ftplugin/python.lua

@@ -1,5 +1,4 @@
-vim.o.colorcolumn = "100"
-vim.opt.tabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.softtabstop = 4
-vim.g.no_python_maps = 1
+vim.opt_local.colorcolumn = "100"
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4

CONFIG/nvim/init.lua

@@ -83,7 +83,7 @@ vim.opt.spelllang = { "en" }
 
 -- Splits
 vim.opt.splitbelow = true
-vim.opt.splitkeep = "screen"
+vim.opt.splitkeep = "cursor"
 vim.opt.splitright = true
 
 -- Terminal & Status Column
@@ -118,6 +118,7 @@ vim.api.nvim_create_autocmd("FileType", {
 -- MAPS
 -- ----------------------------------------
 
+vim.g.no_python_maps = 1
 local map = vim.keymap.set
 
 -- better esc

CONFIG/sway/config

@@ -291,13 +291,6 @@ exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CU
 exec hash dbus-update-activation-environment 2>/dev/null && \
      dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
 
-# Idle configuration
-exec swayidle -w \
-    timeout 1200 'gtklock -d' \
-    timeout 2400 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-    timeout 10 'if pgrep -x gtklock; then swaymsg "output * power off"; fi' \
-    before-sleep 'gtklock -d'
-
 # Start foot server
 exec systemctl --user enable --now foot-server.service
 
@@ -319,7 +312,13 @@ exec {
 }
 
 exec_always {
-    pkill -x swaync; exec swaync
+    # Idle configuration
+    pkill -x swayidle; exec swayidle -w \
+        timeout 1200 'gtklock' \
+        timeout 2400 'swaymsg "output * dpms off"' \
+            resume 'swaymsg "output * dpms on"' \
+        before-sleep 'gtklock'
+        lock 'gtklock'
 
     # nwg-drawer
     nwg-drawer -r -c 7 -is 90 -mb 10 -ml 50 -mr 50 -mt 10