diff --git a/git/.gitconfig b/git/.gitconfig
index 65ec049..b8fcc02 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,8 +3,14 @@
 	name = Gabe Venberg
 [alias]
 	hist = log --graph --date-order --date=short --pretty=format:'%C(auto)%h%d %C(reset)%s %C(bold blue)%ce %C(reset)%C(green)%cr (%cd)'
-	graph = log --graph --date-order --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) (%C(bold red)%an%C(reset)/%C(bold cyan)%ae%C(reset)) - %C(white)%s%C(reset)%C(yellow)%d%C(reset)' --all
+	graph = log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'
 [init]
 	defaultBranch = trunk
 [push]
 	autoSetupRemote = true
+[difftool]
+	prompt = false
+[diff]
+    tool = nvimdiff
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 93147aa..bf78d90 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -191,9 +191,10 @@ font pango:DejaVu Sans Mono 8
 		bindsym $mod+control+plus exec --no-startup-id "xbacklight -inc 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
 		bindsym $mod+control+minus exec --no-startup-id "xbacklight -dec 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
 
-	#screenshot everything with mod+s, current window with mod+shift+s
+	#screenshot everything with mod+s, current window with mod+shift+s, selection with mod+ctrl+s
 		bindsym $mod+s exec --no-startup-id "maim ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Whole-desktop screenshot taken'"
 		bindsym $mod+shift+s exec --no-startup-id "maim -i $(xdotool getactivewindow) ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Window screenshot taken'"
+		bindsym $mod+ctrl+s exec --no-startup-id "maim -s ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Whole-desktop screenshot taken'"
 
 	#colour picker with xcolor
 		bindsym --release $mod+c exec --no-startup-id "xcolor -s"
diff --git a/neovim/.config/nvim/lua/packages.lua b/neovim/.config/nvim/lua/packages.lua
index f5a2910..d283bc4 100644
--- a/neovim/.config/nvim/lua/packages.lua
+++ b/neovim/.config/nvim/lua/packages.lua
@@ -1,12 +1,12 @@
 -- bootstrapping packer
-local fn=vim.fn
-local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+local fn = vim.fn
+local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
 if fn.empty(fn.glob(install_path)) > 0 then
-	Packer_Bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+	Packer_Bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim',
+		install_path })
 end
 
 return require('packer').startup(function(use)
-
 	--startup speed
 	use 'lewis6991/impatient.nvim'
 
@@ -16,12 +16,38 @@ return require('packer').startup(function(use)
 
 	use { 'nvim-treesitter/nvim-treesitter',
 		run = ':TSUpdate',
-		config=function() require('nvim-treesitter').setup{
-			ensure_installed='maintained',
-			highlight={enable=true},
-			indent={enable=true},
-			incremental_selection={enable=true}
-		}end,
+		config = function()
+			require('nvim-treesitter').setup {
+				ensure_installed = {
+					'c',
+					'lua',
+					'vim',
+					'vimdoc',
+					'query',
+					'bash',
+					'comment',
+					'cpp',
+					'diff',
+					'git_config',
+					'git_rebase',
+					'gitattributes',
+					'gitcommit',
+					'gitignore',
+					'json',
+					'jsonc',
+					'latex',
+					'make',
+					'python',
+					'regex',
+					'rust',
+					'toml',
+				},
+				auto_install = true,
+				highlight = { enable = true },
+				indent = { enable = true },
+				incremental_selection = { enable = true }
+			}
+		end,
 	}
 	use {
 		{
@@ -39,7 +65,7 @@ return require('packer').startup(function(use)
 			end
 		},
 		{
-		    "williamboman/mason-lspconfig.nvim",
+			"williamboman/mason-lspconfig.nvim",
 			after = "mason.nvim",
 			config = function()
 				require("mason-lspconfig").setup({
@@ -51,22 +77,22 @@ return require('packer').startup(function(use)
 						'texlab',
 						'clangd',
 					},
-					automatic_installation=true
+					automatic_installation = true
 				})
 			end
 		},
 		{
 			"neovim/nvim-lspconfig",
-			after = {"mason-lspconfig.nvim", "rust-tools.nvim"},
+			after = { "mason-lspconfig.nvim", "rust-tools.nvim" },
 			config = function()
 				require('LSPconfig')
 			end
 		},
-		{'simrat39/rust-tools.nvim',},
-		{'mfussenegger/nvim-jdtls',},
+		{ 'simrat39/rust-tools.nvim', },
+		{ 'mfussenegger/nvim-jdtls', },
 	}
 
-	use {'hrsh7th/nvim-cmp',
+	use { 'hrsh7th/nvim-cmp',
 		requires = {
 			'neovim/nvim-lspconfig',
 			'hrsh7th/cmp-nvim-lsp',
@@ -83,29 +109,29 @@ return require('packer').startup(function(use)
 			'ray-x/cmp-treesitter',
 			'uga-rosa/cmp-dictionary',
 		},
-        config = function()
+		config = function()
 			require('cmp-lsp')
-        end
+		end
 	}
 
-	use {'L3MON4D3/LuaSnip',
-		requires={
+	use { 'L3MON4D3/LuaSnip',
+		requires = {
 			'rafamadriz/friendly-snippets'
 		},
-		config=function()
+		config = function()
 			require("luasnip.loaders.from_snipmate").load()
 			require("luasnip.loaders.from_vscode").load()
 		end
 	}
 
-	use {'nvim-telescope/telescope.nvim',
+	use { 'nvim-telescope/telescope.nvim',
 		requires = {
-			{'nvim-lua/plenary.nvim'},
-			{'nvim-lua/popup.nvim'},
-			{'nvim-treesitter/nvim-treesitter'},
-			{'nvim-telescope/telescope-symbols.nvim'},
-			{'nvim-telescope/telescope-file-browser.nvim'},
-			{'folke/trouble.nvim'},
+			{ 'nvim-lua/plenary.nvim' },
+			{ 'nvim-lua/popup.nvim' },
+			{ 'nvim-treesitter/nvim-treesitter' },
+			{ 'nvim-telescope/telescope-symbols.nvim' },
+			{ 'nvim-telescope/telescope-file-browser.nvim' },
+			{ 'folke/trouble.nvim' },
 		},
 		config = function()
 			local trouble = require("trouble.providers.telescope")
@@ -121,303 +147,311 @@ return require('packer').startup(function(use)
 	}
 
 	--file browser
-	use {'kyazdani42/nvim-tree.lua',
+	use { 'kyazdani42/nvim-tree.lua',
 		requires = {
-		  'kyazdani42/nvim-web-devicons', -- optional, for file icon
+			'kyazdani42/nvim-web-devicons', -- optional, for file icon
 		},
-		config = function() require'nvim-tree'.setup {
+		config = function()
+			require 'nvim-tree'.setup {
 
-			on_attach = function(bufnr)
-				local api = require('nvim-tree.api')
+				on_attach = function(bufnr)
+					local api = require('nvim-tree.api')
 
-				local function opts(desc)
-					return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
-				end
+					local function opts(desc)
+						return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true,
+							nowait = true }
+					end
 
 
-				-- Default mappings. Feel free to modify or remove as you wish.
-				--
-				-- BEGIN_DEFAULT_ON_ATTACH
-				vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node,          opts('CD'))
-				vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer,     opts('Open: In Place'))
-				vim.keymap.set('n', '<C-k>', api.node.show_info_popup,              opts('Info'))
-				vim.keymap.set('n', '<C-r>', api.fs.rename_sub,                     opts('Rename: Omit Filename'))
-				vim.keymap.set('n', '<C-t>', api.node.open.tab,                     opts('Open: New Tab'))
-				vim.keymap.set('n', '<C-v>', api.node.open.vertical,                opts('Open: Vertical Split'))
-				vim.keymap.set('n', '<C-x>', api.node.open.horizontal,              opts('Open: Horizontal Split'))
-				vim.keymap.set('n', '<BS>',  api.node.navigate.parent_close,        opts('Close Directory'))
-				vim.keymap.set('n', '<CR>',  api.node.open.edit,                    opts('Open'))
-				vim.keymap.set('n', '<Tab>', api.node.open.preview,                 opts('Open Preview'))
-				vim.keymap.set('n', '>',     api.node.navigate.sibling.next,        opts('Next Sibling'))
-				vim.keymap.set('n', '<',     api.node.navigate.sibling.prev,        opts('Previous Sibling'))
-				vim.keymap.set('n', '.',     api.node.run.cmd,                      opts('Run Command'))
-				vim.keymap.set('n', '-',     api.tree.change_root_to_parent,        opts('Up'))
-				vim.keymap.set('n', 'a',     api.fs.create,                         opts('Create'))
-				vim.keymap.set('n', 'bmv',   api.marks.bulk.move,                   opts('Move Bookmarked'))
-				vim.keymap.set('n', 'B',     api.tree.toggle_no_buffer_filter,      opts('Toggle No Buffer'))
-				vim.keymap.set('n', 'c',     api.fs.copy.node,                      opts('Copy'))
-				vim.keymap.set('n', 'C',     api.tree.toggle_git_clean_filter,      opts('Toggle Git Clean'))
-				vim.keymap.set('n', '[c',    api.node.navigate.git.prev,            opts('Prev Git'))
-				vim.keymap.set('n', ']c',    api.node.navigate.git.next,            opts('Next Git'))
-				vim.keymap.set('n', 'd',     api.fs.remove,                         opts('Delete'))
-				vim.keymap.set('n', 'D',     api.fs.trash,                          opts('Trash'))
-				vim.keymap.set('n', 'E',     api.tree.expand_all,                   opts('Expand All'))
-				vim.keymap.set('n', 'e',     api.fs.rename_basename,                opts('Rename: Basename'))
-				vim.keymap.set('n', ']e',    api.node.navigate.diagnostics.next,    opts('Next Diagnostic'))
-				vim.keymap.set('n', '[e',    api.node.navigate.diagnostics.prev,    opts('Prev Diagnostic'))
-				vim.keymap.set('n', 'F',     api.live_filter.clear,                 opts('Clean Filter'))
-				vim.keymap.set('n', 'f',     api.live_filter.start,                 opts('Filter'))
-				vim.keymap.set('n', 'g?',    api.tree.toggle_help,                  opts('Help'))
-				vim.keymap.set('n', 'gy',    api.fs.copy.absolute_path,             opts('Copy Absolute Path'))
-				vim.keymap.set('n', 'H',     api.tree.toggle_hidden_filter,         opts('Toggle Dotfiles'))
-				vim.keymap.set('n', 'I',     api.tree.toggle_gitignore_filter,      opts('Toggle Git Ignore'))
-				vim.keymap.set('n', 'J',     api.node.navigate.sibling.last,        opts('Last Sibling'))
-				vim.keymap.set('n', 'K',     api.node.navigate.sibling.first,       opts('First Sibling'))
-				vim.keymap.set('n', 'm',     api.marks.toggle,                      opts('Toggle Bookmark'))
-				vim.keymap.set('n', 'o',     api.node.open.edit,                    opts('Open'))
-				vim.keymap.set('n', 'O',     api.node.open.no_window_picker,        opts('Open: No Window Picker'))
-				vim.keymap.set('n', 'p',     api.fs.paste,                          opts('Paste'))
-				vim.keymap.set('n', 'P',     api.node.navigate.parent,              opts('Parent Directory'))
-				vim.keymap.set('n', 'q',     api.tree.close,                        opts('Close'))
-				vim.keymap.set('n', 'r',     api.fs.rename,                         opts('Rename'))
-				vim.keymap.set('n', 'R',     api.tree.reload,                       opts('Refresh'))
-				vim.keymap.set('n', 's',     api.node.run.system,                   opts('Run System'))
-				vim.keymap.set('n', 'S',     api.tree.search_node,                  opts('Search'))
-				vim.keymap.set('n', 'U',     api.tree.toggle_custom_filter,         opts('Toggle Hidden'))
-				vim.keymap.set('n', 'W',     api.tree.collapse_all,                 opts('Collapse'))
-				vim.keymap.set('n', 'x',     api.fs.cut,                            opts('Cut'))
-				vim.keymap.set('n', 'y',     api.fs.copy.filename,                  opts('Copy Name'))
-				vim.keymap.set('n', 'Y',     api.fs.copy.relative_path,             opts('Copy Relative Path'))
-				vim.keymap.set('n', '<2-LeftMouse>',  api.node.open.edit,           opts('Open'))
-				vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))
-				-- END_DEFAULT_ON_ATTACH
+					-- Default mappings. Feel free to modify or remove as you wish.
+					--
+					-- BEGIN_DEFAULT_ON_ATTACH
+					vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
+					vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
+					vim.keymap.set('n', '<C-k>', api.node.show_info_popup, opts('Info'))
+					vim.keymap.set('n', '<C-r>', api.fs.rename_sub, opts('Rename: Omit Filename'))
+					vim.keymap.set('n', '<C-t>', api.node.open.tab, opts('Open: New Tab'))
+					vim.keymap.set('n', '<C-v>', api.node.open.vertical, opts('Open: Vertical Split'))
+					vim.keymap.set('n', '<C-x>', api.node.open.horizontal, opts('Open: Horizontal Split'))
+					vim.keymap.set('n', '<BS>', api.node.navigate.parent_close, opts('Close Directory'))
+					vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
+					vim.keymap.set('n', '<Tab>', api.node.open.preview, opts('Open Preview'))
+					vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling'))
+					vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling'))
+					vim.keymap.set('n', '.', api.node.run.cmd, opts('Run Command'))
+					vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up'))
+					vim.keymap.set('n', 'a', api.fs.create, opts('Create'))
+					vim.keymap.set('n', 'bmv', api.marks.bulk.move, opts('Move Bookmarked'))
+					vim.keymap.set('n', 'B', api.tree.toggle_no_buffer_filter, opts('Toggle No Buffer'))
+					vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy'))
+					vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts('Toggle Git Clean'))
+					vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
+					vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
+					vim.keymap.set('n', 'd', api.fs.remove, opts('Delete'))
+					vim.keymap.set('n', 'D', api.fs.trash, opts('Trash'))
+					vim.keymap.set('n', 'E', api.tree.expand_all, opts('Expand All'))
+					vim.keymap.set('n', 'e', api.fs.rename_basename, opts('Rename: Basename'))
+					vim.keymap.set('n', ']e', api.node.navigate.diagnostics.next, opts('Next Diagnostic'))
+					vim.keymap.set('n', '[e', api.node.navigate.diagnostics.prev, opts('Prev Diagnostic'))
+					vim.keymap.set('n', 'F', api.live_filter.clear, opts('Clean Filter'))
+					vim.keymap.set('n', 'f', api.live_filter.start, opts('Filter'))
+					vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
+					vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path'))
+					vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles'))
+					vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Git Ignore'))
+					vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling'))
+					vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling'))
+					vim.keymap.set('n', 'm', api.marks.toggle, opts('Toggle Bookmark'))
+					vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
+					vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker'))
+					vim.keymap.set('n', 'p', api.fs.paste, opts('Paste'))
+					vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory'))
+					vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
+					vim.keymap.set('n', 'r', api.fs.rename, opts('Rename'))
+					vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh'))
+					vim.keymap.set('n', 's', api.node.run.system, opts('Run System'))
+					vim.keymap.set('n', 'S', api.tree.search_node, opts('Search'))
+					vim.keymap.set('n', 'U', api.tree.toggle_custom_filter, opts('Toggle Hidden'))
+					vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
+					vim.keymap.set('n', 'x', api.fs.cut, opts('Cut'))
+					vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name'))
+					vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path'))
+					vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open'))
+					vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))
+					-- END_DEFAULT_ON_ATTACH
 
 
-				-- Mappings migrated from view.mappings.list
-				--
-				-- You will need to insert "your code goes here" for any mappings with a custom action_cb
-				vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
-				vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
-				vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open'))
-				vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
-				vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker'))
-				vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))
-				vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
-				vim.keymap.set('n', '<C-v>', api.node.open.vertical, opts('Open: Vertical Split'))
-				vim.keymap.set('n', '<C-x>', api.node.open.horizontal, opts('Open: Horizontal Split'))
-				vim.keymap.set('n', '<C-t>', api.node.open.tab, opts('Open: New Tab'))
-				vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling'))
-				vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling'))
-				vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory'))
-				vim.keymap.set('n', '<BS>', api.node.navigate.parent_close, opts('Close Directory'))
-				vim.keymap.set('n', '<Tab>', api.node.open.preview, opts('Open Preview'))
-				vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling'))
-				vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling'))
-				vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Git Ignore'))
-				vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles'))
-				vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh'))
-				vim.keymap.set('n', 'a', api.fs.create, opts('Create'))
-				vim.keymap.set('n', 'd', api.fs.remove, opts('Delete'))
-				vim.keymap.set('n', 'D', api.fs.trash, opts('Trash'))
-				vim.keymap.set('n', 'r', api.fs.rename, opts('Rename'))
-				vim.keymap.set('n', '<C-r>', api.fs.rename_sub, opts('Rename: Omit Filename'))
-				vim.keymap.set('n', 'x', api.fs.cut, opts('Cut'))
-				vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy'))
-				vim.keymap.set('n', 'p', api.fs.paste, opts('Paste'))
-				vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name'))
-				vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path'))
-				vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path'))
-				vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
-				vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
-				vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up'))
-				vim.keymap.set('n', 's', api.node.run.system, opts('Run System'))
-				vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
-				vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
-				vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
-
-			end,
-			-- on_attach = on_attach
-		} end
+					-- Mappings migrated from view.mappings.list
+					--
+					-- You will need to insert "your code goes here" for any mappings with a custom action_cb
+					vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
+					vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
+					vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open'))
+					vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
+					vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker'))
+					vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))
+					vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
+					vim.keymap.set('n', '<C-v>', api.node.open.vertical, opts('Open: Vertical Split'))
+					vim.keymap.set('n', '<C-x>', api.node.open.horizontal, opts('Open: Horizontal Split'))
+					vim.keymap.set('n', '<C-t>', api.node.open.tab, opts('Open: New Tab'))
+					vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling'))
+					vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling'))
+					vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory'))
+					vim.keymap.set('n', '<BS>', api.node.navigate.parent_close, opts('Close Directory'))
+					vim.keymap.set('n', '<Tab>', api.node.open.preview, opts('Open Preview'))
+					vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling'))
+					vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling'))
+					vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Git Ignore'))
+					vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles'))
+					vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh'))
+					vim.keymap.set('n', 'a', api.fs.create, opts('Create'))
+					vim.keymap.set('n', 'd', api.fs.remove, opts('Delete'))
+					vim.keymap.set('n', 'D', api.fs.trash, opts('Trash'))
+					vim.keymap.set('n', 'r', api.fs.rename, opts('Rename'))
+					vim.keymap.set('n', '<C-r>', api.fs.rename_sub, opts('Rename: Omit Filename'))
+					vim.keymap.set('n', 'x', api.fs.cut, opts('Cut'))
+					vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy'))
+					vim.keymap.set('n', 'p', api.fs.paste, opts('Paste'))
+					vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name'))
+					vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path'))
+					vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path'))
+					vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
+					vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
+					vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up'))
+					vim.keymap.set('n', 's', api.node.run.system, opts('Run System'))
+					vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
+					vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
+					vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
+				end,
+				-- on_attach = on_attach
+			}
+		end
 	}
 
 	--UI stuff
 
-	use {'simrat39/symbols-outline.nvim',
-	config=function()
-		local opts = {
-			highlight_hovered_item = true,
-			show_guides = true,
-			auto_preview = false,
-			position = 'right',
-			relative_width = true,
-			width = 30,
-			auto_close = false,
-			show_numbers = false,
-			show_relative_numbers = false,
-			show_symbol_details = true,
-			preview_bg_highlight = 'Pmenu',
-			autofold_depth = nil,
-			auto_unfold_hover = true,
-			fold_markers = { '', '' },
-			wrap = false,
-		}
-		require("symbols-outline").setup(opts)
-	end
-}
-
-use {'stevearc/dressing.nvim',
-config=function()
-	require('dressing').setup{}
-end
-	}
-
-	use {'nvim-lualine/lualine.nvim',
-	requires = {'kyazdani42/nvim-web-devicons', opt = true},
-	config=function() require('lualine').setup{
-		options={
-			icons_enabled = true,
-			theme = 'auto',
-			component_separators = { left = '', right = ''},
-			section_separators = { left = '', right = ''},
-			disabled_filetypes = {},
-			always_divide_middle = true,
-		},
-		sections = {
-			lualine_a = {'mode'},
-			lualine_b = {'branch', 'diff', 'diagnostics'},
-			lualine_c = {'filename'},
-			lualine_x = {'encoding', 'fileformat', 'filetype'},
-			lualine_y = {'progress'},
-			lualine_z = {'location'}
-		},
-		inactive_sections = {
-			lualine_a = {},
-			lualine_b = {},
-			lualine_c = {'filename'},
-			lualine_x = {'location'},
-			lualine_y = {},
-			lualine_z = {}
-		},
-		extensions = {}
-	} end,
-}
-
-use {'kdheepak/tabline.nvim',
-config = function()
-	require'tabline'.setup {
-		-- Defaults configuration options
-		enable = true,
-		options = {
-			-- If lualine is installed tabline will use separators configured in lualine by default.
-			-- These options can be used to override those settings.
-			-- section_separators = {'', ''},
-			-- component_separators = {'', ''},
-			-- max_bufferline_percent = 66, -- set to nil by default, and it uses vim.o.columns * 2/3
-			show_tabs_always = false, -- this shows tabs only when there are more than one tab or if the first tab is named
-			show_devicons = true, -- this shows devicons in buffer section
-			show_bufnr = true, -- this appends [bufnr] to buffer section,
-			show_filename_only = false, -- shows base filename only instead of relative path in filename
-		}
-	}
-	vim.cmd[[
-	set guioptions-=e " Use showtabline in gui vim
-	set sessionoptions+=tabpages,globals " store tabpages and globals in session
-	]]
-end,
-requires = { { 'hoob3rt/lualine.nvim', opt=true }, {'kyazdani42/nvim-web-devicons', opt = true} }
-	}
-
-	use {'folke/trouble.nvim',
-	requires = "kyazdani42/nvim-web-devicons",
-	config = function() require("trouble").setup {
-		position = "bottom", -- position of the list can be: bottom, top, left, right
-		height = 10, -- height of the trouble list when position is top or bottom
-		width = 50, -- width of the list when position is left or right
-		icons = true, -- use devicons for filenames
-		mode = "workspace_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist"
-		fold_open = "", -- icon used for open folds
-		fold_closed = "", -- icon used for closed folds
-		group = true, -- group results by file
-		padding = true, -- add an extra new line on top of the list
-		action_keys = { -- key mappings for actions in the trouble list
-		-- map to {} to remove a mapping, for example:
-		-- close = {},
-		close = "q", -- close the list
-		cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
-		refresh = "r", -- manually refresh
-		jump = {"<cr>", "<tab>"}, -- jump to the diagnostic or open / close folds
-		open_split = { "<c-x>" }, -- open buffer in new split
-		open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-		open_tab = { "<c-t>" }, -- open buffer in new tab
-		jump_close = {"o"}, -- jump to the diagnostic and close the list
-		toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
-		toggle_preview = "P", -- toggle auto_preview
-		hover = "K", -- opens a small popup with the full multiline message
-		preview = "p", -- preview the diagnostic location
-		close_folds = {"zM", "zm"}, -- close all folds
-		open_folds = {"zR", "zr"}, -- open all folds
-		toggle_fold = {"zA", "za", '<space>'}, -- toggle fold of current file
-		previous = "k", -- previous item
-		next = "j" -- next item
-	},
-	indent_lines = true, -- add an indent guide below the fold icons
-	auto_open = false, -- automatically open the list when you have diagnostics
-	auto_close = false, -- automatically close the list when you have no diagnostics
-	auto_preview = true, -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
-	auto_fold = false, -- automatically fold a file trouble list at creation
-	auto_jump = {"lsp_definitions"}, -- for the given modes, automatically jump if there is only a single result
-	signs = {
-		-- icons / text used for a diagnostic
-		error = "",
-		warning = "",
-		hint = "",
-		information = "",
-		other = "﫠"
-	},
-	use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
-}
+	use { 'simrat39/symbols-outline.nvim',
+		config = function()
+			local opts = {
+				highlight_hovered_item = true,
+				show_guides = true,
+				auto_preview = false,
+				position = 'right',
+				relative_width = true,
+				width = 30,
+				auto_close = false,
+				show_numbers = false,
+				show_relative_numbers = false,
+				show_symbol_details = true,
+				preview_bg_highlight = 'Pmenu',
+				autofold_depth = nil,
+				auto_unfold_hover = true,
+				fold_markers = { '', '' },
+				wrap = false,
+			}
+			require("symbols-outline").setup(opts)
 		end
 	}
 
-	use {'romgrk/nvim-treesitter-context',
-	requires = 'nvim-treesitter/nvim-treesitter',
-	config=function() require('treesitter-context').setup{
-		enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
-		max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
-		trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
-		min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
-		zindex = 200, -- The Z-index of the context window
-		mode = 'cursor',  -- Line used to calculate context. Choices: 'cursor', 'topline'
-		-- Separator between context and content. Should be a single character string, like '-'.
-		-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
-		separator = nil,
-	} end
-}
+	use { 'stevearc/dressing.nvim',
+		config = function()
+			require('dressing').setup {}
+		end
+	}
 
-use {'lewis6991/gitsigns.nvim',
--- tag = 'release', -- To use the latest release. currently bugged
-config=function() require('gitsigns').setup() end
+	use { 'nvim-lualine/lualine.nvim',
+		requires = { 'kyazdani42/nvim-web-devicons', opt = true },
+		config = function()
+			require('lualine').setup {
+				options = {
+					icons_enabled = true,
+					theme = 'auto',
+					component_separators = { left = '', right = '' },
+					section_separators = { left = '', right = '' },
+					disabled_filetypes = {},
+					always_divide_middle = true,
+				},
+				sections = {
+					lualine_a = { 'mode' },
+					lualine_b = { 'branch', 'diff', 'diagnostics' },
+					lualine_c = { 'filename' },
+					lualine_x = { 'encoding', 'fileformat', 'filetype' },
+					lualine_y = { 'progress' },
+					lualine_z = { 'location' }
+				},
+				inactive_sections = {
+					lualine_a = {},
+					lualine_b = {},
+					lualine_c = { 'filename' },
+					lualine_x = { 'location' },
+					lualine_y = {},
+					lualine_z = {}
+				},
+				extensions = {}
+			}
+		end,
+	}
+
+	use { 'kdheepak/tabline.nvim',
+		config = function()
+			require 'tabline'.setup {
+				-- Defaults configuration options
+				enable = true,
+				options = {
+					-- If lualine is installed tabline will use separators configured in lualine by default.
+					-- These options can be used to override those settings.
+					-- section_separators = {'', ''},
+					-- component_separators = {'', ''},
+					-- max_bufferline_percent = 66, -- set to nil by default, and it uses vim.o.columns * 2/3
+					show_tabs_always = false, -- this shows tabs only when there are more than one tab or if the first tab is named
+					show_devicons = true, -- this shows devicons in buffer section
+					show_bufnr = true, -- this appends [bufnr] to buffer section,
+					show_filename_only = false, -- shows base filename only instead of relative path in filename
+				}
+			}
+			vim.cmd [[
+	set guioptions-=e " Use showtabline in gui vim
+	set sessionoptions+=tabpages,globals " store tabpages and globals in session
+	]]
+		end,
+		requires = { { 'hoob3rt/lualine.nvim', opt = true }, { 'kyazdani42/nvim-web-devicons', opt = true } }
+	}
+
+	use { 'folke/trouble.nvim',
+		requires = "kyazdani42/nvim-web-devicons",
+		config = function()
+			require("trouble").setup {
+				position = "bottom", -- position of the list can be: bottom, top, left, right
+				height = 10,       -- height of the trouble list when position is top or bottom
+				width = 50,        -- width of the list when position is left or right
+				icons = true,      -- use devicons for filenames
+				mode = "workspace_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist"
+				fold_open = "", -- icon used for open folds
+				fold_closed = "", -- icon used for closed folds
+				group = true,      -- group results by file
+				padding = true,    -- add an extra new line on top of the list
+				action_keys = {
+				                   -- key mappings for actions in the trouble list
+					-- map to {} to remove a mapping, for example:
+					-- close = {},
+					close = "q",          -- close the list
+					cancel = "<esc>",     -- cancel the preview and get back to your last window / buffer / cursor
+					refresh = "r",        -- manually refresh
+					jump = { "<cr>", "<tab>" }, -- jump to the diagnostic or open / close folds
+					open_split = { "<c-x>" }, -- open buffer in new split
+					open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
+					open_tab = { "<c-t>" }, -- open buffer in new tab
+					jump_close = { "o" }, -- jump to the diagnostic and close the list
+					toggle_mode = "m",    -- toggle between "workspace" and "document" diagnostics mode
+					toggle_preview = "P", -- toggle auto_preview
+					hover = "K",          -- opens a small popup with the full multiline message
+					preview = "p",        -- preview the diagnostic location
+					close_folds = { "zM", "zm" }, -- close all folds
+					open_folds = { "zR", "zr" }, -- open all folds
+					toggle_fold = { "zA", "za", '<space>' }, -- toggle fold of current file
+					previous = "k",       -- previous item
+					next = "j"            -- next item
+				},
+				indent_lines = true,      -- add an indent guide below the fold icons
+				auto_open = false,        -- automatically open the list when you have diagnostics
+				auto_close = false,       -- automatically close the list when you have no diagnostics
+				auto_preview = true,      -- automatically preview the location of the diagnostic. <esc> to close preview and go back to last window
+				auto_fold = false,        -- automatically fold a file trouble list at creation
+				auto_jump = { "lsp_definitions" }, -- for the given modes, automatically jump if there is only a single result
+				signs = {
+					-- icons / text used for a diagnostic
+					error = "",
+					warning = "",
+					hint = "",
+					information = "",
+					other = "﫠"
+				},
+				use_diagnostic_signs = false -- enabling this will use the signs defined in your lsp client
+			}
+		end
+	}
+
+	use { 'romgrk/nvim-treesitter-context',
+		requires = 'nvim-treesitter/nvim-treesitter',
+		config = function()
+			require('treesitter-context').setup {
+				enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
+				max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+				trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+				min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+				zindex = 200, -- The Z-index of the context window
+				mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
+				-- Separator between context and content. Should be a single character string, like '-'.
+				-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+				separator = nil,
+			}
+		end
+	}
+
+	use { 'lewis6991/gitsigns.nvim',
+		-- tag = 'release', -- To use the latest release. currently bugged
+		config = function() require('gitsigns').setup() end
 	}
 
 	use 'chentau/marks.nvim'
 
-	use {'lukas-reineke/indent-blankline.nvim',
-	config=function()
-		vim.opt.list = true
-		vim.opt.listchars:append("eol:↴")
-		require('indent_blankline').setup{
-			show_end_of_line=true,
-			show_current_context=true
-		}
-	end
-}
+	use { 'lukas-reineke/indent-blankline.nvim',
+		config = function()
+			vim.opt.list = true
+			vim.opt.listchars:append("eol:↴")
+			require('indent_blankline').setup {
+				show_end_of_line = true,
+				show_current_context = true
+			}
+		end
+	}
 
---editing utilities
+	--editing utilities
 
-use {'numToStr/Comment.nvim',
-config = function()
-	require('Comment').setup()
-end
+	use { 'numToStr/Comment.nvim',
+		config = function()
+			require('Comment').setup()
+		end
 	}
 
 	use {
@@ -428,26 +462,26 @@ end
 	}
 
 	use { 'Wansmer/treesj',
-	requires = { 'nvim-treesitter' },
-	config = function()
-		require('treesj').setup({
-			-- Use default keymaps
-			-- (<space>m - toggle, <space>j - join, <space>s - split)
-			use_default_keymaps = false,
-			max_join_length = 256,
-		})
-	end,
-}
+		requires = { 'nvim-treesitter' },
+		config = function()
+			require('treesj').setup({
+				-- Use default keymaps
+				-- (<space>m - toggle, <space>j - join, <space>s - split)
+				use_default_keymaps = false,
+				max_join_length = 256,
+			})
+		end,
+	}
 
-use "jbyuki/venn.nvim"
+	use "jbyuki/venn.nvim"
 
---color scheme stuff.
+	--color scheme stuff.
 
-use 'bluz71/vim-moonfly-colors'
+	use 'bluz71/vim-moonfly-colors'
 
-use 'bluz71/vim-nightfly-guicolors'
+	use 'bluz71/vim-nightfly-guicolors'
 
-if Packer_Bootstrap then
-	require('packer').sync()
-end
+	if Packer_Bootstrap then
+		require('packer').sync()
+	end
 end)
diff --git a/nvim_minimal/.config/nvim/foldtext.vimrc b/nvim_minimal/.config/nvim/foldtext.vimrc
new file mode 100644
index 0000000..9cb0e6b
--- /dev/null
+++ b/nvim_minimal/.config/nvim/foldtext.vimrc
@@ -0,0 +1,9 @@
+"TODO: port to LUA!
+function! Minimal_foldtext()
+	let lines_count = v:foldend - v:foldstart + 1
+	let lines_count_text = '+' . v:folddashes . '| ' . printf("%10S" , lines_count) . ' lines |'
+	let line_level_text = '| ' . printf("%8S" , 'level ' . v:foldlevel) . ' |'
+	let fold_text_end = line_level_text . repeat('-',8)
+	let fold_text_length = strlen(lines_count_text . fold_text_end) + &foldcolumn
+	return lines_count_text . repeat('-' , winwidth(0) - fold_text_length - 4) . fold_text_end
+endfunction
diff --git a/nvim_minimal/.config/nvim/init.lua b/nvim_minimal/.config/nvim/init.lua
new file mode 100644
index 0000000..04b7e7d
--- /dev/null
+++ b/nvim_minimal/.config/nvim/init.lua
@@ -0,0 +1,81 @@
+--set some aliases to make typing this faster.
+local cmd = vim.cmd
+local opt = vim.opt
+local fn = vim.fn
+local map = vim.api.nvim_set_keymap
+
+--leader key is set through a variable, for some reason.
+vim.g.mapleader = ';'
+
+--helper functions
+local function keyCode(string)
+	return vim.api.nvim_replace_termcodes(str, true, true, true, true)
+end
+
+--options using vim.opt (aliased, of course.)
+opt.mouse = 'a'
+opt.lazyredraw = true
+opt.termguicolors = true
+opt.autoread = true
+opt.swapfile = false
+opt.history = 500
+opt.formatoptions = 'rojq'
+--disable hard text wrapping, will only wrap visually.
+opt.textwidth = 0
+opt.wrapmargin = 0
+opt.wrap = true
+opt.linebreak = true
+opt.breakindent = true
+--add ruler to side of screen.
+opt.number = true
+opt.numberwidth=2
+--displays cordinates of your cursor in statusbar
+opt.ruler = true
+--always leave 5 cells between cursor and side of window.
+opt.scrolloff = 5
+--better command line completion
+opt.wildmenu = true
+--ignore case in search if search is all lowercase.
+opt.ignorecase = true
+opt.smartcase = true
+--show unfinished commands in statusbar.
+opt.showcmd = true
+--regex stuff
+opt.magic = true
+--always have a status line
+opt.laststatus = 2
+--tab stuff
+opt.tabstop = 4
+opt.shiftwidth = 0 --zero inherrits tabstop.
+opt.autoindent = true
+opt.smartindent = true
+opt.smarttab = true
+--space based tabs.
+-- opt.softtabstop=-1 --negative value inherrits shiftwidth.
+-- opt.expandtab=true
+--highlight search results as you type.
+opt.hlsearch = true
+opt.incsearch = true
+--foling stuff
+opt.foldlevelstart = 5
+cmd([[source ~/.config/nvim/foldtext.vimrc]])
+opt.foldmethod = 'indent'
+opt.foldtext = 'minimal_foldtext()'
+opt.fillchars = 'stl:=,stlnc: ,vert:|,fold:-'
+opt.foldcolumn = '4'
+opt.foldenable = true
+opt.foldignore = ''
+
+--keyboard mappings
+local opts = { noremap = true, silent = true }
+--toggle spell check
+map('n', '<leader>sp', ':setlocal spell!<CR>', opts)
+--use ctrl+direction to move between splits.
+map('n', '<C-h>', '<C-w>h', opts)
+map('n', '<C-j>', '<C-w>j', opts)
+map('n', '<C-k>', '<C-w>k', opts)
+map('n', '<C-l>', '<C-w>l', opts)
+--toggle folds with space.
+map('', '<Space>', 'za', opts)
+--clear highlighting with leader+h
+map('', '<leader>h', ':nohls<CR>', opts)
diff --git a/ssh-agent-systemd/.config/systemd/user/ssh-agent.service b/ssh-agent-systemd/.config/systemd/user/ssh-agent.service
index 9428410..8b39bb8 100644
--- a/ssh-agent-systemd/.config/systemd/user/ssh-agent.service
+++ b/ssh-agent-systemd/.config/systemd/user/ssh-agent.service
@@ -4,7 +4,7 @@ Description=SSH key agent
 [Service]
 Type=simple
 Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
-ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
+ExecStart=-/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
 
 [Install]
 WantedBy=default.target
diff --git a/x11/.xinitrc b/x11/.xinitrc
index 639b789..423ff42 100644
--- a/x11/.xinitrc
+++ b/x11/.xinitrc
@@ -1,5 +1,8 @@
 #remap caps lock to a third control key. both shifts at once toggle shiftlock
 setxkbmap -option ctrl:nocaps
+#dark mode styling for qt and gtk apps.
+export GTK_THEME=Adwaita:dark
+export GTK2_RC_FILES=/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc
+export QT_STYLE_OVERRIDE=adwaita-dark
 xrdb -merge ~/.Xresources
-#~/dotfiles/scripts/mousestart
 i3
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cb51d3f..795cee6 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -153,6 +153,8 @@
 	alias slideshow='feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay'
 	# converts all .doc and .docx files in the local directory to pdfs using libreoffice
 	alias doc2pdf='loffice --convert-to pdf --headless *.docx#'
+	#common options for sshfs
+	alias sshmnt='sshfs -o idmap=user,compression=no,reconnect,follow_symlinks,dir_cache=yes,ServerAliveInterval=15'
 
 #setup grep to be a bit more nice
 	local GREP_OPTIONS=""
@@ -176,3 +178,6 @@
 	#zsh completions, if it exists.
 	testPath=$(find /usr/share -path '*fzf/*completion.zsh' -print -quit 2> /dev/null)
 	[ -f "$testPath" ] && source $testPath
+	#if it was installed using git, can just source the one file:
+	testPath="$HOME/.fzf.zsh"
+	[ -f "$testPath" ] && source $testPath