Fixes fish version check

.config/alacritty.toml

@@ -1,58 +0,0 @@
-[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

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

.config/fish/completions/arkesend.fish

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

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

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

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

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

.config/git/config

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

.emacs

@@ -12,18 +12,7 @@
  '(c-basic-offset 4)
  '(compilation-scroll-output 'first-error)
  '(custom-safe-themes
-	  '("162201cf5b5899938cfaec99c8cb35a2f1bf0775fc9ccbf5e63130a1ea217213"
+	  '("162201cf5b5899938cfaec99c8cb35a2f1bf0775fc9ccbf5e63130a1ea217213" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "6622bb651e72d8ebd66454bd86db6c3990324243ff4325c1b6df252aba63b13e" "2f8eadc12bf60b581674a41ddc319a40ed373dd4a7c577933acaff15d2bf7cc6" "f458b92de1f6cf0bdda6bce23433877e94816c3364b821eb4ea9852112f5d7dc" "016f665c0dd5f76f8404124482a0b13a573d17e92ff4eb36a66b409f4d1da410" "13096a9a6e75c7330c1bc500f30a8f4407bd618431c94aeab55c9855731a95e1" "8b148cf8154d34917dfc794b5d0fe65f21e9155977a36a5985f89c09a9669aa0" "bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e" "680f62b751481cc5b5b44aeab824e5683cf13792c006aeba1c25ce2d89826426" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" default))
-		   "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)
@@ -46,19 +35,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 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))
  '(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
+	  '(face trailing tabs lines-tail newline space-before-tab::tab space-before-tab::space space-before-tab tab-mark)))
-		   space-before-tab::space space-before-tab tab-mark)))
 
 (if (display-graphic-p)
 	(if (fboundp 'tool-bar-mode)
@@ -81,23 +70,23 @@
 	                        ("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)
 
@@ -360,6 +349,12 @@
 		      )
 	)
 
+(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
@@ -372,6 +367,49 @@
 	)
 
 
+;; (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
@@ -401,6 +439,15 @@
 	:after yasnippet
 	)
 
+(use-package yasnippet-licenses
+	:straight (yasnippet-licenses
+		          :type git
+		          :host github
+		          :repo "atuleu/yasnippet-licenses"
+		          :files (:defaults "*.el" "snippets")
+		          )
+	:after yasnippet
+	)
 
 
 
@@ -433,9 +480,9 @@
 (use-package cmake-mode
 	:ensure-system-package (
 		                       (cmake . cmake)
-		                       (pipx . pipx)
+		                       (pip . python3-pip)
-		                       (cmake-format . "pipx install cmakelang[YAML]")
+		                       (cmake-format . "pip install --user cmakelang[YAML]")
-		                       (cmake-language-server . "pipx install cmake-language-server")
+		                       (cmake-language-server . "pip install --user cmake-language-server")
 		                       )
 	:config
 	(setq cmake-tab-width 4)
@@ -521,7 +568,6 @@
 	:hook
 	(c-mode . lsp-deferred)
 	(c++-mode . lsp-deferred)
-	(c++-mode . (lambda () (setq-local lsp-enable-on-type-formatting nil)))
 	)
 
 (use-package clang-format+
@@ -614,7 +660,6 @@
 								(concat "-imp." ext)
 								(concat "-impl." ext)
 								".cpp"
-								".c"
 								)))
 					)
 				(when (member ext '("c" "cc" "cpp"))
@@ -705,22 +750,19 @@
 		(setq lsp-ui-doc-use-webkit t)
 		)
 	(add-to-list 'lsp-language-id-configuration '("\\.postcss\\'" . "css"))
-	(defun atu/lsp-inline-completion-display-toggle-key ()
+	(advice-add 'lsp :before
-		"Add or remove `i` key from the lsp-command-map`  depending on `lsp-inline-completion-mode`"
+		(lambda (&rest _args)
-		(if lsp-inline-completion-mode
+			(eval '(setf (lsp-session-server-id->folders (lsp-session)) (ht)
-			(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)
 		)
-	:bind (("C-c C-d" . lsp-ui-doc-toggle))
+	(setq lsp-completion-provider :none)
-
+	:bind (
-	:hook (
+		      ("C-c C-d" . lsp-ui-doc-toggle)
-			  (lsp-mode . lsp-enable-which-key-integration)
+		      )
-			  (lsp-inline-completion-mode . lsp-inline-completion-company-integration-mode)
+	:hook
-			  (lsp-inline-completion-mode . atu/lsp-inline-completion-display-toggle-key)
+	(lsp-mode . lsp-enable-which-key-integration)
-			  )
 	:commands
 	(lsp lsp-deferred)
 	)
@@ -1020,9 +1062,8 @@
 	(dockerfile-mode . lsp-deferred)
 	)
 
-
 (use-package spdx
-	:quelpa (spdx :fetcher github :repo "condy0919/spdx.el")
+	:straight (:host github :repo "condy0919/spdx.el")
 	:bind (:map prog-mode-map
 			  ("C-c i l" . spdx-insert-spdx))
 	:custom

tomorrow-night-tweeked.ron

@@ -1,37 +0,0 @@
-(
-    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,8 +102,7 @@ files=".config/fish \
 .config/starship.toml \
 .local/share/omf \
 .emacs \
-.tmux.conf.local \
+.tmux.conf.local"
-.config/alacritty.toml"
 
 
 
@@ -164,7 +163,7 @@ ${current_version}
 3.4.0
 EOF
 				)
-	if [ $(echo "${current_version_test}" | sort -n | head -1) != "3.4.0" ]
+	if [ $(echo "${current_version_test}" | sort | head -1) != "3.4.0" ]
 	then
 		echo "Wrong version of fish ${current_version}"
 		fish_good=1