Changed some of lua & i3 seggings

* window navigation added to nvim
* i3 startup changes
* added sakura config
* added zerotierone scripts

co-authored-by: who-is-this-guy sotov2071@gmail.com

5 files changed, 132 insertions, 24 deletions

diff --git a/.config/i3/config b/.config/i3/config
index 9b11669..ab35539 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -66,9 +66,12 @@ bindsym $mod+semicolon focus right
 # bindsym $mod+Print exec coreshot -s
 # bindsym $mod+Shift+Print exec coreshot -w
 
-bindsym Print exec maim ~/Screenshots/screenshot-$(date +"%Y-%m-%dT%H:%M:%S").png
-bindsym $mod+Print exec maim -s ~/Screenshots/screenshot-$(date +"%Y-%m-%dT%H:%M:%S").png
-bindsym $mod+Shift+Print exec maim -i $(xdotool getactivewindow) ~/screenshot-$(date +"%Y-%m-%dT%H:%M:%S").png
+set $maim maim --tolerance=1 --quiet 
+#--color="56,200,200,69"
+set $maim_paste tee ~/Screenshots/screenshot-$(date +"%Y-%m-%dT%H:%M:%S").png | xclip -selection clipboard -t image/png
+bindsym Print exec $maim | $maim_paste
+bindsym $mod+Print exec $maim -s | $maim_paste
+bindsym $mod+Shift+Print exec $maim -i $(xdotool getactivewindow) | $maim_paste
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -257,12 +260,12 @@ default_border pixel 3
 # started upon launching
 
 # monito settings
-exec xrandr --setprovideroutputsource NVIDIA-G0 Intel
-exec ~/.screenlayout/doublemonitor.layout.sh
+exec --setprovideroutputsource NVIDIA-G0 Intel
+exec_always ~/.screenlayout/doublemonitor.layout.sh
 
 # disable integrated keyboard input
 # please, just work (check out that function in bashrc lmao)
-exec kboff 
+exec_always kboff 
 # switch keyboard colors
 exec openrgb --color "00FFFF"
 
@@ -273,7 +276,7 @@ exec microsoft-edge-dev
 #exec discord
 #exec qtcreator
 #exec doublecmd
-exec_always feh --bg-fill ~/wallpaper/nov2023.png
+exec_always feh --bg-fill ~/wallpaper/dec2023.png
 exec_always setxkbmap -layout us,ru -option grp:alt_shift_toggle
 exec_always ~/.screenlayout/fullscreen.sh
 # exec_always xset r rate 269 19
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index c7e83a4..b672205 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,6 +1,11 @@
 {
   "awesome-vim-colorschemes": { "branch": "master", "commit": "4b2787b8894c4a70c42d15c2808d7cf278cb6abb" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "nerdtree": { "branch": "master", "commit": "0cb04e9245b000daf32f04aae5f606011a6aa3b5" },
+  "nvim-treesitter": { "branch": "master", "commit": "d8a71826a20dfc9ed3d8a43e28a00611a302b456" },
+  "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" },
+  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index 2344087..ee7dea7 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -4,9 +4,14 @@
 -- plugins to be installed
 plugins = {
 	"folke/lazy.nvim",			-- plugin manager
+	"nvim-lua/popup.nvim",			-- some functions for other plugins
+	"nvim-lua/plenary.nvim",		-- some functions for other plugins
 	"folke/which-key.nvim",			-- pretty self-descriptive name
 	"rafi/awesome-vim-colorschemes",	-- same here
-	"tpope/vim-commentary"			-- gc & gcc for commenting
+	"tpope/vim-commentary",			-- gc & gcc for commenting
+	"tpope/vim-surround",			-- replace quotes e.t.c
+	"nvim-treesitter/nvim-treesitter",	-- folding code, advanced syntax highlighting & sitting on a tree
+	"preservim/nerdtree",			-- file explorer
 }
 
 -- options for lazy
@@ -32,4 +37,5 @@ vim.opt.rtp:prepend(lazypath)
 -- initialization
 lazy = require("lazy")
 lazy.setup(plugins, opts)
+-- lazy.load('nerdtree')
 
diff --git a/.config/nvim/lua/user/remaps.lua b/.config/nvim/lua/user/remaps.lua
index 742e967..a047392 100644
--- a/.config/nvim/lua/user/remaps.lua
+++ b/.config/nvim/lua/user/remaps.lua
@@ -7,34 +7,45 @@ local map = vim.api.nvim_set_keymap
 map("", "\\", "<Nop>", opt)
 vim.g.mapleader = "\\"
 
--- some minor commands
-map("c", "w!!", "w !sudo tee % > /dev/null", opt)
 
 -- remap j and k
--- i refuse to elaborate
+-- I refuse to elaborate
 map("n", "j", "<Up>", opt)
 map("n", "k", "<Down>", opt)
+map("n", "dj", "d<Up>", opt)
+map("n", "dk", "d<Down>", opt)
 
 -- window navigation
-map("n", "<C-l>", "<C-w>l", opt)
 map("n", "<C-j>", "<C-w>k", opt) -- SWITCHED K AND J
 map("n", "<C-k>", "<C-w>j", opt) -- SWITCHED K AND J
+map("n", "<C-l>", "<C-w>l", opt)
 map("n", "<C-h>", "<C-w>h", opt)
 
+-- buffer navigation
+map("n", "gn", ":bn<Cr>", opt)
+map("n", "gp", ":bp<Cr>", opt)
+
 -- Insert mode navigation
 map("i", "<C-h>", "<Left>", opt)
 map("i", "<C-j>", "<Up>", opt)   -- SWITCHED K AND J
 map("i", "<C-k>", "<Down>", opt) -- SWITCHED K AND J
 map("i", "<C-l>", "<Right>", opt)
+map("i", "<C-w>", "<C-Right>", opt)
+map("i", "<C-W>", "<Esc>Wi", opt)
+map("i", "<C-b>", "<C-Left>", opt)
+map("i", "<C-B>", "<Esc>Bi", opt)
+
+-- Terminal mode
+map("t", "<Esc>", "<C-\\><C-n>" , opt)
 
 -- lexer options..?
-map("n", "<leader>e", ":Lex 49<cr>", opt)
+map("n", "<leader>e", ":NERDTreeToggle<CR>", opt)
 
 -- resizing options
-map("n", "<C-Left>", ":vertical resize -5<cr>", opt)
-map("n", "<C-Up>", ":resize +5<cr>", opt)
-map("n", "<C-Right>", ":vertical resize +5<cr>", opt)
-map("n", "<C-Down>", ":resize -5<cr>", opt)
+map("n", "<C-Left>", ":vertical resize -4<cr>", opt)
+map("n", "<C-Up>", ":resize +1<cr>", opt)
+map("n", "<C-Right>", ":vertical resize +4<cr>", opt)
+map("n", "<C-Down>", ":resize -1<cr>", opt)
 
 -- better indentation
 map("v", "<", "<gv", opt)
@@ -45,14 +56,19 @@ map("n", "<A-j>", ":m .-2<CR>==", opt) -- SWITCHED K AND J
 map("n", "<A-k>", ":m .+1<CR>==", opt) -- SWITCHED K AND J
 
 -- duplicating lines 
-map("n", "<C-Up>", ":.,.t.-1<CR>==", opt)
-map("n", "<C-Down>", ":.,.t.<CR>==", opt)
+map("n", "<C-A-Up>", ":.,.t.-1<CR>==", opt)
+map("n", "<C-A-Down>", ":.,.t.<CR>==", opt)
 
 -- leader remaps
-map("n", "<leader>/", ":nohlsearch<CR>", opt)	-- discard search highlighting
-map("n", "<leader>T", ":term<CR>", opt)		-- open terminal fullscreen with \T
-map("n", "<leader>t", ":vsplit term <CR>", opt)	-- split to terminal with \t
-map("n", "<leader>pl", ":Lazy<CR>", opt)	-- open plugin manager
+map("n", "<leader>/", ":nohlsearch<CR>", opt)				-- discard search highlighting
+map("n", "<leader>t", ":split<CR>:terminal<CR>:resize 4<CR>", opt)	-- open terminal fullscreen with \T
+map("n", "<leader>T", ":vsplit<CR>:terminal<CR>", opt)			-- split to terminal with \t
+map("n", "<leader>pl", ":Lazy<CR>", opt)				-- open plugin manager
 
 -- miscellaneous
-map("n", "<leader>relaod", ":luafile ~/.config/nvim/lua/init.lua", {noremap = false})
+map("c", "w!!", "w !sudo tee % > /dev/null", opt)
+
+-- better G and gg
+map("n", "G", "G$", opt)
+map("n", "gg", "gg0", opt)
+
diff --git a/.config/sakura/sakura.conf b/.config/sakura/sakura.conf
new file mode 100644
index 0000000..65dfb05
--- /dev/null
+++ b/.config/sakura/sakura.conf
@@ -0,0 +1,78 @@
+[sakura]
+colorset1_fore=rgb(255,255,255)
+colorset1_back=rgb(41,41,41)
+colorset1_curs=rgb(143,240,164)
+colorset1_scheme=0
+colorset1_key=F1
+colorset2_fore=rgb(192,192,192)
+colorset2_back=rgb(0,0,0)
+colorset2_curs=rgb(255,255,255)
+colorset2_scheme=1
+colorset2_key=F2
+colorset3_fore=rgb(192,192,192)
+colorset3_back=rgb(0,0,0)
+colorset3_curs=rgb(255,255,255)
+colorset3_scheme=1
+colorset3_key=F3
+colorset4_fore=rgb(192,192,192)
+colorset4_back=rgb(0,0,0)
+colorset4_curs=rgb(255,255,255)
+colorset4_scheme=1
+colorset4_key=F4
+colorset5_fore=rgb(192,192,192)
+colorset5_back=rgb(0,0,0)
+colorset5_curs=rgb(255,255,255)
+colorset5_scheme=1
+colorset5_key=F5
+colorset6_fore=rgb(192,192,192)
+colorset6_back=rgb(0,0,0)
+colorset6_curs=rgb(255,255,255)
+colorset6_scheme=1
+colorset6_key=F6
+last_colorset=1
+bold_is_bright=false
+scroll_lines=4096
+font=OverpassM Nerd Font 11
+show_tab_bar=multiple
+scrollbar=false
+closebutton=true
+tabs_on_bottom=false
+less_questions=false
+copy_on_select=false
+disable_numbered_tabswitch=false
+use_fading=false
+scrollable_tabs=true
+urgent_bell=Yes
+audible_bell=Yes
+blinking_cursor=No
+cursor_type=VTE_CURSOR_SHAPE_BLOCK
+word_chars=-,./?%&#_~:
+palette=1
+add_tab_accelerator=5
+del_tab_accelerator=5
+switch_tab_accelerator=8
+move_tab_accelerator=9
+copy_accelerator=5
+scrollbar_accelerator=5
+open_url_accelerator=5
+font_size_accelerator=4
+set_tab_name_accelerator=5
+search_accelerator=5
+add_tab_key=T
+del_tab_key=W
+prev_tab_key=Left
+next_tab_key=Right
+copy_key=C
+paste_key=V
+scrollbar_key=S
+set_tab_name_key=N
+search_key=F
+increase_font_size_key=plus
+decrease_font_size_key=minus
+fullscreen_key=F11
+set_colorset_accelerator=5
+icon_file=terminal-tango.svg
+paste_button=2
+menu_button=3
+window_columns=80
+window_rows=24