diff --git a/dotfiles.org b/dotfiles.org index a4d51ad..51527b6 100644 --- a/dotfiles.org +++ b/dotfiles.org @@ -22,7 +22,7 @@ This file contains all configurations across all my machines. Well, most of them export PATH="/usr/local/bin:$PATH" #+end_src ** Git -- TODO: re-evaliate merge conflictstyle +- TODO: re-evaluate merge conflictstyle #+begin_src ini :tangle ~/.gitconfig [user] name = Ian Keane @@ -131,7 +131,7 @@ set-option -g window-status-format '#{window_name}' local wezterm = require 'wezterm' local config = {} - config.color_scheme = 'OceanicNext (base16)' + config.color_scheme = 'OceanicNext (base16_transparent)' config.font = wezterm.font 'Deja Vu Sans Mono' config.font_size = 20 config.enable_tab_bar = false @@ -154,6 +154,12 @@ set-option -g window-status-format '#{window_name}' #+begin_src toml :tangle ~/.config/helix/config.toml theme = "base16_default" #+end_src +#+begin_src toml :tangle ~/.config/helix/languages.toml +[[language]] +name = "lua" +formatter = { command = "stylua", args = [ "-" ] } +#+end_src + ** Emacs Pinentry #+begin_src txt :tangle ~/.gnupg/gpg-agent.conf diff --git a/flavours.org b/flavours.org index c3753dc..27aadd7 100644 --- a/flavours.org +++ b/flavours.org @@ -5,6 +5,7 @@ I don't really remember how this works, but it will be more comfortable to manage as a tangle file than it was as a massive directory. I need to come back and make this work once everything else is troubleshot for nix +#+TOC: headlines 2 * .config ** config.toml