From c2d7704eebe90964ecaed912c0596644411b4034 Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Sun, 13 Aug 2023 20:13:48 -0500
Subject: [PATCH] random stuff

---
 boxes/xps.nix           |  3 ---
 builds/utils/sh/rebuild |  2 ++
 common/desktop.nix      |  8 ++++++++
 config/nvim/init.lua    | 44 ++++++++++++++++++++++++-----------------
 4 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100755 builds/utils/sh/rebuild

diff --git a/boxes/xps.nix b/boxes/xps.nix
index ea77a97..3e3912c 100644
--- a/boxes/xps.nix
+++ b/boxes/xps.nix
@@ -7,12 +7,9 @@
   ];
 
   environment.systemPackages = with pkgs; [
-    xbrightness
     gnome.cheese
     musescore
-    magic-wormhole
     libsForQt5.kdenlive
-    calcurse
   ];
 
   services.tlp.enable = true;
diff --git a/builds/utils/sh/rebuild b/builds/utils/sh/rebuild
new file mode 100755
index 0000000..70c620a
--- /dev/null
+++ b/builds/utils/sh/rebuild
@@ -0,0 +1,2 @@
+cd ~/dot_testing
+sudo nixos-rebuild -I nixos-config=./boxes/$(hostname).nix switch
diff --git a/common/desktop.nix b/common/desktop.nix
index 33fcebd..ed86b22 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -43,6 +43,7 @@ in {
     xscreensaver
     ncpamixer
     gpick
+    calcurse
     dunst
     libnotify
     tig
@@ -59,6 +60,13 @@ in {
     remind
     python3
     pinentry-curses
+    magic-wormhole
+    xbrightness
+
+    unzip
+    lua-language-server
+    rnix-lsp
+    python311Packages.jedi-language-server
 
     ungoogled-chromium
     discord
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 170e241..9462dfc 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -158,29 +158,26 @@ end
 
 local packer_bootstrap = ensure_packer()
 
-local packaer = require('packer').startup(function(use)
+local packer = require('packer').startup(function(use)
 	use 'wbthomason/packer.nvim'
 	use 'nvim-lua/plenary.nvim'
 	use 'nvim-telescope/telescope.nvim'
-	use {
-		'VonHeikemen/lsp-zero.nvim',
-		reqiures = {
-			-- LSP Support
-			'neovim/nvim-lspconfig',
-			'williamboman/mason.nvim',
-			'williamboman/mason-lspconfig.nvim',
-
-			-- Autocompletion
-			'hrsh7th/nvim-cmp',
-			'hrsh7th/cmp-nvim-lsp',
-			'L3MON4D3/LuaSnip',
-		}
-	}
-	use 'tpope/vim-surround'
-	use 'tpope/vim-commentary'
-	use 'tpope/vim-fugitive'
+	use 'VonHeikemen/lsp-zero.nvim'
+	use 'neovim/nvim-lspconfig'
+	use 'hrsh7th/nvim-cmp'
+	use 'hrsh7th/cmp-nvim-lsp'
+	use 'L3MON4D3/LuaSnip'
 	use 'https://github.com/vimwiki/vimwiki.git'
 	use 'lervag/vimtex'
+	use {
+		"folke/which-key.nvim",
+		config = function()
+			vim.o.timeout = true
+			vim.o.timeoutlen = 300
+--			require("which-key").setup {
+--			}
+		end
+	}
 
 	if packer_bootstrap then
 		require('packer').sync()
@@ -195,6 +192,17 @@ lsp.on_attach(function(client, bufnr)
   lsp.default_keymaps({buffer = bufnr})
 end)
 
+local lspconfig = require('lspconfig')
+
+lsp.ensure_installed({
+	'rnix',
+	'jedi_language_server',
+})
+
+lspconfig.lua_ls.setup(lsp.nvim_lua_ls())
+lspconfig.rnix.setup({})
+lspconfig.jedi_language_server.setup({})
+
 lsp.setup()
 -- }}}