Auto commit: 2024-11-08 23:40:01

.config/lazygit/state.yml

@@ -1,11 +1,9 @@
 lastupdatecheck: 0
 recentrepos:
-    - /home/fic
-<<<<<<< HEAD
-=======
-    - /home/fic/cisc/indiv-project
->>>>>>> refs/remotes/origin/main
-    - /home/fic/scripts
+  - /home/fic
+  - /home/fic/cisc/indiv-project
+  - refs/remotes/origin/main
+  - /home/fic/scripts
 startuppopupversion: 5
 lastversion: 0.44.1
 customcommandshistory: []

.config/nvim/lazyvim.json

@@ -37,7 +37,7 @@
     "lazyvim.plugins.extras.util.mini-hipatterns"
   ],
   "news": {
-    "NEWS.md": "6520"
+    "NEWS.md": "7107"
   },
   "version": 6
 }

.config/nvim/lua/config/autocmds.lua

@@ -3,8 +3,6 @@
 -- 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()
@@ -24,7 +22,6 @@ vim.api.nvim_create_autocmd("FileType", {
         ]])
   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", {

.config/nvim/lua/plugins/copilot.lua

@@ -2,20 +2,6 @@ return {
   {
     "zbirenbaum/copilot-cmp",
     opts = function()
-      -- 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",