Fix italics

dot_config/alacritty/alacritty.toml

@@ -0,0 +1,38 @@
+#import = ["~/.config/alacritty/everforest.toml",]
+import = ["~/.config/alacritty/catppuccin-mocha.toml"]
+live_config_reload = true
+
+[window]
+dynamic_padding = true
+opacity = 0.95
+blur = true
+
+[window.padding]
+x = 20
+y = 20
+
+[cursor]
+
+[cursor.style]
+shape = "Block"
+blinking = "On"
+
+[font]
+size = 13
+
+[font.bold]
+family = "Hack"
+style = "Bold"
+
+[font.bold_italic]
+family = "Hack"
+style = "BoldItalic"
+
+[font.italic]
+family = "Hack"
+style = "Italic"
+
+[font.normal]
+family = "Hack"
+style = "Regular"
+

dot_config/alacritty/catppuccin-mocha.toml

@@ -0,0 +1,75 @@
+[colors.primary]
+background = "#1e1e2e"
+foreground = "#cdd6f4"
+dim_foreground = "#7f849c"
+bright_foreground = "#cdd6f4"
+
+[colors.cursor]
+text = "#1e1e2e"
+cursor = "#f5e0dc"
+
+[colors.vi_mode_cursor]
+text = "#1e1e2e"
+cursor = "#b4befe"
+
+[colors.search.matches]
+foreground = "#1e1e2e"
+background = "#a6adc8"
+
+[colors.search.focused_match]
+foreground = "#1e1e2e"
+background = "#a6e3a1"
+
+[colors.footer_bar]
+foreground = "#1e1e2e"
+background = "#a6adc8"
+
+[colors.hints.start]
+foreground = "#1e1e2e"
+background = "#f9e2af"
+
+[colors.hints.end]
+foreground = "#1e1e2e"
+background = "#a6adc8"
+
+[colors.selection]
+text = "#1e1e2e"
+background = "#f5e0dc"
+
+[colors.normal]
+black = "#45475a"
+red = "#f38ba8"
+green = "#a6e3a1"
+yellow = "#f9e2af"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+cyan = "#94e2d5"
+white = "#bac2de"
+
+[colors.bright]
+black = "#585b70"
+red = "#f38ba8"
+green = "#a6e3a1"
+yellow = "#f9e2af"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+cyan = "#94e2d5"
+white = "#a6adc8"
+
+[colors.dim]
+black = "#45475a"
+red = "#f38ba8"
+green = "#a6e3a1"
+yellow = "#f9e2af"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+cyan = "#94e2d5"
+white = "#bac2de"
+
+[[colors.indexed_colors]]
+index = 16
+color = "#fab387"
+
+[[colors.indexed_colors]]
+index = 17
+color = "#f5e0dc"

dot_config/alacritty/everforest.toml

@@ -0,0 +1,13 @@
+[colors.primary]
+background = "#272e33"
+foreground = "#d3c6aa"
+
+[colors.normal]
+black = "#475258"
+blue = "#7fbbb3"
+cyan = "#83c092"
+green = "#a7c080"
+magenta = "#d699b6"
+red = "#e67e80"
+white = "#d3c6aa"
+yellow = "#dbbc7f"

dot_config/emacs/init.el

@@ -78,7 +78,7 @@
 (add-hook 'after-init-hook #'elpaca-process-queues)
 (elpaca `(,@elpaca-order))
 
-;; Unload seq before elpaca build - also see `use-package' declaration for seq below
+;; Unload `seq' before build
 ;; https://github.com/progfolio/elpaca/issues/216#issuecomment-1868444883
 (defun +elpaca-unload-seq (e)
   (and (featurep 'seq) (unload-feature 'seq t))
@@ -198,7 +198,7 @@
           ))
   :hook ((astro-mode
           c-ts-mode
-          c++-mode
+          c++-ts-mode
           zig-mode) . eglot-ensure))
 
 (use-package elec-pair
@@ -278,14 +278,28 @@
   (save-place-mode))
 
 (use-package seq
-  ;; Unload `seq' before elpaca starts building
+  ;; Unload `seq' before `elpaca' starts building
   :ensure `(seq :build ,(+elpaca-seq-build-steps)))
 
 (use-package simple
+  :ensure nil
+  :config (setq-default indent-tabs-mode nil)
+  :hook ((conf-mode prog-mode) . column-number-mode))
+
+(use-package text-mode
+  :ensure nil
+  :config (setq-local fill-column 120
+                      whitespace-style '(face
+                                         whitespace-missing-newline-at-eof
+                                         space-after-tab
+                                         space-before-tab
+                                         trailing)))
+
+(use-package treesit
   :ensure nil
   :config
-  (setq-default indent-tabs-mode nil)
+  (push '(c++-mode . c++-ts-mode) major-mode-remap-alist)
-  (column-number-mode))
+  (setq treesit-font-lock-level 4))
 
 (use-package whitespace
   :ensure nil
@@ -311,11 +325,18 @@
   :custom (esup-depth 0))
 
 ;; Theme
+(use-package catppuccin-theme
+  :config
+  (setq custom-safe-themes t
+        catppuccin-flavor 'macchiato)
+  (catppuccin-reload)
+  (load-theme 'catppuccin t))
+
 (use-package everforest
   :ensure (everforest :host sourcehut :repo "theorytoe/everforest-theme")
   :config
-  (setq custom-safe-themes t)
+  ;; (setq custom-safe-themes t)
-  (load-theme 'everforest-hard-dark t)
+  ;; (load-theme 'everforest-hard-dark t)
   (let ((moody_line (face-attribute 'mode-line :foreground))
         (moody_inactive (face-attribute 'mode-line-inactive :background)))
     (set-face-attribute 'mode-line          nil :overline   moody_line)
@@ -378,6 +399,9 @@
 ;; Better undo/redo
 (use-package undo-tree
   :defer 3
+  :bind (:map undo-tree-map
+              ("C-z" . undo-tree-undo)
+              ("C-M-z" . undo-tree-redo))
   :config (global-undo-tree-mode)
   :custom
   (undo-tree-auto-save-history t)
@@ -604,7 +628,7 @@
   ("C-c y s" . yas-insert-snippet)
   ("C-c y v" . yas-visit-snippet-file)
   :config (yas-reload-all)
-  :hook (lsp-mode . yas-minor-mode))
+  :hook (prog-mode . yas-minor-mode))
 
 (use-package yasnippet-snippets
   :after (yasnippet))
@@ -614,12 +638,23 @@
 
 ;; Visualize color names
 (use-package rainbow-mode
-  :hook ((conf-mode lsp-mode) . rainbow-mode))
+  :hook ((conf-mode
+          prog-mode
+          toml-ts-mode) . rainbow-mode))
 
 ;; Syntax parsing/highlighting
 (use-package treesit-auto
   :defer 1
   :config
+  (setq my-cpp-tsauto-config
+        (make-treesit-auto-recipe
+         :lang 'cpp
+         :ts-mode 'c++-ts-mode
+         :remap 'c++-mode
+         :url "https://github.com/tree-sitter/tree-sitter-cpp"
+         :revision "v0.21.0"
+         :ext "\\.cpp\\'"))
+  (add-to-list 'treesit-auto-recipe-list my-cpp-tsauto-config)
   (treesit-auto-add-to-auto-mode-alist 'all)
   (global-treesit-auto-mode)
   :custom
@@ -645,12 +680,9 @@
 
 (use-package lsp-mode
   :hook
-  ((;; c-ts-mode
+  ((csharp-ts-mode
-    ;; c++-ts-mode
-    csharp-ts-mode
     go-ts-mode
     python-ts-mode) . lsp)
-  ;; zig-mode) . lsp)
   (lsp-mode . lsp-enable-which-key-integration)
   :custom
   (lsp-use-plists t)
@@ -739,7 +771,7 @@
 
 ;; C++
 (use-package modern-cpp-font-lock
-  :hook (c++-mode . modern-c++-font-lock-mode))
+  :hook (c++-ts-mode . modern-c++-font-lock-mode))
 
 ;; Go
 (use-package go-mode

dot_config/kanshi/config

@@ -9,5 +9,9 @@ profile dual-off {
 }
 
 profile laptop {
-  output eDP-1 enable mode 3840x2160@60Hz scale 2
+  output eDP-1 enable scale 2
+}
+
+profile laptop-off {
+  output eDP-1 disable
 }

dot_config/river/executable_init.tmpl

@@ -46,13 +46,16 @@ riverctl map normal Super P focus-view previous
 riverctl map normal Super+Alt N swap next
 riverctl map normal Super+Alt P swap previous
 
+# Switch back and forth between two tag groups
+riverctl map normal Super O focus-previous-tags
+
 # Focus the next/previous output
 riverctl map normal Super V focus-output next
 riverctl map normal Super+Alt V focus-output previous
 
 # Send the focused view to the next/previous output
-riverctl map normal Super+Shift Grave send-to-output next
+riverctl map normal Super Grave send-to-output next
-riverctl map normal Super Grave send-to-output previous
+riverctl map normal Super+Shift Grave send-to-output previous
 
 # Bump the focused view to the top of the layout stack
 riverctl map normal Super+Shift Return zoom
@@ -89,7 +92,7 @@ riverctl map normal Super+Shift F send-layout-cmd rivertile "main-location right
 riverctl map normal Super+Shift P send-layout-cmd rivertile "main-location top"
 riverctl map normal Super+Shift N send-layout-cmd rivertile "main-location bottom"
 
-# Vim-like keybinds for layouts/views
+## Vim-like keybinds for layouts/views
 
 # Focus the next/previous view in the layout stack
 riverctl map normal Super J focus-view next
@@ -254,6 +257,23 @@ riverctl map-switch normal lid close 'waylock-launcher'
 riverctl focus-output DP-1
 {{- end }}
 
+{{ if eq .chezmoi.hostname "helix" }}
+# Initial tags: $((1 << ("WORKSPACE" - 1)))
+riverctl rule-add -app-id 'firefox' tags 1
+riverctl rule-add -app-id 'chromium' tags 2
+riverctl rule-add -app-id 'thunar' tags $((1 << 2))
+riverctl rule-add -app-id 'evince' tags $((1 << 3))
+riverctl rule-add -app-id 'libreoffice*' tags $((1 << 3))
+riverctl rule-add -app-id 'Alacritty' tags $((1 << 5))
+riverctl rule-add -app-id 'foot' tags $((1 << 5))
+riverctl rule-add -app-id 'kitty' tags $((1 << 5))
+riverctl rule-add -app-id 'emacs' tags $((1 << 6))
+riverctl rule-add -app-id 'kitty' -title 'weechat' tags $((1 << 7))
+riverctl rule-add -app-id 'Mattermost' tags $((1 << 7))
+riverctl rule-add -app-id 'thunderbird' tags $((1 << 8))
+riverctl rule-add -app-id 'tutanota-desktop' tags $((1 << 8))
+{{- end }}
+
 # Start floating
 riverctl rule-add -app-id 'Bitwarden' float
 riverctl rule-add -app-id 'Blueman-manager' float

dot_local/bin/executable_update-all

@@ -22,7 +22,7 @@ zls_has_update=$(echo "$aur_updates" | grep -c 'zls-git')
 
 if [ "$river_has_update" -ne 0 ] && [ "$zls_has_update" -ne 0 ]; then
   zigup 0.13.0
-  paru -Syu river-git
+  paru -Syu river-git --ignore zls-git
   zigup master
   paru -S zls-git
 elif [ "$river_has_update" -ne 0 ]; then