From 56a684d5ba650d878ffcf563150337abbb5a233d Mon Sep 17 00:00:00 2001 From: js0ny Date: Wed, 29 Jan 2025 21:48:49 +0000 Subject: [PATCH] Remove multiple files from VCS --- common/wakatime.example.cfg | 19 +++++++++++++++++++ tools/emacs.d/.gitignore | 3 +++ tools/emacs.d/custom.el | 13 ------------- tools/nvim/lazy-lock.json | 1 + tools/nvim/lua/plugins/lsp.lua | 22 ++++++++++++++++++++-- 5 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 common/wakatime.example.cfg delete mode 100644 tools/emacs.d/custom.el diff --git a/common/wakatime.example.cfg b/common/wakatime.example.cfg new file mode 100644 index 0000000..4d3410b --- /dev/null +++ b/common/wakatime.example.cfg @@ -0,0 +1,19 @@ + +[settings] +api_key = FILL_YOUR_API_KEY_HERE +exclude = + ^COMMIT_EDITMSG$ + ^TAG_EDITMSG$ + *.md + *.org + *.txt + *.log +include = + readme.md + README.md + readme.org + README.org + readme.txt + README.txt + readme + README diff --git a/tools/emacs.d/.gitignore b/tools/emacs.d/.gitignore index d540018..149da8c 100644 --- a/tools/emacs.d/.gitignore +++ b/tools/emacs.d/.gitignore @@ -18,3 +18,6 @@ tramp recentf custom.el + +.org-id-locations +bookmarks diff --git a/tools/emacs.d/custom.el b/tools/emacs.d/custom.el deleted file mode 100644 index 602a0b0..0000000 --- a/tools/emacs.d/custom.el +++ /dev/null @@ -1,13 +0,0 @@ -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(package-selected-packages - '(ob-csharp org-bullets org-superstar marginalia vertico doom-modeline wakatime-mode evil-surround all-the-icons dired-single gnu-elpa-keyring-update--keyring gnu-elpa-keyring-update lsp-mode catppuccin-theme use-package evil company))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/tools/nvim/lazy-lock.json b/tools/nvim/lazy-lock.json index 49525e3..cc24f68 100644 --- a/tools/nvim/lazy-lock.json +++ b/tools/nvim/lazy-lock.json @@ -36,6 +36,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "onedarkpro.nvim": { "branch": "main", "commit": "44775f8206ee43b692e7f3dc894ddc47996ee523" }, + "orgmode": { "branch": "master", "commit": "ac7821620462b69c32f237736996e67ab291058b" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" }, diff --git a/tools/nvim/lua/plugins/lsp.lua b/tools/nvim/lua/plugins/lsp.lua index 3eaa219..a5e3c4a 100644 --- a/tools/nvim/lua/plugins/lsp.lua +++ b/tools/nvim/lua/plugins/lsp.lua @@ -24,7 +24,7 @@ return { require("luasnip").config.setup({ enable_autosnippets = true }) end, }, - { "williamboman/mason.nvim", config = true }, + { "williamboman/mason.nvim", config = true }, { "williamboman/mason-lspconfig.nvim", lazy = false, @@ -47,8 +47,26 @@ return { "NoahTheDuke/vim-just", ft = { "just" }, }, - { import = "plugins.mod.trouble-nvim" }, + { + "nvim-orgmode/orgmode", + event = "VeryLazy", + ft = { "org" }, + config = function() + -- Setup orgmode + require("orgmode").setup({ + org_agenda_files = "~/orgfiles/**/*", + org_default_notes_file = "~/orgfiles/refile.org", + }) + -- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option + -- add ~org~ to ignore_install + -- require('nvim-treesitter.configs').setup({ + -- ensure_installed = 'all', + -- ignore_install = { 'org' }, + -- }) + end, + }, + { import = "plugins.mod.trouble-nvim" }, { import = "plugins.mod.nvim-treesitter" }, { "folke/lazydev.nvim",