diff --git a/init.el b/init.el index d3a6e4a..3e18067 100644 --- a/init.el +++ b/init.el @@ -5,7 +5,7 @@ ;; If there is more than one, they won't work right. '(initial-frame-alist '((fullscreen . maximized))) '(package-selected-packages - '(ef-themes dockerfile-mode dap-mode julia-ts-mode lsp-julia julia-mode marginalia vertico tide which-key use-package pyenv-mode flycheck exec-path-from-shell elpy doom-themes doom-modeline all-the-icons))) + '(zig-mode treesit ef-themes dockerfile-mode dap-mode julia-ts-mode lsp-julia julia-mode marginalia vertico tide which-key use-package pyenv-mode flycheck exec-path-from-shell elpy doom-themes doom-modeline all-the-icons))) (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) @@ -27,6 +27,11 @@ (use-package marginalia :ensure t) +(require 'treesit) + +(use-package zig-mode + :ensure t) + (use-package dired :config (put 'dired-find-alternate-file 'disabled nil) @@ -45,8 +50,8 @@ (scroll-bar-mode -1) -;;(set-face-attribute 'default nil :font "Luculent" :height 110) -(set-face-attribute 'default nil :font "VictorMono Nerd Font Mono" :height 110) +(set-face-attribute 'default nil :font "Hack Nerd Font Mono" :height 110) +;;(set-face-attribute 'default nil :font "VictorMono Nerd Font Mono" :height 110) (set-default-coding-systems 'utf-8) @@ -62,6 +67,8 @@ (setq show-paren-delay 0) +(setq native-comp-async-report-warnings-errors 'silent) + (delete-selection-mode 1) (show-paren-mode 1) @@ -223,8 +230,8 @@ Exempt major modes are defined in `display-line-numbers-exempt-modes'." (use-package modus-themes :ensure t) -(load-theme 'modus-operandi-tinted t) -;; (load-theme 'modus-vivendi t) +(modus-themes-select 'modus-vivendi-tinted) +(setq modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted)) (use-package ef-themes :ensure t) @@ -247,7 +254,7 @@ ef-themes-variable-pitch-ui t) ;; (mapc #'disable-theme custom-enabled-themes) -;; (ef-themes-select 'ef-autumn) +;; (ef-themes-select 'ef-maris-light) ;; theming stops here diff --git a/snippets/csharp-mode/class b/snippets/csharp-mode/class new file mode 100644 index 0000000..1308130 --- /dev/null +++ b/snippets/csharp-mode/class @@ -0,0 +1,12 @@ +# -*- mode: csharp -*- +# name: class +# key: cl +# -- +namespace $0`(directory-file-name default-directory)`; + +public sealed class `(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))` +{ + public `(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`() + { + } +} diff --git a/snippets/csharp-mode/ctor b/snippets/csharp-mode/ctor new file mode 100644 index 0000000..31cf8fe --- /dev/null +++ b/snippets/csharp-mode/ctor @@ -0,0 +1,8 @@ +# -*- mode: csharp -*- +# name: ctor +# key: ctor +# -- +public `(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`() +{ + $0 +} diff --git a/snippets/csharp-mode/foreach b/snippets/csharp-mode/foreach new file mode 100644 index 0000000..60caadc --- /dev/null +++ b/snippets/csharp-mode/foreach @@ -0,0 +1,8 @@ +# -*- mode: csharp -*- +# name: foreach +# key: f +# -- +foreach (var ${1:Name} in ${2:Collection}) +{ + $0 +} \ No newline at end of file diff --git a/snippets/csharp-mode/mpriv b/snippets/csharp-mode/mpriv new file mode 100644 index 0000000..8f821d9 --- /dev/null +++ b/snippets/csharp-mode/mpriv @@ -0,0 +1,8 @@ +# -*- mode: csharp -*- +# name: mpriv +# key: mr +# -- +private ${1:void} ${2:Method}($3) +{ + $0 +} \ No newline at end of file diff --git a/snippets/csharp-mode/mpub b/snippets/csharp-mode/mpub new file mode 100644 index 0000000..2c47a4f --- /dev/null +++ b/snippets/csharp-mode/mpub @@ -0,0 +1,8 @@ +# -*- mode: csharp -*- +# name: mpub +# key: mp +# -- +public ${1:void} ${2:Method}($3) +{ + $0 +} \ No newline at end of file diff --git a/snippets/csharp-mode/mpubstatv b/snippets/csharp-mode/mpubstatv new file mode 100644 index 0000000..eefa5dd --- /dev/null +++ b/snippets/csharp-mode/mpubstatv @@ -0,0 +1,8 @@ +# -*- mode: csharp -*- +# name: mpubstatv +# key: mpsv +# -- +public static void ${1:Method}($2) +{ + $0 +} \ No newline at end of file diff --git a/snippets/csharp-mode/print b/snippets/csharp-mode/print new file mode 100644 index 0000000..42c790b --- /dev/null +++ b/snippets/csharp-mode/print @@ -0,0 +1,5 @@ +# -*- mode: csharp -*- +# name: print +# key: p +# -- +System.Console.WriteLine($"{$0}"); \ No newline at end of file diff --git a/snippets/csharp-mode/prop b/snippets/csharp-mode/prop new file mode 100644 index 0000000..05d07c4 --- /dev/null +++ b/snippets/csharp-mode/prop @@ -0,0 +1,5 @@ +# -*- mode: csharp -*- +# name: prop +# key: prop +# -- +public ${1:string} ${2:PropertyName} { get; set; } \ No newline at end of file diff --git a/snippets/csharp-mode/summary b/snippets/csharp-mode/summary new file mode 100644 index 0000000..eddc58c --- /dev/null +++ b/snippets/csharp-mode/summary @@ -0,0 +1,7 @@ +# -*- mode: csharp -*- +# name: summary +# key: /// +# -- +/// +/// $0 +/// \ No newline at end of file diff --git a/snippets/csharp-mode/try b/snippets/csharp-mode/try new file mode 100644 index 0000000..cb19bee --- /dev/null +++ b/snippets/csharp-mode/try @@ -0,0 +1,12 @@ +# -*- mode: csharp -*- +# name: try +# key: t +# -- +try +{ + $0 +} +catch (${1:Exception} ${2:ex}) +{ + ${3:System.Console.WriteLine(ex.Message);} +} \ No newline at end of file diff --git a/tree-sitter/libtree-sitter-bash.so b/tree-sitter/libtree-sitter-bash.so new file mode 100755 index 0000000..f7578e6 Binary files /dev/null and b/tree-sitter/libtree-sitter-bash.so differ diff --git a/tree-sitter/libtree-sitter-json.so b/tree-sitter/libtree-sitter-json.so new file mode 100755 index 0000000..882cd84 Binary files /dev/null and b/tree-sitter/libtree-sitter-json.so differ diff --git a/tree-sitter/libtree-sitter-python.so b/tree-sitter/libtree-sitter-python.so new file mode 100755 index 0000000..99705f6 Binary files /dev/null and b/tree-sitter/libtree-sitter-python.so differ diff --git a/tree-sitter/libtree-sitter-zig.so b/tree-sitter/libtree-sitter-zig.so new file mode 100755 index 0000000..6444203 Binary files /dev/null and b/tree-sitter/libtree-sitter-zig.so differ