From 8bf9cb689276d067a1f18aa5df509cf38b187038 Mon Sep 17 00:00:00 2001
From: Ethan Simmons <eesimmons9105@gmail.com>
Date: Tue, 26 Mar 2024 15:03:20 -0500
Subject: [PATCH] Updated Desktop dotfiles

---
 desktop/alacritty/alacritty.toml              |   2 +-
 desktop/nvim/lua/config/keymaps.lua           |   5 ++-
 desktop/nvim/lua/config/plugins/init.lua      |  13 +++++--
 desktop/nvim/lua/config/plugins/lspconfig.lua |  32 ++++++++++++++++--
 desktop/nvim/lua/config/settings.lua          |   4 ++-
 ...%eesim%.config%nvim%lua%config%keymaps.lua | Bin 0 -> 6925 bytes
 ...nfig%nvim%lua%config%plugins%lspconfig.lua | Bin 0 -> 17906 bytes
 desktop/sway/config                           |  28 +++++++++------
 8 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%keymaps.lua
 create mode 100644 desktop/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%plugins%lspconfig.lua

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 0000000000000000000000000000000000000000..9fc01db2562fe6378d92adc32552c927692007c0
GIT binary patch
literal 6925
zcmeI0&1w`u5P*B#_!BiTB*w(3D0qk=x+u6gc@eyM6Z9$`A_TLEU<l?Udsa^>coS4S
z<RGYsQ3Ul3d;>uc^#R1A*4NXuscCm-VR81<1--ph-8IuwUv>9PUs`B9y0~<1`J1br
z-T3|d_Wd(IzaG7_{P5}O;-|scp)U_^&iz<i`Ec*<tqab%JyM2O7aFx|^J|SO*K0TC
zSJWzXMaqyAgj$QcTAi62pta&If2LJrOIG<`ns%%HN5o%B4XOUm5fB_x9*1+kCgs|@
zq-gj-;p$Cq_YLUY$e$o<!4TW)O^+9IRr^W}YRwCm@S4b!@;AoY3ccLT6Z3GbwFNw9
z)b3J0j!3JTrAcpI!)+dZKx|L+;-MWIlHCh0%`NS?Rcz0KVr_Y^?WiK!1ARU6(mo-P
zNnE`>uH4u!fhZ}Fi9(qoiG0|uQ#NA&7wts4YSGPhWr&b`q2w`$=nfQM1D8xv0X(oN
z2{u6}Rl30*$-j0So3Xe(BQreEzAVNK-fhMO^ju~HTbkQMp-d6nvqf`zG{QYSodfPE
zneoB;RRmnsFuwt;>pPyn2lyyT0!|dl6ajvs2>4hGd?`=dV=@C|ioaIG!5*#X5Z+;2
zpbzoA*b;G~P^NSvKK?K9<41C{+=DVhgzuYT<}e;KF7Su>IJU%`D3mF}yjC>JC)zQO
z)^?A|43eFCBciTv<(nS``+|pl9H71pUe<;^><Hw>PV^w;4Y@Lbo^pjKlqr%cCyR1r
zvTd%M&u<H!l^G>V#Jeb2qHO`p9C@ga0$|^dAz>#9Wr|=wRfK)21NLZd@U+Z0f&9K0
zJfQWQ3r~_DfhQ7u5dnX?2>ij0;G+#f(OcSz-r9Jou+)Rv9#fG92|WSoi*!SOpfmd1
z3t<oB?S$u9$$~__FVwk-kgxkmU&#(|?ZF&#wa3+-PdlCR+y>FpoXvN_Ls>)Xq;E|0
Qk70$-mjY}^z4?9pFD{z^HUIzs

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8b13c258f11d5f85e0dc20368f0a048efd2c0c7f
GIT binary patch
literal 17906
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

literal 0
HcmV?d00001

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