Merge remote-tracking branch 'origin/emacs' into wayland/hypr

doom/config.org

@@ -160,6 +160,23 @@ Modifications to the default key bindings to mimic spacemacs
 (map! :nvi "C" nil) ; remove this one weird binding
 
 (map! "<f12>" #'toggle-input-method)
+
+; Remap JIS yen key to backslash
+(global-set-key (kbd "M-¥") (kbd "\\"))
+(global-set-key (kbd "M-|") (kbd "|"))
+(global-set-key (kbd "C-M-¥") (kbd "C-\\"))
+#+end_src
+
+** Scroll
+
+#+begin_src emacs-lisp :tangle packages.el
+(use-package ultra-scroll
+	;:load-path "~/code/emacs/ultra-scroll" ; if you git clone'd instead of package-vc-install
+	:init
+	(setq scroll-conservatively 101 ; important!
+	      scroll-margin 0)
+	:config
+	(ultra-scroll-mode 1))
 #+end_src
 
 ** Font settings
@@ -263,6 +280,9 @@ numbers are disabled. For relative line numbers, set this to ~relative~.
 	css-indent-offset 3
 	sh-indentation 3
 	nxml-indent-offset 3
+	tex-indent-arg 3
+	tex-indent-item 3
+	tex-indent-basic 3
 )
 #+end_src
 
@@ -648,6 +668,24 @@ Add the necessary hooks for LilyPond mode.
 	(setq rustic-indent-offset standard-indent))
 #+end_src
 
+*** Typst
+
+#+begin_src emacs-lisp :tangle packages.el
+(package! typst-ts-mode :recipe (
+	:type git :host codeberg :repo "meow_king/typst-ts-mode"))
+#+end_src
+#+begin_src emacs-lisp
+(map! :after typst-ts-mode
+	:localleader
+	:map typst-ts-mode-map
+	:desc "Preview"            "p" #'typst-ts-preview
+	:desc "Compile"            "c" #'typst-ts-compile
+	:desc "Compile & Preview"  "P" #'typst-ts-compile-and-preview
+	:desc "Watch start"        "w" #'typst-ts-watch-start
+	:desc "Watch stop"         "W" #'typst-ts-watch-stop
+	)
+#+end_src
+
 ** Tools
 
 *** Language Server Protocol (LSP)

doom/init.el

@@ -146,9 +146,9 @@
        (julia +lsp)        ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        (latex +latexmk +lsp) ; writing papers in Emacs has never been so fun
-       ;;lean              ; for folks with too much to prove
+       ;lean              ; for folks with too much to prove
        ledger            ; be audit you can be
-       ;;lua               ; one-based indices? one-based indices
+       lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        nix               ; I hereby declare "nix geht mehr!"

hypr/hyprland.conf

@@ -10,7 +10,7 @@ monitor=,preferred,auto,auto
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
-exec-once = hyprpaper & swaync & fcitx5 & flameshot & eww --config ~/.config/eww/bar open vbar & kando
+exec-once = hyprpaper & swaync & fcitx5 & flameshot & eww --config ~/.config/eww/bar open vbar & kando & timidity -iA
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -52,10 +52,10 @@ decoration {
 
     rounding = 10
 
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
+#drop_shadow = yes
+#shadow_range = 4
+#shadow_render_power = 3
+#col.shadow = rgba(1a1a1aee)
 
     active_opacity = 0.95
     inactive_opacity = 0.7
@@ -197,6 +197,7 @@ bind = $mainMod, mouse_up, workspace, e-1
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
+bindm = $mainMod SHIFT, mouse:273, resizewindow 1
 
 bind = SUPER,Tab,cyclenext,          # change focus to another window
 bind = SUPER,Tab,bringactivetotop,   # bring it to the top

kando/config.json

@@ -1,15 +1,10 @@
 {
-  "menuTheme": "neon-lights",
+  "menuTheme": "default",
   "darkMenuTheme": "default",
-  "menuThemeColors": {
-    "neon-lights": {
-      "glow-color": "rgba(168, 255, 196, 1)",
-      "connector-color": "rgba(173, 222, 255, 0.75)"
-    }
-  },
+  "menuThemeColors": {},
   "darkMenuThemeColors": {},
   "enableDarkModeForMenuThemes": false,
-  "sidebarVisible": false,
+  "sidebarVisible": true,
   "enableVersionCheck": true,
   "zoomFactor": 1
 }

swaylock/config

@@ -1,7 +1,7 @@
 # Lock
 ignore-empty-password
 show-failed-attempts
-grace=2
+grace=0
 
 # Clock
 clock