Compare commits

...

8 Commits

Author SHA1 Message Date
8322ef1997 Weird LFS bug 2025-11-06 18:59:02 +01:00
96416217ba [emacs] Clean lsp-inline-comment-mode integration
Cleanly integrate it with company and other.
2025-10-30 22:24:56 +01:00
f16574af53 Adds completion for some custom tools 2025-10-30 09:56:15 +01:00
0daf243692 Adds completion for some utilities 2025-10-30 08:59:49 +01:00
c6cf796f15 Adds a setting to spawn a new instance.
With stacking in my WM like cosmic, it is almost all I need. Goodbye gnome-terminal.
2025-10-30 00:05:56 +01:00
d1a7c54680 Adds alacritty support 2025-10-30 00:00:22 +01:00
65d7b932d4 Fixes electric indentation 2025-10-29 23:11:46 +01:00
4f7cf6bf36 [emacs] Fixes quelpa-use-package git repo path 2025-10-22 12:03:51 +02:00
8 changed files with 102 additions and 78 deletions

58
.config/alacritty.toml Normal file
View File

@@ -0,0 +1,58 @@
[font]
size = 12.0
[font.bold]
family = "UbuntuMono Nerd Font Mono"
style = "Bold"
[font.bold_italic]
family = "UbuntuMono Nerd Font Mono"
style = "Bold Italic"
[font.normal]
family = "UbuntuMono Nerd Font Mono"
style = "Regular"
[font.italic]
family = "UbuntuMono Nerd Font Mono"
style = "Italic"
[colors.primary]
foreground = "#C5C8C6"
background = "#282A2E"
[colors.cursor]
text = '#1d1f21'
cursor='#F6F6F6'
[colors.normal]
black= "#282A2E"
red= "#CC6666"
green= "#B5BD68"
yellow= "#F0C674"
blue= "#81A2BE"
magenta= "#B294BB"
cyan= "#8ABEB7"
white= "#969896"
[colors.bright]
black= "#373B41"
red= "#FF9999"
green= "#E5ED98"
yellow= "#FFF6A4"
blue= "#B1D2EE"
magenta= "#E2C4EB"
cyan= "#BAEEE7"
white= "#C5C8C6"
[keyboard]
bindings = [
{ key = "T", mods = "Control|Shift", action = "SpawnNewInstance" }
]
[window]
decorations = "Full"
# Local Variables:
# vc-follow-symlinks: t
# End:

View File

@@ -0,0 +1 @@
complete -c arkedump -f -a "(GO_FLAGS_COMPLETION=1 arkedump (string split ' ' (commandline -cp)))"

View File

@@ -0,0 +1 @@
complete -c arkesend -f -a "(GO_FLAGS_COMPLETION=1 arkesend (string split ' ' (commandline -cp)))"

View File

@@ -0,0 +1 @@
complete -c leto-cli -f -a "(GO_FLAGS_COMPLETION=1 leto-cli (string split ' ' (commandline -cp)))"

View File

@@ -0,0 +1 @@
complete -c zeus-cli -f -a "(GO_FLAGS_COMPLETION=1 zeus-cli (string split ' ' (commandline -cp)))"

View File

@@ -7,8 +7,3 @@
tool = meld
[init]
defaultBranch = main
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true

108
.emacs
View File

@@ -12,7 +12,18 @@
'(c-basic-offset 4)
'(compilation-scroll-output 'first-error)
'(custom-safe-themes
'("162201cf5b5899938cfaec99c8cb35a2f1bf0775fc9ccbf5e63130a1ea217213" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "6622bb651e72d8ebd66454bd86db6c3990324243ff4325c1b6df252aba63b13e" "2f8eadc12bf60b581674a41ddc319a40ed373dd4a7c577933acaff15d2bf7cc6" "f458b92de1f6cf0bdda6bce23433877e94816c3364b821eb4ea9852112f5d7dc" "016f665c0dd5f76f8404124482a0b13a573d17e92ff4eb36a66b409f4d1da410" "13096a9a6e75c7330c1bc500f30a8f4407bd618431c94aeab55c9855731a95e1" "8b148cf8154d34917dfc794b5d0fe65f21e9155977a36a5985f89c09a9669aa0" "bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e" "680f62b751481cc5b5b44aeab824e5683cf13792c006aeba1c25ce2d89826426" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" default))
'("162201cf5b5899938cfaec99c8cb35a2f1bf0775fc9ccbf5e63130a1ea217213"
"e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2"
"6622bb651e72d8ebd66454bd86db6c3990324243ff4325c1b6df252aba63b13e"
"2f8eadc12bf60b581674a41ddc319a40ed373dd4a7c577933acaff15d2bf7cc6"
"f458b92de1f6cf0bdda6bce23433877e94816c3364b821eb4ea9852112f5d7dc"
"016f665c0dd5f76f8404124482a0b13a573d17e92ff4eb36a66b409f4d1da410"
"13096a9a6e75c7330c1bc500f30a8f4407bd618431c94aeab55c9855731a95e1"
"8b148cf8154d34917dfc794b5d0fe65f21e9155977a36a5985f89c09a9669aa0"
"bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e"
"680f62b751481cc5b5b44aeab824e5683cf13792c006aeba1c25ce2d89826426"
"631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b"
default))
'(display-time-24hr-format t)
'(display-time-default-load-average nil)
'(doom-modeline-github t)
@@ -35,19 +46,19 @@
'(lisp-simple-loop-indentation 4)
'(lisp-tag-body-indentation 4)
'(lisp-tag-indentation 4)
'(lsp-copilot-enabled t)
'(lsp-inline-completion-idle-delay 99999999)
'(org-agenda-files '("~/org/1.TODO.org"))
'(package-enable-at-startup nil)
'(package-selected-packages
'(spdx opencl-c-mode polymode string-inflection code-cells clang-format+ cmake-format xterm-color dockerfile-mode web-mode prettier json-mode py-isort blacken pyvenv yaml-mode lsp-pyright ng2-mode lsp-ltex lsp-treemacs treemacs-nerd-icons treemacs-projectile treemacs lsp-ui lsp-mode which-key flycheck vterm projectile yasnippet-snippets yasnippet aggressive-indent doom-themes company-go zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode markdown-mode srefactor irony cmake-mode company magit use-package))
'(package-selected-packages nil)
'(safe-local-variable-values
'((vc-follow-symlinks . t)
(TeX-master . t)
(TeX-parse-self . t)))
'((vc-follow-symlinks . t) (TeX-master . t) (TeX-parse-self . t)))
'(system-packages-noconfirm t)
'(tab-width 4)
'(warning-suppress-log-types '((comp)))
'(whitespace-style
'(face trailing tabs lines-tail newline space-before-tab::tab space-before-tab::space space-before-tab tab-mark)))
'(face trailing tabs lines-tail newline space-before-tab::tab
space-before-tab::space space-before-tab tab-mark)))
(if (display-graphic-p)
(if (fboundp 'tool-bar-mode)
@@ -83,7 +94,7 @@
(quelpa
'(quelpa-use-package
:fetcher github
:repo "quelpa/quelpa-use-package.git"))
:repo "quelpa/quelpa-use-package"))
(require 'quelpa-use-package)
@@ -349,12 +360,6 @@
)
)
(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.
)
(use-package xterm-color
:config
@@ -367,49 +372,6 @@
)
;; (use-package smart-tabs-mode
;; :config
;; (setq-default tab-width 4) ; or any other preferred value
;; (setq cua-auto-tabify-rectangles nil)
;; (smart-tabs-advice c-indent-line c-basic-offset)
;; (smart-tabs-advice c-indent-region c-basic-offset)
;; (smart-tabs-add-language-support cmake cmake-mode-hook
;; (
;; (cmake-indent . cmake-tab-width)
;; )
;; )
;; (smart-tabs-add-language-support protobuf protobuf-mode-hook
;; (
;; (c-indent-line . c-basic-offset)
;; (c-indent-region . c-basic-offset)
;; )
;; )
;; (smart-tabs-add-language-support glsl glsl-mode-hook
;; (
;; (c-indent-line . c-basic-offset)
;; (c-indent-region . c-basic-offset)
;; )
;; )
;; (smart-tabs-add-language-support opencl opencl-mode-hook
;; (
;; (c-indent-line . c-basic-offset)
;; (c-indent-region . c-basic-offset)
;; )
;; )
;; (smart-tabs-add-language-support elisp emacs-lisp-mode-hook
;; (
;; (lisp-indent-line . lisp-indent-offset)
;; (lisp-indent-region . lisp-indent-offset)
;; )
;; )
;; (smart-tabs-insinuate 'c 'c++ 'cmake 'nxml 'protobuf 'glsl 'elisp)
;; )
(use-package aggressive-indent
:hook
@@ -471,9 +433,9 @@
(use-package cmake-mode
:ensure-system-package (
(cmake . cmake)
(pip . python3-pip)
(cmake-format . "pip install --user cmakelang[YAML]")
(cmake-language-server . "pip install --user cmake-language-server")
(pipx . pipx)
(cmake-format . "pipx install cmakelang[YAML]")
(cmake-language-server . "pipx install cmake-language-server")
)
:config
(setq cmake-tab-width 4)
@@ -559,6 +521,7 @@
:hook
(c-mode . lsp-deferred)
(c++-mode . lsp-deferred)
(c++-mode . (lambda () (setq-local lsp-enable-on-type-formatting nil)))
)
(use-package clang-format+
@@ -742,19 +705,22 @@
(setq lsp-ui-doc-use-webkit t)
)
(add-to-list 'lsp-language-id-configuration '("\\.postcss\\'" . "css"))
(advice-add 'lsp :before
(lambda (&rest _args)
(eval '(setf (lsp-session-server-id->folders (lsp-session)) (ht)
(defun atu/lsp-inline-completion-display-toggle-key ()
"Add or remove `i` key from the lsp-command-map` depending on `lsp-inline-completion-mode`"
(if lsp-inline-completion-mode
(define-key lsp-command-map (kbd "i") #'lsp-inline-completion-display)
(define-key lsp-command-map (kbd "i") nil)))
(with-eval-after-load 'lsp-inline-completion
(define-key lsp-inline-completion-active-map (kbd "C-j") #'lsp-inline-completion-accept)
)
)
)
)
(setq lsp-completion-provider :none)
:bind (
("C-c C-d" . lsp-ui-doc-toggle)
)
:hook
:bind (("C-c C-d" . lsp-ui-doc-toggle))
:hook (
(lsp-mode . lsp-enable-which-key-integration)
(lsp-inline-completion-mode . lsp-inline-completion-company-integration-mode)
(lsp-inline-completion-mode . atu/lsp-inline-completion-display-toggle-key)
)
:commands
(lsp lsp-deferred)
)

View File

@@ -102,7 +102,8 @@ files=".config/fish \
.config/starship.toml \
.local/share/omf \
.emacs \
.tmux.conf.local"
.tmux.conf.local \
.config/alacritty.toml"