diff --git a/.config/lazygit/state.yml b/.config/lazygit/state.yml
index 251480bc..7ca04901 100644
--- a/.config/lazygit/state.yml
+++ b/.config/lazygit/state.yml
@@ -1,6 +1,10 @@
 lastupdatecheck: 0
 recentrepos:
     - /home/fic
+<<<<<<< HEAD
+=======
+    - /home/fic/cisc/indiv-project
+>>>>>>> refs/remotes/origin/main
     - /home/fic/scripts
 startuppopupversion: 5
 lastversion: 0.44.1
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index bef24937..f3af118e 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -12,6 +12,7 @@
     "lazyvim.plugins.extras.editor.mini-diff",
     "lazyvim.plugins.extras.editor.mini-files",
     "lazyvim.plugins.extras.editor.mini-move",
+    "lazyvim.plugins.extras.editor.outline",
     "lazyvim.plugins.extras.editor.refactoring",
     "lazyvim.plugins.extras.formatting.black",
     "lazyvim.plugins.extras.formatting.prettier",
@@ -30,7 +31,6 @@
     "lazyvim.plugins.extras.lang.toml",
     "lazyvim.plugins.extras.lang.typescript",
     "lazyvim.plugins.extras.lang.yaml",
-    "lazyvim.plugins.extras.ui.edgy",
     "lazyvim.plugins.extras.ui.mini-indentscope",
     "lazyvim.plugins.extras.ui.treesitter-context",
     "lazyvim.plugins.extras.util.dot",
diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua
index 9fdda0ea..bd71930b 100644
--- a/.config/nvim/lua/config/autocmds.lua
+++ b/.config/nvim/lua/config/autocmds.lua
@@ -3,6 +3,28 @@
 -- Add any additional autocmds here
 vim.opt_local.breakindent = true
 vim.opt_local.wrap = true
+<<<<<<< HEAD
+=======
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "python",
+  callback = function()
+    local cl = require("colorbuddy")
+    cl.Group.new("@variable", cl.colors.primary)
+    cl.Group.new("@string", cl.colors.secondary)
+    cl.Group.new("@keyword", cl.colors.complement)
+    cl.Group.new("@keyword.operator", cl.colors.complement)
+    cl.Group.new("@constant.builtin", cl.colors.complement)
+  end,
+})
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "tex",
+  callback = function()
+    vim.cmd([[
+            syntax match texMathSymbol "\\oplus" conceal cchar=⊕
+        ]])
+  end,
+})
+>>>>>>> refs/remotes/origin/main
 -- This autocommand fixes syntax highlighting for inline math in markdown files
 -- Together with vimtex, it will apply very sexy good stuff here!
 vim.api.nvim_create_autocmd("FileType", {
diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua
index 82428823..333816b8 100644
--- a/.config/nvim/lua/plugins/copilot.lua
+++ b/.config/nvim/lua/plugins/copilot.lua
@@ -2,11 +2,29 @@ return {
   {
     "zbirenbaum/copilot-cmp",
     opts = function()
-      local copilot_toggle = require("lazyvim.util.toggle").wrap({
-        name = "Copilot Completion",
+      -- local copilot_toggle = require("lazyvim.util.toggle").wrap({
+      --   name = "Copilot Completion",
+      --   get = function()
+      --     return not require("copilot.client").is_disabled()
+      --   end,
+      --   set = function(state)
+      --     if state then
+      --       require("copilot.command").enable()
+      --     else
+      --       require("copilot.command").disable()
+      --     end
+      --   end,
+      -- })
+      -- disable by default
+      require("copilot.command").disable()
+      local cptoggle = Snacks.toggle.new({
+        name = "Copilot",
+        -- map = vim.keymap.set,
+        which_key = true,
         get = function()
           return not require("copilot.client").is_disabled()
         end,
+        notify = true,
         set = function(state)
           if state then
             require("copilot.command").enable()
@@ -15,11 +33,8 @@ return {
           end
         end,
       })
-
-      -- disable by default
-      require("copilot.command").disable()
-
-      LazyVim.toggle.map("<leader>at", copilot_toggle)
+      Snacks.toggle.map(cptoggle, "<leader>at", { desc = "Toggle Copilot" })
+      -- LazyVim.toggle.map("<leader>at", copilot_toggle)
     end,
   },
   { "CopilotC-Nvim/CopilotChat.nvim", opts = {
diff --git a/.config/nvim/lua/plugins/no-neck-pain.lua b/.config/nvim/lua/plugins/no-neck-pain.lua
new file mode 100644
index 00000000..255d3aad
--- /dev/null
+++ b/.config/nvim/lua/plugins/no-neck-pain.lua
@@ -0,0 +1,35 @@
+-- Ok, this plugin is really awesome!
+-- And everyone should know about it -- game changer!!!
+return {
+  "shortcuts/no-neck-pain.nvim",
+  version = "*",
+  opts = function()
+    require("which-key").add({
+      { "<leader>n", group = "+NoNeckPain" },
+    })
+    return {
+      width = 120,
+      mappings = {
+        enabled = true,
+      },
+      autocmds = {
+        enableOnVimEnter = true,
+        skipEnteringNoNeckPainBuffer = true,
+      },
+      buffers = {
+        left = {
+          scratchPad = {
+            enabled = false,
+            pathToFile = "~/SyncDocuments/scratch-l.md",
+          },
+        },
+        right = {
+          scratchPad = {
+            enabled = false,
+            pathToFile = "~/SyncDocuments/scratch-r.md",
+          },
+        },
+      },
+    }
+  end,
+}
diff --git a/.config/nvim/lua/plugins/noirbuddy.lua b/.config/nvim/lua/plugins/noirbuddy.lua
index 715e62db..291f467d 100644
--- a/.config/nvim/lua/plugins/noirbuddy.lua
+++ b/.config/nvim/lua/plugins/noirbuddy.lua
@@ -77,6 +77,8 @@ return {
         -- Group.new("gotype", colors.primary)
         Group.new("Boolean", colors.complement)
         Group.new("Constant", colors.complement)
+        -- TODO: change these groups to match Snacks instead...
+        -- Is that even needed actually?
         Group.new("NotifyINFOBorder", colors.infoborder)
         Group.new("NotifyINFOTitle", colors.complement)
         Group.new("NotifyINFOIcon", colors.complement)
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index c32a8b7f..93faa63c 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -56,6 +56,14 @@ pwntools
 networkx
 NetworkX
 ie
+numpy
 unicode
 ints
 oplus
+Neo4J
+neo4j
+APOC
+GDS
+Configs
+TarInfo
+csv
diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl
index fe7d022d..7cb576fd 100644
Binary files a/.config/nvim/spell/en.utf-8.add.spl and b/.config/nvim/spell/en.utf-8.add.spl differ
diff --git a/.config/yadm/.gitignore b/.config/yadm/.gitignore
new file mode 100644
index 00000000..6eeb6bbf
--- /dev/null
+++ b/.config/yadm/.gitignore
@@ -0,0 +1,2 @@
+*.log
+./*.log
diff --git a/.config/yadm/auto.sh b/.config/yadm/auto.sh
index 09d91eb8..29add76c 100755
--- a/.config/yadm/auto.sh
+++ b/.config/yadm/auto.sh
@@ -19,5 +19,12 @@ done
 # Commit and push if there are changes
 if [[ -n $(yadm status --porcelain) ]]; then
   yadm commit -m "Auto commit: $(date +'%Y-%m-%d %H:%M:%S')"
-  yadm push
+  # Check if the ssh-agent env is present
+  if [ -f ~/.ssh/environment-dpad ]; then
+    source "$HOME/.ssh/environment-dpad"
+    yadm push
+  else
+    echo "ERROR: ssh-agent environment not found, aborting push..."
+    exit
+  fi
 fi
diff --git a/.config/yadm/autoshdpad.log b/.config/yadm/autoshdpad.log
new file mode 100644
index 00000000..145d0e2b
--- /dev/null
+++ b/.config/yadm/autoshdpad.log
@@ -0,0 +1,183 @@
+[main 8765c96] Auto commit: 2024-11-08 14:05:02
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 .config/yadm/autoshdpad.log
+[main 436d911] Auto commit: 2024-11-08 14:10:01
+ 1 file changed, 3 insertions(+)
+[main ed4869f] Auto commit: 2024-11-08 14:15:02
+ 1 file changed, 2 insertions(+)
+[main 50bec13] Auto commit: 2024-11-08 14:20:02
+ 1 file changed, 2 insertions(+)
+[main d9f0f46] Auto commit: 2024-11-08 14:25:02
+ 1 file changed, 2 insertions(+)
+[main f984a12] Auto commit: 2024-11-08 14:30:02
+ 1 file changed, 2 insertions(+)
+[main c92f706] Auto commit: 2024-11-08 14:35:02
+ 1 file changed, 2 insertions(+)
+[main 8f279ea] Auto commit: 2024-11-08 14:40:02
+ 1 file changed, 2 insertions(+)
+[main 9fe8ab9] Auto commit: 2024-11-08 14:45:02
+ 1 file changed, 2 insertions(+)
+[main a06b43e] Auto commit: 2024-11-08 14:50:02
+ 1 file changed, 2 insertions(+)
+[main 9c101dc] Auto commit: 2024-11-08 14:55:02
+ 1 file changed, 2 insertions(+)
+[main 853f0ca] Auto commit: 2024-11-08 15:00:02
+ 1 file changed, 2 insertions(+)
+[main 0b11da2] Auto commit: 2024-11-08 15:05:02
+ 1 file changed, 2 insertions(+)
+[main cebcdc9] Auto commit: 2024-11-08 15:10:02
+ 1 file changed, 2 insertions(+)
+[main 56c5aa8] Auto commit: 2024-11-08 15:15:02
+ 1 file changed, 2 insertions(+)
+[main 765eb79] Auto commit: 2024-11-08 15:20:02
+ 1 file changed, 2 insertions(+)
+[main 5a2a7fd] Auto commit: 2024-11-08 15:25:02
+ 1 file changed, 2 insertions(+)
+[main 9765088] Auto commit: 2024-11-08 15:30:02
+ 1 file changed, 2 insertions(+)
+[main 14b4c72] Auto commit: 2024-11-08 15:45:04
+ 1 file changed, 2 insertions(+)
+[main 2428f22] Auto commit: 2024-11-08 15:50:03
+ 1 file changed, 2 insertions(+)
+[main c9063ed] Auto commit: 2024-11-08 15:55:03
+ 1 file changed, 2 insertions(+)
+[main 3bf3439] Auto commit: 2024-11-08 16:00:03
+ 1 file changed, 2 insertions(+)
+[main 61a3689] Auto commit: 2024-11-08 16:05:02
+ 1 file changed, 2 insertions(+)
+[main 7c1723e] Auto commit: 2024-11-08 16:10:03
+ 1 file changed, 2 insertions(+)
+[main d956930] Auto commit: 2024-11-08 16:15:03
+ 1 file changed, 2 insertions(+)
+[main 13fc5c6] Auto commit: 2024-11-08 16:20:03
+ 1 file changed, 2 insertions(+)
+[main 22a273f] Auto commit: 2024-11-08 16:25:03
+ 1 file changed, 2 insertions(+)
+[main be78ca3] Auto commit: 2024-11-08 16:30:03
+ 1 file changed, 2 insertions(+)
+[main 19f6e85] Auto commit: 2024-11-08 16:35:03
+ 1 file changed, 2 insertions(+)
+[main dc933eb] Auto commit: 2024-11-08 16:40:03
+ 1 file changed, 2 insertions(+)
+[main d79db01] Auto commit: 2024-11-08 16:45:03
+ 1 file changed, 2 insertions(+)
+[main 7ef30dc] Auto commit: 2024-11-08 16:50:02
+ 1 file changed, 2 insertions(+)
+[main 2a17ffb] Auto commit: 2024-11-08 16:55:03
+ 1 file changed, 2 insertions(+)
+[main b4fa06b] Auto commit: 2024-11-08 17:00:03
+ 1 file changed, 2 insertions(+)
+[main d4ba063] Auto commit: 2024-11-08 17:05:03
+ 1 file changed, 2 insertions(+)
+[main 02cddac] Auto commit: 2024-11-08 17:10:03
+ 1 file changed, 2 insertions(+)
+[main 29aabaa] Auto commit: 2024-11-08 17:30:03
+ 1 file changed, 2 insertions(+)
+[main eeb8a0c] Auto commit: 2024-11-08 17:35:03
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+[main f7c230a] Auto commit: 2024-11-08 17:40:03
+ 1 file changed, 2 insertions(+)
+[main 9b9efe0] Auto commit: 2024-11-08 17:45:03
+ 1 file changed, 2 insertions(+)
+[main 57b1e7c] Auto commit: 2024-11-08 17:50:03
+ 1 file changed, 2 insertions(+)
+[main f299169] Auto commit: 2024-11-08 17:55:03
+ 1 file changed, 2 insertions(+)
+[main 29487b4] Auto commit: 2024-11-08 18:00:03
+ 1 file changed, 2 insertions(+)
+[main deae75f] Auto commit: 2024-11-08 18:05:02
+ 1 file changed, 2 insertions(+)
+[main f90dc52] Auto commit: 2024-11-08 18:25:02
+ 1 file changed, 2 insertions(+)
+[main 39f6a5f] Auto commit: 2024-11-08 18:30:02
+ 1 file changed, 2 insertions(+)
+[main d27ba9c] Auto commit: 2024-11-08 18:35:02
+ 1 file changed, 2 insertions(+)
+[main f0429c2] Auto commit: 2024-11-08 18:40:02
+ 1 file changed, 2 insertions(+)
+[main 5a683de] Auto commit: 2024-11-08 18:45:02
+ 1 file changed, 2 insertions(+)
+[main 87929a5] Auto commit: 2024-11-08 18:50:02
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 .config/nvim/lua/plugins/no-neck-pain.lua
+[main 19bdcd3] Auto commit: 2024-11-08 18:55:02
+ 1 file changed, 3 insertions(+)
+[main cc0e5ef] Auto commit: 2024-11-08 19:00:02
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+[main 287902b] Auto commit: 2024-11-08 19:05:02
+ 3 files changed, 19 insertions(+), 16 deletions(-)
+[main ce16f38] Auto commit: 2024-11-08 19:10:02
+ 2 files changed, 3 insertions(+)
+[main 6406661] Auto commit: 2024-11-08 19:15:02
+ 1 file changed, 2 insertions(+)
+[main c2608b2] Auto commit: 2024-11-08 19:20:02
+ 1 file changed, 2 insertions(+)
+[main fe10c4a] Auto commit: 2024-11-08 19:25:02
+ 4 files changed, 8 insertions(+)
+[main cdee114] Auto commit: 2024-11-08 19:30:02
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+[main e840172] Auto commit: 2024-11-08 19:35:02
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+[main a2d9e72] Auto commit: 2024-11-08 19:40:02
+ 2 files changed, 6 insertions(+)
+[main a21f977] Auto commit: 2024-11-08 19:45:02
+ 2 files changed, 8 insertions(+)
+[main 6986b50] Auto commit: 2024-11-08 19:50:02
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+[main b751252] Auto commit: 2024-11-08 19:55:02
+ 2 files changed, 5 insertions(+)
+[main a4594e3] Auto commit: 2024-11-08 20:00:02
+ 1 file changed, 2 insertions(+)
+[main 525744b] Auto commit: 2024-11-08 20:05:02
+ 3 files changed, 5 insertions(+)
+[main 4f40347] Auto commit: 2024-11-08 20:10:02
+ 3 files changed, 3 insertions(+)
+[main 4d800a7] Auto commit: 2024-11-08 20:15:02
+ 1 file changed, 2 insertions(+)
+[main 1f29792] Auto commit: 2024-11-08 20:20:01
+ 1 file changed, 2 insertions(+)
+[main a86a696] Auto commit: 2024-11-08 20:25:02
+ 1 file changed, 2 insertions(+)
+[main 41f27cb] Auto commit: 2024-11-08 20:30:02
+ 2 files changed, 7 insertions(+)
+hi
+[main 4f7c77e] Auto commit: 2024-11-08 20:35:02
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+ERROR: ssh-agent environment not found, aborting push...
+[main 2c8bef4] Auto commit: 2024-11-08 20:40:03
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+[main 712f0b1] Auto commit: 2024-11-08 20:45:02
+ 1 file changed, 2 insertions(+)
+[main 1b65254] Auto commit: 2024-11-08 20:50:02
+ 1 file changed, 2 insertions(+)
+[main c51b6cc] Auto commit: 2024-11-08 20:55:02
+ 2 files changed, 3 insertions(+)
+ create mode 100644 .config/yadm/.gitignore
+[main 9dfadaf] Auto commit: 2024-11-08 21:00:02
+ 2 files changed, 11 insertions(+)
+[main d4bfec3] Auto commit: 2024-11-08 21:05:02
+ 2 files changed, 4 insertions(+)
+[main b18db45] Auto commit: 2024-11-08 21:10:02
+ 3 files changed, 3 insertions(+)
+[main 521fcb3] Auto commit: 2024-11-08 21:15:02
+ 3 files changed, 3 insertions(+)
+[main c9838c5] Auto commit: 2024-11-08 21:20:02
+ 2 files changed, 3 insertions(+)
+[main ec908f5] Auto commit: 2024-11-08 21:25:02
+ 1 file changed, 2 insertions(+)
+[main 5f2c50f] Auto commit: 2024-11-08 21:30:02
+ 1 file changed, 2 insertions(+)
+[main 8a29964] Auto commit: 2024-11-08 21:35:02
+ 1 file changed, 2 insertions(+)
+[main 77cae5e] Auto commit: 2024-11-08 21:40:02
+ 1 file changed, 2 insertions(+)
+[main 4ead2ba] Auto commit: 2024-11-08 21:45:02
+ 1 file changed, 2 insertions(+)
+[main 1410343] Auto commit: 2024-11-08 21:50:02
+ 1 file changed, 2 insertions(+)
+[main dc5d5ab] Auto commit: 2024-11-08 21:55:02
+ 1 file changed, 2 insertions(+)
+[main 3f088dd] Auto commit: 2024-11-08 22:00:02
+ 1 file changed, 2 insertions(+)
+[main 03e28b5] Auto commit: 2024-11-08 22:05:02
+ 1 file changed, 2 insertions(+)
diff --git a/.config/yadm/cron b/.config/yadm/cron
new file mode 100644
index 00000000..f84fb7c4
--- /dev/null
+++ b/.config/yadm/cron
@@ -0,0 +1 @@
+*/5 * * * * /home/fic/.config/yadm/auto.sh >> /home/fic/yadm-auto-push.log