RAGH

4 files changed, 16 insertions, 15 deletions

diff --git a/.config/i3/config b/.config/i3/config
index f7f62c9..982dea7 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -36,7 +36,6 @@ for_window [instance="Godot_Engine"] floating enable
 tiling_drag modifier titlebar
 
 bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+b exec librewolf
 
 bindsym $mod+Shift+q kill
 
@@ -59,15 +58,15 @@ bindsym $mod+v split v
 
 bindsym $mod+f fullscreen toggle
 
-bindsym $mod+s layout stacking
+bindsym $mod+y layout stacking
 bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
+bindsym $mod+p layout toggle split
 
 bindsym $mod+Shift+space floating toggle
 
 bindsym $mod+space focus mode_toggle
 
-bindsym $mod+a focus parent
+bindsym $mod+b focus parent
 
 
 set $ws1 "1"
@@ -125,8 +124,7 @@ client.background       #ffffff
 
 mode "resize" {
   bindsym $left resize shrink width 10 px or 10 ppt
-  bindsym $up resize grow height 10 px or 10 ppt
-  bindsym $down resize shrink height 10 px or 10 ppt
+  bindsym $up resize grow height 10 px or 10 ppt  bindsym $down resize shrink height 10 px or 10 ppt
   bindsym $right resize grow width 10 px or 10 ppt
 
   bindsym Return mode "default"
diff --git a/.config/nvim/ftdetect/hobbylang.vim b/.config/nvim/ftdetect/hobbylang.vim
index 263edde..ea320c0 100644
--- a/.config/nvim/ftdetect/hobbylang.vim
+++ b/.config/nvim/ftdetect/hobbylang.vim
@@ -1 +1 @@
-au BufNewFile,BufRead *.hl set filetype=hobbylang
+au BufNewFile,BufRead *.hs set filetype=hobbylang
diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua
index ef97bd1..2ae706b 100644
--- a/.config/nvim/lua/map.lua
+++ b/.config/nvim/lua/map.lua
@@ -25,9 +25,9 @@ vim.keymap.set(nv, "<C-l>", "<C-w>l", {})
 
 -- Same, but for terminal
 vim.keymap.set("t", "<C-h>", "<C-\\><C-n><C-w>h", {})
-vim.keymap.set("t", "<C-j>", "<C-\\><C-n><C-w>j", {})
-vim.keymap.set("t", "<C-k>", "<C-\\><C-n><C-w>k", {})
-vim.keymap.set("t", "<C-l>", "<C-\\><C-n><C-w>l", {})
+vim.keymap.set("t", "<C-t>", "<C-\\><C-n><C-w>j", {})
+vim.keymap.set("t", "<C-n>", "<C-\\><C-n><C-w>k", {})
+vim.keymap.set("t", "<C-s>", "<C-\\><C-n><C-w>l", {})
 
 -- Moving windows
 vim.keymap.set(nv, "<C-w>h", "<C-w>H", {})
diff --git a/.config/nvim/syntax/hobbylang.vim b/.config/nvim/syntax/hobbylang.vim
index e1953d0..cb02b5b 100644
--- a/.config/nvim/syntax/hobbylang.vim
+++ b/.config/nvim/syntax/hobbylang.vim
@@ -3,11 +3,11 @@ if exists("b:current_syntax")
 endif
 
 syn keyword hlStatement   break continue return self
-syn keyword hlLabel       case default
+syn keyword hlLabel       case
 syn keyword hlConditional if else match
 syn keyword hlRepeat      while loop for
 syn keyword hlStructure   struct enum var func
-syn keyword hlModifier    static
+syn keyword hlModifier    static global
 syn keyword hlLiteral     true false nil
 
 syn match   hlFunction    /\<\h\w*\ze\_s*(/
@@ -16,11 +16,14 @@ syn match   hlComment     /\/\/.*/
 syn match   hlType        /[^a-z0-9_][A-Z][A-z0-9_]*/
 syn match   hlNumber      /\<\d\+\>/
 syn match   hlNumber      /\<\d\+\.\d*/
-syn match   hlOperator    /=|\+=|-=|\*=|\/=|%=|\*\*=|\+|-|\*\*|\*|\/|%|<|>|<=|>=|==|!=|!|\.\./
+syn match   hlOperator    /=|\+=|-=|\*=|\/=|%=|\*\*=|\+|-|\*\*|\*|\/|%|\<|\>|\<=|\>=|==|!=|!|\.\./
 
-syn region  hlString      start="\"" end="\""
-syn region  hlString      start="'"  end="'"
+syn region  hlString      start="\"" end="\"" contains=hlEscape
+syn region  hlString      start="'"  end="'" contains=hlEscape
 
+syn match   hlEscape      /\\[ntra"'\\]/
+
+hi def link hlEscape      Special
 hi def link hlStructure   Structure
 hi def link hlFunction    Function 
 hi def link hlStatement   Statement