Weird LFS bug

Cleanly integrate it with company and other.

.config/alacritty.toml

@@ -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:

.config/fish/completions/arkedump.fish

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

.config/fish/completions/arkesend.fish

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

.config/fish/completions/leto-cli.fish

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

.config/fish/completions/zeus-cli.fish

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

.config/fish/fish_variables

@@ -1,6 +1,6 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
 SETUVAR fish_color_autosuggestion:969896
 SETUVAR fish_color_cancel:\x2dr
 SETUVAR fish_color_command:b294bb

.config/git/config

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

.emacs

@@ -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
-	  '(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)
@@ -70,28 +81,28 @@
 	                        ("gnu" . "https://elpa.gnu.org/packages/")))
 (package-initialize)
 
-(defvar bootstrap-version)
-(let ((bootstrap-file
-	      (expand-file-name
-		      "straight/repos/straight.el/bootstrap.el"
-		      (or (bound-and-true-p straight-base-dir)
-			      user-emacs-directory)))
-	     (bootstrap-version 7))
-	(unless (file-exists-p bootstrap-file)
-		(with-current-buffer
-			(url-retrieve-synchronously
-				"https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
-				'silent 'inhibit-cookies)
-			(goto-char (point-max))
-			(eval-print-last-sexp)))
-	(load bootstrap-file nil 'nomessage))
 
-(straight-use-package 'use-package)
+
+
+(unless (package-installed-p 'quelpa)
+	(with-temp-buffer
+		(url-insert-file-contents "https://raw.githubusercontent.com/quelpa/quelpa/master/quelpa.el")
+		(eval-buffer)
+		(quelpa-self-upgrade)))
+(setq quelpa-checkout-melpa-p nil)
+(setq quelpa-use-package-inhibit-loading-quelpa t)
+(quelpa
+	'(quelpa-use-package
+		 :fetcher github
+		 :repo "quelpa/quelpa-use-package"))
+(require 'quelpa-use-package)
+
+
 (require 'use-package-ensure)
 (setq use-package-always-ensure t)
 
-
-(use-package use-package-ensure-system-package)
+(use-package system-packages)
+;(use-package use-package-ensure-system-package)
 
 
 ;; required because vterm wants this before loading.
@@ -151,6 +162,7 @@
 	(setq vertico-cycle t)
 	:config
 	(vertico-reverse-mode)
+	(keymap-set vertico-map "TAB" #'minibuffer-complete)
 	)
 
 ;; Persist history over Emacs restarts. Vertico sorts by history position.
@@ -165,9 +177,9 @@
 	;; Configure a custom style dispatcher (see the Consult wiki)
 	;; (setq orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch)
 	;;       orderless-component-separator #'orderless-escapable-split-on-space)
-	(setq completion-styles '(orderless basic)
-		completion-category-defaults nil
-		completion-category-overrides '((file (styles partial-completion))))
+	(setq completion-styles '(partial-completion orderless basic)
+		;;completion-category-defaults nil
+		completion-category-overrides '((file (styles basic partial-completion ))))
 	)
 
 ;; Example configuration for Consult
@@ -348,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
@@ -366,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
@@ -425,7 +388,24 @@
 	(magit-credential-cache-daemon-socket nil)
 	)
 
+
+(use-package yasnippet
+	:delight yas-minor-mode
+	:bind ( :map yas-minor-mode-map
+		      ("TAB" . nil)
+		      )
+	)
+
+
+(use-package yasnippet-snippets
+	:after yasnippet
+	)
+
+
+
+
 (use-package company
+	:after yasnippet
 	:delight
 	:bind ( ("M-TAB" . company-complete) )
 	:init
@@ -453,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)
@@ -472,33 +452,41 @@
 	(defun atu/cmake-format-buffer ()
 		"Formats the current buffer using cmake-format"
 		(interactive)
-		(let ((error-buffer (atu/create-or-erase-buffer "*cmake-format:stderr*")))
+		(let (
+			     (error-buffer (atu/create-or-erase-buffer "*cmake-format:stderr*"))
+			     (cmake-format-config-file-exists
+				     (file-exists-p (projectile-expand-root ".cmake-format.yaml"))
+				     )
+			     )
 			(setq-local atu/after-save-message nil)
-			(if (eq 0 (call-process-region
-				          ;;region
-				          (point-min)
-				          (point-max)
-				          "cmake-format"
-				          nil ;do not delete buffer
-				          ;; discard stdout copy stderr to buffer
-				          error-buffer
-				          nil ;dont-redisplay buffer
-				          "-"
-				          ))
-				(let ((current-point (point)))
-					(call-process-region
-						(point-min) (point-max)
-						"cmake-format"
-						t t t; replace current buffer and redisplay it
-						"-"
+			(if cmake-format-config-file-exists
+				(if (eq 0 (call-process-region
+					          ;;region
+					          (point-min)
+					          (point-max)
+					          "cmake-format"
+					          nil ;do not delete buffer
+					          ;; discard stdout copy stderr to buffer
+					          error-buffer
+					          nil ;dont-redisplay buffer
+					          "-"
+					          ))
+					(let ((current-point (point)))
+						(call-process-region
+							(point-min) (point-max)
+							"cmake-format"
+							t t t; replace current buffer and redisplay it
+							"--log-level=error" "-"
+							)
+						(goto-char (+ (point-min) current-point))
+						nil
 						)
-					(goto-char (+ (point-min) current-point))
-					nil
+					(message
+						"cmake-format: could not format %s see buffer %s for details"
+						(buffer-name) error-buffer)
+					(current-message)
 					)
-				(message
-					"cmake-format: could not format %s see buffer %s for details"
-					(buffer-name) error-buffer)
-				(current-message)
+				(message "cmake-format: skipping as no configuration file found")
 				)
 			)
 		)
@@ -527,9 +515,13 @@
 	:ensure nil
 	:ensure-system-package
 	(clangd . clangd)
+	:config
+	(setq  lsp-clients-clangd-args
+		'("--header-insertion-decorators=0" "--query-driver=/**/arm-none-eabi-*" "--log=verbose"))
 	:hook
 	(c-mode . lsp-deferred)
 	(c++-mode . lsp-deferred)
+	(c++-mode . (lambda () (setq-local lsp-enable-on-type-formatting nil)))
 	)
 
 (use-package clang-format+
@@ -539,29 +531,31 @@
 	(c-mode-common . clang-format+-mode)
 	)
 
-(use-package yasnippet
-	:delight yas-minor-mode
+(use-package string-inflection
+	:bind
+	("C-c u" . string-inflection-all-cycle)
+	)
+
+(use-package polymode
 	:config
-	:bind ( :map yas-minor-mode-map
-		      ("TAB" . nil)
-		      )
+	(define-hostmode poly-pio-hostmode
+		:mode 'asm-mode)
+
+	(define-auto-innermode poly-pio-c-innermode
+		:mode 'c-mode
+		:head-matcher "^%c-sdk{$"
+		:tail-matcher "^%}$"
+		:head-mode 'host
+		:tail-mode 'host)
+
+	(define-polymode poly-pio-mode
+		:hostmode 'poly-pio-hostmode
+		:innermodes '(poly-pio-c-innermode))
+
+	(add-to-list 'auto-mode-alist '("\\.pio$" . poly-pio-mode))
 	)
 
 
-(use-package yasnippet-snippets
-	:after yasnippet
-	)
-
-(use-package yasnippet-licenses
-	:straight (yasnippet-licenses
-		          :type git
-		          :host github
-		          :repo "atuleu/yasnippet-licenses"
-		          :files (:defaults "*.el" "snippets")
-		          )
-	:after yasnippet
-	)
-
 (use-package projectile
 	:bind ( :map projectile-mode-map
 		      ( "C-c p" . 'projectile-command-map)
@@ -620,6 +614,7 @@
 								(concat "-imp." ext)
 								(concat "-impl." ext)
 								".cpp"
+								".c"
 								)))
 					)
 				(when (member ext '("c" "cc" "cpp"))
@@ -645,6 +640,27 @@
 		)
 	)
 
+;; (use-package polymode
+;; 	:config
+;; 	(define-hostmode poly-pio-hostmode
+;; 		:mode 'asm-mode)
+
+;; 	(define-innermode poly-pio-c-innermode
+;; 		:mode 'c-mode
+;; 		:head-matcher "^% c-sdk {$"
+;; 		:tail-matcher "^%}$"
+;; 		:head-mode 'host
+;; 		:tail-mode 'host)
+
+;; 	(define-polymode poly-pio-mode
+;; 		:hostmode 'poly-pio-hostmode
+;; 		:innermodes '(poly-pio-c-innermode))
+
+;; 	(add-to-list 'auto-mode-alist '("\\.pio$" . poly-pio-mode))
+
+;; 	)
+
+
 (use-package vterm)
 
 (use-package flycheck
@@ -689,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
-	(lsp-mode . lsp-enable-which-key-integration)
+	: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)
 	)
@@ -950,7 +969,7 @@
 	)
 
 (use-package glsl-mode)
-(use-package opencl-mode)
+(use-package opencl-c-mode)
 
 (use-package protobuf-mode
 	:mode "\\.proto\\'"
@@ -1002,6 +1021,15 @@
 	)
 
 
+(use-package spdx
+	:quelpa (spdx :fetcher github :repo "condy0919/spdx.el")
+	:bind (:map prog-mode-map
+			  ("C-c i l" . spdx-insert-spdx))
+	:custom
+	(spdx-copyright-holder 'auto)
+	(spdx-project-detection 'auto))
+
+
 
 ;; Local Variables:
 ;; vc-follow-symlinks: t

tomorrow-night-tweeked.ron

@@ -0,0 +1,37 @@
+(
+    name: "Tomorrow Night - Tweeked",
+    foreground: "#C5C8C6",
+    background: "#282A2E",
+    cursor: "#F6F6F6",
+    dim_foreground: "#282A2E",
+    normal: (
+        black: "#282A2E",
+        red: "#CC6666",
+        green: "#B5BD68",
+        yellow: "#F0C674",
+        blue: "#81A2BE",
+        magenta: "#B294BB",
+        cyan: "#8ABEB7",
+        white: "#969896",
+    ),
+    bright: (
+        black: "#373B41",
+        red: "#FF9999",
+        green: "#E5ED98",
+        yellow: "#FFF6A4",
+        blue: "#B1D2EE",
+        magenta: "#E2C4EB",
+        cyan: "#BAEEE7",
+        white: "#C5C8C6",
+    ),
+    dim: (
+        black: "#1f1d21",
+        red: "#BB5555",
+        green: "#A4AC57",
+        yellow: "#DFB563",
+        blue: "#7091AD",
+        magenta: "#A183AA",
+        cyan: "#79ADA6",
+        white: "#858785",
+   ),
+)

update.sh

@@ -102,7 +102,8 @@ files=".config/fish \
 .config/starship.toml \
 .local/share/omf \
 .emacs \
-.tmux.conf.local"
+.tmux.conf.local \
+.config/alacritty.toml"
 
 
 
@@ -151,10 +152,30 @@ function load_gnome_terminal_profiles() {
 
 function install_fish() {
 	echo "--- Ensuring fish is current shell"
-    if ! which fish 1>/dev/null
-    then
-		echo "+++ Installing fish"
-		run sudo apt-get install -y fish
+	local fish_good=0
+	if ! which fish 1>/dev/null
+	then
+		fish_good=1
+	fi
+
+	local current_version=$(fish --version | cut -d " " -f 3)
+	local current_version_test=$(cat <<EOF
+${current_version}
+3.4.0
+EOF
+				)
+	if [ $(echo "${current_version_test}" | sort -n | head -1) != "3.4.0" ]
+	then
+		echo "Wrong version of fish ${current_version}"
+		fish_good=1
+	fi
+
+	if [ $fish_good -eq 1 ]
+	then
+		echo "+++ Installing fish from PPA"
+		run sudo add-apt-repository -y ppa:fish-shell/release-3
+		run sudo apt update
+		run sudo apt install -y fish
 	else
 		echo "+++ Fish is installed"
     fi