Compare commits

..

6 Commits

3 changed files with 66 additions and 27 deletions

View File

@ -10,7 +10,7 @@ const simplifiedHead = [
{ {
async: true, async: true,
src: 'https://umami.phundrak.com/script.js', src: 'https://umami.phundrak.com/script.js',
'data-website-id': '67166941-8c83-4a19-bc8c-139e44b7f7aa', 'data-website-id': '9574ed51-3939-4d4e-979f-6b2908fbe1af',
'data-do-not-track': 'true', 'data-do-not-track': 'true',
}, },
], ],

View File

@ -21,7 +21,8 @@ variables to install grammars for different languages.
css-ts-mode yaml-ts-mode) . lsp-deferred) css-ts-mode yaml-ts-mode) . lsp-deferred)
:init :init
(setq treesit-language-source-alist (setq treesit-language-source-alist
'((bash "https://github.com/tree-sitter/tree-sitter-bash") '((astro "https://github.com/virchau13/tree-sitter-astro")
(bash "https://github.com/tree-sitter/tree-sitter-bash")
(c "https://github.com/tree-sitter/tree-sitter-c") (c "https://github.com/tree-sitter/tree-sitter-c")
(cmake "https://github.com/uyha/tree-sitter-cmake") (cmake "https://github.com/uyha/tree-sitter-cmake")
(common-lisp "https://github.com/theHamsta/tree-sitter-commonlisp") (common-lisp "https://github.com/theHamsta/tree-sitter-commonlisp")
@ -32,7 +33,7 @@ variables to install grammars for different languages.
(go "https://github.com/tree-sitter/tree-sitter-go") (go "https://github.com/tree-sitter/tree-sitter-go")
(go-mod "https://github.com/camdencheek/tree-sitter-go-mod") (go-mod "https://github.com/camdencheek/tree-sitter-go-mod")
(html "https://github.com/tree-sitter/tree-sitter-html") (html "https://github.com/tree-sitter/tree-sitter-html")
(js . ("https://github.com/tree-sitter/tree-sitter-javascript" "master" "src")) (js ("https://github.com/tree-sitter/tree-sitter-javascript" "master" "src"))
(json "https://github.com/tree-sitter/tree-sitter-json") (json "https://github.com/tree-sitter/tree-sitter-json")
(lua "https://github.com/Azganoth/tree-sitter-lua") (lua "https://github.com/Azganoth/tree-sitter-lua")
(make "https://github.com/alemuller/tree-sitter-make") (make "https://github.com/alemuller/tree-sitter-make")
@ -41,8 +42,8 @@ variables to install grammars for different languages.
(r "https://github.com/r-lib/tree-sitter-r") (r "https://github.com/r-lib/tree-sitter-r")
(rust "https://github.com/tree-sitter/tree-sitter-rust") (rust "https://github.com/tree-sitter/tree-sitter-rust")
(toml "https://github.com/tree-sitter/tree-sitter-toml") (toml "https://github.com/tree-sitter/tree-sitter-toml")
(tsx . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src")) (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src")
(typescript . ("https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src")) (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src")
(yaml "https://github.com/ikatyang/tree-sitter-yaml")))) (yaml "https://github.com/ikatyang/tree-sitter-yaml"))))
#+end_src #+end_src
@ -1445,6 +1446,15 @@ Auto-completion for ~emmet-mode~, ~html-mode~, and ~web-mode~.
:after (emmet-mode web-mode)) :after (emmet-mode web-mode))
#+end_src #+end_src
**** Astro
#+begin_src emacs-lisp
(use-package astro-ts-mode
:straight (:build t)
:defer t
:init
(mapc #'treesit-install-language-grammar '(astro css tsx)))
#+end_src
**** CSS **** CSS
Lets customize a bit the built-in CSS mode. Lets customize a bit the built-in CSS mode.
#+begin_src emacs-lisp #+begin_src emacs-lisp

View File

@ -45,6 +45,12 @@ I also use [[https://github.com/elkowar/eww/][eww]] for some widgets, lets lo
eww shell-completions --shell fish | source eww shell-completions --shell fish | source
#+end_src #+end_src
The [[https://crates.io/crates/sqlx][sqlx]] CLI is a requirement for my Rust projects using this crate.
The code below integrates its completions in Fish.
#+begin_src fish
sqlx completions fish | source
#+end_src
Since I dont really have a better place on this website to put it, Since I dont really have a better place on this website to put it,
here is my direnv configuration located at here is my direnv configuration located at
=$HOME/.config/direnv/direnv.toml=. =$HOME/.config/direnv/direnv.toml=.
@ -82,13 +88,19 @@ Now, there is only one function I modify when it comes to the
appearance of fish when Im the one using it: the ~fish_greeting~ appearance of fish when Im the one using it: the ~fish_greeting~
function. I just want it empty. function. I just want it empty.
#+BEGIN_SRC fish #+BEGIN_SRC fish
function fish_greeting; end function fish_greeting
pumo-system-info
end
#+END_SRC #+END_SRC
For my fish prompt, I use [[https://starship.rs][starship]], a shell-agnostic prompt. Lets For my fish prompt, I use [[https://starship.rs][starship]], a shell-agnostic prompt. Lets
load it: load it:
#+begin_src fish #+begin_src fish
function starship_transient_prompt_func
starship module character
end
starship init fish | source starship init fish | source
enable_transience
#+end_src #+end_src
** Setting up external tools ** Setting up external tools
@ -130,6 +142,8 @@ $rlang\
$rust\ $rust\
$scala\ $scala\
$zig\ $zig\
$nix_shell\
$direnv\
$memory_usage\ $memory_usage\
$env_var\ $env_var\
$custom\ $custom\
@ -153,6 +167,23 @@ symbol = "λ "
style = "bold green" style = "bold green"
#+end_src #+end_src
Some module configurations dont exactly sit right with me, so lets
tweak them a bit.
#+begin_src toml
[nix_shell]
format = '[$symbol$state( \($name\))]($style)'
symbol = '❄️ '
[shlvl]
disabled = false
threshold = 3
[direnv]
disabled = false
detect_files = ['.envrc', '.env']
symbol = ' '
#+end_src
Finally, lets disable all modules I dont need. Finally, lets disable all modules I dont need.
#+begin_src toml #+begin_src toml
[cobol] [cobol]
@ -199,8 +230,6 @@ disable = true
disable = true disable = true
[vagrant] [vagrant]
disable = true disable = true
[nix_shell]
disable = true
[conda] [conda]
disable = true disable = true
[aws] [aws]