I don't even know at this point

12 files changed, 72 insertions, 19 deletions

diff --git a/.bashrc b/.bashrc
index b8a60ae..aed6bbb 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,6 @@
 
 source /etc/profile
+source /etc/environment
 source "$HOME/.cursed_bash.sh"
 source /usr/share/git/git-prompt.sh
 source /usr/share/doc/pkgfile/command-not-found.bash
@@ -8,6 +9,7 @@ eval "$(zoxide init --cmd cd bash)"
 
 # application shortcuts
 alias ls="ls --color"
+alias cat=lolcat
 alias dl="~/.local/bin/download"
 alias qmake="/usr/lib/qt6/bin/qmake"
 alias psiphon="psiphon-console-client"
@@ -15,6 +17,10 @@ alias cppreference="microsoft-edge-dev /usr/share/doc/cppreference/en/cpp.html"
 alias lan="/home/main/zerotierconnect.sh"
 alias python=/home/main/coding/py/venv/bin/python3
 alias pdf=mupdf
+alias config='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias siskictl=systemctl
+alias boobs=systemctl
+alias tmux="tmux -f ~/.config/tmux.conf"
 
 # shell options
 shopt -s autocd
diff --git a/.config/i3/config b/.config/i3/config
index 9e6b5cb..27f981a 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -17,14 +17,12 @@ exec --no-startup-id dex --autostart --environment i3
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
-
-exec --no-startup-id devilspie -a
 exec --no-startup-id picom
 exec --no-startup-id xsettnigsd
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
+bindsym alt+shift exec $refresh_i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $refresh_i3status
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
@@ -287,7 +285,7 @@ exec_always ~/.screenlayout/doublemonitor.layout.sh
 # exec openrgb --color "00FFFF"
 
 exec $terminal 
-exec $terminal -e bashtop
+exec $terminal -e btop
 exec firefox
 exec telegram-desktop
 exec discord
@@ -297,10 +295,12 @@ exec discord
 # * source1 (weibo): https://www.weibo.com/6593199887/L3yxyEJ1T
 # * source2 (gelbooru): https://gelbooru.com/index.php?page=post&s=view&id=7506062 
 exec_always feh --bg-fill ~/wallpaper/yae_beautiful_1.jpg
+# exec_always setxkbmap -layout us,ru,kr -option grp:alt_shift_toggle korean:ralt_hangul
 exec_always setxkbmap -layout us,ru -option grp:alt_shift_toggle
 exec_always ~/.screenlayout/fullscreen.sh
-# exec_always xset r rate 269 19
-exec_always xset r rate 222  22
-
+exec_always xset r rate 222 45
+exec_always fcitx5 -d
+exec_always xinput --set-prop 'pointer:''INSTANT USB GAMING MOUSE ' 'libinput Accel Profile Enabled' 0, 1
+exec_always xinput --set-prop 'pointer:''INSTANT USB GAMING MOUSE ' 'libinput Accel Speed' 0.5
 
 # empty lines at the EOF
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4039a41..5bc1dd7 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -7,5 +7,4 @@ require "user.lspinit"
 require "user.treesitter"
 require "user.coderunner"
 require "user.debugger"
--- autocmd to load lsp seems to break it
 
diff --git a/.config/nvim/lua/user/coderunner.lua b/.config/nvim/lua/user/coderunner.lua
index 77330ab..843534f 100644
--- a/.config/nvim/lua/user/coderunner.lua
+++ b/.config/nvim/lua/user/coderunner.lua
@@ -1,5 +1,15 @@
 local term = require'toggleterm'
 
+cxx = function()
+	local script = 
+	'echo $file > /dev/null;' ..
+	'OLDPWD_=\\${PWD};' ..
+	'while [[ ! -f CMakeLists.txt || ! -f compile_commands.json && \\\"\\$PWD\\\" != / ]]; do cd ..; done;' ..
+	'if [[ -f CMakeLists.txt && -f compile_commands.json ]]; then mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make -j24 && ' ..
+	'./\\$(sed -nr \\\"/add_executable/s/.*add_executable\\\\((\\\\S+).+/\\\\1/p\\\" ../CMakeLists.txt); fi;' ..
+	'cd ${OLDPWD_}'
+	vim.cmd(string.format("TermExec cmd='%s'", script))
+end
 -- Define the code runner configuration
 require('code_runner').setup({
 	mode = "toggleterm",
@@ -7,16 +17,9 @@ require('code_runner').setup({
 	startinsert = true,
     	filetype = {
         	rust = 'cargo check; if [ \\$? -ne 0 ]; then echo cargo check failed; else cargo run || cargo test -- --nocapture --test-threads=1; fi; echo $file > /dev/null',
-		cpp = function()
-			local script = 
-			'echo $file > /dev/null;' ..
-			'while [[ ! -f CMakeLists.txt && \\\"\\$PWD\\\" != / ]]; do cd ..; done;' ..
-			'if [[ -f CMakeLists.txt ]]; then mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make -j24 && ' ..
-			'./\\$(sed -nr \\\"/add_executable/s/.*add_executable\\\\((\\\\S+).+/\\\\1/p\\\" ../CMakeLists.txt); fi;' ..
-			'cd ..'
-			vim.cmd(string.format("TermExec cmd='%s'", script))
-		end,
+		cpp = cxx,
+		c = cxx,
 		python = 'python3 $file',
-		tex = 'mkdir -p build && pdflatex -output-directory=build -output-format=PDF $file'
+		tex = "mkdir -p build && if pdflatex -interaction=batchmode -output-directory=build -output-format=pdf $file; then killall -SIGHUP mupdf; else echo -e \\\\\\\\x1b[1\\\\;31mBUILD FAILED\\\\\\\\x1b[0m; fi"
 	},
 })
diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
index 098277d..7a768ab 100644
--- a/.config/nvim/lua/user/options.lua
+++ b/.config/nvim/lua/user/options.lua
@@ -23,6 +23,7 @@ local options = {
 	expandtab = false, -- !!!!!!!!!
 	cursorline = false,
 	number = true,
+	relativenumber = true, 
 	wrap = false,
 	-- splitting
 	splitbelow = true,
@@ -31,6 +32,14 @@ local options = {
 	completeopt = { 'menuone', 'noselect', 'noinsert' },
 	-- treesitter
 	foldlevel = 3,
+	spell= true,
+	spelllang="en_gb,ru_yo",
+	mousemodel="popup",
+	spellsuggest = "best,5",
+	undofile = true,
+	undodir = "/home/main/.vim/undo",
+	-- list = true,
+	-- listchars = "space:*,tab:--"
 }
 
 for key, val in pairs(options) do
diff --git a/.config/nvim/lua/user/treesitter.lua b/.config/nvim/lua/user/treesitter.lua
index 74b8f56..2f4d6b8 100644
--- a/.config/nvim/lua/user/treesitter.lua
+++ b/.config/nvim/lua/user/treesitter.lua
@@ -3,10 +3,29 @@
 
 local ts = require 'nvim-treesitter'
 local tsc = require 'nvim-treesitter.configs'
+local tsp = require 'nvim-treesitter.parsers'
+local tsi = require 'nvim-treesitter.install'
 
 vim.wo.foldmethod = 'expr'
 vim.wo.foldexpr = 'nvim_treesitter#foldexpr()'
 
+tsi.compilers = { 'clang' }
+
+vim.filetype.add{
+	pattern = {[".*/hypr/.*%.conf"] = "hyprlang"},
+}
+
+tsp.get_parser_configs().hyprland = {
+	install_info = {
+		url = "~/src/tree-sitter-hyprlang/",
+		files = {"src/parser.c"},
+		branch = "master",
+		requires_generate_from_grammar = false, --ligma ballse
+	},
+	filetype = "hyprlang",
+}
+
+
 tsc.setup{
 	ensure_installed = { "rust", "cpp", "python" },
 	auto_install = true,
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
new file mode 100644
index 0000000..09afcb2
--- /dev/null
+++ b/.config/nvim/spell/en.utf-8.add
@@ -0,0 +1,12 @@
+#reesitter
+#reesitter/!
+#reesitter
+treesitter/!
+neovim
+nvim
+struct
+bool
+TODO
+endif
+necessary/!
+necessary
diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl
new file mode 100644
index 0000000..473d69f
--- /dev/null
+++ b/.config/nvim/spell/en.utf-8.add.spl
diff --git a/.config/nvim/spell/ru.utf-8.spl b/.config/nvim/spell/ru.utf-8.spl
new file mode 100644
index 0000000..43d0e4b
--- /dev/null
+++ b/.config/nvim/spell/ru.utf-8.spl
diff --git a/.config/nvim/spell/ru.utf-8.sug b/.config/nvim/spell/ru.utf-8.sug
new file mode 100644
index 0000000..b418a0d
--- /dev/null
+++ b/.config/nvim/spell/ru.utf-8.sug
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index c5ae784..8b8d013 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -7,6 +7,7 @@ no-fading-openclose = false;
 no-fading-destroyed-args = true;
 shadow = false; // high CPU load and degraded performance in terminal
 corner-radius = 13;
+backend = "xrender";
 rounded-corners-exclude = [
 	"window_type = 'dock'",
 	"class_g = 'i3bar'",
@@ -16,6 +17,8 @@ opacity-rule = [
 	"100: name *= 'Pornhub'", // not sus
 	"100: name ~= 'ヰカちゃん♡♡~ – \\\\([0-9]+\\\\)'", // my girlfriend is more important than my rice
 	"100: name ~= 'Вика Цой'",
+	"100: class_g *= 'mupdf'",
+	"100: class_g *= 'firefox'",
 
 	// rules for calls break the media viewing so this is a workaround
 	"99: class_g *= 'Telegram' && name = 'Media viewer' && focused",
@@ -43,3 +46,4 @@ wintypes = {
 	dock = { fade = false };
 	dnd = { fade = false };
 };
+
diff --git a/.config/sakura/sakura.conf b/.config/sakura/sakura.conf
index 83962ab..2134906 100644
--- a/.config/sakura/sakura.conf
+++ b/.config/sakura/sakura.conf
@@ -32,7 +32,7 @@ colorset6_key=F6
 last_colorset=1
 bold_is_bright=false
 scroll_lines=4096
-font=OverpassM Nerd Font 13
+font=OverpassM Nerd Font 12
 show_tab_bar=multiple
 scrollbar=false
 closebutton=false
@@ -76,3 +76,4 @@ paste_button=2
 menu_button=3
 window_columns=80
 window_rows=24
+new_tab_after_current=true