.bashrc

@@ -21,8 +21,7 @@ alias xp="xprop | awk '/^WM_CLASS/{sub(/.* =/, \"instance:\"); sub(/,/, \"\nclas
 alias gs='git status'
 alias ga='git add'
 alias gc='git commit'
-alias gp='git pull'
-alias gP='git push'
+alias gp='git push'
 
 alias nvcfg='nvim ~/.config/nvim/init.vim'
 

.config/nvim/UltiSnips/tex.snippets

@@ -238,16 +238,31 @@ snippet ooo "\infty" iA
 endsnippet
 
 context "math()"
-snippet nn "hn" iA
-[n]
+snippet hnn "hn" iA
+h[n]
 endsnippet
 
 context "math()"
-snippet tt "ht" iA
-(t)
+snippet htt "ht" iA
+h(t)
 endsnippet
 
 context "math()"
-snippet ss "hs" iA
-(s)
+snippet xnn "xn" iA
+x[n]
+endsnippet
+
+context "math()"
+snippet xtt "xt" iA
+x(t)
+endsnippet
+
+context "math()"
+snippet ynn "yn" iA
+y[n]
+endsnippet
+
+context "math()"
+snippet ytt "yt" iA
+y(t)
 endsnippet

.config/nvim/ftplugin/tex.vim

@@ -27,4 +27,3 @@ let g:vimtex_syntax_conceal = {
           \ 'sections': 1,
           \ 'styles': 1,
           \}
-set textwidth=80

.config/nvim/init.vim

@@ -73,7 +73,6 @@ Plug 'folke/trouble.nvim'
 Plug 'nvim-telescope/telescope.nvim'
 Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'make' }
 Plug 'nvim-telescope/telescope-ui-select.nvim'
-Plug 'nvim-neorg/neorg-telescope'
 Plug 'kyazdani42/nvim-web-devicons'
 
 " Debugging
@@ -90,9 +89,6 @@ Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'lewis6991/spellsitter.nvim'
 Plug 'nvim-treesitter/playground'
 
-" Neorg
-Plug 'nvim-neorg/neorg'
-
 " Copilot
 " Plug 'github/copilot.vim'
 endif
@@ -266,8 +262,7 @@ let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
 
 " Fugitive Config {{{
 nnoremap <leader>gs :G<CR>
-nnoremap <leader>gp :G pull<CR>
-nnoremap <leader>gP :G push<CR>
+nnoremap <leader>gp :G push<CR>
 set updatetime=100
 " }}}
 
@@ -278,9 +273,9 @@ let g:vifm_replace_netrw = 1
 let g:vifm_embed_split = 1
 let g:vifm_exec = "vifmrun"
 nnoremap <silent> gx :!xdg-open <c-r>=shellescape(expand('<cfile>'))<cr><cr>
-command! Vex vertical VsplitVifm
-command! Sex SplitVifm
-command! Ex Vifm
+command Vex vertical VsplitVifm
+command Sex SplitVifm
+command Ex Vifm
 " }}}
 
 " Markdown config {{{
@@ -408,7 +403,6 @@ if has("nvim")
 		sources = cmp.config.sources({
 			{ name = 'copilot' },
 			{ name = 'nvim_lsp' },
-			{ name = 'neorg' },
 			{ name = 'nvim_lua' },
 			{ name = 'ultisnips' },
 			{ name = 'spell',
@@ -464,14 +458,7 @@ if has("nvim")
 
 	require('lspconfig')['texlab'].setup({ capabilities = capabilities, on_attach = on_attach })
 
-	require('rust-tools').setup({ server = {capabilities = capabilities, 
-		on_attach = function(client, bufnr) 
-			on_attach(client, bufnr);
-			local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
-			buf_set_keymap('n', '<leader>c', '<Cmd>lua require\'rust-tools\'.open_cargo_toml.open_cargo_toml()<CR>', {noremap = true})
-		end 
-		}
-	})
+	require('rust-tools').setup({ server = {capabilities = capabilities, on_attach = on_attach } })
 
 	--[[
 	require('lean').setup{ --{{{
@@ -542,42 +529,6 @@ if has("nvim")
     -- or leave it empty to use the default settings
     -- refer to the configuration section below
 	}
-
-	require('neorg').setup {
-		load = {
-        	["core.defaults"] = {},
-			["core.norg.completion"] = {
-				config = { -- Note that this table is optional and doesn't need to be provided
-					engine = 'nvim-cmp',
-				}
-			},
-			["core.integrations.nvim-cmp"] = {
-				config = { -- Note that this table is optional and doesn't need to be provided
-					-- Configuration here
-				}
-			},
-			["core.norg.concealer"] = {
-				config = { -- Note that this table is optional and doesn't need to be provided
-					-- Configuration here
-				}
-			},
-			["core.norg.dirman"] = {
-				config = {
-					workspaces = {
-						example_gtd = "~/GitHub/example_workspaces/gtd",
-						neorg = "~/neorg",
-					},
-					default_workspace = "neorg",
-				},
-			},
-			["core.gtd.base"] = {
-				config = {
-					workspace = "neorg",
-				},
-			},
-			["core.integrations.telescope"] = {}, -- Enable the telescope module
-    	}
-	}
 EOF
 endif