From aaa69015444eda2f71cb23a0d12e38c7b79ddfe6 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Wed, 22 Nov 2023 18:08:58 -0500
Subject: [PATCH] A bunch of cleanup

---
 nix/base-system/flake.nix           | 4 +++-
 nix/base-system/init.lua            | 6 +-----
 nix/darwin/darwin-configuration.nix | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index a5b563a..5965ef8 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -148,7 +148,7 @@ EOF";
             # on darwin and add it as an overlay
             python310
             python310Packages.pip
-            python310Packages.vritualenv
+            python310Packages.virtualenv
             emacs
             git
             mercurial
@@ -184,6 +184,8 @@ EOF";
             plantuml-c4
             texlive.combined.scheme-basic
             nssTools
+            packer
+            nomad
             mkcert
             octave
             kubo
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 4aa51b4..dfa9a22 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -271,10 +271,6 @@ set signcolumn=yes
 autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 ]])
 
-vim.cmd([[
-let g:coq_settings = { 'auto_start': 'shut-up', 'display.icons.mode': "none" }
-]])
-
 --Set completeopt to have a better completion experience
 -- :help completeopt
 -- menuone: popup even when there's only one match
@@ -285,7 +281,7 @@ let g:coq_settings = { 'auto_start': 'shut-up', 'display.icons.mode': "none" }
 vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
 vim.opt.shortmess = vim.opt.shortmess + { c = true}
 vim.api.nvim_set_option('updatetime', 300)
-vim.opt.sessionoptions = {'buffers', 'curdir', 'localoptions', 'options', 'terminal' }
+vim.opt.sessionoptions = {'buffers', 'curdir', 'skiprtp', 'localoptions', 'terminal', 'tabpages' }
 -- Fixed column for diagnostics to appear
 -- Show autodiagnostic popup on cursor hover_range
 -- Goto previous / next diagnostic warning / error 
diff --git a/nix/darwin/darwin-configuration.nix b/nix/darwin/darwin-configuration.nix
index 9dd1c25..47a7d75 100644
--- a/nix/darwin/darwin-configuration.nix
+++ b/nix/darwin/darwin-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
 
   nix = {