Merge branch 'desktop' into headless

.config/nvim/init.lua

@@ -0,0 +1,30 @@
+require("plugins")
+require("keybinds")
+-- GENERAL SETTINGS
+vim.o.termguicolors = true
+vim.cmd('colorscheme monokai') -- set colorscheme
+vim.o.syntax = 'on'
+vim.o.errorbells = false
+vim.o.smartcase = true
+vim.o.showmode = true
+vim.o.ignorecase = true -- case-insensitive search
+vim.bo.swapfile = false
+vim.o.backup = false
+vim.o.undodir = vim.fn.stdpath('config') .. '/undodir'
+vim.o.undofile = true
+vim.o.incsearch = true
+vim.o.hidden = true
+vim.o.completeopt='menuone,noinsert,noselect'
+vim.bo.autoindent = true
+vim.bo.smartindent = true
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
+vim.o.shiftwidth = 2
+vim.o.expandtab = true
+vim.wo.number = true
+vim.wo.relativenumber = true
+vim.o.scrolloff = 8
+vim.wo.signcolumn = 'yes'
+vim.wo.wrap = false
+vim.opt.cursorline = true
+

.config/nvim/init.vim

@@ -1,36 +0,0 @@
-"LOAD VIM-PLUG
-if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"'))
-	echo "Downloading junegunn/vim-plug to manage plugins..."
-	silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/
-	silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim
-	autocmd VimEnter * PlugInstall
-endif
-
-" SETTINGS SECTION
-colorscheme monokai " enable monokai theme
-set noerrorbells " disable error bells if not disabled by terminal
-set nocompatible " Disable old VI compatibility
-syntax enable " Syntax highlighting
-set showmode " Show current mode
-set number " Show line numbers
-set relativenumber "show relative line numbers except for the one im on
-set visualbell " Blink cursor on error instead of beeping 
-set incsearch " search while typing
-set smartcase " ignore case if lowercase, match case if uppercase used
-set wildmode=longest,list,full " enable autocomplete
-set tabstop=4 softtabstop=4 " replace tabs with 4 spaces
-"set expandtab
-set smartindent 
-set termguicolors " colors???
-set exrc
-set scrolloff=8
-set completeopt=menuone,noinsert,noselect
-set signcolumn=yes
-
-"PLUGINS SECTION
-call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"'))
-Plug 'lervag/vimtex'
-call plug#end()
-
-"KEYBINDS SECTION
-

.config/nvim/lua/keybinds.lua

@@ -0,0 +1 @@
+-- filetype-specific keybinds can be found in the ftplugin folder, requires 'filetype plugin on'

.config/nvim/lua/plugins.lua

@@ -0,0 +1,32 @@
+-- INSTALL PACKER PLUGINS https://github.com/wbthomason/packer.nvim#bootstrapping
+local vim = vim
+local execute = vim.api.nvim_command
+local fn = vim.fn
+local install_path = fn.stdpath('data')..'/site/pack/packer/opt/packer.nvim'
+if fn.empty(fn.glob(install_path)) > 0 then
+    execute('!git clone https://github.com/wbthomason/packer.nvim '..install_path)
+    execute 'packadd packer.nvim'
+end
+vim.cmd('packadd packer.nvim')
+local packer = require'packer'
+local util = require'packer.util'
+packer.init({
+  package_root = util.join_paths(vim.fn.stdpath('data'), 'site', 'pack')
+})
+--- startup and add configure plugins
+packer.startup(function()
+  local use = use
+  use 'neovim/nvim-lspconfig'
+  use 'nvim-treesitter/nvim-treesitter'
+  end
+)
+--[[ PLUGIN CONFIGURATION
+local configs = require'nvim-treesitter.configs'
+configs.setup {
+  ensure_installed = "maintained",
+  highlight = {
+    enable = true,
+  }
+}
+]]--
+

.config/zsh/.zshrc

@@ -122,7 +122,7 @@ source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zs
 	#ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]=fg=009
 	#ZSH_HIGHLIGHT_STYLES[assign]=none
 
-	[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh									# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+	[[ ! -f "$ZDOTDIR/p10k.zsh" ]] || source "$ZDOTDIR/p10k.zsh"									# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 
 
 source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh 			# load fish-completion, needs to be sourced after syntax highlighting