summaryrefslogtreecommitdiff
path: root/ar/.config
diff options
context:
space:
mode:
Diffstat (limited to 'ar/.config')
-rw-r--r--ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua48
-rw-r--r--ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua (renamed from ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua)8
-rw-r--r--ar/.config/fcitx5/config19
-rw-r--r--ar/.config/fontconfig/fonts.conf6
-rw-r--r--ar/.config/git/ignore9
-rw-r--r--ar/.config/htop/htoprc97
-rw-r--r--ar/.config/shell/aliasrc6
7 files changed, 109 insertions, 84 deletions
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua
index 993b02c..848bf09 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/mini.lua
@@ -796,21 +796,21 @@ end tell
---@return string symbol, string hlGroup
local function mapSymbols(status, is_symlink)
local statusMap = {
--- stylua: ignore start
-[" M"] = { symbol = "✹", hlGroup = "MiniDiffSignChange"}, -- Modified in the working directory
-["M "] = { symbol = "•", hlGroup = "MiniDiffSignChange"}, -- modified in index
-["MM"] = { symbol = "≠", hlGroup = "MiniDiffSignChange"}, -- modified in both working tree and index
-["A "] = { symbol = "+", hlGroup = "MiniDiffSignAdd" }, -- Added to the staging area, new file
-["AA"] = { symbol = "≈", hlGroup = "MiniDiffSignAdd" }, -- file is added in both working tree and index
-["D "] = { symbol = "-", hlGroup = "MiniDiffSignDelete"}, -- Deleted from the staging area
-["AM"] = { symbol = "⊕", hlGroup = "MiniDiffSignChange"}, -- added in working tree, modified in index
-["AD"] = { symbol = "-•", hlGroup = "MiniDiffSignChange"}, -- Added in the index and deleted in the working directory
-["R "] = { symbol = "→", hlGroup = "MiniDiffSignChange"}, -- Renamed in the index
-["U "] = { symbol = "‖", hlGroup = "MiniDiffSignChange"}, -- Unmerged path
-["UU"] = { symbol = "⇄", hlGroup = "MiniDiffSignAdd" }, -- file is unmerged
-["UA"] = { symbol = "⊕", hlGroup = "MiniDiffSignAdd" }, -- file is unmerged and added in working tree
-["??"] = { symbol = "?", hlGroup = "MiniDiffSignDelete"}, -- Untracked files
-["!!"] = { symbol = "!", hlGroup = "MiniDiffSignChange"}, -- Ignored files
+ -- stylua: ignore start
+ [" M"] = { symbol = "✹", hlGroup = "MiniDiffSignChange"}, -- Modified in the working directory
+ ["M "] = { symbol = "•", hlGroup = "MiniDiffSignChange"}, -- modified in index
+ ["MM"] = { symbol = "≠", hlGroup = "MiniDiffSignChange"}, -- modified in both working tree and index
+ ["A "] = { symbol = "+", hlGroup = "MiniDiffSignAdd" }, -- Added to the staging area, new file
+ ["AA"] = { symbol = "≈", hlGroup = "MiniDiffSignAdd" }, -- file is added in both working tree and index
+ ["D "] = { symbol = "-", hlGroup = "MiniDiffSignDelete"}, -- Deleted from the staging area
+ ["AM"] = { symbol = "⊕", hlGroup = "MiniDiffSignChange"}, -- added in working tree, modified in index
+ ["AD"] = { symbol = "-•", hlGroup = "MiniDiffSignChange"}, -- Added in the index and deleted in the working directory
+ ["R "] = { symbol = "→", hlGroup = "MiniDiffSignChange"}, -- Renamed in the index
+ ["U "] = { symbol = "‖", hlGroup = "MiniDiffSignChange"}, -- Unmerged path
+ ["UU"] = { symbol = "⇄", hlGroup = "MiniDiffSignAdd" }, -- file is unmerged
+ ["UA"] = { symbol = "⊕", hlGroup = "MiniDiffSignAdd" }, -- file is unmerged and added in working tree
+ ["??"] = { symbol = "?", hlGroup = "MiniDiffSignDelete"}, -- Untracked files
+ ["!!"] = { symbol = "!", hlGroup = "MiniDiffSignChange"}, -- Ignored files
-- stylua: ignore end
}
@@ -927,18 +927,18 @@ end tell
---@param buf_id integer
---@return nil
local function updateGitStatus(buf_id)
- local cwd = vim.uv.cwd()
- if not cwd or not vim.fs.root(cwd, ".git") then
+ local git_root = vim.fs.root(buf_id, ".git")
+ if not git_root then
return
end
local currentTime = os.time()
- if gitStatusCache[cwd] and currentTime - gitStatusCache[cwd].time < cacheTimeout then
- updateMiniWithGit(buf_id, gitStatusCache[cwd].statusMap)
+ if gitStatusCache[git_root] and currentTime - gitStatusCache[git_root].time < cacheTimeout then
+ updateMiniWithGit(buf_id, gitStatusCache[git_root].statusMap)
else
- fetchGitStatus(cwd, function(content)
+ fetchGitStatus(git_root, function(content)
local gitStatusMap = parseGitStatus(content)
- gitStatusCache[cwd] = {
+ gitStatusCache[git_root] = {
time = currentTime,
statusMap = gitStatusMap,
}
@@ -979,9 +979,9 @@ end tell
pattern = "MiniFilesBufferUpdate",
callback = function(sii)
local bufnr = sii.data.buf_id
- local cwd = vim.fn.expand("%:p:h")
- if gitStatusCache[cwd] then
- updateMiniWithGit(bufnr, gitStatusCache[cwd].statusMap)
+ local git_root = vim.fs.root(bufnr, ".git")
+ if git_root and gitStatusCache[git_root] then
+ updateMiniWithGit(bufnr, gitStatusCache[git_root].statusMap)
end
end,
})
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua
index 9ce9124..90528a1 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/recordings.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/snippets/diary.lua
@@ -6,8 +6,8 @@ local f = ls.function_node
local fmt = require("luasnip.extras.fmt").fmta
-local recordings_snippet = s(
- "recordings",
+local diary_snippet = s(
+ "diary",
fmt(
[[---
title: <title>
@@ -26,5 +26,5 @@ date: <date>
)
)
-ls.add_snippets("markdown", { recordings_snippet })
-ls.add_snippets("quarto", { recordings_snippet })
+ls.add_snippets("markdown", { diary_snippet })
+ls.add_snippets("quarto", { diary_snippet })
diff --git a/ar/.config/fcitx5/config b/ar/.config/fcitx5/config
index cf1c6da..2b164b3 100644
--- a/ar/.config/fcitx5/config
+++ b/ar/.config/fcitx5/config
@@ -1,5 +1,5 @@
[Hotkey]
-# Enumerate when press trigger key repeatedly
+# Enumerate when holding modifier of Toggle key
EnumerateWithTriggerKeys=True
# Enumerate Input Method Forward
EnumerateForwardKeys=
@@ -9,24 +9,26 @@ EnumerateBackwardKeys=
EnumerateSkipFirst=False
# Toggle embedded preedit
TogglePreedit=
+# Time limit in milliseconds for triggering modifier key shortcuts
+ModifierOnlyKeyTimeout=250
[Hotkey/TriggerKeys]
0=
1=
-[Hotkey/AltTriggerKeys]
+[Hotkey/ActivateKeys]
0=
-[Hotkey/EnumerateGroupForwardKeys]
+[Hotkey/DeactivateKeys]
0=
-[Hotkey/EnumerateGroupBackwardKeys]
+[Hotkey/AltTriggerKeys]
0=
-[Hotkey/ActivateKeys]
+[Hotkey/EnumerateGroupForwardKeys]
0=
-[Hotkey/DeactivateKeys]
+[Hotkey/EnumerateGroupBackwardKeys]
0=
[Hotkey/PrevPage]
@@ -60,9 +62,9 @@ CompactInputMethodInformation=True
ShowFirstInputMethodInformation=True
# Default page size
DefaultPageSize=5
-# Override Xkb Option
+# Override XKB Option
OverrideXkbOption=False
-# Custom Xkb Option
+# Custom XKB Option
CustomXkbOption=
# Force Enabled Addons
EnabledAddons=
@@ -76,3 +78,4 @@ AllowInputMethodForPassword=False
ShowPreeditForPassword=False
# Interval of saving user data in minutes
AutoSavePeriod=30
+
diff --git a/ar/.config/fontconfig/fonts.conf b/ar/.config/fontconfig/fonts.conf
index 935549d..c5ac402 100644
--- a/ar/.config/fontconfig/fonts.conf
+++ b/ar/.config/fontconfig/fonts.conf
@@ -7,7 +7,6 @@
<family>Source Han Serif KR</family>
<family>DejaVu Serif</family>
<family>Droid Serif</family>
- <family>Libertinus Serif</family>
<family>Joy Pixels</family>
<family>Noto Color Emoji</family>
<family>FontAwesome</family>
@@ -19,7 +18,6 @@
<family>Source Han Serif KR</family>
<family>DejaVu Serif</family>
<family>Droid Serif</family>
- <family>Libertinus Serif</family>
<family>Joy Pixels</family>
<family>Noto Color Emoji</family>
<family>FontAwesome</family>
@@ -31,7 +29,6 @@
<family>Source Han Sans KR</family>
<family>DejaVu Sans</family>
<family>Droid Sans</family>
- <family>Libertinus Sans</family>
<family>Joy Pixels</family>
<family>Noto Color Emoji</family>
<family>FontAwesome</family>
@@ -42,7 +39,6 @@
<prefer>
<family>Noto Sans Mono</family>
<family>Noto Sans Mono CJK KR</family>
- <family>Libertinus Mono</family>
<family>FontAwesome</family>
<family>Braille</family>
</prefer>
@@ -52,7 +48,6 @@
<prefer>
<family>D2CodingLigature Nerd Font Mono</family>
<family>Hack Nerd Font Mono</family>
- <family>Libertinus Mono</family>
<family>FontAwesome</family>
<family>Braille</family>
</prefer>
@@ -62,7 +57,6 @@
<prefer>
<family>Noto Sans CJK KR</family>
<family>D2CodingLigature Nerd Font</family>
- <family>Libertinus</family>
<family>FontAwesome</family>
<family>Braille</family>
</prefer>
diff --git a/ar/.config/git/ignore b/ar/.config/git/ignore
index 03a48c8..779455d 100644
--- a/ar/.config/git/ignore
+++ b/ar/.config/git/ignore
@@ -87,13 +87,22 @@ shortcutrc
zshnameddirrc
# Suckless
+dmenu/config.h
dmenu/dmenu
dmenu/stest
+dwm/config.h
dwm/dwm
+dwmblocks/config.h
dwmblocks/dwmblocks
+slock/config.h
slock/slock
+st/config.h
st/st
+surf/config.h
surf/surf
+tabbed/config.h
+tabbed/tabbed
+tabbed/xembed
# Tmux
*/tmux/plugins/
diff --git a/ar/.config/htop/htoprc b/ar/.config/htop/htoprc
index 8666417..6df10ed 100644
--- a/ar/.config/htop/htoprc
+++ b/ar/.config/htop/htoprc
@@ -1,53 +1,72 @@
# Beware! This file is rewritten by htop when settings are changed in the interface.
# The parser is also very primitive, and not human-friendly.
-.all_branches_collapsed=0
-.sort_direction=-1
-.sort_key=PERCENT_CPU
-.tree_sort_direction=1
-.tree_sort_key=PID
-.tree_view=0
-.tree_view_always_by_pid=0
-account_guest_in_cpu_meter=0
-all_branches_collapsed=0
-color_scheme=5
-column_meter_modes_0=1 1 1 2 2 2 1
-column_meter_modes_1=
-column_meters_0=LeftCPUs Memory Swap Uptime LoadAverage Tasks RightCPUs
-column_meters_1=
+htop_version=3.4.1-ee21c79
config_reader_min_version=3
-cpu_count_from_one=0
-delay=15
-detailed_cpu_time=0
-enable_mouse=1
-fields=0 48 17 18 38 39 2 46 46 47 49 1
-find_comm_in_cmdline=1
-header_layout=two_50_50
-header_margin=1
-hide_function_bar=0
+fields=0 48 17 18 38 39 40 2 46 47 49 1
hide_kernel_threads=1
-hide_running_in_container=0
hide_userland_threads=0
+hide_running_in_container=0
+shadow_other_users=1
+show_thread_names=0
+show_program_path=1
highlight_base_name=1
-highlight_changes=1
-highlight_changes_delay_secs=1
highlight_deleted_exe=1
+shadow_distribution_path_prefix=0
highlight_megabytes=1
highlight_threads=1
-htop_version=3.3.0-dev
-screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+highlight_changes=1
+highlight_changes_delay_secs=1
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=0
+header_margin=1
screen_tabs=1
-shadow_distribution_path_prefix=0
-shadow_other_users=1
-show_cpu_frequency=1
+detailed_cpu_time=0
+cpu_count_from_one=0
show_cpu_usage=1
-show_merged_command=0
-show_program_path=1
-show_thread_names=0
-sort_direction=-1
+show_cpu_frequency=1
+show_cpu_temperature=0
+degree_fahrenheit=0
+show_cached_memory=1
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=6
+enable_mouse=1
+delay=15
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=LeftCPUs2 Memory Swap
+column_meter_modes_0=1 1 1
+column_meters_1=RightCPUs2 Tasks LoadAverage Uptime
+column_meter_modes_1=1 2 2 2
+tree_view=0
sort_key=46
-strip_exe_from_cmdline=1
-tree_sort_direction=1
tree_sort_key=0
-tree_view=0
+sort_direction=-1
+tree_sort_direction=1
tree_view_always_by_pid=0
-update_process_names=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_CPU
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
+.sort_key=IO_RATE
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PID
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=1
+.tree_sort_direction=1
+.all_branches_collapsed=0
diff --git a/ar/.config/shell/aliasrc b/ar/.config/shell/aliasrc
index 55f04e7..8061a60 100644
--- a/ar/.config/shell/aliasrc
+++ b/ar/.config/shell/aliasrc
@@ -488,6 +488,6 @@ alias szs="source ${XDG_CONFIG_HOME:-${HOME}/.config}/zsh/.zshrc"
alias ylogh='ylog -s hidden -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
alias ylogi='ylog -s hidden -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogt='ylog -s recordings -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogy='ylog -s recordings -c us | grep $(LC_TIME=C date -v-1d +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
-alias ylogu='ylog -s recordings -c us'
+alias ylogt='ylog -s diary -c us | grep $(LC_TIME=C date +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogy='ylog -s diary -c us | grep $(LC_TIME=C date -d "yesterday" +%d/%b) | grep -E "[0-9]{2}:[0-9]{2}:[0-9]{2} "'
+alias ylogu='ylog -s diary -c us'