From f84de51208fa354cf2fef17ddf9c079d53fe06fc Mon Sep 17 00:00:00 2001
From: simonkellet <simon@simonkellet.xyz>
Date: Wed, 6 Sep 2023 20:17:38 +0100
Subject: [PATCH] chnages

---
 i3/config                   | 17 ++++++++++-------
 nvim/UltiSnips/beg          |  5 +++++
 nvim/UltiSnips/std.snippets |  3 +++
 nvim/init.vim               | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 nvim/UltiSnips/beg
 create mode 100644 nvim/UltiSnips/std.snippets

diff --git a/i3/config b/i3/config
index cbd6c48..8ee01bf 100644
--- a/i3/config
+++ b/i3/config
@@ -62,7 +62,7 @@ client.focused_inactive #44475A #44475A #F8F8F2 #44475A   #44475A
 client.unfocused        #282A36 #282A36 #BFBFBF #282A36   #282A36
 client.urgent           #44475A #FF5555 #F8F8F2 #FF5555   #FF5555
 client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
-
+#
 client.background       #F8F8F2
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
@@ -77,10 +77,11 @@ exec --no-startup-id autotiling
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
 exec --no-startup-id bash ~/.fehbg &
-exec --no-startup-id guake
+# exec --no-startup-id guake #retire until its fixed?
 exec --no-startup-id picom -c
 exec --no-startup-id xfce4-power-manager
-exec --no-startup-id gammy 
+exec --no-startup-id gammy
+exec --no-startup-id emacs --daemon
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -108,7 +109,7 @@ bindsym $mod+KP_Next exec --no-startup-id bash ~/.scripts/tf2
 bindsym $mod+KP_Left exec --no-startup-id bash ~/.scripts/one-mon.sh
 
 # Make a note and push via gotify
-bindsym $mod+n exec --no-startup-id bash ~/.scripts/gnote
+#bindsym $mod+n exec --no-startup-id bash ~/.scripts/gnote # replaced with QOwnNotes as i use it more
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -204,13 +205,15 @@ bindsym $mod+shift+BackSpace	gaps inner all set 0; gaps outer all set 0
 #### Programs
 bindsym $mod+Return exec kitty 
 bindsym $mod+Shift+Return exec alacritty -e ~/.scripts/web
-bindsym $mod+Ctrl+Return exec alacritty -e ~/.scripts/mc
+# bindsym $mod+Ctrl+Return exec alacritty -e ~/.scripts/mc #BRING BACK THE MC SERVER???
 bindsym $mod+x exec xinput-gui
 bindsym $mod+c exec brave https://calendar.google.com/calendar/u/0/r?pli=1
 bindsym $mod+Shift+b exec blueman-manager
 bindsym $mod+p exec bwmenu
-bindsym $mod+Shift+f exec --no-startup-id nautilus
-bindsym $mod+Ctrl+f exec --no-startup-id alacritty -e ranger 
+bindsym $mod+Shift+f exec --no-startup-id thunar
+bindsym $mod+Ctrl+f exec --no-startup-id alacritty -e ranger
+bindsym $mod+e exec emacsclient -c -a 'emacs'
+bindsym $mod+n exec --no-startup-id QOwnNotes
 
 # Print Screen :::
 #WHOLE SCREEN
diff --git a/nvim/UltiSnips/beg b/nvim/UltiSnips/beg
new file mode 100644
index 0000000..1b22394
--- /dev/null
+++ b/nvim/UltiSnips/beg
@@ -0,0 +1,5 @@
+snippet beg "begin{} / end{}" bA
+\begin{$1}
+	$0
+\end{$1}
+endsnippet
diff --git a/nvim/UltiSnips/std.snippets b/nvim/UltiSnips/std.snippets
new file mode 100644
index 0000000..d3f4dfd
--- /dev/null
+++ b/nvim/UltiSnips/std.snippets
@@ -0,0 +1,3 @@
+snippet std "use namespace std" b
+using namespace std;
+endsnippet
diff --git a/nvim/init.vim b/nvim/init.vim
index dee4e4b..762c744 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -53,6 +53,7 @@ Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'}
 set completeopt-=preview
 " Go related keybinds
 autocmd FileType go nmap <leader>r  <Plug>(go-run)
+
 " Move through errors easier!
 map <C-n> :cnext<CR>
 map <C-m> :cprevious<CR>
@@ -72,6 +73,8 @@ autocmd FileType go nmap <leader>b :<C-u>call <SID>build_go_files()<CR>
 let g:go_def_mode='gopls'
 let g:go_info_mode='gopls'
 let g:go_list_type = "quickfix"
+let g:go_gopls_complete_unimported = 1
+let g:go_gopls_use_placeholders = 1
 
 set autowrite
 """"""""""""""""""""""""""""""GO""""""""""""""""""""""""""""""""""""""""
@@ -135,6 +138,8 @@ Plug 'mattn/calendar-vim'
 
 " Animate
 " Plug 'camspiers/animate.vim'
+
+" Lens
 Plug 'camspiers/lens.vim'
 
 " Better Syntax Support
@@ -290,6 +295,17 @@ nnoremap <leader>T :VimwikiTable<CR>
 " Rust
 let g:rustfmt_autosave = 1
 
+" C
+let g:clang_complete_auto = 0
+let g:clang_auto_select = 0
+let g:neoformat_cpp_clangformat = {
+    \ 'exe': 'clang-format',
+    \ 'args': ['--style="{IndentWidth: 4}"']
+\}
+let g:neoformat_enabled_cpp = ['clangformat']
+let g:neoformat_enabled_c = ['clangformat']
+
+
 " Fullscreen on nvim in kitty term
 "autocmd VimLeave * :silent !kitty @ set-spacing padding=20 margin=20
 "autocmd VimEnter * :silent !kitty @ set-spacing padding=0 margin=0