Long time since last commit

after/ftplugin/c.lua

@@ -0,0 +1 @@
+vim.opt.shiftwidth = 2

lua/angryluck/plugins/conform.lua

@@ -15,9 +15,12 @@ return { -- Autoformat
     formatters_by_ft = {
       lua = { "stylua" },
       haskell = { "fourmolu" },
+      -- haskell = { "ormolu" },
       json = { "jq" },
+      c = { "clang-format" },
       -- Conform can also run multiple formatters sequentially
       -- python = { "isort", "black" },
+      python = { "autopep8", "black" },
       --
       -- You can use a sub-list to tell conform to run *until* a formatter is found.
       -- javascript = { { "prettierd", "prettier" } },

lua/angryluck/plugins/init.lua

@@ -82,6 +82,10 @@ return {
     opts = { signs = false },
   },
 
+  -- F# syntax/lsp
+  --
+  "ionide/Ionide-vim",
+
   -- [ GRAVEYARD ]
   -- Plugins I don't use anymore
   --------------------------------------------------

lua/angryluck/plugins/isabelle-lsp.lua

@@ -0,0 +1,17 @@
+return {
+  {
+    "Treeniks/isabelle-lsp.nvim",
+    branch = "isabelle-language-server",
+    dependencies = {
+      "neovim/nvim-lspconfig",
+    },
+    config = function()
+      require("isabelle-lsp").setup({
+        isabelle_path = "/home/angryluck/isabelle-lsp/isabelle-emacs/bin/isabelle",
+      })
+      local lspconfig = require("lspconfig")
+      lspconfig.isabelle.setup({})
+    end,
+  },
+  "Treeniks/isabelle-syn.nvim",
+}

lua/angryluck/plugins/lsp.lua

@@ -135,19 +135,20 @@ return { -- LSP Configuration & Plugins
           },
         },
       },
-      ltex = {
+      -- ltex = {
-        filetypes = { "tex" },
+      --   filetypes = { "tex" },
-        settings = {
+      --   settings = {
-          dictionary = {
+      --     dictionary = {
-            ["en-US"] = { "homotopy" },
+      --       ["en-US"] = { "homotopy" },
-          },
+      --     },
-        },
+      --   },
-      },
+      -- },
       hls = {
         filetypes = { "haskell", "lhaskell", "cabal" },
         haskell = {
           cabalFormattingProvider = "cabalfmt",
           formattingProvider = "fourmolu",
+          -- formattingProvider = "ormolu",
         },
         single_file_suppport = true,
       },

lua/angryluck/plugins/treesitter.lua

@@ -16,11 +16,11 @@ return {
       "bash",
       "c",
       "haskell",
-      "lua",
+      -- "lua",
       "vim",
       "vimdoc",
       -- "org",
-      "norg",
+      -- "norg",
       "markdown",
     },
     ignore_install = { "latex" },
@@ -108,7 +108,8 @@ return {
     },
     refactor = {
       highlight_definitions = {
-        enable = true,
+        -- enable = true,
+        enable = false,
         -- Set to false if you have an `updatetime` of ~100.
         clear_on_cursor_move = true,
       },

lua/angryluck/plugins/vim-orgmode.lua

@@ -1,83 +1,83 @@
 return {
-  "nvim-orgmode/orgmode",
+  -- "nvim-orgmode/orgmode",
-  dependencies = {
+  -- dependencies = {
-    {
+  --   {
-      "nvim-treesitter/nvim-treesitter",
+  --     "nvim-treesitter/nvim-treesitter",
-      lazy = true,
+  --     lazy = true,
-      config = function()
+  --     config = function()
-        -- Setup treesitter
+  --       -- Setup treesitter
-        require("nvim-treesitter.configs").setup {
+  --       require("nvim-treesitter.configs").setup {
-          highlight = {
+  --         highlight = {
-            enable = true,
+  --           enable = true,
-          },
+  --         },
-          ensure_installed = { "org" },
+  --         ensure_installed = { "org" },
-        }
+  --       }
-      end,
+  --     end,
-    },
+  --   },
-    {
+  --   {
-      "akinsho/org-bullets.nvim",
+  --     "akinsho/org-bullets.nvim",
-      config = function()
+  --     config = function()
-        require("org-bullets").setup()
+  --       require("org-bullets").setup()
-      end,
+  --     end,
-    },
+  --   },
-    -- "joaomsa/telescope-orgmode.nvim",
+  --   -- "joaomsa/telescope-orgmode.nvim",
-    -- "nvim-telescope/telescope.nvim",
+  --   -- "nvim-telescope/telescope.nvim",
-    -- {
+  --   -- {
-    --   "lukas-reineke/headlines.nvim",
+  --   --   "lukas-reineke/headlines.nvim",
-    --   dependencies = "nvim-treesitter/nvim-treesitter",
+  --   --   dependencies = "nvim-treesitter/nvim-treesitter",
-    --   config = function()
+  --   --   config = function()
-    --     vim.cmd [[highlight Headline1 guibg=#1e2718]]
+  --   --     vim.cmd [[highlight Headline1 guibg=#1e2718]]
-    --     vim.cmd [[highlight Headline2 guibg=#21262d]]
+  --   --     vim.cmd [[highlight Headline2 guibg=#21262d]]
-    --     vim.cmd [[highlight CodeBlock guibg=#1c1c1c]]
+  --   --     vim.cmd [[highlight CodeBlock guibg=#1c1c1c]]
-    --     vim.cmd [[highlight Dash guibg=#D19A66 gui=bold]]
+  --   --     vim.cmd [[highlight Dash guibg=#D19A66 gui=bold]]
-    --
+  --   --
-    --     require("headlines").setup {
+  --   --     require("headlines").setup {
-    --       org = {
+  --   --       org = {
-    --         headline_highlights = { "Headline1", "Headline2" },
+  --   --         headline_highlights = { "Headline1", "Headline2" },
-    --       },
+  --   --       },
-    --     }
+  --   --     }
-    --   end, -- or `opts = {}`
+  --   --   end, -- or `opts = {}`
-    -- },
+  --   -- },
-  },
+  -- },
-  -- ADD THIS BACK LATER - SOMETHING WRONG, SO DOESNT START
+  -- -- ADD THIS BACK LATER - SOMETHING WRONG, SO DOESNT START
-  -- event = 'VeryLazy',
+  -- -- event = 'VeryLazy',
-  config = function()
+  -- config = function()
-    -- Load treesitter grammar for org
+  --   -- Load treesitter grammar for org
-    -- require("orgmode").setup_ts_grammar()
+  --   -- require("orgmode").setup_ts_grammar()
-    -- require("telescope").load_extension "orgmode"
+  --   -- require("telescope").load_extension "orgmode"
-
+  --
-    -- vim.api.nvim_create_autocmd("FileType", {
+  --   -- vim.api.nvim_create_autocmd("FileType", {
-    --   pattern = "org",
+  --   --   pattern = "org",
-    --   group = vim.api.nvim_create_augroup("orgmode_telescope_nvim", { clear = true }),
+  --   --   group = vim.api.nvim_create_augroup("orgmode_telescope_nvim", { clear = true }),
-    --   callback = function()
+  --   --   callback = function()
-    --     vim.keymap.set("n", "<leader>or", require("telescope").extensions.orgmode.refile_heading)
+  --   --     vim.keymap.set("n", "<leader>or", require("telescope").extensions.orgmode.refile_heading)
-    --   end,
+  --   --   end,
-    -- })
+  --   -- })
-
+  --
-    -- Setup orgmode
+  --   -- Setup orgmode
-    require("orgmode").setup {
+  --   require("orgmode").setup {
-      org_agenda_files = { "~/documents/orgfiles/**/*", "~/gtd/**/*" },
+  --     org_agenda_files = { "~/documents/orgfiles/**/*", "~/gtd/**/*" },
-      -- org_default_notes_file = "~/documents/orgfiles/refile.org",
+  --     -- org_default_notes_file = "~/documents/orgfiles/refile.org",
-      org_default_notes_file = "~/gtd/inbox.org",
+  --     org_default_notes_file = "~/gtd/inbox.org",
-      org_archive_location = "~/gtd/archive/%s_archive::",
+  --     org_archive_location = "~/gtd/archive/%s_archive::",
-      org_todo_keywords = {
+  --     org_todo_keywords = {
-        "NEXT(n)",
+  --       "NEXT(n)",
-        "TODO(t)",
+  --       "TODO(t)",
-        "WAITING(w)",
+  --       "WAITING(w)",
-        -- "SCHEDULED(s)",
+  --       -- "SCHEDULED(s)",
-        "|",
+  --       "|",
-        "DONE(d)",
+  --       "DONE(d)",
-        "CANCELLED(c)",
+  --       "CANCELLED(c)",
-      },
+  --     },
-      -- org_hide_leading_stars = true,
+  --     -- org_hide_leading_stars = true,
-      mappings = {
+  --     mappings = {
-        capture = {
+  --       capture = {
-          org_capture_finalize = "<Leader>ow",
+  --         org_capture_finalize = "<Leader>ow",
-        },
+  --       },
-        note = {
+  --       note = {
-          org_note_finalize = "<Leader>ow",
+  --         org_note_finalize = "<Leader>ow",
-        },
+  --       },
-      },
+  --     },
-    }
+  --   }
-  end,
+  -- end,
 }

lua/angryluck/plugins/which-key.lua

@@ -1,13 +1,20 @@
 return { -- Shows pending keybinds
   "folke/which-key.nvim",
   event = "VimEnter",
+  opts = {
+    popup_mappings = {
+      scroll_down = "<Nop>",
+      scroll_up = "<Nop>",
+    },
+  },
+
   config = function()
     require("which-key").setup({
       -- Remove this if so many keymaps, that you need to scroll
-      popup_mappings = {
+      -- popup_mappings = {
-        scroll_down = "<Nop>",
+      --   scroll_down = "<Nop>",
-        scroll_up = "<Nop>",
+      --   scroll_up = "<Nop>",
-      },
+      -- },
       -- Doesn't work
       -- trigger_blacklist = {
       --   v = { "j", "k", "<C-D>", "<C-U>" },
@@ -15,14 +22,26 @@ return { -- Shows pending keybinds
     })
 
     -- Document existing key chains
-    require("which-key").register({
+    require("which-key").add({
       -- Naming leader-key-groups
-      ["<leader>c"] = { name = "[C]ode", _ = "which_key_ignore" },
+      { "<leader>c", group = "[C]ode" },
-      ["<leader>d"] = { name = "[D]ocument", _ = "which_key_ignore" },
+      { "<leader>c_", hidden = true },
-      ["<leader>r"] = { name = "[R]ename", _ = "which_key_ignore" },
+      { "<leader>d", group = "[D]ocument" },
-      ["<leader>s"] = { name = "[S]earch", _ = "which_key_ignore" },
+      { "<leader>d_", hidden = true },
-      ["<leader>w"] = { name = "[W]orkspace", _ = "which_key_ignore" },
+      { "<leader>o", group = "[O]rgmode" },
-      ["<leader>o"] = { name = "[O]rgmode", _ = "which_key_ignore" },
+      { "<leader>o_", hidden = true },
+      { "<leader>r", group = "[R]ename" },
+      { "<leader>r_", hidden = true },
+      { "<leader>s", group = "[S]earch" },
+      { "<leader>s_", hidden = true },
+      { "<leader>w", group = "[W]orkspace" },
+      -- old: require("which-key").register:
+      -- ["<leader>c"] = { name = "[C]ode", _ = "which_key_ignore" },
+      -- ["<leader>d"] = { name = "[D]ocument", _ = "which_key_ignore" },
+      -- ["<leader>r"] = { name = "[R]ename", _ = "which_key_ignore" },
+      -- ["<leader>s"] = { name = "[S]earch", _ = "which_key_ignore" },
+      -- ["<leader>w"] = { name = "[W]orkspace", _ = "which_key_ignore" },
+      -- ["<leader>o"] = { name = "[O]rgmode", _ = "which_key_ignore" },
     })
   end,
 }