diff --git a/desktop/alacritty/alacritty.toml b/desktop/alacritty/alacritty.toml
index b13a4c3..a02b498 100644
--- a/desktop/alacritty/alacritty.toml
+++ b/desktop/alacritty/alacritty.toml
@@ -10,4 +10,4 @@ family = "Codelia Nerd Font"
 style = "Regular"
 
 [shell]
-program = "/bin/zsh"
+program = "/usr/bin/fish"
diff --git a/desktop/nvim/lua/config/keymaps.lua b/desktop/nvim/lua/config/keymaps.lua
index c580761..c098e41 100644
--- a/desktop/nvim/lua/config/keymaps.lua
+++ b/desktop/nvim/lua/config/keymaps.lua
@@ -1,4 +1,5 @@
 vim.g.mapleader=','
+vim.g.maplocalleader=','
 
 vim.keymap.set('n', '<C-h>', '<C-w>h')
 vim.keymap.set('n', '<C-j>', '<C-w>j')
@@ -7,6 +8,8 @@ vim.keymap.set('n', '<C-l>', '<C-w>l')
 
 vim.keymap.set('n', '<leader>ff', ':FzfLua files<CR>')
 vim.keymap.set('n', '<leader>fb', ':FzfLua buffers<CR>')
-vim.keymap.set('n', '<leader>rg', ':FzfLua grep<CR>')
+vim.keymap.set('n', '<leader>rg', ':FzfLua grep_project<CR>')
 
 vim.keymap.set('i', '<S-Tab>', '<C-d>')
+
+vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
diff --git a/desktop/nvim/lua/config/plugins/init.lua b/desktop/nvim/lua/config/plugins/init.lua
index 6b48bb3..615e251 100644
--- a/desktop/nvim/lua/config/plugins/init.lua
+++ b/desktop/nvim/lua/config/plugins/init.lua
@@ -17,15 +17,22 @@ local plugins = {
     'hrsh7th/nvim-cmp',
     'hrsh7th/cmp-nvim-lsp',
     'hrsh7th/cmp-path',
-
-    'rust-lang/rust.vim',
+    'L3MON4D3/LuaSnip',
 
     {
     'windwp/nvim-autopairs',
     event = 'InsertEnter',
-    opts={},
+    opts = {},
     },
 
+    {
+    'kaarmu/typst.vim',
+    ft = 'typst',
+    lazy = false,
+    },
+
+    'jalvesaq/Nvim-R',
+
 }
 
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
diff --git a/desktop/nvim/lua/config/plugins/lspconfig.lua b/desktop/nvim/lua/config/plugins/lspconfig.lua
index 68d653a..ed7b6b5 100644
--- a/desktop/nvim/lua/config/plugins/lspconfig.lua
+++ b/desktop/nvim/lua/config/plugins/lspconfig.lua
@@ -1,17 +1,41 @@
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = false;
 
 local lspconfig = require('lspconfig')
 
-local servers = {'ccls', 'rust_analyzer', 'pylsp'}
+lspconfig.rust_analyzer.setup {
+    capabilities = capabilities,
+    settings = {
+        ["rust-analyzer"] = {
+            cargo = {
+                allFeatures = true,
+            },
+            imports = {
+                group = {
+                    enable = false,
+                },
+            },
+            completion = {
+                postfix = {
+                    enable = false,
+                },
+            },
+        },
+    },
+}
 
-for _, lsp in ipairs(servers) do
+local default_servers = {'ccls', 'pylsp', 'typst_lsp', 'r_language_server'}
+
+for _, lsp in ipairs(default_servers) do
     lspconfig[lsp].setup {
         capabilities = capabilities
     }
 end
 
+local luasnip = require 'luasnip'
 local cmp = require 'cmp'
 
+
 cmp.setup {
     preselect = cmp.PreselectMode.None,
     mapping = cmp.mapping.preset.insert({
@@ -32,6 +56,8 @@ cmp.setup {
     }),
     sources = {
         { name = 'nvim_lsp' },
-        { name = 'path' }
+        { name = 'path' },
     },
 }
+
+
diff --git a/desktop/nvim/lua/config/settings.lua b/desktop/nvim/lua/config/settings.lua
index 2abc96c..494b2fd 100644
--- a/desktop/nvim/lua/config/settings.lua
+++ b/desktop/nvim/lua/config/settings.lua
@@ -31,8 +31,10 @@ vim.opt.wrapscan=true
 vim.opt.report=0
 
 vim.opt.list=true
-vim.opt.completeopt=menuone,noselect,noinsert
+vim.opt.completeopt=menuone,noselect
 
+vim.opt.undodir='~/.vimdid'
+vim.opt.undofile=true
 
 vim.g['loaded_perl_provider']=0
 vim.g['python3_host_prog']='/usr/bin/python'
diff --git a/desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%keymaps.lua b/desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%keymaps.lua
new file mode 100644
index 0000000..9fc01db
Binary files /dev/null and b/desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%keymaps.lua differ
diff --git a/desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%plugins%lspconfig.lua b/desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%plugins%lspconfig.lua
new file mode 100644
index 0000000..8b13c25
Binary files /dev/null and b/desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%plugins%lspconfig.lua differ
diff --git a/desktop/sway/config b/desktop/sway/config
index 03046eb..b5d7b75 100644
--- a/desktop/sway/config
+++ b/desktop/sway/config
@@ -36,7 +36,7 @@ bindsym $mod+Return exec alacritty
 bindsym $mod+Control+f exec MOZ_ENABLE_WAYLAND=1 firefox
 bindsym $mod+Control+s exec steam
 bindsym $mod+Control+t exec thunar
-bindsym $mod+Control+d exec discord
+bindsym $mod+Control+d exec vesktop --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer
 bindsym $mod+Control+x exec strawberry
 bindsym $mod+Control+q exec qbittorrent
 bindsym $mod+Control+h exec helvum
@@ -152,12 +152,17 @@ workspace $ws10 output $MonitorB
 set $opacity 0.9
 for_window [app_id="de.shorsh.discord-screenaudio"] opacity $opacity
 for_window [class="discord"] opacity $opacity
+for_window [class="vesktop"] opacity &opacity
 for_window [app_id="Alacritty"] opacity $opacity
 
 for_window [class="gamescope"] fullscreen
 for_window [app_id="gamescope"] fullscreen
 for_window [app_id="mpv"] fullscreen
 
+
+for_window [app_id="relm4.test.simple"] floating enable
+
+
 # Workspace 1
 
 # Workspace 2
@@ -208,16 +213,16 @@ mode "resize" {
         # Pressing right will grow the window’s width.
         # Pressing up will shrink the window’s height.
         # Pressing down will grow the window’s height.
-        bindsym h resize shrink width 10 px
-        bindsym j resize grow height 10 px
-        bindsym k resize shrink height 10 px
-        bindsym l resize grow width 10 px
+        bindsym h resize shrink width 20 px
+        bindsym j resize grow height 20 px
+        bindsym k resize shrink height 20 px
+        bindsym l resize grow width 20 px
 
         # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px
-        bindsym Down resize grow height 10 px
-        bindsym Up resize shrink height 10 px
-        bindsym Right resize grow width 10 px
+        bindsym Left resize shrink width 20 px
+        bindsym Down resize grow height 20 px
+        bindsym Up resize shrink height 20 px
+        bindsym Right resize grow width 20 px
 
         # back to normal: Enter or Escape or $mod+r
         bindsym Return mode "default"
@@ -262,17 +267,18 @@ output HDMI-A-1 mode 1920x1080@75Hz pos 3440 0
 
 
 exec --no-startup-id openrgb --startminimized
-exec --no-startup-id sway-audio-idle-inhibit
 exec --no-startup-id ydotoold
 exec --no-startup-id easyeffects --gapplication-service
+exec --no-startup-id wayland-pipewire-idle-inhibit
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec --no-startup-id protonmail-bridge
 exec --no-startup-id swayidle -w \
                         timeout 300 'swaymsg "output * dpms off"' \
                         resume '/home/eesim/Scripts/ResumeMonitor.sh'
 
 exec vorta
 exec MOZ_ENABLE_WAYLAND=1 firefox
-exec discord
+exec vesktop --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
 exec sleep 0.2 && swww init