Skip to content

Commit fc3de47

Browse files
meainmeain
committed
[scripts] ,ask: improve document search logic
1 parent c76b67a commit fc3de47

File tree

19 files changed

+216
-99
lines changed

19 files changed

+216
-99
lines changed

‎emacs/.config/emacs/early-init.el

+54-44
Original file line numberDiff line numberDiff line change
@@ -45,57 +45,64 @@
4545
(defvar meain/font-list '(;; name size line-spacing weight
4646
("Adelle Mono" . '(11 .1 'regular))
4747
("Aglet Mono" . '(11 .2 'regular))
48+
("Agave" . '(17 .1 'regular))
4849
("Anka/Coder" . '(14 .1 'regular))
4950
("Anonymous Pro" . '(12 .1 'regular))
5051
("Apercu Mono" . '(11 nil 'regular))
51-
("Berkeley Mono" . '(13 nil 'regular))
52+
("Berkeley Mono" . '(15 .2 'light))
53+
("Typori" . '(15 .2 'regular)) ;; not monospace
54+
("Monoflow" . '(14 nil 'regular))
55+
("Latin Modern Mono" . '(17 nil 'regular))
56+
("Latin Modern Mono Light Cond" . '(19 nil 'regular))
5257
("BPMono" . '(10 .1 'regular))
5358
("Cartograph CF" . '(11 nil 'regular))
54-
("Cascadia Code" . '(11 nil 'regular))
59+
("Cascadia Code" . '(13 nil 'regular))
5560
("Cascadia Code Light" . '(11 nil 'regular))
5661
("Cascadia Mono" . '(13 nil 'regular))
5762
("Cascadia Mono Light" . '(13 nil 'regular))
5863
("Codename Coder Free 4F" . '(13 nil 'regular))
5964
("Comic Mono" . '(14 nil 'regular))
6065
("CommitMono" . '(11 .1 'regular))
6166
("Consolas" . '(12 nil 'regular))
67+
("Consola Mono" . '(16 nil 'regular))
6268
("Conta" . '(11 nil 'regular))
6369
("Courier New" . '(11 nil 'regular))
6470
("CozetteVector" . '(12 nil 'regular))
6571
("CQ Mono" . '(13 .1 'regular))
66-
("Dank Mono" . '(14 nil 'regular))
72+
("Dank Mono" . '(16 .1 'regular))
6773
("DankMono Nerd Font" . '(13 nil 'regular))
6874
("DejaVu Sans Mono" . '(11 nil 'regular))
69-
("DM Mono" . '(11 nil 'regular))
75+
("DM Mono" . '(15 .1 'light))
7076
("Edlo" . '(11 nil 'regular))
7177
("Ellograph CF" . '(11 .1 'regular))
7278
("Ellograph CF Thin" . '(11 .1 'regular))
7379
("Envy Code R" . '(11 nil 'regular))
7480
("FairfaxHD" . '(13 nil 'regular))
75-
("Fantasque Sans Mono" . '(13 .2 'regular))
81+
("Fantasque Sans Mono" . '(18 .1 'regular))
7682
("Noto Sans Mono" . '(14 .2 'regular))
77-
("Fira Code" . '(13 nil 'thin))
83+
("Noto Sans Mono ExtraCondensed" . '(15 nil 'regular))
84+
("Fira Code" . '(14 .2 'thin))
7885
("fixed" . '(11 nil 'regular))
79-
("Go Mono" . '(13 nil 'regular))
86+
("Go Mono" . '(15 .2 'regular))
8087
("Hermit" . '(10 nil 'regular))
81-
("HyperFont" . '(11 nil 'regular))
82-
("iA Writer Duo S" . '(11 nil 'regular))
83-
("iA Writer Mono S" . '(11 nil 'regular))
84-
("IBM Plex Mono" . '(11 nil 'regular))
88+
("HyperFont" . '(16 .2 'regular))
89+
("iA Writer Duo S" . '(15 nil 'regular))
90+
("iA Writer Mono S" . '(15 nil 'regular))
91+
("IBM Plex Mono" . '(13 nil 'regular))
8592
("Inconsolata" . '(16 nil 'regular))
8693
("Input" . '(12 nil 'regular)) ; custom version
8794
("Input Mono" . '(11 .1 'regular))
8895
("IntelOne Mono" . '(11 nil 'regular))
89-
("Iosevka" . '(14 .1 'regular))
90-
("Zed Mono" . '(15 .2 'regular))
96+
("Iosevka" . '(16 .1 'light))
97+
("Zed Mono" . '(16 .1 'light))
9198
("Iosevka Comfy" . '(14 .2 'regular))
92-
("Iosevka Comfy Motion" . '(14 nil 'regular))
99+
("Iosevka Comfy Motion" . '(16 .1 'light))
93100
("Iosevka Comfy Wide Motion" . '(11 nil 'regular))
94101
("Iosevka Light" . '(12 .1 'regular))
95102
("Iosevka Slab" . '(12 nil 'regular))
96103
("Iosevka Thin" . '(11 nil 'regular))
97104
("Izayoi Monospaced" . '(12 .2 'regular))
98-
("JetBrains Mono" . '(13 nil 'regular))
105+
("JetBrains Mono" . '(14 .1 'regular))
99106
("Maple Mono" . '(14 nil 'regular))
100107
("JetBrains Mono Light" . '(12 nil 'light))
101108
("JuliaMono" . '(14 .2 'light))
@@ -109,39 +116,41 @@
109116
("Lotion" . '(13 nil 'regular))
110117
("Luculent" . '(11 .2 'regular))
111118
("M+ 1m" . '(11 nil 'regular))
112-
("Martian Mono" . '(10 nil 'regular))
113-
("Martian Mono Condensed" . '(10 nil 'regular))
114-
("Martian Mono ExtraLight" . '(10 nil 'regular))
115-
("Martian Mono Light" . '(10 nil 'regular))
119+
("Martian Mono" . '(13 nil 'regular))
120+
("Martian Mono Condensed" . '(13 nil 'regular))
121+
("Martian Mono ExtraLight" . '(13 nil 'regular))
122+
("Martian Mono Light" . '(13 nil 'regular))
123+
("Monaco" . '(14 .1 'regular))
116124
("Monaco for Powerline" . '(10 .1 'regular))
117-
("Monaspace Argon" . '(11 .1 'regular))
118-
("Monaspace Krypton" . '(11 .1 'regular))
119-
("Monaspace Neon" . '(11 .1 'regular))
120-
("Monaspace Neon Light" . '(11 .1 'regular))
121-
("Monaspace Radon" . '(11 .1 'regular))
122-
("Monaspace Xenon" . '(11 .1 'regular))
125+
("Monaspace Argon" . '(15 .2 'regular))
126+
("Monaspace Krypton" . '(15 .2 'regular))
127+
("Monaspace Neon" . '(15 .2 'regular))
128+
("Monaspace Neon Var" . '(15 .1 'regular))
129+
("Monaspace Neon Light" . '(15 .2 'regular))
130+
("Monaspace Radon" . '(15 .2 'regular))
131+
("Monaspace Xenon" . '(15 .2 'regular))
123132
("monofur" . '(13 nil 'regular))
124-
("Monoid" . '(11 .1 'light))
133+
("Monoid" . '(13 .2 'light))
125134
("Monoid HalfLoose" . '(9 .1 'light))
126135
("Hack" . '(13 nil 'light))
127136
("Monoisome" . '(12 .3 'light))
128137
("Monoisome HalfLoose" . '(11 .2 'light))
129138
("MonoLisa" . '(11 .2 'regular))
130139
("mononoki" . '(14 .1 'regular))
131-
("0xProto" . '(12 .3 'regular))
140+
("0xProto" . '(14 .2 'regular))
132141
("monoOne" . '(11 nil 'regular))
133-
("MonospaceTypewriter" . '(11 nil 'regular))
142+
("MonospaceTypewriter" . '(14 .2 'regular))
134143
("NanumGothicCoding" . '(12 .2 'regular))
135144
("NK57 Monospace" . '(10 .2 'regular))
136-
("Operator Mono" . '(11 .1 'regular))
145+
("Operator Mono" . '(16 .1 'thin))
137146
("Operator Mono Light" . '(11 .1 'regular))
138147
("Overpass Mono" . '(11 nil 'regular))
139148
("Overpass Mono Light" . '(11 nil 'regular))
140149
("Oxygen Mono" . '(11 .2 'regular))
141150
("Panic Sans" . '(11 nil 'regular))
142151
("PragmataPro" . '(12 .1 'regular))
143152
("ProFont for Powerline" . '(13 .1 'regular))
144-
("PT Mono" . '(13 .1 'regular))
153+
("PT Mono" . '(15 .1 'regular))
145154
("Quinze" . '(13 nil 'regular))
146155
("Rec Mono Casual" . '(11 nil 'regular))
147156
("Rec Mono Linear" . '(11 nil 'regular))
@@ -150,41 +159,42 @@
150159
("Recursive Monospace Casual" . '(11 nil 'regular))
151160
("Red Hat Mono" . '(11 nil 'regular))
152161
("Reno Mono" . '(11 nil 'regular))
153-
("Roboto Mono" . '(13 .1 'regular))
162+
("Roboto Mono" . '(15 .2 'regular))
154163
("American Typewriter" . '(15 .2 'regular))
155164
("Sarasa Mono SC Nerd". '(12 nil 'regular))
156165
("saxMono" . '(13 nil 'regular))
157166
("SF Mono" . '(11 nil 'regular))
158167
("SF Mono Light" . '(10 nil 'regular))
159168
("Share Tech Mono" . '(11 nil 'regular))
160169
("Sometype Mono" . '(12 nil 'regular))
161-
("SpaceMono Nerd Font Mono" . '(11 nil 'regular))
162-
("Sudo" . '(17 .1 'regular))
163-
("SV Basic Manual" . '(13 nil 'regular))
170+
("SpaceMono Nerd Font Mono" . '(15 nil 'regular))
171+
("Sudo" . '(19 .1 'regular))
172+
("SV Basic Manual" . '(18 .3 'regular))
164173
("Syne Mono" . '(12 nil 'regular))
165174
("Syne Tactile" . '(14 .1 'regular))
166-
("TerminessTTF Nerd Font" . '(14 nil 'regular))
167-
("Terminess Nerd Font Mono" . '(15 nil 'regular))
168-
("Geist Mono" . '(14 .1 'regular))
175+
("TerminessTTF Nerd Font" . '(16 nil 'regular))
176+
("Terminess Nerd Font" . '(18 nil 'regular))
177+
("Terminess Nerd Font Mono" . '(18 .1 'regular))
178+
("Geist Mono" . '(15 .1 'light))
169179
("Geist Mono Light" . '(14 .1 'regular))
170180
("TerminessTTF Nerd Font Mono" . '(14 nil 'regular))
171181
("Times New Roman" . '(13 .1 'regular))
172182
("Tlwg Typewriter" . '(12 nil 'regular))
183+
("TT2020" . '(16 .3 'regular))
173184
("TT2020Base" . '(13 .1 'regular))
174185
("TT2020 Style E" . '(13 .2 'regular))
175186
("Ubuntu Mono" . '(12 .1 'regular))
176-
("Unifont" . '(15 .2 'regular))
187+
("Unifont" . '(16 .2 'regular))
177188
("Uroob" . '(14 nil 'regular))
178-
("Victor Mono" . '(13 .1 'regular))
179-
("Whois" . '(13 .1 'regular))
180-
("Xanh Mono" . '(13 nil 'regular))
189+
("Victor Mono" . '(15 nil 'regular))
190+
("Whois" . '(17 .2 'regular))
191+
("Xanh Mono" . '(16 .1 'regular))
181192
("OCRA" . '(12 nil 'regular))
182-
("Martian Mono SemiCondensed" . '(10 nil 'regular))
183193
("Gintronic" . '(11 nil 'regular))
184-
("Departure Mono" . '(13 .1 'regular))
194+
("Departure Mono" . '(14 .2 'regular))
185195
("CMU Typewriter Text" . '(13 nil 'regular))
186196
))
187-
(defvar meain/font-name "Zed Mono") ; saxMono ; Syne Mono ; Dank Mono ; Overpass Mono ; Fantasque Sans Mono
197+
(defvar meain/font-name "Dank Mono") ; Zed Mono ; saxMono ; Syne Mono ; Overpass Mono ; Fantasque Sans Mono
188198

189199
(defun meain/get-font-prop (font-name prop)
190200
"Get PROP (property) from FONT-NAME."

‎emacs/.config/emacs/init.el

+8-5
Original file line numberDiff line numberDiff line change
@@ -1978,6 +1978,7 @@ list of available pages."
19781978
(erase-buffer)
19791979
(insert (shell-command-to-string (concat "git show " branch ":" filepath)))
19801980
(goto-line line-no) ;; will be different, but just a start
1981+
(face-remap-add-relative 'default 'lazy-highlight)
19811982
(funcall mm))))
19821983

19831984
;; Structural diff using difftastic
@@ -2087,6 +2088,7 @@ list of available pages."
20872088
:config (global-evil-matchit-mode 1))
20882089

20892090
;; Highlight color codes
2091+
;; Alternative: https://github.com/DevelopmentCool2449/colorful-mode
20902092
(use-package rainbow-mode
20912093
:ensure t
20922094
:commands (rainbow-mode)
@@ -2668,9 +2670,10 @@ Instead of `default-directory' when calling `ORIG-FN' with `ARGS'."
26682670
:ensure t
26692671
:defer t
26702672
:mode "\\.nix\\'"
2671-
:config
2672-
(add-hook 'nix-mode-hook (lambda ()
2673-
(setq imenu-create-index-function #'meain/imenu-config-nesting-path))))
2673+
;; :config
2674+
;; (add-hook 'nix-mode-hook (lambda ()
2675+
;; (setq imenu-create-index-function #'meain/imenu-config-nesting-path)))
2676+
)
26742677
;; builtin package for scheme (for tree-sitter grammar)
26752678
(use-package scheme-mode :defer t :mode "\\.scm\\'")
26762679
(use-package csv-mode
@@ -3536,8 +3539,8 @@ Instead of `default-directory' when calling `ORIG-FN' with `ARGS'."
35363539
(add-hook 'rust-mode-hook
35373540
(lambda ()
35383541
(tree-sitter-hl-add-patterns nil
3539-
[((identifier) @rust.constructor
3540-
(.match? @rust.constructor "^[A-Z]"))]))))
3542+
[((identifier) @rust.constructor
3543+
(.match? @rust.constructor "^[A-Z]"))]))))
35413544

35423545
;; Some custom text objects based on treesitter
35433546
(use-package evil-textobj-tree-sitter

‎git/.config/git/config

+6
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,9 @@
7878
conflictstyle = zdiff3
7979
[rerere]
8080
enabled = true
81+
[maintenance]
82+
repo = /Users/meain/dev/alcion/canario
83+
repo = /Users/meain/dev/alcion/ark
84+
repo = /Users/meain/dev/src/nixpkgs
85+
[url "[email protected]:"]
86+
insteadOf = https://github.com/

‎hammerspoon/.hammerspoon/init.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ local chrome = "com.google.Chrome"
1414
local obsidian = "md.obsidian"
1515
local cursor = "com.todesktop.230313mzl4w4u92"
1616
local vscodium = "com.vscodium" -- used for sourcegraph cody
17+
local vscode = "com.microsoft.VSCode"
1718
local mail = "com.apple.mail"
1819
local zed = "dev.zed.Zed"
1920
local cal = "com.apple.iCal"
@@ -55,7 +56,7 @@ bindFocus("s", slack, true)
5556
bindFocus("l", teams, true)
5657
bindFocus("h", notesApp, true)
5758
bindFocus("j", editor, true)
58-
bindFocus("o", vscodium, true)
59+
bindFocus("o", vscode, true)
5960
bindFocus("p", zed, true)
6061
bindFocus("e", mail, true)
6162
bindFocus("y", cal, true)

‎home-manager/.config/home-manager/firefox.nix

+1
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
"font.name.sans-serif.x-western" = "${defaultFont}";
176176
"font.name.serif.x-western" = "${defaultFont}";
177177
"browser.display.use_document_fonts" = 0;
178+
# "reader.font_type.values" = ["sans-serif" "serif" "monospace" "${defaultFont}"]; # syntax not verified
178179

179180
# do not open a tab in a new window
180181
# ascentpayroll.net open link in a new without without any

‎home-manager/.config/home-manager/repo_bookmarks.nix

+10
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,14 @@ utils.gh-bookmarks {
1010
repo = "meain/dotfiles";
1111
basename = "dotfiles";
1212
basekeyword = "dot";
13+
} ++
14+
utils.gh-bookmarks {
15+
repo = "alcionai/canario";
16+
basename = "canario";
17+
basekeyword = "can";
18+
} ++
19+
utils.gh-bookmarks {
20+
repo = "alcionai/ark";
21+
basename = "ark";
22+
basekeyword = "ark";
1323
}

‎jj/Library/Application Support/jj/config.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ diff-editor = ":builtin"
1010

1111
[ui.diff]
1212
format = "git"
13+
# tool = ["difft", "--color=always", "$left", "$right"]
1314

1415
[colors]
1516
"diff removed token" = { underline = false }

‎k9s/.config/k9s/config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ k9s:
88
skin: personal
99
enableMouse: true
1010
headless: false
11-
logoless: false
12-
crumbsless: false
11+
logoless: true
12+
crumbsless: true
1313
reactive: true
1414
noIcons: false
1515
skipLatestRevCheck: true

‎nix-darwin/.config/nix-darwin/flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{
2727
# Build darwin flake using:
2828
# $ darwin-rebuild build --flake .#Abins-MacBook-Air
29-
darwinConfigurations."machine" = nix-darwin.lib.darwinSystem {
29+
darwinConfigurations."DarkBlue" = nix-darwin.lib.darwinSystem {
3030
modules = [
3131
configuration
3232
./modules/homebrew.nix

‎nix-darwin/.config/nix-darwin/system.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
location = "~/Documents/Screenshots"; # will have to create it manually
6464
};
6565

66-
universalaccess = {
67-
closeViewScrollWheelToggle = true; # enable zoom with scroll wheel
68-
reduceMotion = true; # disable animations
69-
reduceTransparency = true; # disable transparency
70-
};
66+
# universalaccess = {
67+
# closeViewScrollWheelToggle = true; # enable zoom with scroll wheel
68+
# reduceMotion = true; # disable animations
69+
# reduceTransparency = true; # disable transparency
70+
# };
7171
}

‎notmuch/.config/notmuch/config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[database]
2-
path=/home/meain/.local/share/mail
2+
path=/Users/meain/.local/share/mail
33

44
[user]
55
name=Abin Simon

0 commit comments

Comments
 (0)