nix/base-system/.zshrc

@@ -7,6 +7,3 @@ bindkey '^R' history-incremental-search-backward
 
 # Opam configurattion
 [[ ! -r ~/.opam/opam-init/init.zsh ]] || source ~/.opam/opam-init/init.zsh  > /dev/null 2> /dev/null
-
-# dotnet stuff
-[[ ! -d /usr/local/share/dotnet ]] || DOTNET_ROOT=/usr/local/share/dotnet PATH=$PATH:/usr/local/share/dotnet 

nix/base-system/flake.lock

@@ -329,11 +329,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1710102698,
-        "narHash": "sha256-PO4wOhMGqL1zVWSTiGMPGnW1aC5urvInhd9TV82LF0E=",
+        "lastModified": 1708869798,
+        "narHash": "sha256-ptDmgUUJBZ5SYkRNqmcfrSqIcsARsBO4CrOxKlFVmZY=",
         "owner": "zaphar",
         "repo": "Heracles",
-        "rev": "00e84bd99a2ccf25363034ac9de7eeba916867a8",
+        "rev": "ac52aea6c84870afb6104d0184b4371ba689db89",
         "type": "github"
       },
       "original": {

nix/base-system/flake.nix

@@ -132,7 +132,7 @@ EOF";
                 cmp-nvim-lsp-signature-help
                 nvim-dap # Debug Adapter Protocol support
                 #nvim-dap-ui
-                neogit
+                vimagit
                 hoon-vim
                 nvim-treesitter
                 lean-nvim
@@ -294,8 +294,8 @@ EOF";
             nomad
             mkcert
             kubo
-            #dotnet-sdk_7
-            #netcoredbg
+            dotnet-sdk_7
+            netcoredbg
             powershell
             unstablePkgs.ocaml
             unstablePkgs.opam

nix/base-system/init.lua

@@ -313,7 +313,7 @@ require('nvim-treesitter.configs').setup {
         enable = true,
         additional_vim_regex_highlighting = false,
     },
-    indent = { enable = true },
+    --indent = { enable = true },
     rainbow = {
         enable = true,
         extended_mode = true,
@@ -452,18 +452,8 @@ vim.keymap.set("n", "<Leader>ts", function()
     vim.cmd("tabs")
 end)
 
--- Neogit integration
--- See https://github.com/NeogitOrg/neogit for configuration information.
-local neogit = require('neogit')
-neogit.setup()
-
 vim.keymap.set("n", "<Leader>mg", function()
-    neogit.open()
-end)
-
--- Add a file to git
-vim.keymap.set("n", "<Leader>ga", function()
-    vim.cmd("!git add %")
+    vim.cmd("MagitOnly")
 end)
 
 require('possession').setup {
@@ -530,9 +520,7 @@ lean.setup {
 
 -- telescope keymaps
 vim.keymap.set("n", "<Leader>pl", telescope.extensions.possession.list)
--- TODO(zaphar): Remove this once my muscle memory has set in.
 vim.keymap.set("n", "<Leader>nff", telescope_builtins.fd)
-vim.keymap.set("n", "<Leader>ff", telescope_builtins.fd)
 vim.keymap.set("n", "<Leader>rl", telescope_builtins.lsp_references)
 vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename)
 vim.keymap.set("n", "<Leader>sl", telescope_builtins.lsp_workspace_symbols)