Merge branch 'master' of github.com:js0ny/dotfiles

.gitignore

@@ -34,3 +34,5 @@ common/fzfrc
 gitconfig
 
 spacemacs/
+
+lazy-lock.json

platforms/linux/chromium-flags.conf

@@ -5,9 +5,13 @@
 # This solves the issue of chromium apps not being able to access passwords in non-plasma environments
 
 # Location:
-# ~/.config/chromium-flags.conf
+# ~/.config/chromium-flags.conf (for chromium)
+# ~/.config/chrome-flags.conf
 # ~/.var/app/com.vivaldi.Vivaldi/config/vivaldi-flags.conf (For flatpak)
+# ~/.config/vivaldi-stable.conf (For ArchLinux vivaldi)
 # Linking:
 # ln -sf $DOTFILES/platforms/linux/chromium-flags.conf ~/.var/app/com.vivaldi.Vivaldi/config/vivaldi-flags.conf
+--UseOzonePlatform=wayland
+--ozone-platform=wayland
 --password-store=kwallet6
 --enable-wayland-ime

platforms/linux/etc/environment

@@ -23,8 +23,8 @@ QT_IM_MODULE=fcitx
 SDL_IM_MODULE=fcitx
 XMODIFIFERS="@im=fcitx"
 GLFW_IM_MODULE=fcitx
-# Scaling
-QT_SCALE_FACTOR=1.75
-# 2 * 0.875 = 1.75
-GDK_SCALE=2
-GDK_DPI_SCALE=0.875
+# Scaling - Buggy on Plasma
+# QT_SCALE_FACTOR=1.75
+# # 2 * 0.875 = 1.75
+# GDK_SCALE=2
+# GDK_DPI_SCALE=0.875

platforms/linux/etc/keyd/default.conf

@@ -0,0 +1,14 @@
+# /etc/keyd/default.conf
+
+[ids]
+
+*
+
+[main]
+
+# Maps capslock to escape when pressed and control when held.
+capslock= overload(control, esc)
+enter= overload(control, enter)
+backspace= \
+\= backspace
+tab=overload(alt, tab)

platforms/linux/hypr/hyprland.conf

@@ -264,6 +264,8 @@ bind = $mainMod, i, movefocus, r
 bind = $mainMod, e, movefocus, u
 bind = $mainMod, n, movefocus, d
 
+bind = $mainMod, c, exec, grimblast copy area
+
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2

platforms/linux/kde/dolphinrc

@@ -3,7 +3,7 @@ Version=202
 ViewPropsTimestamp=2024,12,10,0,19,35.931
 
 [IconsMode]
-PreviewSize=48
+PreviewSize=96
 
 [KFileDialog Settings]
 Places Icons Auto-resize=false

tools/bash/profile

@@ -23,9 +23,6 @@ pathadd() {
     fi
 }
 
-pathadd "$HOME/.local/bin"
-pathadd "$HOME/.local/sbin"
-
 
 # Dynamically Add Path
 minimal_path=(

tools/browser/surfingkeys.js

@@ -1,6 +1,9 @@
 // Paste this into surfingkeys advanced settings
 // or use:
 // Load settings from: https://raw.githubusercontent.com/js0ny/dotfiles/refs/heads/master/tools/browser/surfingkeys.js
+// Browse to Extension > Surfingkeys > Allow access to file URLs to enable local file access
+// Windows: file:///C:/Users/username/.dotfiles/tools/browser/surfingkeys.js
+// *nix: file:///home/username/.dotfiles/tools/browser/surfingkeys.js
 
 // #region Example
 /** Examples
@@ -244,6 +247,8 @@ api.unmap("<space>"); // Leader Key
 
 forwardFactory.pull(mapLists);
 vForwardFactory.pull(vMapLists);
+
+api.map("gH", "g/");
 // #endregion
 
 // #region Omnibar NOTE: Dosn't work
@@ -490,6 +495,63 @@ mapkey(",r", "Change model to regenerate last output", function () {
 }, { domain: /perplexity.ai/ });
 // #endregion
 
+// #region pixiv.net
+// Use site-specific paging method
+unmap("[[", /pixiv.net/);
+unmap("]]", /pixiv.net/);
+unmap(",", /pixiv.net/);
+const isArtwork = (url) => /pixiv.net\/artworks/.test(url.href)
+
+mapkey("[[", "Previous Page", function () {
+  const url = new URL(window.location.href);
+  if (url.href === url.origin) {
+    return;
+  }
+  const page = url.searchParams.get("p");
+  const newPage = page ? parseInt(page) - 1 : 1;
+  url.searchParams.set("p", newPage);
+  window.location.href = url.href;
+}, { domain: /pixiv.net/ });
+
+mapkey("]]", "Next Page", function () {
+  const url = new URL(window.location.href);
+  if (url.href === url.origin) {
+    return;
+  }
+  const page = url.searchParams.get("p");
+  const newPage = page ? parseInt(page) + 1 : 2;
+  url.searchParams.set("p", newPage);
+  window.location.href = url.href;
+}, { domain: /pixiv.net/ });
+mapkey(",b", "Add to [b]ookmark", function () {
+  const url = new URL(window.location.href);
+  if (!isArtwork(url)) { return; }
+  const toolbar = q('section [class$="Toolbar"]')
+  toolbar.querySelectorAll("div")[2].querySelector("button").click()
+}, { domain: /pixiv.net/ });
+mapkey(",B", "Add to private [B]ookmark", function () {
+  const url = new URL(window.location.href);
+  if (!isArtwork(url)) { return; }
+  const toolbar = q('section [class$="Toolbar"]')
+  toolbar.querySelectorAll("div")[0].querySelector("button").click()
+  setTimeout(() => { // Wait for the DOM to update
+    q("div[role=menu]").querySelector("li").click()
+  }, 100);
+}, { domain: /pixiv.net/ });
+mapkey(",v", "Up[v]ote Artwork", function () {
+  const url = new URL(window.location.href);
+  if (!isArtwork(url)) { return; }
+  const toolbar = q('section [class$="Toolbar"]')
+  toolbar.querySelectorAll("div")[3].querySelector("button").click()
+}, { domain: /pixiv.net/ });
+mapkey(",f", "Toggle [f]ollow the author", function () {
+  const url = new URL(window.location.href)
+  if (!isArtwork(url)) { return; }
+  q("aside").querySelector("section").querySelector("button").click()
+}, { domain: /pixiv.net/ });
+// #endregion
+
+
 // #endregion
 
 // #region ACE Editor

tools/doom/config.el

@@ -0,0 +1,139 @@
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets. It is optional.
+;; (setq user-full-name "John Doe"
+;;       user-mail-address "john@doe.com")
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom:
+;;
+;; - `doom-font' -- the primary font to use
+;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
+;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;;   presentations or streaming.
+;; - `doom-symbol-font' -- for symbols
+;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
+;;
+;; See 'C-h v doom-font' for documentation and more examples of what they
+;; accept. For example:
+;;
+(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 14 :weight 'semi-light)
+     doom-variable-pitch-font (font-spec :family "JetBrainsMono Nerd Font" :size 13))
+;;
+;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
+;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
+;; refresh your font settings. If Emacs still can't find your font, it likely
+;; wasn't installed correctly. Font issues are rarely Doom issues!
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+(setq doom-theme 'doom-one)
+
+;; This determines the style of line numbers in effect. If set to `nil', line
+;; numbers are disabled. For relative line numbers, set this to `relative'.
+(setq display-line-numbers t)
+(setq display-line-numbers-type 'relative)
+
+
+;; If you use `org' and don't want your org files in the default location below,
+;; change `org-directory'. It must be set before org loads!
+(setq org-directory "~/Documents/OrgFiles/")
+
+
+;; Whenever you reconfigure a package, make sure to wrap your config in an
+;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
+;;
+;;   (after! PACKAGE
+;;     (setq x y))
+;;
+;; The exceptions to this rule:
+;;
+;;   - Setting file/directory variables (like `org-directory')
+;;   - Setting variables which explicitly tell you to set them before their
+;;     package is loaded (see 'C-h v VARIABLE' to look up their documentation).
+;;   - Setting doom variables (which start with 'doom-' or '+').
+;;
+;; Here are some additional functions/macros that will help you configure Doom.
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package!' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;;   this file. Emacs searches the `load-path' when you load packages with
+;;   `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+;; This will open documentation for it, including demos of how they are used.
+;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
+;; etc).
+;;
+;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+;; they are implemented.
+
+(load! "keymaps.el")
+
+
+
+(after! treemacs
+  (map! :map evil-treemacs-state-map
+        ;; 导航
+        "n"    #'treemacs-next-line
+        "e"    #'treemacs-previous-line
+        "N"    #'treemacs-next-neighbour
+        "E"    #'treemacs-previous-neighbour
+        "H"    #'treemacs-toggle-show-dotfiles
+        "I"    #'treemacs-hide-gitignored-files-mode
+        "i"    #'treemacs-RET-action
+        "a"    #'treemacs-create-file
+        "A"    #'treemacs-create-dir
+        "c"    #'treemacs-copy-file
+        "d"    #'treemacs-delete-file
+        "r"    #'treemacs-rename-file
+        "q"    #'treemacs-quit
+        "y"    #'treemacs-copy-relative-path-at-point
+        "Y"    #'treemacs-copy-absolute-path-at-point
+        "m"    #'treemacs-mark-or-unmark-path-at-point
+        ))
+
+
+(after! wakatime-mode
+  (global-wakatime-mode))
+
+;; For CJK users
+;; Insert zero width space around the emphasis symbols, this might be useful for
+;; languages that does not rely on space
+(after! org
+  (defun my/insert-emphasis-with-zws (char)
+    (interactive "c")
+    (insert ?\u200B char)
+    (save-excursion (insert char ?\u200B)))
+
+  (map! :map org-mode-map
+        "C-c b" (lambda () (interactive) (my/insert-emphasis-with-zws ?*))
+        "C-c i" (lambda () (interactive) (my/insert-emphasis-with-zws ?/))
+        "C-c u" (lambda () (interactive) (my/insert-emphasis-with-zws ?_))))
+
+
+(after! org-agenda
+  (map! :map evil-org-agenda-mode-map
+        :nv "n" #'org-agenda-next-line
+        :nv "e" #'org-agenda-previous-line
+        "gn" 'org-agenda-next-item
+        "ge" 'org-agenda-previous-item
+        :nv "i" #'evil-forward-char))
+
+
+(after! evil-org-agenda
+  (evil-define-key '(normal visual) evil-org-agenda-mode-map
+    "n" #'org-agenda-next-line
+    "e" #'org-agenda-previous-line
+    "i" #'evil-forward-char
+    "gn" #'org-agenda-next-item
+    "ge" #'org-agenda-previous-item))

tools/doom/custom.el

@@ -0,0 +1,13 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(custom-safe-themes
+   '("2b501400e19b1dd09d8b3708cefcb5227fda580754051a24e8abf3aff0601f87" default)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )

tools/doom/init.el

@@ -0,0 +1,193 @@
+;;; init.el -*- lexical-binding: t; -*-
+
+;; This file controls what Doom modules are enabled and what order they load
+;; in. Remember to run 'doom sync' after modifying it!
+
+;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
+;;      documentation. There you'll find a link to Doom's Module Index where all
+;;      of our modules are listed, including what flags they support.
+
+;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
+;;      flags as well (those symbols that start with a plus).
+;;
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
+;;      directory (for easy access to its source code).
+
+(doom! :input
+       ;;bidi              ; (tfel ot) thgir etirw uoy gnipleh
+       chinese
+       ;;japanese
+       ;;layout            ; auie,ctsrnm is the superior home row
+
+       :completion
+       ;;company           ; the ultimate code completion backend
+       (corfu +orderless)  ; complete with cap(f), cape and a flying feather!
+       ;;helm              ; the *other* search engine for love and life
+       ;;ido               ; the other *other* search engine...
+       ;;ivy               ; a search engine for love and life
+       vertico           ; the search engine of the future
+
+       :ui
+       ;;deft              ; notational velocity for Emacs
+       doom              ; what makes DOOM look the way it does
+       doom-dashboard    ; a nifty splash screen for Emacs
+       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;(emoji +unicode)  ; 🙂
+       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       indent-guides     ; highlighted indent columns
+       ;;ligatures         ; ligatures and symbols to make your code pretty again
+       ;;minimap           ; show a map of the code on the side
+       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;;nav-flash         ; blink cursor line after big motions
+       ;;neotree           ; a project drawer, like NERDTree for vim
+       ophints           ; highlight the region an operation acts on
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
+       tabs              ; a tab bar for Emacs
+       treemacs          ; a project drawer, like neotree but cooler
+       unicode           ; extended unicode support for various languages
+       (vc-gutter +pretty) ; vcs diff in the fringe
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
+       ;;window-select     ; visually switch windows
+       workspaces        ; tab emulation, persistence & separate workspaces
+       ;;zen               ; distraction-free coding or writing
+
+       :editor
+       (evil +everywhere); come to the dark side, we have cookies
+       file-templates    ; auto-snippets for empty files
+       fold              ; (nigh) universal code folding
+       ;;(format +onsave)  ; automated prettiness
+       ;;god               ; run Emacs commands without modifier keys
+       ;;lispy             ; vim for lisp, for people who don't like vim
+       ;;multiple-cursors  ; editing in many places at once
+       ;;objed             ; text object editing for the innocent
+       ;;parinfer          ; turn lisp into python, sort of
+       ;;rotate-text       ; cycle region at point between text candidates
+       snippets          ; my elves. They type so I don't have to
+       word-wrap         ; soft wrapping with language-aware indent
+
+       :emacs
+       dired             ; making dired pretty [functional]
+       electric          ; smarter, keyword-based electric-indent
+       ;;eww               ; the internet is gross
+       ;;ibuffer           ; interactive buffer management
+       undo              ; persistent, smarter undo for your inevitable mistakes
+       vc                ; version-control and Emacs, sitting in a tree
+
+       :term
+       ;;eshell            ; the elisp shell that works everywhere
+       ;;shell             ; simple shell REPL for Emacs
+       ;;term              ; basic terminal emulator for Emacs
+       ;;vterm             ; the best terminal emulation in Emacs
+
+       :checkers
+       syntax              ; tasing you for every semicolon you forget
+       ;;(spell +flyspell) ; tasing you for misspelling mispelling
+       grammar           ; tasing grammar mistake every you make
+
+       :tools
+       ;;ansible
+       ;;biblio            ; Writes a PhD for you (citation needed)
+       ;;collab            ; buffers with friends
+       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       ;;direnv
+       ;;docker
+       editorconfig      ; let someone else argue about tabs vs spaces
+       ;;ein               ; tame Jupyter notebooks with emacs
+       (eval +overlay)     ; run code, run (also, repls)
+       lookup              ; navigate your code and its documentation
+       lsp               ; M-x vscode
+       magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
+       ;;pass              ; password manager for nerds
+       ;;pdf               ; pdf enhancements
+       ;;prodigy           ; FIXME managing external services & code builders
+       ;;terraform         ; infrastructure as code
+       ;;tmux              ; an API for interacting with tmux
+       ;;tree-sitter       ; syntax and parsing, sitting in a tree...
+       ;;upload            ; map local to remote projects via ssh/ftp
+
+       :os
+       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
+       ;;tty               ; improve the terminal Emacs experience
+
+       :lang
+       ;;agda              ; types of types of types of types...
+       ;;beancount         ; mind the GAAP
+       (cc +lsp)         ; C > C++ == 1
+       ;;clojure           ; java with a lisp
+       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+       ;;coq               ; proofs-as-programs
+       ;;crystal           ; ruby at the speed of c
+       ;;csharp            ; unity, .NET, and mono shenanigans
+       ;;data              ; config/data formats
+       ;;(dart +flutter)   ; paint ui and not much else
+       ;;dhall
+       ;;elixir            ; erlang done right
+       ;;elm               ; care for a cup of TEA?
+       emacs-lisp        ; drown in parentheses
+       ;;erlang            ; an elegant language for a more civilized age
+       ;;ess               ; emacs speaks statistics
+       ;;factor
+       ;;faust             ; dsp, but you get to keep your soul
+       ;;fortran           ; in FORTRAN, GOD is REAL (unless declared INTEGER)
+       ;;fsharp            ; ML stands for Microsoft's Language
+       ;;fstar             ; (dependent) types and (monadic) effects and Z3
+       ;;gdscript          ; the language you waited for
+       ;;(go +lsp)         ; the hipster dialect
+       ;;(graphql +lsp)    ; Give queries a REST
+       (haskell +lsp)    ; a language that's lazier than I am
+       ;;hy                ; readability of scheme w/ speed of python
+       ;;idris             ; a language you can depend on
+       ;;json              ; At least it ain't XML
+       ;;(java +lsp)       ; the poster child for carpal tunnel syndrome
+       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       ;;julia             ; a better, faster MATLAB
+       ;;kotlin            ; a better, slicker Java(Script)
+       latex             ; writing papers in Emacs has never been so fun
+       ;;lean              ; for folks with too much to prove
+       ;;ledger            ; be audit you can be
+       ;;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!"
+       ;;ocaml             ; an objective camel
+       (org +roam2 +pomodoro +dragndrop)               ; organize your plain life in plain text
+       ;;php               ; perl's insecure younger brother
+       ;;plantuml          ; diagrams for confusing people more
+       ;;graphviz          ; diagrams for confusing yourself even more
+       ;;purescript        ; javascript, but functional
+       python            ; beautiful is better than ugly
+       ;;qt                ; the 'cutest' gui framework ever
+       ;;racket            ; a DSL for DSLs
+       ;;raku              ; the artist formerly known as perl6
+       ;;rest              ; Emacs as a REST client
+       ;;rst               ; ReST in peace
+       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       ;;(rust +lsp)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       ;;scala             ; java, but good
+       (scheme +guile)   ; a fully conniving family of lisps
+       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       ;;sml
+       ;;solidity          ; do you need a blockchain? No.
+       ;;swift             ; who asked for emoji variables?
+       ;;terra             ; Earth and Moon in alignment for performance.
+       ;;web               ; the tubes
+       ;;yaml              ; JSON, but readable
+       ;;zig               ; C, but simpler
+
+       :email
+       (mu4e +org +gmail)
+       ;;notmuch
+       ;;(wanderlust +gmail)
+
+       :app
+       ;;calendar
+       ;;emms
+       ;;everywhere        ; *leave* Emacs!? You must be joking
+       ;;irc               ; how neckbeards socialize
+       ;;(rss +org)        ; emacs as an RSS reader
+
+       :config
+       ;;literate
+       (default +bindings +smartparens))

tools/doom/keymaps.el

@@ -0,0 +1,30 @@
+(map! :nv "l" 'evil-insert
+      :nv "L" 'evil-insert-line
+      :nv "k" 'evil-ex-search-next
+      :nv "K" 'evil-ex-search-previous
+      :nv "n" 'evil-next-line
+      :nv "e" 'evil-previous-line
+      :nv "i" 'evil-forward-char
+      )
+
+(evil-define-key '(normal visual operator) 'global
+  ;; To see the keybindings, use <C-h> k then type the key
+  "n" 'evil-next-line
+  "e" 'evil-previous-line
+  "i" 'evil-forward-char
+  "l" 'evil-insert
+  "L" 'evil-insert-0-line
+  "k" 'evil-search-next
+  "K" 'evil-search-previous
+  "j" 'evil-forward-word-end
+  "J" 'evil-forward-WORD-end
+  "N" '(lambda () (interactive) (evil-next-line 5))       ; 5n
+  "E" '(lambda () (interactive) (evil-previous-line 5))   ; 5e
+  "H" 'switch-to-prev-buffer
+  "I" 'switch-to-next-buffer
+  )
+
+;; (evil-define-key evil-org-mode-map (kbd "I") 'evil-prev-buffer)
+;;
+
+(evil-define-key '(normal visual operator) evil-org-mode-map (kbd "I") 'evil-next-buffer)

tools/doom/packages.el

@@ -0,0 +1,51 @@
+;; -*- no-byte-compile: t; -*-
+;;; $DOOMDIR/packages.el
+
+;; To install a package with Doom you must declare them here and run 'doom sync'
+;; on the command line, then restart Emacs for the changes to take effect -- or
+
+
+;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
+;; (package! some-package)
+
+;; To install a package directly from a remote git repo, you must specify a
+;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
+;; https://github.com/radian-software/straight.el#the-recipe-format
+;; (package! another-package
+;;   :recipe (:host github :repo "username/repo"))
+
+;; If the package you are trying to install does not contain a PACKAGENAME.el
+;; file, or is located in a subdirectory of the repo, you'll need to specify
+;; `:files' in the `:recipe':
+;; (package! this-package
+;;   :recipe (:host github :repo "username/repo"
+;;            :files ("some-file.el" "src/lisp/*.el")))
+
+;; If you'd like to disable a package included with Doom, you can do so here
+;; with the `:disable' property:
+;; (package! builtin-package :disable t)
+
+;; You can override the recipe of a built in package without having to specify
+;; all the properties for `:recipe'. These will inherit the rest of its recipe
+;; from Doom or MELPA/ELPA/Emacsmirror:
+;; (package! builtin-package :recipe (:nonrecursive t))
+;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
+
+;; Specify a `:branch' to install a package from a particular branch or tag.
+;; This is required for some packages whose default branch isn't 'master' (which
+;; our package manager can't deal with; see radian-software/straight.el#279)
+;; (package! builtin-package :recipe (:branch "develop"))
+
+;; Use `:pin' to specify a particular commit to install.
+;; (package! builtin-package :pin "1a2b3c4d5e")
+
+
+;; Doom's packages are pinned to a specific commit and updated from release to
+;; release. The `unpin!' macro allows you to unpin single packages...
+;; (unpin! pinned-package)
+;; ...or multiple packages
+;; (unpin! pinned-package another-pinned-package)
+;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
+;; (unpin! t)
+
+(package! wakatime-mode)

tools/emacs.d/.gitignore

@@ -4,6 +4,7 @@
 /eshell/
 /server/
 /url/
+transient/
 
 # 临时文件
 tutorial
@@ -22,3 +23,5 @@ custom.el
 .org-id-locations
 bookmarks
 .cache
+eln-cache
+org-persist

tools/emacs.d/lisp/init-appearance.el

@@ -20,10 +20,31 @@
 (use-package catppuccin-theme
   :config
   (setq catppuccin-flavor 'mocha) ; This looks like shit in terminal mode
-  (load-theme 'catppuccin t))
+  ;; (load-theme 'catppuccin t)
+  )
+
+(use-package doom-themes
+  :ensure t
+  :config
+  ;; Global settings (defaults)
+  (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
+        doom-themes-enable-italic t) ; if nil, italics is universally disabled
+  (load-theme 'doom-nord-aurora t)
+
+  ;; Enable flashing mode-line on errors
+  (doom-themes-visual-bell-config)
+
+  ;; Enable custom neotree theme (nerd-icons must be installed!)
+  ;; (doom-themes-neotree-config)
+
+  ;; or for treemacs users
+  (setq doom-themes-treemacs-theme "doom-nord-aurora") ; use "doom-colors" for less minimal icon theme
+  (doom-themes-treemacs-config)
+  ;; Corrects (and improves) org-mode's native fontification.
+  (doom-themes-org-config))
 
 
-;; Better mode line, see (L7) Icon install
+;; Better mode line, see (L11) for Icon install
 ;; M-x nerd-icons-install-fonts
 (use-package doom-modeline
   :ensure t
@@ -31,4 +52,6 @@
 
 (global-tab-line-mode) ; bufferline
 
+
+
 (provide 'init-appearance)

tools/emacs.d/lisp/init-basic.el

@@ -15,8 +15,6 @@
   (prog-mode . display-line-numbers-mode))
 
 
-;; Auto input pairred brackets
-(electric-pair-mode 1)
 
 ;; https://book.emacs-china.org/#orgcfd105e Open with Emacs
 (server-mode 1)
@@ -25,10 +23,15 @@
 (require 'recentf)
 (recentf-mode 1)
 
-;; Disable toobar and scrollbar
+;; Disable topbars
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
+(menu-bar-mode -1)
 
+(use-package alert
+  :commands (alert)
+  :config
+  (setq alert-default-style 'libnotify))
 
 ;; Export module
 (provide 'init-basic)

tools/emacs.d/lisp/init-edit.el

@@ -3,6 +3,9 @@
 ;; Use UTF-8 & LF
 (setq-default buffer-file-coding-system 'utf-8-unix)
 
+;; Auto input pairred brackets
+(electric-pair-mode 1)
+
 ;; Company - Complete Anything
 (use-package company
   :ensure t
@@ -25,12 +28,13 @@
   (marginalia-mode))
 
 
+;; (set-language-environment "UTF-8")
+(set-default-coding-systems 'utf-8)
+;; (prefer-coding-system 'utf-8)
+
 ;;; 设置语言环境为 UTF-8
-;(set-language-environment "UTF-8")
 ;
 ;;; 强制使用 UTF-8
-;(prefer-coding-system 'utf-8)
-;(set-default-coding-systems 'utf-8)
 ;(set-terminal-coding-system 'utf-8)
 ;(set-keyboard-coding-system 'utf-8)
 ;
@@ -54,4 +58,11 @@
 
 (setq-default buffer-file-coding-system 'utf-8-unix)
 
+;; Avy - act like Vim Easymotion
+(use-package avy
+  :config
+  (evil-define-key '(normal) 'global (kbd "T") 'avy-goto-char)
+  (evil-define-key '(normal) 'global (kbd "s") 'avy-goto-char-2)
+  (evil-define-key '(normal) 'global (kbd "s") 'avy-goto-char-2-above))
+
 (provide 'init-edit)

tools/emacs.d/lisp/init-file.el

@@ -53,5 +53,13 @@
   ;; Treemacs mode specific binding
   (evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action))
 
+;; magit - Git Client
+(use-package magit
+  :ensure t
+  :after (evil-leader)
+  :config
+  (evil-leader/set-key
+    "g" 'magit-status)
+  )
 
 (provide 'init-file)

tools/emacs.d/lisp/init-keymaps.el

@@ -1,11 +1,8 @@
 ;;; init-keymaps.el
 
 ;; Once this is defined, `M-x open-init-file` will open this file
-(defun open-init-file()
+(defun open-org-config()
   (interactive) ;; Mark function as `interactive` that allows user to access by M-x open-init-file RET
-  (find-file  "~/.emacs.d/init.el"))
-(defun reload-init()
-  (interactive) 
-  (load-file "~/.emacs.d/init.el"))
+  (find-file  "~/.emacs.d/lisp/init-org.el"))
 
 (provide 'init-keymaps)

tools/emacs.d/lisp/init-org.el

@@ -39,10 +39,8 @@
     ("~" (org-code verbatim :background "deep sky blue" :foreground "MidnightBlue"))
     ("+" (:strike-through t))))
 
-(use-package org-bullets
-  :after org
-  :hook (org-mode . org-bullets-mode))
 
+;; Better LaTeX preview
 (use-package org-fragtog
   :after org
   :hook (org-mode . org-fragtog-mode))
@@ -104,5 +102,66 @@
 (global-set-key (kbd "C-c b") (lambda () (interactive) (my/insert-emphasis-with-zws ?*)))
 (global-set-key (kbd "C-c i") (lambda () (interactive) (my/insert-emphasis-with-zws ?/)))
 
+;; Pomodoro for org clock
+(use-package org-pomodoro)
+
+;; Org Styles Integration
+(use-package org-modern
+  :ensure t
+  :after (org)
+  :config
+  (with-eval-after-load 'org (global-org-modern-mode))
+;; https://github.com/minad/org-modern/issues/232
+  (setq org-modern-fold-stars
+      '(("▶" . "▼")
+        ("▷" . "▽")
+        ;; ("⯈" . "⯆")
+        ("▷" . "▽")
+        ("▹" . "▿")
+        ("▸" . "▾"))
+)
+)
+
+(use-package mixed-pitch
+  :hook
+  (text-mode . org-mode))
+
+;; Integrate Emacs Timer with System Notifications
+;; 定义通知函数
+(defun my/org-clock-notification (title message &optional icon)
+  "发送一个系统通知"
+  (alert message
+         :title title
+         :icon icon
+         :category 'org-clock))
+
+;; 添加定时器检查函数
+(defun my/org-clock-check-timer ()
+  "检查当前正在运行的 clock 是否到期"
+  (when (org-clocking-p)
+    (let* ((clocked-time (org-clock-get-clocked-time))
+           (effort (org-duration-to-minutes 
+                    (or (org-entry-get (org-clock-is-active) "Effort")
+                        "0")))
+           (remaining (- effort clocked-time)))
+      (when (and (> effort 0) (<= remaining 0))
+        (my/org-clock-notification 
+         "Org Clock 提醒"
+         (format "任务 '%s' 的预计时间已到！"
+                (org-clock-get-clock-string)))))))
+
+;; 设置定时器，每分钟检查一次
+(run-with-timer 0 60 #'my/org-clock-check-timer)
+
+;; 在 org-clock-in-hook 中添加检查
+(add-hook 'org-clock-in-hook
+          (lambda ()
+            (let ((effort (org-entry-get (point) "Effort")))
+              (when effort
+                (my/org-clock-notification 
+                 "开始计时"
+                 (format "开始计时任务: %s\n预计用时: %s" 
+                        (org-get-heading t t t t)
+                        effort))))))
 
 (provide 'init-org)

tools/fish/conf.d/alias.fish

@@ -64,7 +64,7 @@ if command -v pacman > /dev/null
     abbr --add pacu "sudo pacman -Syu"
     if command -v paru > /dev/null
         abbr --add pacs "paru -Ss"
-    elif command -v yay > /dev/null
+    else if command -v yay > /dev/null
         abbr --add pacs "yay -Ss"
     else
         abbr --add pacs "pacman -Ss"

tools/nvim/lazy-lock.json

@@ -1,55 +0,0 @@
-{
-  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
-  "auto-session": { "branch": "main", "commit": "16016db7f79d942a1538eaafb15a39f033f7a359" },
-  "betterTerm.nvim": { "branch": "main", "commit": "5d3f41d9e8b3553d49764906a14e45a08dbe2308" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "code_runner.nvim": { "branch": "main", "commit": "65218f8f646fe61e506090522df357539642ae83" },
-  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
-  "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" },
-  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" },
-  "grug-far.nvim": { "branch": "main", "commit": "82a81e0b5638667893d0d89f232dbb510cc5ab14" },
-  "hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" },
-  "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
-  "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
-  "lazygit.nvim": { "branch": "main", "commit": "77a0d42943d8265271e6e6beaed72da54eeb17e7" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "luasnip-latex-snippets.nvim": { "branch": "main", "commit": "cab134611eb755abe9ba95f5d86969f5cece448d" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1f941b3668151963fca3e1230922c433ea4b7b64" },
-  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
-  "nvim-tree.lua": { "branch": "master", "commit": "d529a99f88e0dff02e0aa275db2f595cd252a2c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "2206739829518c9ea59dbdb9003e0147fdaf2d1c" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" },
-  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "onedarkpro.nvim": { "branch": "main", "commit": "44775f8206ee43b692e7f3dc894ddc47996ee523" },
-  "orgmode": { "branch": "master", "commit": "ac7821620462b69c32f237736996e67ab291058b" },
-  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
-  "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" },
-  "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
-  "vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" },
-  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
-  "vim-just": { "branch": "main", "commit": "0f7d26de0c48e2620b733e51f4159aae13dc3bee" },
-  "vim-visual-multi-colemak-hnei": { "branch": "master", "commit": "2cc37d77590d6569d991ebd8d96ab5867eb5a47a" },
-  "vim-wakatime": { "branch": "master", "commit": "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d" },
-  "vimtex": { "branch": "master", "commit": "83e331dcad5ce28012e656eea3906b5b897db2ba" },
-  "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" },
-  "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" },
-  "yanky.nvim": { "branch": "main", "commit": "d2696b30e389dced94d5acab728f524a25f308d2" }
-}

tools/nvim/lua/config/options.lua

@@ -62,3 +62,15 @@ opt.sidescrolloff = 10 -- Always show 10 columns left/right of cursor
 opt.conceallevel = 2
 
 vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
+
+-- Hide zero-width space
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "*",
+  callback = function()
+    vim.opt_local.conceallevel = 2
+    vim.cmd([[
+      syntax match ZeroWidthSpace /\%u200b/ conceal
+      highlight link ZeroWidthSpace Conceal
+    ]])
+  end,
+})

tools/zed/keymap.json

@@ -58,5 +58,17 @@
       "k": "search::SelectNextMatch",
       "K": "search::SelectPrevMatch"
     }
+  },
+  {
+    "context": "ProjectPanel && not_editing",
+
+    "bindings": {
+      "n": "menu::SelectNext",
+      "e": "menu::SelectPrev",
+      "i": "project_panel::ExpandSelectedEntry",
+      "A": "project_panel::NewDirectory",
+      "a": "project_panel::NewFile",
+      "d": "project_panel::Delete"
+    }
   }
 ]

tools/zed/settings.json

@@ -18,9 +18,10 @@
 // custom settings, run `zed: open default settings` from the
 // command palette (cmd-shift-p / ctrl-shift-p)
 {
+  "base_keymap": "VSCode",
   "vim_mode": true,
   "ui_font_size": 16,
-  "buffer_font_size": 16,
+  "buffer_font_size": null,
   "theme": {
     "mode": "dark",
     "light": "Catppuccin Latte",