Skip to content

Commit

Permalink
feat(emacs): sync config
Browse files Browse the repository at this point in the history
  • Loading branch information
danilshvalov committed Mar 10, 2024
1 parent c3a8357 commit 5180874
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 107 deletions.
6 changes: 3 additions & 3 deletions .arcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[core]
# editor = "nvim"
# pager = "nvim -R"
pager = "(f=$(mktemp --suffix .diff); cat > $f; my-emacs $f; rm -v $f)"
editor = "nvim"
pager = "nvim -R"
# pager = "(f=$(mktemp --suffix .diff); cat > $f; my-emacs $f; rm -v $f)"

[alias]
st = status
Expand Down
1 change: 1 addition & 0 deletions .config/emacs/.lsp-session-v1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#s(lsp-session ("/home/danilshvalov/arcadia/taxi/backend-py3/services/dashboards/test_dashboards/cron") nil #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()) #s(hash-table size 65 test equal rehash-size 1.5 rehash-threshold 0.8125 data ()))
28 changes: 21 additions & 7 deletions .config/emacs/config.el
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

(defun my-set-current-directory (directory)
;; (setq my-directory directory)
(add-to-list 'my-directories (cons (my-tab-name-current) directory))
(setq my-directories (push (cons (my-tab-name-current) directory) my-directories))
)

;; remove image resize delay
Expand Down Expand Up @@ -220,7 +220,7 @@
(doom-themes-set-faces 'user
`(highlight
:foreground 'unspecified
:background 'unspecified
:background "#3C435E"
:inherit 'region)
`(font-lock-comment-face :foreground ,(doom-lighten 'comments 0.2))
`(corfu-current :background ,(doom-color 'region))
Expand Down Expand Up @@ -504,15 +504,18 @@ expand immediately. Common gateway for
:keymaps 'override
"s" 'avy-goto-char-2))

(use-builtin eglot
(use-package jsonrpc)
(use-package eldoc)

(use-package eglot
:custom
(eglot-sync-connect nil)
(eglot-events-buffer-size 0)
:hook
((LaTeX-mode
c++-ts-mode
csharp-mode
;; python-ts-mode
python-ts-mode
conf-toml-mode
tsx-ts-mode)
.
Expand All @@ -533,7 +536,7 @@ expand immediately. Common gateway for

(add-to-list 'eglot-server-programs '(c++-ts-mode . ("clangd" "--compile-commands-dir=build_debug")))
(add-to-list 'eglot-server-programs '(latex-mode . ("texlab")))
;; (add-to-list 'eglot-server-programs '(python-ts-mode . ("pylsp")))
(add-to-list 'eglot-server-programs '(python-ts-mode . ("pylsp")))
(add-to-list
'eglot-server-programs
'(conf-toml-mode . ("taplo" "lsp" "stdio"))))
Expand Down Expand Up @@ -575,6 +578,10 @@ expand immediately. Common gateway for
;; "rg --null --line-buffered --color=never --max-columns=1000 --path-separator / --smart-case --no-heading --with-filename --line-number --search-zip")
(consult-async-split-style 'semicolon)
(consult-preview-key nil)
(consult-async-min-input 0)
(consult-async-refresh-delay 0)
(consult-async-input-debounce 0)
(consult-async-input-throttle 0)
:general
(nvmap
:keymaps 'override
Expand Down Expand Up @@ -1118,7 +1125,7 @@ Quit if no candidate is selected."
(nvmap
"ga" 'ialign))

(use-builtin flymake
(use-package flymake
:hook ((sql-mode) . flymake-mode)
:commands flymake-mode
:custom
Expand All @@ -1128,7 +1135,7 @@ Quit if no candidate is selected."
(flymake-no-changes-timeout 1.0)
(flymake-start-on-save-buffer t)
(flymake-proc-compilation-prevents-syntax-check t)
(flymake-show-diagnostics-at-end-of-line nil)
(flymake-show-diagnostics-at-end-of-line t)
(flymake-wrap-around nil)
:general
(nvmap
Expand Down Expand Up @@ -2039,6 +2046,13 @@ Note that these rules can't contain anchored rules themselves."
(let* ((branches (or branches (arc--select-branch-list))))
(apply 'arc--call-process "arc" "branch" "--delete" branches)))

(use-package indent-bars
:elpaca (indent-bars :host github :repo "jdtsmith/indent-bars")
:custom
(indent-bars-color-by-depth nil)
(indent-bars-color '(shadow :face-bg nil :blend 0.5))
:hook ((prog-mode text-mode) . indent-bars-mode))

(advice-add 'arc--call-process :around #'execute-at-project-root)

(modify-syntax-entry ?_ "w")
35 changes: 17 additions & 18 deletions .config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
{
"LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
"arrow.nvim": { "branch": "master", "commit": "9d98760d9a195174a24b6ccc20217bc98f3596e0" },
"ccc.nvim": { "branch": "main", "commit": "0ca30a4fd8429bffb6394f4ee27166fb4ff29fbf" },
"ccc.nvim": { "branch": "main", "commit": "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c" },
"cmdbuf.nvim": { "branch": "main", "commit": "aa3a26fa7f9b77f5d9de89fa662eebd09d8885de" },
"conform.nvim": { "branch": "master", "commit": "192a6d2ddace343f1840a8f72efe2315bd392243" },
"fzf-lua": { "branch": "main", "commit": "3b3cc17c7bb91f6bbef7166c0756f89a189c4db4" },
"fzf-lua": { "branch": "main", "commit": "91ec17b4fd0d810599f054eef08db967a0457fbf" },
"git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
"indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" },
"keymap-amend.nvim": { "branch": "master", "commit": "b8bf9d820878d5497fdd11d6de55dea82872d98e" },
"keymap.nvim": { "branch": "main", "commit": "825e0c1c141c278ed6754086115165330f5cb045" },
"langmapper.nvim": { "branch": "main", "commit": "9d98285b2e45d1c392c6a03e7adedde97d2aa71a" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"leap.nvim": { "branch": "main", "commit": "b41f48643b483bb0881c0f7804f6f0be7bb95155" },
"lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
"leap.nvim": { "branch": "main", "commit": "52f7ce4fcc1764caac77cf4d43c2c4f5fb42d517" },
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
"luautf8": { "branch": "master", "commit": "bdd3d7fb6ef22334fde028ba792d3a16309a4de8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"mini.nvim": { "branch": "main", "commit": "b7403ad0c2a4dab777244171ca1b7e8c89696584" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"mini.nvim": { "branch": "main", "commit": "1d49300d50a2c8ee7faecceb151084f207ff65ba" },
"mkdnflow.nvim": { "branch": "main", "commit": "1b24b8b5fe10fe09af4572c0165293e0dcd998aa" },
"neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" },
"neodev.nvim": { "branch": "main", "commit": "de3685b8c1cd439dd96b7958793f6f381f98652d" },
"nvim-FeMaco.lua": { "branch": "main", "commit": "6af458f0196215f397db31a6e1fb2df795811693" },
"nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
"nvim-jdtls": { "branch": "master", "commit": "382b9f625861f47d95876bcfb4c261f3b96077cb" },
"nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" },
"nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" },
"nvim-jdtls": { "branch": "master", "commit": "01b57f75b00e71541aa328398d5e10ba5ca3ea18" },
"nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" },
"nvim-surround": { "branch": "main", "commit": "8f2af76134f37058dc4c27a24bc5f86c9cae76dc" },
"nvim-treesitter": { "branch": "master", "commit": "6e2b56cbe75ddf18e6efecee44bc3936d70b0b3e" },
"nvim-treesitter": { "branch": "master", "commit": "eb1914bb10dc9b114a61197de0ec58a308c40071" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" },
"nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" },
"nvim_rocks": { "branch": "master", "commit": "fd1f1dff8cc8ed5688fc4b890352a2a340940e34" },
"obsidian.nvim": { "branch": "main", "commit": "9ede6c86b1f47afe00442a6e84fa1f5b00153742" },
"oil.nvim": { "branch": "master", "commit": "132b4ea0740c417b9d717411cab4cf187e1fd095" },
"peek.nvim": { "branch": "master", "commit": "c6ab252ff874e1597e27f865dcfc68b15cae0cff" },
"plantuml-syntax": { "branch": "master", "commit": "309c15c77794433f276fb09eb4e3b8f381003cfd" },
"oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" },
"peek.nvim": { "branch": "master", "commit": "4163a48f190d2b2d94840be3eb38b4af83961ebe" },
"plantuml-syntax": { "branch": "master", "commit": "845abb56dcd3f12afa6eb47684ef5ba3055802b8" },
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
"term-edit.nvim": { "branch": "master", "commit": "e04f69d5828c6e6a4d81c34f75f18762fad50372" },
Expand All @@ -44,6 +43,6 @@
"vim-fswitch": { "branch": "master", "commit": "94acdd8bc92458d3bf7e6557df8d93b533564491" },
"vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" },
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vimtex": { "branch": "master", "commit": "01c4c167338b74dc0c30621841bc548b52e96330" },
"vimtex": { "branch": "master", "commit": "9df79e15bf035d1cfb32c11fffed38dd7b6a0501" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
}
Loading

0 comments on commit 5180874

Please sign in to comment.