···3333;; just comment it out by adding a semicolon to the start of the line.
3434;; You may delete these explanatory comments.
3535(package-initialize)
3636-3736(custom-set-variables
3837 ;; custom-set-variables was added by Custom.
3938 ;; If you edit it by hand, you could mess it up, so be careful.
4039 ;; Your init file should contain only one such instance.
4140 ;; If there is more than one, they won't work right.
4241 '(alert-fade-time 5)
4343- '(auto-save-file-name-transforms '((".*" "~/.local/share/emacs/autosave/" t)))
4442 '(backup-by-copying t)
4543 '(backup-directory-alist '(("." . "~/.local/share/emacs/backup")))
4644 '(before-save-hook '(delete-trailing-whitespace))
···9593 ("begin" "$1" "$" "$$" "\\(" "\\[")))
9694 '(org-image-actual-width nil)
9795 '(org-indirect-buffer-display 'current-window)
9898- '(org-notifications-play-sounds nil)
9999- '(org-notifications-style 'libnotify)
100100- '(org-notifications-title "Agenda Reminder")
10196 '(org-preview-latex-default-process 'dvipng)
10297 '(org-priority-default 68)
10398 '(org-priority-lowest 68)
···108103 '(org-use-property-inheritance '("DEADLINE" "SCHEDULED"))
109104 '(org-wild-notifier-keyword-whitelist nil)
110105 '(package-selected-packages
111111- '(fish-mode ox-slack org-notifications org-ql dash alert orglink ox-gfm go-mode yaml-mode rust-mode hl-todo evil-collection monokai-theme evil-org evil))
106106+ '(fish-mode ox-slack org-ql dash alert orglink ox-gfm go-mode yaml-mode rust-mode hl-todo evil-collection monokai-theme evil-org evil))
112107 '(package-user-dir "~/.local/share/emacs/elpa")
113113- '(read-buffer-completion-ignore-case t)
114108 '(require-final-newline t)
115109 '(select-enable-clipboard nil)
116110 '(show-paren-mode t)
···123117 ;; If you edit it by hand, you could mess it up, so be careful.
124118 ;; Your init file should contain only one such instance.
125119 ;; If there is more than one, they won't work right.
126126- '(default ((t (:inherit nil :extend nil :stipple nil :background "#272822" :foreground "#F8F8F2" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 98 :width normal :foundry "outline" :family "Monospace")))))
120120+ '(default ((t (:inherit nil :extend nil :stipple nil :background "#272822" :foreground "#F8F8F2" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 120 :width normal :foundry "nil" :family "Monaspace Argon Var")))))
121121+127122128123;; ================================================================================
129124;; User Configuration
···264259 ;; but now it seems like redo is working better
265260 (org-agenda-redo)))))
266261267267-(defun org-agenda-redo-save-hook()
268268- ;; same as above, but only if current mode is org-mode
269269- (when (eq major-mode 'org-mode)
270270- (org-agenda-redo-all)
271271- ;; re-evaluate notifications after updating agenda
272272- (org-notifications-start)))
273273-274262;; https://emacs.stackexchange.com/a/13238
275263(defun org-todo-list-current-file (&optional arg)
276264 "Like `org-todo-list', but using only the current buffer's file."
···379367;; Export org-mode to github-flavored markdown
380368(eval-after-load "org"
381369 '(require 'ox-gfm nil t))
382382-383383-(org-notifications-start)
384384-;; add our own rule to make sure notifs are persistent.
385385-(alert-add-rule :category "org-notifications"
386386- :persistent t
387387- :style 'notifications
388388- ;; by default this is inserted to head of list
389389- :continue t)
···28282929-- TODO: convert remainder of this to proper Lua config
30303131-if not vim.g.vscode then
3232- -- Default to dark mode if unset
3333- vim.opt.background = os.getenv("COLOR_THEME") or "dark"
3131+-- Wrap this in a pcall in case treesitter isn't installed
3232+pcall(function()
3333+ require("nvim-treesitter.configs").setup({
3434+ highlight = {
3535+ -- VScode does highlighting and we don't want treesitter
3636+ enable = false, -- not vim.g.vscode,
3737+ },
3838+ })
3939+end)
34403535- require("monokai-nightasty").setup({
3636- on_highlights = function(highlights, colors)
3737- -- It seems like most syntaxes just use String for quotes, but
3838- -- for some (e.g. JSON) they are highlighted differently.
3939- -- This just forces them back to regular String highlight
4040- highlights.Quote = highlights.String
4141+-- Even though vscode should be doing its own highlights, this also
4242+-- enables monokai for e.g. :help highlighting and matches a little better when
4343+-- vscode-neovim tries to highlight things it shouldn't.
4444+-- TODO I should maybe file another issue about the highlight stuff...
4545+require("monokai-nightasty").setup({
4646+ on_highlights = function(highlights, colors)
4747+ -- It seems like most syntaxes just use String for quotes, but
4848+ -- for some (e.g. JSON) they are highlighted differently.
4949+ -- This just forces them back to regular String highlight
5050+ highlights.Quote = highlights.String
41514242- -- More like the old vim highlighting:
4343- highlights.gitcommitSummary, highlights.gitcommitOverflow =
4444- highlights.gitcommitOverflow, highlights.gitcommitSummary
4545- end,
4646- })
4747- vim.cmd.colorscheme("monokai-nightasty")
5252+ -- More like the old vim highlighting:
5353+ highlights.gitcommitSummary, highlights.gitcommitOverflow =
5454+ highlights.gitcommitOverflow, highlights.gitcommitSummary
5555+ end,
5656+})
48574949- -- Wrap this in a pcall in case treesitter isn't installed
5050- pcall(function()
5151- require("nvim-treesitter.configs").setup({
5252- highlight = { enable = true },
5353- })
5454- end)
5858+vim.cmd.colorscheme("monokai-nightasty")
5959+6060+if not vim.g.vscode then
6161+ -- Default to dark mode if unset
6262+ vim.opt.background = os.getenv("COLOR_THEME") or "dark"
55635664 -- TODO: https://github.com/akinsho/git-conflict.nvim
5765else
5866 -- vscode-neovim
5967 local vscode = require("vscode")
60686161- vim.opt.cmdheight = 1
6969+ -- vim.opt.cmdheight = 1
62706371 local group = vim.api.nvim_create_augroup("vscode-custom", {})
6472···84928593 -- Fix comment handling for AHK
8694 vim.api.nvim_create_autocmd({ "BufEnter" }, {
8787- pattern = {"*.ahk", "*.ahk2"},
9595+ pattern = { "*.ahk", "*.ahk2" },
8896 group = group,
8997 callback = function(args)
9098 vim.opt.comments = {
···94102 ":;;",
95103 ":;",
96104 }
9797- end
105105+ end,
98106 })
99107100108 -- For whatever reason, nvim buffers sometimes open without line numbers:
···184192 },
185193186194 -- Opt-in to takeover on some URLs
187187- ["https?://(www[.])?shadertoy[.]com"] = {
195195+ ["https?://(www[.])?shadertoy[.]com/?.*"] = {
188196 takeover = "once",
189197 priority = 5,
190198 },
···196204}
197205198206if vim.g.started_by_firenvim then
207207+ -- TODO: different devices need different font sizes here:
208208+ -- https://github.com/glacambre/firenvim/issues/e565
209209+ -- h9 is probably ok for a 1080p screen, but hiDPI is different
210210+ -- and seems like 18~20 is about right? Lua could probably figure it out
211211+ -- using some yadm / os commands
212212+213213+ require("lspconfig").glsl_analyzer.setup({})
214214+199215 vim.cmd([[
200216 " For whatever reason this doesn't needs explicit keybinding:
201217 " https://github.com/glacambre/firenvim/issues/332
+1-1
.config/yadm/.pre-commit-config.yaml
···1010 id: clean-keepassxc
1111 language: python
1212 entry: .config/yadm/hooks/clean-keepassxc-ini.py
1313- args: [.config/keepassxc/keepassxc.ini]
1413 files: ^[.]config/keepassxc/keepassxc[.]ini
1414+ pass_filenames: true
15151616 # Order these first so any auto-formatting etc. doesn't affect them.
1717 # For example, merge conflict detection may be affected.
···11#!/usr/bin/env python3
2233import configparser
44+import os
45import pathlib
56import sys
67···1617 config.remove_section("KeeShare")
1718 with filename.open("w") as newfile:
1819 config.write(newfile, space_around_delimiters=False)
2020+2121+ # trim extra trailing newline, to avoid conflict with end-of-file-fixer
2222+ newfile.seek(0, os.SEEK_END)
2323+ newfile.truncate(newfile.tell() - 1)
192420252126if __name__ == "__main__":
.ssh/vscode_config
This is a binary file and will not be displayed.
+1-5
.vscode/argv.json
···88{
99 // Use software rendering instead of hardware accelerated rendering.
1010 // This can help in cases where you see rendering issues in VS Code.
1111- "disable-hardware-acceleration": false,
1212-1313- // Enabled by default by VS Code to resolve color issues in the renderer
1414- // See https://github.com/microsoft/vscode/issues/51791 for details
1515- "disable-color-correct-rendering": true,
1111+ // "disable-hardware-acceleration": true,
16121713 // Allows to disable crash reporting.
1814 // Should restart the app if the value is changed.