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 wildmode=longest,list,full " enable autocomplete
-set smartcase " ignore case if lowercase, match case if uppercase used
-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/tmux/tmux.conf

@@ -0,0 +1,20 @@
+#CONFIGURATION
+set-option -g prefix C-a # rebind tmux prefix to CTRL + a because vim uses default CTRL + b
+bind-key C-a last-window # double-press of CTRL + a (tmux prefix) switches to previous window
+set-window-option -g mode-keys vi # vi mode
+set-option -g allow-rename off # dont rename windows on command execution TODO fix
+set -s escape-time 0 # dont delay escape key in vim
+set -g base-index 1           # start windows numbering at 1
+
+#COLORS
+set -g default-terminal "screen-256color" # use default terminal colors
+set-option -g pane-border-style fg=white
+set-option -g pane-active-border-style fg=green
+set-option -g message-style bg=green,fg=black
+
+#STATUSBAR
+set -g status-position bottom
+set -g status-left ""
+set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,}#{=21:pane_title}"
+set -g status-style fg=black,bg=red # color for the statusbar
+set-window-option -g window-status-current-style fg=green,bg=black # color for the current window (tab)

.config/xfce4/terminal/terminalrc

@@ -1,44 +0,0 @@
-[Configuration]
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_UNDERLINE
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=TRUE
-MiscMouseAutohide=FALSE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=FALSE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-ScrollingLines=999999
-BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
-BackgroundDarkness=0,920000
-MiscBellUrgent=FALSE
-MiscMouseWheelZoom=TRUE
-MiscMiddleClickOpensUri=TRUE
-MiscCopyOnSelect=FALSE
-MiscShowRelaunchDialog=TRUE
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=TRUE
-MiscNewTabAdjacent=FALSE
-MiscSearchDialogOpacity=100
-MiscShowUnsafePasteDialog=TRUE
-ColorForeground=#f8f8f8f8f2f2
-ColorBackground=#19191a1a1717
-ColorCursor=#f8f8f8f8f2f2
-ColorPalette=#272728282222;#f9f926267272;#a6a6e2e22e2e;#f4f4bfbf7575;#6666d9d9efef;#aeae8181ffff;#a1a1efefe4e4;#f8f8f8f8f2f2;#757571715e5e;#f9f926267272;#a6a6e2e22e2e;#f4f4bfbf7575;#6666d9d9efef;#aeae8181ffff;#a1a1efefe4e4;#f9f9f8f8f5f5
-TabActivityColor=#a6a6e2e22e2e
-CustomCommand=zsh
-TitleMode=TERMINAL_TITLE_REPLACE
-DropdownKeepOpenDefault=TRUE
-DropdownKeepAbove=FALSE
-DropdownStatusIcon=FALSE
-ShortcutsNoHelpkey=TRUE
-ShortcutsNoMenukey=TRUE
-

.config/zsh/.zshrc

@@ -66,7 +66,8 @@ alias df='df -h'                                                					# Human-rea
 alias free='free -m'
 alias vi='nvim'                                            					# Show sizes in MB
 alias ll='ls -l'
-alias la='ls -a'
+alias la='ls --almost-all'
+alias r='R'
 # Add an "alert" alias for long running commands.  Use like so: 'sleep 10; alert'
 alias notify='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 #Add a "dotfiles" alias for .dotfile git repo
@@ -121,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

.profile

@@ -1,4 +1,23 @@
+# Clean Up Home Directory
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+export TS3_CONFIG_DIR="$XDG_CONFIG_HOME/ts3client"
+export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
+export CARGO_HOME="$XDG_DATA_HOME/cargo" 
+export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter"
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java"
+export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" 
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+export WGETRC="$XDG_CONFIG_HOME/wgetrc"
+alias wget='wget --hsts-file="$XDG_CACHE_HOME/wget-hsts"'
+alias yarn='yarn --use-yarnrc "$XDG_CONFIG_HOME/yarn/config"'
+alias code='code --extensions-dir "$XDG_DATA_HOME/vscode"'
+alias vscodium='vscodium --extensions-dir "$XDG_DATA_HOME/vscode"'
+
 export EDITOR=/usr/bin/nvim
+export BROWSER=/usr/bin/firefox
 export QT_QPA_PLATFORMTHEME="qt5ct"
 export QT_AUTO_SCREEN_SCALE_FACTOR=0
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0"