nix/base-system/flake.nix

@@ -164,8 +164,6 @@ EOF";
                 #nvim-dap-ui
                 hoon-vim
                 nvim-treesitter
-                lualine-nvim
-                lualine-lsp-progress
                 lean-nvim
                 roslyn-nvim
                 nvim-treesitter-context
@@ -173,7 +171,7 @@ EOF";
 				nvim-treesitter-parsers.ini
 				nvim-treesitter-parsers.rust
 				nvim-treesitter-parsers.c
-				#nvim-treesitter-parsers.c_sharp # currently broken for some reason
+				nvim-treesitter-parsers.c_sharp
 				nvim-treesitter-parsers.cpp
 				nvim-treesitter-parsers.clojure
 				nvim-treesitter-parsers.latex
@@ -196,6 +194,7 @@ EOF";
 				nvim-treesitter-parsers.promql
 				nvim-treesitter-parsers.nix
 				nvim-treesitter-parsers.hoon
+				nvim-treesitter-parsers.c_sharp
                 omnisharp-extended-lsp-nvim
                 #neotest-dotnet
                 nix-develop-nvim
@@ -277,7 +276,7 @@ EOF";
             enable = true;  # default shell on catalina
           # This is a total hack but we don't want the default clobbering it which it does if it's an empty string or null
             promptInit = "#noop";
-            interactiveShellInit = (builtins.readFile ./zshrc);
+            interactiveShellInit = (builtins.readFile ./.zshrc);
           };
 
           tmux = {
@@ -347,7 +346,6 @@ EOF";
             victoriametrics
             # TODO add sonic-pi here if it supports the arch
             unstablePkgs.dbeaver-bin
-            jujutsu
         ])
         #++ (with pkgs.ocamlPackages; [
         #    dune_3

nix/base-system/init.lua

@@ -16,7 +16,6 @@ vim.opt.mouse = ""
 vim.opt.tabstop = 4
 vim.opt.shiftwidth = 4
 --vim.opt.smarttab = false
-vim.opt.fileformats = "unix,dos"
 
 vim.g.BASH_AuthorName = 'Jeremy Wall'
 vim.g.BASH_AuthorRef = 'jw'
@@ -578,24 +577,6 @@ vim.keymap.set("n", "<Leader>tdb", function()
     vim.cmd("DBUIToggle")
 end)
 
-require('lualine').setup {
-    icons_enabled = false,
-    disabled_filetypes = {
-        statusline = {},
-        winbar = {},
-    },
-    sections = {
-        -- left side
-        lualine_a = {'mode'},
-        lualine_b = {'filename'},
-        lualine_c = {'encoding', 'fileformat', 'filetype'},
-        -- right side
-        lualine_x = {'diagnostics'},
-        lualine_y = {'progress', 'lsp_progress'},
-        lualine_z = {'location'}
-    }
-}
-
 local dap = require('dap')
 dap.adapters.lldb = {
     type = "executable",