Compare commits
177 Commits
c5c67f8cb4
...
main
Author | SHA1 | Date | |
---|---|---|---|
![]() |
86ccfa62fa | ||
![]() |
ef4259d1f1 | ||
![]() |
39a42861b8 | ||
![]() |
cb5d569142 | ||
![]() |
ae55a1cdde | ||
![]() |
59cc290bce | ||
![]() |
1341a44239 | ||
![]() |
cd303f8eca | ||
![]() |
164aa24311 | ||
![]() |
a2534ef43a | ||
![]() |
ff6a910eed | ||
![]() |
7313bd2851 | ||
![]() |
a4aa75bd07 | ||
![]() |
e6799a761d | ||
![]() |
c533e55e9d | ||
![]() |
9ac3c9c270 | ||
![]() |
768086b43a | ||
![]() |
d19b80d973 | ||
![]() |
8764cb7d9e | ||
![]() |
257ae1d4b3 | ||
![]() |
9c90547b6b | ||
![]() |
7d8bc680b3 | ||
![]() |
bf08f424eb | ||
![]() |
e5e5e39038 | ||
![]() |
9e1ec5cc76 | ||
![]() |
cdb20a1eb7 | ||
![]() |
372fd2b673 | ||
![]() |
ec159ff00e | ||
![]() |
ebfc0f121c | ||
![]() |
5d33aa6dee | ||
![]() |
d50924057b | ||
![]() |
54f42eb54c | ||
![]() |
390a61a239 | ||
![]() |
1f9730727a | ||
![]() |
cdf5c1a8c3 | ||
![]() |
4ba5524765 | ||
![]() |
ac555d147f | ||
![]() |
2ef79fdb09 | ||
![]() |
751666a528 | ||
![]() |
70b785d2e6 | ||
![]() |
df7e2468b8 | ||
![]() |
d3e9f68879 | ||
![]() |
101fb1d4f7 | ||
![]() |
fbc2769105 | ||
![]() |
723d3d63a8 | ||
![]() |
1ef2e0a891 | ||
![]() |
dbe1e3bc20 | ||
![]() |
d6f1b1abf4 | ||
![]() |
b62fc1bbcf | ||
![]() |
75d7d8baaa | ||
![]() |
73eae38fba | ||
![]() |
adb4d9dc7c | ||
![]() |
bee50c778c | ||
![]() |
e9c5c6f402 | ||
![]() |
b9b44851e5 | ||
![]() |
38c0c9c176 | ||
![]() |
042835dfb6 | ||
![]() |
5cc306e635 | ||
![]() |
cec4d4a758 | ||
![]() |
bae0191c6a | ||
![]() |
02d5338422 | ||
![]() |
83c0a53167 | ||
![]() |
0122e038b8 | ||
![]() |
fc886b4ded | ||
![]() |
31b62c358b | ||
![]() |
3e47df0cc8 | ||
![]() |
b909524ed8 | ||
![]() |
bc36439ae8 | ||
![]() |
031d24dc03 | ||
![]() |
21f925a994 | ||
![]() |
3bd6f8b0f3 | ||
![]() |
ffb6bed383 | ||
![]() |
3c846b18b2 | ||
![]() |
91a62ee415 | ||
![]() |
d41c5e0620 | ||
![]() |
e95fe03911 | ||
![]() |
cc571f716a | ||
![]() |
842753530e | ||
![]() |
58ae02ab96 | ||
![]() |
62ff857185 | ||
![]() |
5d282822b2 | ||
![]() |
4ac305b141 | ||
![]() |
463638297f | ||
![]() |
9d779a50d5 | ||
![]() |
3fd4da2c7b | ||
![]() |
2670a5c92e | ||
![]() |
d42375ac06 | ||
![]() |
cbf9ea5195 | ||
![]() |
a803516c40 | ||
![]() |
455c3b9706 | ||
![]() |
71ea0433c4 | ||
![]() |
4f604c7737 | ||
![]() |
370ebcb022 | ||
![]() |
621a82c419 | ||
![]() |
10b4fe617f | ||
![]() |
7f67a66f83 | ||
![]() |
0c486d0510 | ||
![]() |
a6ab2c9f08 | ||
![]() |
a45d8331db | ||
![]() |
5e94720ffb | ||
![]() |
19cb5c37e8 | ||
![]() |
0cb140bfdd | ||
![]() |
d0ac25ce86 | ||
![]() |
72c9da1463 | ||
![]() |
c74f5ffd1f | ||
![]() |
6672a9d253 | ||
![]() |
56fe3e02f5 | ||
![]() |
6f0bdd72b3 | ||
![]() |
13099c4d49 | ||
![]() |
c389cb9585 | ||
![]() |
93f4d7733e | ||
![]() |
80977aba22 | ||
![]() |
365f01da54 | ||
![]() |
f0cedaa4a2 | ||
![]() |
baa6a284b6 | ||
![]() |
f37136c653 | ||
![]() |
319a2750b7 | ||
![]() |
c5a650956b | ||
![]() |
1e79cbba99 | ||
![]() |
29735c36f2 | ||
![]() |
d2cbbc760a | ||
![]() |
73812068ae | ||
![]() |
90d283620e | ||
![]() |
f41c8fea5c | ||
![]() |
027763171a | ||
![]() |
543a855331 | ||
![]() |
4db56fee78 | ||
![]() |
3ce59de41b | ||
![]() |
64c237babd | ||
![]() |
9da96641a9 | ||
![]() |
7ed6e51c73 | ||
![]() |
2fd2eeb7f3 | ||
![]() |
d2e4e67de8 | ||
![]() |
8fee57b18e | ||
![]() |
84aae5f2ba | ||
![]() |
0b5d7dd6b6 | ||
![]() |
5299fa8d48 | ||
![]() |
77c4036a6c | ||
![]() |
0a18fef87a | ||
![]() |
56cbe48f3f | ||
![]() |
834f8131ff | ||
![]() |
41c657d5b4 | ||
![]() |
da9a378be7 | ||
![]() |
798a04527e | ||
![]() |
49ef034db8 | ||
![]() |
4c24eb8d30 | ||
![]() |
ddd90709d2 | ||
![]() |
aee39f036a | ||
![]() |
0f9a9d9d8d | ||
![]() |
5f9c74cda9 | ||
![]() |
83976749be | ||
![]() |
97a3b51027 | ||
![]() |
fa61c8ff8c | ||
![]() |
514c71a5f9 | ||
![]() |
b4d8d52270 | ||
![]() |
022845035e | ||
![]() |
caa31d3c4e | ||
![]() |
020e96ab15 | ||
![]() |
dd4e485642 | ||
![]() |
c2aaf94ab7 | ||
![]() |
2869e5b244 | ||
![]() |
fd3a54ce62 | ||
![]() |
01281629fa | ||
![]() |
8af3797ce1 | ||
![]() |
8413b03484 | ||
![]() |
4a05eb7682 | ||
![]() |
53d49483a1 | ||
![]() |
cb3bb564fc | ||
![]() |
d246b6245a | ||
![]() |
124b5052be | ||
![]() |
cdda87b300 | ||
![]() |
8ff62cef14 | ||
![]() |
d106ea1053 | ||
![]() |
4dbd0ee01a | ||
![]() |
87bf5ef08d | ||
![]() |
fa8d397333 | ||
![]() |
108415ae0c |
@@ -1,8 +1,8 @@
|
||||
encryption = "age"
|
||||
[edit]
|
||||
command = "nvim"
|
||||
|
||||
[diff]
|
||||
pager = "delta"
|
||||
exclude = ["scripts"]
|
||||
|
||||
[merge]
|
||||
|
@@ -19,9 +19,12 @@ README.md
|
||||
.config/alacritty
|
||||
.config/conky
|
||||
.config/dunst
|
||||
.config/fcitx5
|
||||
.config/fontconfig
|
||||
.config/i3
|
||||
.config/mozc
|
||||
.config/mpv
|
||||
.config/nvim/lua/plugins/treesitter.lua
|
||||
.config/polybar
|
||||
.config/redshift
|
||||
.config/rofi
|
||||
|
@@ -78,5 +78,6 @@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
|
||||
|
||||
{{ if eq .chezmoi.hostname "arch" -}}
|
||||
# nvidia-settings
|
||||
nvidia-settings --config="$XDG_CONFIG_HOME/nvidia/settings" --load-config-only
|
||||
# 2024-10-14: Comment out below one line due to KMS error.
|
||||
#nvidia-settings --config="$XDG_CONFIG_HOME/nvidia/settings" --load-config-only
|
||||
{{- end }}
|
||||
|
@@ -1,3 +1,4 @@
|
||||
[general]
|
||||
live_config_reload = true
|
||||
|
||||
[colors.bright]
|
||||
@@ -51,22 +52,8 @@ size = 7.5
|
||||
size = 5.5
|
||||
{{- end }}
|
||||
|
||||
[font.bold]
|
||||
style = "Bold"
|
||||
|
||||
[font.bold_italic]
|
||||
style = "Bold Italic"
|
||||
|
||||
[font.italic]
|
||||
style = "Italic"
|
||||
|
||||
[font.normal]
|
||||
family = "Source Code Pro"
|
||||
style = "Regular"
|
||||
|
||||
[font.offset]
|
||||
x = 0
|
||||
y = 0
|
||||
offset = { x = 0, y = 0 }
|
||||
normal = { family = "Source Code Pro", style = "Regular" }
|
||||
|
||||
[window]
|
||||
dynamic_padding = true
|
||||
|
53
dot_config/atuin/config.toml
Normal file
53
dot_config/atuin/config.toml
Normal file
@@ -0,0 +1,53 @@
|
||||
# Official Documents:
|
||||
# https://docs.atuin.sh/configuration/config/#search_mode_shell_up_key_binding
|
||||
# https://docs.atuin.sh/configuration/key-binding/
|
||||
|
||||
sync_address = "https://atuin.inkch.xyz"
|
||||
sync_frequency = "15m"
|
||||
|
||||
filter_mode = "global"
|
||||
filter_mode_shell_up_key_binding = "host"
|
||||
|
||||
enter_accept = true
|
||||
inline_height = 20
|
||||
invert = true
|
||||
max_preview_height = 9
|
||||
preview.strategy = "fixed"
|
||||
|
||||
show_tabs = false
|
||||
show_help = false
|
||||
prefers_reduced_motion = true
|
||||
|
||||
history_filter = [
|
||||
"^\\.+$",
|
||||
"^\\.+/$",
|
||||
"^a(mv|cp) -g ",
|
||||
"^aunpack ",
|
||||
"^batexa -lag --git$",
|
||||
"^cd ",
|
||||
"^cd$",
|
||||
"^fg$",
|
||||
"^fiztory$",
|
||||
"^history$",
|
||||
"^mcomix",
|
||||
"^mkcd ",
|
||||
"^mkdir ",
|
||||
"^ls$",
|
||||
"^ls -al(g)?$",
|
||||
"^ls -la(g)?$",
|
||||
"^unrar ",
|
||||
"^unzip ",
|
||||
"^z(i)?$", # zoxide
|
||||
"^z(i)? ", # zoxide
|
||||
"^ "
|
||||
]
|
||||
|
||||
common_prefix = [
|
||||
"grc",
|
||||
"doas",
|
||||
"sudo"
|
||||
]
|
||||
|
||||
|
||||
[theme]
|
||||
name = "my-theme"
|
7
dot_config/atuin/themes/my-theme.toml
Normal file
7
dot_config/atuin/themes/my-theme.toml
Normal file
@@ -0,0 +1,7 @@
|
||||
[theme]
|
||||
name = "my-theme"
|
||||
parent = ""
|
||||
|
||||
[colors]
|
||||
Annotation = "#DDDDDD"
|
||||
Base = "#999999"
|
@@ -1,9 +1,10 @@
|
||||
conky.config = {
|
||||
-- common
|
||||
background = true,
|
||||
-- ximerama_head = 1, -- won't work neither 0 and 1
|
||||
alignment = 'middle_middle',
|
||||
double_buffer = true,
|
||||
gap_x = 0,
|
||||
gap_x = 2000, -- This makes qlocktwo in center (I don't know why)
|
||||
gap_y = 0,
|
||||
draw_shades = false,
|
||||
update_interval = 15.0,
|
@@ -3,7 +3,7 @@ conky.config = {
|
||||
background = true,
|
||||
alignment = 'middle_middle',
|
||||
double_buffer = true,
|
||||
gap_x = 2240,
|
||||
gap_x = 4350,
|
||||
gap_y = 50,
|
||||
draw_shades = false,
|
||||
update_interval = 1.0,
|
32
dot_config/git/commitmsg
Normal file
32
dot_config/git/commitmsg
Normal file
@@ -0,0 +1,32 @@
|
||||
|
||||
|
||||
# Format: <type>[optional scope]: <description>
|
||||
#
|
||||
# Examples:
|
||||
# feat: add new login flow
|
||||
# fix: handle empty input properly in parser
|
||||
# refactor(api): simplify response handler
|
||||
# docs: add README section on usage
|
||||
# chore: update .gitignore rules
|
||||
# test: add coverage for config loader
|
||||
#
|
||||
#
|
||||
# BREAKING CHANGES must be indicated with a "!" or in the footer:
|
||||
# feat!: change output format to JSON
|
||||
# chore(build)!: drop support for Node 14
|
||||
#
|
||||
# Or add footer:
|
||||
# BREAKING CHANGE: config files now must include version field
|
||||
|
||||
# --------------------
|
||||
# <type>(optional scope): <description>
|
||||
#
|
||||
# Optional body — explain what and why, not how
|
||||
#
|
||||
# Optional footers:
|
||||
# BREAKING CHANGE: description
|
||||
# Refs: #123, #456
|
||||
# Reviewed-by: username
|
||||
# --------------------
|
||||
|
||||
# Leave empty lines between header, body, and footer.
|
@@ -5,7 +5,6 @@
|
||||
[core]
|
||||
excludesfile = ~/.config/git/ignore
|
||||
editor = nvim
|
||||
pager = delta
|
||||
autocrlf = false
|
||||
quotepath = false
|
||||
|
||||
@@ -20,19 +19,10 @@
|
||||
branch = auto
|
||||
ui = auto
|
||||
|
||||
[delta]
|
||||
line-numbers = true
|
||||
diff-so-fancy = true
|
||||
dark = true
|
||||
navigate = true
|
||||
syntax-theme = base16
|
||||
|
||||
[interactive]
|
||||
diffFilter = delta -n --color-only --diff-so-fancy
|
||||
|
||||
[diff]
|
||||
renames = true
|
||||
colorMoved = default
|
||||
external = difft
|
||||
|
||||
[merge]
|
||||
tool = nvimdiff
|
||||
@@ -57,11 +47,18 @@
|
||||
fe = fetch
|
||||
fa = fetch --all
|
||||
co = checkout
|
||||
cob = checkout -b
|
||||
cm = commit -m
|
||||
cma = commit -am
|
||||
emp = commit --allow-empty -m
|
||||
br = branch
|
||||
bra = branch -a
|
||||
d = diff
|
||||
l = log --graph --decorate --oneline --date=iso
|
||||
delete-merged-branch = !git branch -l --merged main | rg -v \"(HEAD|main|\\*)\" | xargs -I % git branch -d %
|
||||
l = log -p --ext-diff
|
||||
ls = log --graph --decorate --oneline --date=iso
|
||||
delete-merged-branch = "!git branch -l --merged main | rg -v \"(HEAD|main|\\*)\" | xargs -I % git branch -d %"
|
||||
mg = merge
|
||||
mgf = merge --ff-only
|
||||
|
||||
; vim: noet ft=gitconfig
|
||||
; -*- indent-tabs-mode: t; tab-width: 4 -*-
|
@@ -4,3 +4,4 @@
|
||||
.note
|
||||
tags
|
||||
.#*
|
||||
.my/
|
||||
|
@@ -7,13 +7,8 @@
|
||||
font pango:Source Han Code JP M 7
|
||||
|
||||
# Special Keys
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
set $m Mod4
|
||||
set $a Mod1
|
||||
{{- else if eq .chezmoi.hostname "buzz" }}
|
||||
set $m Mod1
|
||||
set $a Mod4
|
||||
{{- end }}
|
||||
set $c Control
|
||||
set $s Shift
|
||||
|
||||
@@ -51,10 +46,16 @@ set $ws8 "8"
|
||||
set $ws9 "9"
|
||||
set $ws10 "10"
|
||||
|
||||
set $ws_media "8"
|
||||
set $ws_util "9"
|
||||
set $ws_game "10"
|
||||
set $ws_read "5"
|
||||
set $ws_music "6"
|
||||
set $ws_studio "7"
|
||||
set $ws_media "8"
|
||||
set $ws_util "9"
|
||||
set $ws_game "10"
|
||||
|
||||
set $ws_browser "1"
|
||||
set $ws_console "2"
|
||||
set $ws_emacs "3"
|
||||
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
set $DELL "primary"
|
||||
@@ -71,6 +72,9 @@ workspace $ws7 output $DELL
|
||||
workspace $ws8 output $BenQ
|
||||
workspace $ws9 output $BenQ
|
||||
workspace $ws10 output $DELL
|
||||
workspace $ws_browser output $DELL
|
||||
workspace $ws_console output $DELL
|
||||
workspace $ws_emacs output $DELL
|
||||
{{- end }}
|
||||
|
||||
|
||||
@@ -184,6 +188,13 @@ bindsym XF86Launch8 resize grow width 10 px
|
||||
bindsym XF86TouchpadToggle resize shrink height 10 px
|
||||
bindsym XF86TouchpadOn resize grow height 10 px
|
||||
|
||||
{{ if eq .chezmoi.hostname "buzz" }}
|
||||
#bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight +2
|
||||
#bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -2
|
||||
bindsym XF86MonBrightnessUp exec --no-startup-id doas light -A 0.1
|
||||
bindsym XF86MonBrightnessDown exec --no-startup-id doas light -U 0.1
|
||||
{{ end }}
|
||||
|
||||
bindsym $m+bracketleft move left; resize set width 20 ppt
|
||||
bindsym $m+bracketright move right; resize set width 80 ppt
|
||||
|
||||
@@ -193,9 +204,9 @@ bindsym $m+bracketright move right; resize set width 80 ppt
|
||||
#############################################
|
||||
|
||||
## Alacritty
|
||||
bindsym $m+comma exec --no-startup-id launch-console; workspace $ws2
|
||||
bindsym $m+$s+period exec --no-startup-id launch-console emacs; workspace $ws3
|
||||
bindsym $m+comma exec --no-startup-id launch-console
|
||||
bindsym $m+$s+comma exec --no-startup-id launch-console tmp
|
||||
bindsym $m+$s+period exec --no-startup-id textpad
|
||||
|
||||
|
||||
|
||||
@@ -210,8 +221,8 @@ bindsym $m+$s+comma exec --no-startup-id launch-console tmp
|
||||
# bindsym $a+Down exec --no-startup-id pamixer -d 1 # decrease volume 1%
|
||||
# bindsym $a+j exec --no-startup-id pamixer -d 1 # decrease volume 1%
|
||||
|
||||
bindsym $m+apostrophe exec --no-startup-id launch-pavucontrol
|
||||
bindsym $m+$s+quotedbl exec --no-startup-id qpwgraph
|
||||
bindsym $m+apostrophe exec --no-startup-id goto-window carla.Carla2 carla
|
||||
bindsym $m+$s+quotedbl exec --no-startup-id launch-pavucontrol
|
||||
# bindsym $m+$a+n exec --no-startup-id start-music-console
|
||||
bindsym $m+$a+j exec --no-startup-id mpc --host 10.0.2.1 volume -2
|
||||
bindsym $m+$a+k exec --no-startup-id mpc --host 10.0.2.1 volume +2
|
||||
@@ -229,27 +240,24 @@ bindsym $m+$a+slash exec --no-startup-id nowplaying
|
||||
#####################################
|
||||
|
||||
# Browser
|
||||
bindsym $m+m exec --no-startup-id open-brave; workspace $ws1
|
||||
bindsym $m+$s+m exec --no-startup-id open-librewolf-private; workspace $ws1
|
||||
bindsym $m+n exec --no-startup-id open-firefox-dev; workspace $ws1
|
||||
bindsym $m+m exec --no-startup-id open-zen
|
||||
bindsym $m+$s+m exec --no-startup-id open-zen-private
|
||||
bindsym $m+n exec --no-startup-id open-firefox-dev
|
||||
|
||||
# Calendar/Tasks/Mail
|
||||
bindsym $m+period exec --no-startup-id open-emacs; workspace $ws3
|
||||
# Emacs
|
||||
bindsym $m+period exec --no-startup-id open-emacs
|
||||
bindsym $m+slash exec --no-startup-id open-emacs-org-capture
|
||||
|
||||
# File manager
|
||||
bindsym $m+grave exec --no-startup-id pcmanfm
|
||||
bindsym $m+grave exec --no-startup-id bring-window pcmanfm pcmanfm
|
||||
|
||||
# Dictionary
|
||||
bindsym $m+$s+slash exec --no-startup-id goldendictxdg.sh
|
||||
|
||||
# Rofi
|
||||
# bindsym $m+space exec "rofi -show run -modi 'run,calc' -calc-command 'echo {result} | xsel -ib'"
|
||||
bindsym $m+Return exec --no-startup-id rofi -show combi
|
||||
# bindsym $m+Tab exec --no-startup-id "rofi -matching fuzzy -show window"
|
||||
# bindsym $c+semicolon exec --no-startup-id clipcat-menu --finder custom
|
||||
# bindsym $m+semicolon exec --no-startup-id rofi-copyq
|
||||
bindsym $m+semicolon exec --no-startup-id "copyq show"
|
||||
bindsym $m+$s+semicolon exec --no-startup-id "rofimoji"
|
||||
bindsym $m+$s+semicolon exec --no-startup-id "rofimoji -f emojis html math miscellaneous musical supplemental_punctuation"
|
||||
|
||||
# Color pikcer
|
||||
bindsym $m+$c+$s+a exec --no-startup-id gpick
|
||||
@@ -268,16 +276,21 @@ bindsym --release $m+$s+$c+$a+z exec --no-startup-id slock
|
||||
# ^^^^^^^^^ Won't work without this.
|
||||
# See: https://www.reddit.com/r/i3wm/comments/cae4o8/debian_10_slock_keybind_wont_lock_screen/
|
||||
|
||||
bindsym --release $m+$s+$c+$a+f exec --no-startup-id fcitx5-restart
|
||||
|
||||
|
||||
## Notification: dunst
|
||||
bindsym $m+$c+w exec dunstctl close-all
|
||||
bindsym $m+$c+h exec dunstctl history-pop
|
||||
bindsym $m+$c+$a+$s+t exec timer.py
|
||||
|
||||
|
||||
## mozc
|
||||
bindsym $m+$c+e exec /usr/lib/mozc/mozc_tool --mode=config_dialog
|
||||
bindsym $m+$c+t exec /usr/lib/mozc/mozc_tool --mode=dictionary_tool
|
||||
bindsym $m+$c+r exec /usr/lib/mozc/mozc_tool --mode=word_register_dialog
|
||||
|
||||
|
||||
## Force window floating
|
||||
# See: https://i3wm.org/docs/userguide.html#list_of_commands
|
||||
|
||||
@@ -293,9 +306,9 @@ bindsym $m+$c+r exec /usr/lib/mozc/mozc_tool --mode=word_register_dialog
|
||||
# 1440 : 810
|
||||
|
||||
for_window [class="my-gtk-app"] floating enable, move position center
|
||||
|
||||
for_window [class="Imager" instance="rpi-imager"] float enable, move position center
|
||||
for_window [class="discord|Signal|thunderbird"] title_window_icon padding 4px
|
||||
for_window [class="Brave-browser|LibreWolf|firefoxdeveloperedition"] title_window_icon padding 4px
|
||||
for_window [class="Brave-browser|Navigator|librewolf|LibreWolf|firefoxdeveloperedition"] title_window_icon padding 4px
|
||||
for_window [class="^.*"] title_format "%class | %title" # : %title"
|
||||
for_window [class="^.*"] border pixel 1
|
||||
for_window [class="Yad"] floating enable, resize set 640 900, move position center
|
||||
@@ -303,7 +316,7 @@ for_window [class=".*mpv"] floating enable, resize set 1440 810
|
||||
for_window [class="(p|P)cmanfm"] floating enable, resize set 800 560, move position center
|
||||
for_window [class="feh"] floating enable #, resize set 800 600
|
||||
for_window [class="Sxiv"] floating enable #, resize set 800 600
|
||||
for_window [class="Pavucontrol"] floating enable, resize set 720 560
|
||||
for_window [class="pavucontrol"] floating enable, resize set 720 560
|
||||
for_window [class="QjackCtl"] floating enable, resize set 420 100, move position right
|
||||
for_window [class="QjackCtl" title="Graph.*"] floating enable, resize set 1280 1280, move position center
|
||||
for_window [class="qpwgraph"] floating enable, resize set 1440 960, move position center
|
||||
@@ -316,6 +329,7 @@ for_window [class="flameshot"] floating enable
|
||||
for_window [window_role="GtkFileChooserDialog"] floating enable, resize set 800 600
|
||||
for_window [window_role="ECompEditorEvent-.*"] floating enable, resize set 800 600
|
||||
for_window [class="copyq"] floating enable, move position center
|
||||
for_window [class="gnome-text-editor"] floating enable, move position center
|
||||
|
||||
for_window [title="FreeTube Mini-Player:.*"] floating enable, resize set 800 450
|
||||
for_window [title="FreeTube"] layout tabbed
|
||||
@@ -327,25 +341,60 @@ for_window [class="Brave-browser" instance="www.evernote.com__client_web"] layou
|
||||
for_window [class="Homebank"] floating enable, resize set 1200 900, move position center
|
||||
for_window [class="Homebank" title="Budget*"] floating enable, resize set 840 750, move position center
|
||||
|
||||
for_window [class="calibre.*"] layout tabbed, resize set 1000 800
|
||||
for_window [title="Edit metadata.*" class="calibre.*"] floating enable, resize set 1000 800
|
||||
|
||||
for_window [title="Alacritty@tmux:tmp"] floating enable, resize set 800 800, move position center
|
||||
for_window [title="Alacritty@tmux:emacs"] move position left, resize set width 20 ppt
|
||||
for_window [title="Alacritty@tmux:nvim"] floating enable, resize set 800 800, move position center
|
||||
for_window [title="__text_scratchpad"] floating enable, resize set 800 800, move position center
|
||||
|
||||
for_window [class="org.remmina.Remmina"] floating enable, resize set 1000 750, move position center
|
||||
for_window [class="org.remmina.Remmina"] floating enable, resize set 1200 900, move position center
|
||||
|
||||
# Browser
|
||||
for_window [class="Brave"] layout tabbed
|
||||
for_window [class="Firefox"] layout tabbed
|
||||
for_window [class="Navigator|librewolf|LibreWolf"] layout tabbed
|
||||
for_window [class="Navigator|zen"] layout tabbed
|
||||
for_window [class="Chromium"] layout tabbed
|
||||
|
||||
|
||||
# floating music applications
|
||||
for_window [class="Hydrogen"] floating enable, resize set 1200 750, move position 1940 px 30 px
|
||||
for_window [class="Hydrogen" title="Mixer"] floating enable, resize set 1200 750, move position 1940 px 790 px
|
||||
for_window [class="Surge XT"] floating enable, resize set 1200 750, move position 3280 px 30 px
|
||||
for_window [class="Qsynth"] floating enable, move position 2480 px 1200 px
|
||||
for_window [class="Drumstick Metronome"] floating enable, resize set 100 100, move position 4000 px 1010 px
|
||||
for_window [class="FLTK"] floating enable, resize set 1200 560, move position 3160 px 840 px # giada
|
||||
for_window [class="FLTK" title="Warning"] floating enable, move position center
|
||||
for_window [class="FLTK" title="Configuration"] floating enable, move position center
|
||||
for_window [class="TkFDialog" title="Select Audio files"] floating enable, move position center 1000 px 800 px
|
||||
for_window [class="Tk" title="Ultimate Vocal Remover"] floating enable, move position center
|
||||
for_window [class="(g|G)metronome"] floating enable, move position center
|
||||
for_window [class="(Navigator|librewolf)" title=".*Extension:.*"] floating enable, resize set 720 840, move position center
|
||||
for_window [class="(m|M)uted"] floating enable, resize set 1200 900, move position center
|
||||
for_window [class="(a|A)udacity"] floating enable, resize set 1200 600, move position 3280 px 840 px
|
||||
|
||||
## assign application to specific workspace
|
||||
### Tips: Run `xprop` (command line tool) to retrieve class, instance and title.
|
||||
# Browsers
|
||||
assign [class="firefox"] $ws1
|
||||
assign [class="librewolf"] $ws1
|
||||
assign [class="Tor Browser"] $ws0
|
||||
# Browser
|
||||
assign [class="(Navigator|zen)"] $ws_browser
|
||||
# NOTE: Other browsers are treated as supporting tools—
|
||||
# not assigned to $ws_browser for convenience,
|
||||
# so they open in the current workspace.
|
||||
|
||||
# Web Apps
|
||||
assign [instance="track.toggl.com__timer"] $ws_util
|
||||
assign [instance="chatgpt.com" class="Chromium"] $ws0
|
||||
|
||||
# Terminal
|
||||
assign [title="Alacritty@tmux:default"] $ws2
|
||||
assign [title="Alacritty@tmux:emacs"] $ws3
|
||||
assign [class="Emacs"] $ws3
|
||||
assign [title="Alacritty@tmux:default"] $ws_console
|
||||
assign [title="Alacritty@tmux:emacs"] $ws_emacs
|
||||
assign [class="Emacs"] $ws_emacs
|
||||
|
||||
# Book and documents reading
|
||||
assign [class="calibre"] $ws_read
|
||||
assign [class="Zathura"] $ws_read
|
||||
|
||||
# VirtualBox setting
|
||||
assign [class="VirtualBox Machine"] $ws4
|
||||
@@ -356,10 +405,21 @@ assign [class="Virt-manager"] $ws4
|
||||
assign [class="Homebank"] $ws5
|
||||
|
||||
|
||||
# Photo Editing
|
||||
assign [class="Rawtherapee"] $ws7
|
||||
|
||||
# Music Applications
|
||||
assign [class="Hydrogen"] $ws_music # Drum machine
|
||||
assign [class="Surge XT"] $ws_music # Synthesizer
|
||||
assign [class="FLTK"] $ws_music # Giada (loop machine)
|
||||
assign [class="muted"] $ws_music # music util tool
|
||||
assign [class="(a|A)udacity"] $ws_music
|
||||
|
||||
# Photo/Music/Video Editing
|
||||
assign [class="Rawtherapee"] $ws_studio # RAW image editor
|
||||
assign [class="Ardour"] $ws_studio # DAW
|
||||
assign [class="Carla"] $ws_studio # JACK patch bay
|
||||
assign [class="Guitarix"] $ws_studio # Guitar/Bass amp stack
|
||||
assign [class="kdenlive"] $ws_studio # video editor
|
||||
|
||||
# Media Applications
|
||||
assign [class="(g|G)podder"] $ws_media
|
||||
assign [class=".*Celluloid"] $ws_media
|
||||
assign [class="Blanket"] $ws_media
|
||||
@@ -369,6 +429,7 @@ assign [class="vlc"] $ws_media
|
||||
assign [title="FreeTube Mini-Player:.*"] $ws_media
|
||||
assign [title="FreeTube"] $ws_media
|
||||
|
||||
|
||||
# Chat & Todo Applications
|
||||
assign [class="discord"] $ws_util
|
||||
assign [class="(s|S)lack"] $ws_util
|
||||
@@ -380,69 +441,38 @@ assign [class="retroarch"] $ws_game
|
||||
assign [class="steam_app_.*" instance="steam_app_.*"] $ws_game
|
||||
for_window [class="steam_app_.*" instance="steam_app_.*"] move to workspace $ws_game
|
||||
assign [class="Hexcells Infinite.x86_64" instance="Hexcells Infinite.x86_64" title="Hexcells Infinite"] $ws_game
|
||||
assign [class="steam_app_1172470" instance="steam_app_1172470" title="Apex Legends"] $ws_game
|
||||
## KEY_INSERT_GAME_ASSIGN # Don't change left string. See ~/.config/fish/function/i3-assign-games.fish
|
||||
|
||||
#######################################################
|
||||
# Auto Exec
|
||||
#######################################################
|
||||
|
||||
# Power saving (xidlehook)
|
||||
exec --no-startup-id powersave-on
|
||||
exec --no-startup-id "$XDG_CONFIG_HOME/polybar/toggle.sh" # status bar
|
||||
exec --no-startup-id unclutter --timeout 1 --ignore-scrolling & # hide mouse cursor
|
||||
exec --no-startup-id dunst # Notification
|
||||
exec --no-startup-id udiskie & # Watch plug
|
||||
exec --no-startup-id fcitx5 -d # Japanese Input
|
||||
exec --no-startup-id copyq # clipboard
|
||||
exec --no-startup-id flameshot # screenshot # TODO needed?
|
||||
exec --no-startup-id redshift # like f.lux
|
||||
exec --no-startup-id powersave-on # auto screen lock (deps: xidlehook, slock)
|
||||
|
||||
# xss-lock (hook systend-suspend)
|
||||
exec --no-startup-id xss-lock -- slock
|
||||
|
||||
# Auto-hide mouse cursor
|
||||
exec --no-startup-id unclutter --timeout 1 --ignore-scrolling &
|
||||
|
||||
# Key repeat rate
|
||||
# exec_always --no-startup-id xset r rate 200 60
|
||||
|
||||
# compositor
|
||||
exec_always --no-startup-id picom -b > /dev/null 2>&1
|
||||
|
||||
# Notification
|
||||
exec --no-startup-id dunst
|
||||
|
||||
# Watch plug
|
||||
exec --no-startup-id udiskie &
|
||||
|
||||
# Japanese Input
|
||||
exec --no-startup-id fcitx5 -d
|
||||
|
||||
# Clipboard Manager
|
||||
# exec_always --no-startup-id clipcatd -r
|
||||
exec_always --no-startup-id copyq
|
||||
|
||||
# Wallpaper
|
||||
exec --no-startup-id nitrogen --restore
|
||||
exec_always --no-startup-id $HOME/.config/conky/start.sh
|
||||
|
||||
# # Launch terminal
|
||||
# exec --no-startup-id launch-console
|
||||
{{ if eq .chezmoi.hostname "arch" }}
|
||||
exec --no-startup-id xss-lock -- slock # xss-lock (hook systemd-suspend)
|
||||
exec --no-startup-id "transmission-daemon" # torrent
|
||||
exec --no-startup-id start-mpd # music server
|
||||
exec --no-startup-id shairport-sync -o=pa # for AirPlay
|
||||
exec --no-startup-id carla /home/inkch/audio/play.carxp # JACK
|
||||
exec_always --no-startup-id picom -b > /dev/null 2>&1 # compositor
|
||||
exec_always --no-startup-id nitrogen --restore # wallpaper
|
||||
exec_always --no-startup-id $HOME/.config/conky/start.sh # widgets
|
||||
exec --no-startup-id emacs --daemon
|
||||
{{ end }}
|
||||
|
||||
# Note
|
||||
# exec --no-startup-id note.sh
|
||||
# exec --no-startup-id setsid sync-vimwiki.sh > /dev/null &
|
||||
|
||||
# Util
|
||||
exec --no-startup-id goldendictxdg.sh
|
||||
exec --no-startup-id flameshot > /dev/null 2>&1
|
||||
|
||||
# Audio
|
||||
exec --no-startup-id start-mpd
|
||||
exec --no-startup-id shairport-sync -o=pa
|
||||
|
||||
|
||||
# redshift (like f.lux)
|
||||
exec --no-startup-id redshift
|
||||
|
||||
# Polybar
|
||||
exec --no-startup-id "$XDG_CONFIG_HOME/polybar/toggle.sh"
|
||||
|
||||
# Transmission
|
||||
exec --no-startup-id "transmission-daemon"
|
||||
{{ if eq .chezmoi.hostname "buzz" }}
|
||||
exec --no-startup-id "kmonad $XDG_CONFIG_HOME/kmonad/thinkpad.kbd"
|
||||
{{ end }}
|
||||
|
||||
|
||||
#######################################################
|
||||
|
88
dot_config/kmonad/thinkpad.kbd
Normal file
88
dot_config/kmonad/thinkpad.kbd
Normal file
@@ -0,0 +1,88 @@
|
||||
(defcfg
|
||||
;; For Linux
|
||||
input (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd")
|
||||
output (uinput-sink "My KMonad output")
|
||||
|
||||
;; Comment this if you want unhandled events not to be emitted
|
||||
fallthrough true
|
||||
|
||||
;; Set this to false to disable any command-execution in KMonad
|
||||
allow-cmd true
|
||||
)
|
||||
|
||||
(defsrc
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab q w e r t y u i o p [ ] \
|
||||
caps a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft
|
||||
lctl lmet lalt spc ralt prnt rctl
|
||||
)
|
||||
|
||||
(defalias
|
||||
f1 KeyF1
|
||||
f2 KeyF2
|
||||
f3 KeyF3
|
||||
f4 KeyF4
|
||||
f5 KeyF5
|
||||
f6 KeyF6
|
||||
f7 KeyF7
|
||||
f8 KeyF8
|
||||
f9 KeyF9
|
||||
f10 KeyF10
|
||||
f11 KeyF11
|
||||
f12 KeyF12
|
||||
f13 KeyF13
|
||||
f14 KeyF14
|
||||
f15 KeyF15
|
||||
)
|
||||
|
||||
(defalias
|
||||
cle C-left
|
||||
cri C-rght
|
||||
s13 S-KeyF13
|
||||
c13 C-KeyF13
|
||||
low (tap-hold-next-release 150 spc (layer-toggle lower))
|
||||
upp (layer-toggle upper)
|
||||
uti (layer-toggle util)
|
||||
esc #(esc C-KeyF13)
|
||||
ssf (sticky-key 750 lsft)
|
||||
sal (sticky-key 750 lalt)
|
||||
sct (sticky-key 750 lctl)
|
||||
sme (sticky-key 750 lmet)
|
||||
ar A-ret
|
||||
cr C-ret
|
||||
ctl (tap-hold-next-release 500 S-KeyF13 lctl)
|
||||
met (tap-hold-next-release 500 C-KeyF13 lmet)
|
||||
)
|
||||
|
||||
(deflayer qwerty
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab q w e r t y u i o p [ ] \
|
||||
lctl a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft
|
||||
lctl lalt @met @low @upp _ bspc
|
||||
)
|
||||
|
||||
(deflayer lower
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab @esc tab end @cr C-t @cle pgdn pgup @cri @esc [ ] \
|
||||
lctl home @ssf del ret @sme left down up rght : " ret
|
||||
lsft C-z C-x @sct @sal @s13 bspc @ar < > ? rsft
|
||||
lctl lalt @met @low @uti _ bspc
|
||||
)
|
||||
|
||||
(deflayer upper
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab ! @ # $ % ^ & \( \) * [ ] \
|
||||
lctl 1 2 3 4 5 - = [ ] | grv @ar
|
||||
lsft 6 7 8 9 0 \_ + { } \ rsft
|
||||
lctl lalt @met @uti @upp _ bspc
|
||||
)
|
||||
|
||||
(deflayer util
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab f11 f12 f13 f14 f15 ^ & \( \) * [ ] \
|
||||
lctl f1 f2 f3 f4 f5 - = [ ] | grv @ar
|
||||
lsft f6 f7 f8 f9 f10 _ + { } \ rsft
|
||||
lctl lalt @met _ _ _ _
|
||||
)
|
@@ -53,6 +53,7 @@ Alt+h frame-back-step
|
||||
WHEEL_UP seek 10
|
||||
WHEEL_DOWN seek -10
|
||||
|
||||
# BACKSPACE Reset playback speed
|
||||
[ add speed -0.1 # scale playback speed
|
||||
] add speed 0.1
|
||||
{ add speed -0.01 # scale playback speed
|
||||
|
@@ -6,6 +6,10 @@ vim.keymap.set('n', '<leader>pv', vim.cmd.Ex)
|
||||
vim.keymap.set('n', '<leader>M', '<cmd>messages<CR>')
|
||||
vim.keymap.set('n', '<leader>q', '<cmd>x<CR>')
|
||||
vim.keymap.set('n', '<leader>QQ', '<cmd>q!<CR>')
|
||||
vim.keymap.set('n', '<C-c><C-c>', '<cmd>x<CR>')
|
||||
vim.keymap.set('i', '<C-c><C-c>', '<cmd>x<CR>')
|
||||
vim.keymap.set('n', '<C-c><C-q>', '<cmd>q!<CR>')
|
||||
vim.keymap.set('i', '<C-c><C-q>', '<cmd>q!<CR>')
|
||||
{{- if ne .chezmoi.username "root" }}
|
||||
vim.keymap.set('n', '<leader>W', '<cmd>w !sudo -A tee %<CR>')
|
||||
{{- end }}
|
||||
@@ -16,3 +20,5 @@ vim.keymap.set('n', '<C-u>', '<C-u>zz')
|
||||
vim.keymap.set('n', '<C-d>', '<C-d>zz')
|
||||
vim.keymap.set('n', '<PageUp>', '<C-u>zz')
|
||||
vim.keymap.set('n', '<PageDown>', '<C-d>zz')
|
||||
|
||||
vim.keymap.set("i", "<CR>", "<C-g>u<CR>")
|
||||
|
@@ -3,7 +3,7 @@ try
|
||||
if exists('+termguicolors')
|
||||
set termguicolors
|
||||
endif
|
||||
colorscheme yah
|
||||
colorscheme catppuccin
|
||||
catch
|
||||
colorscheme desert
|
||||
endtry
|
||||
@@ -20,13 +20,17 @@ vim.cmd(":syntax enable")
|
||||
vim.opt.backspace = "indent,eol,start"
|
||||
vim.opt.smarttab = true
|
||||
|
||||
vim.opt.cursorline = true
|
||||
vim.opt.ruler = true
|
||||
vim.opt.wildmenu = true
|
||||
|
||||
vim.opt.gdefault = true vim.opt.autoread = true vim.opt.history = 1000
|
||||
vim.opt.gdefault = true
|
||||
vim.opt.autoread = true
|
||||
vim.opt.history = 1000
|
||||
vim.opt.encoding = "utf-8"
|
||||
vim.opt.number = true
|
||||
vim.opt.relativenumber = true
|
||||
vim.opt.scrolloff = 12
|
||||
vim.opt.laststatus = 2
|
||||
vim.opt.showcmd = true
|
||||
vim.opt.showmatch = true
|
||||
@@ -35,6 +39,14 @@ vim.opt.list = true
|
||||
vim.opt.listchars = "tab:>>,trail:_,eol:$,multispace:··,extends:>,precedes:<,nbsp:%"
|
||||
vim.opt.encoding = "utf-8"
|
||||
vim.opt.fenc = "utf-8"
|
||||
vim.opt.spell = true
|
||||
vim.opt.undofile = true
|
||||
vim.opt.undodir = vim.fn.expand("~/.cache/nvim/undo")
|
||||
|
||||
|
||||
if vim.fn.executable('rg') then
|
||||
vim.opt.grepprg = 'rg --vimgrep --smart-case --hidden'
|
||||
end
|
||||
|
||||
{{- if eq .chezmoi.username "root" }}
|
||||
vim.opt.expandtab = false
|
||||
@@ -57,3 +69,26 @@ vim.cmd([[ autocmd InsertLeave * call system("fcitx5-remote -c") ]])
|
||||
|
||||
|
||||
vim.cmd("set clipboard+=unnamedplus")
|
||||
|
||||
|
||||
-- folding
|
||||
vim.opt.fillchars = { fold = " " }
|
||||
vim.opt.foldmethod = "indent"
|
||||
vim.opt.foldenable = false
|
||||
vim.opt.foldlevel = 99
|
||||
vim.g.markdown_folding = 1 -- enable markdown folding
|
||||
|
||||
|
||||
-- auto undo break (insert mode)
|
||||
local function map_undobreak(chars)
|
||||
local term = vim.api.nvim_replace_termcodes("<C-g>u", true, false, true)
|
||||
for _, ch in ipairs(chars) do
|
||||
vim.keymap.set("i", ch, function() return term .. ch end,
|
||||
{ expr = true, silent = true, desc = "undobreak before '" .. ch .. "'" })
|
||||
end
|
||||
end
|
||||
|
||||
map_undobreak({
|
||||
".", ",", "!", "?", ";", ":", ")", "]", "}", ">", -- 英文系
|
||||
"。", "、", "!", "?", ";", ":", ")", "]", "」", "』", ">" -- 和文系
|
||||
})
|
||||
|
70
dot_config/nvim/lua/plugins/catppuccin.lua
Normal file
70
dot_config/nvim/lua/plugins/catppuccin.lua
Normal file
@@ -0,0 +1,70 @@
|
||||
return {
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000,
|
||||
config = function()
|
||||
require("catppuccin").setup({
|
||||
color_overrides = {
|
||||
mocha = {
|
||||
rosewater = "#B294BB",
|
||||
flamingo = "#B294BB",
|
||||
pink = "#B294BB",
|
||||
mauve = "#B294BB",
|
||||
lavender = "#B294BB",
|
||||
red = "#CC6666",
|
||||
maroon = "#CC6666",
|
||||
peach = "#de935f",
|
||||
yellow = "#F0C674",
|
||||
green = "#B5BD68",
|
||||
teal = "#8ABEB7",
|
||||
sky = "#8ABEB7",
|
||||
sapphire = "#8ABEB7",
|
||||
blue = "#81A2BE",
|
||||
text = "#CCCCCC",
|
||||
subtext1 = "#AAAAAA",
|
||||
subtext0 = "#939393",
|
||||
overlay2 = "#888888",
|
||||
overlay1 = "#888888",
|
||||
overlay0 = "#707880",
|
||||
surface2 = "#525252",
|
||||
surface1 = "#333333",
|
||||
surface0 = "#242424",
|
||||
base = "#121212",
|
||||
mantle = "#1F1F1F",
|
||||
crust = "#0E0E0E",
|
||||
},
|
||||
},
|
||||
highlight_overrides = {
|
||||
mocha = function(mocha)
|
||||
return {
|
||||
Whitespace = { fg = mocha.surface2 },
|
||||
Comment = { fg = mocha.subtext0 },
|
||||
LineNr = { fg = mocha.overlay0 },
|
||||
CursorLineNr = { fg = mocha.yellow, style = { "bold" }},
|
||||
Number = { fg = mocha.red },
|
||||
-- ["@variable"] = { fg = mocha.lavender },
|
||||
Statement = { fg = mocha.blue },
|
||||
Keyword = { fg = mocha.blue },
|
||||
Repeat = { fg = mocha.blue },
|
||||
Conditional = { fg = mocha.blue },
|
||||
Special = { fg = mocha.teal },
|
||||
["@keyword.return"] = { fg = mocha.red },
|
||||
["@keyword.operator"] = { fg = mocha.blue },
|
||||
["@keyword.function"] = { fg = mocha.blue },
|
||||
["@punctuation.bracket"] = { fg = mocha.sapphire },
|
||||
Function = { fg = mocha.yellow },
|
||||
["@function.builtin"] = { fg = mocha.red },
|
||||
StatusLine = { fg = mocha.text },
|
||||
StatusLineNC = { fg = mocha.overlay0 },
|
||||
|
||||
["@markup.raw"] = { fg = mocha.sapphire },
|
||||
["@markup.raw.delimiter"] = { fg = mocha.sapphire, style = { "bold" }},
|
||||
["@markup.raw.block"] = { fg = mocha.subtext1 },
|
||||
["@markup.quote"] = { fg = mocha.green },
|
||||
}
|
||||
end,
|
||||
},
|
||||
})
|
||||
vim.cmd[[colorscheme catppuccin]]
|
||||
end
|
||||
}
|
1
dot_config/nvim/lua/plugins/diffview.lua
Normal file
1
dot_config/nvim/lua/plugins/diffview.lua
Normal file
@@ -0,0 +1 @@
|
||||
return { "sindrets/diffview.nvim" }
|
@@ -1,9 +0,0 @@
|
||||
return {
|
||||
'tpope/vim-fugitive',
|
||||
config = function()
|
||||
vim.keymap.set("n", "<leader>gg", vim.cmd.Git)
|
||||
vim.keymap.set("n", "<leader>gl", "<cmd>Git log<CR>")
|
||||
vim.keymap.set("n", "<leader>gf", "<cmd>Git fetch<CR>")
|
||||
vim.keymap.set("n", "<leader>gp", "<cmd>Git push<CR>")
|
||||
end
|
||||
}
|
59
dot_config/nvim/lua/plugins/jaq.lua
Normal file
59
dot_config/nvim/lua/plugins/jaq.lua
Normal file
@@ -0,0 +1,59 @@
|
||||
-- jaq-nvim: Just Another Quickrun
|
||||
-- https://github.com/is0n/jaq-nvim?tab=readme-ov-file
|
||||
|
||||
return {
|
||||
"is0n/jaq-nvim",
|
||||
config = function()
|
||||
require('jaq-nvim').setup{
|
||||
cmds = {
|
||||
-- Uses vim commands
|
||||
internal = {
|
||||
lua = "luafile %",
|
||||
vim = "source %"
|
||||
},
|
||||
|
||||
-- Uses shell commands
|
||||
external = {
|
||||
markdown = "glow %",
|
||||
python = "python3 %",
|
||||
go = "go run %",
|
||||
sh = "sh %",
|
||||
perl = "perl %",
|
||||
ruby = "ruby %"
|
||||
}
|
||||
},
|
||||
|
||||
behavior = {
|
||||
default = "float",
|
||||
startinsert = false,
|
||||
wincmd = false,
|
||||
autosave = false
|
||||
},
|
||||
|
||||
ui = {
|
||||
float = {
|
||||
border = "solid", -- see :h winborder
|
||||
winhl = "Normal",
|
||||
borderhl = "FloatBorder",
|
||||
winblend = 0,
|
||||
height = 0.7,
|
||||
width = 0.7,
|
||||
x = 0.5,
|
||||
y = 0.5
|
||||
},
|
||||
|
||||
terminal = {
|
||||
position = "bot",
|
||||
size = 10,
|
||||
line_no = false
|
||||
},
|
||||
|
||||
quickfix = {
|
||||
position = "bot",
|
||||
size = 10
|
||||
}
|
||||
}
|
||||
}
|
||||
vim.keymap.set("n", "<leader>r", vim.cmd.Jaq)
|
||||
end
|
||||
}
|
1
dot_config/nvim/lua/plugins/linediff.lua
Normal file
1
dot_config/nvim/lua/plugins/linediff.lua
Normal file
@@ -0,0 +1 @@
|
||||
return { 'andrewradev/linediff.vim' }
|
12
dot_config/nvim/lua/plugins/neogit.lua
Normal file
12
dot_config/nvim/lua/plugins/neogit.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
return {
|
||||
"NeogitOrg/neogit",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim", -- required
|
||||
"sindrets/diffview.nvim", -- optional - Diff integration
|
||||
"nvim-telescope/telescope.nvim", -- optional
|
||||
},
|
||||
|
||||
config = function()
|
||||
vim.keymap.set("n", "<leader>gg", vim.cmd.Neogit)
|
||||
end
|
||||
}
|
@@ -1,2 +1 @@
|
||||
return { 'tpope/vim-surround' }
|
||||
|
||||
|
@@ -4,43 +4,7 @@ return {
|
||||
config = function()
|
||||
require'nvim-treesitter.configs'.setup {
|
||||
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"c",
|
||||
"c_sharp",
|
||||
"cmake",
|
||||
"commonlisp",
|
||||
"cpp",
|
||||
"css",
|
||||
"diff",
|
||||
"dockerfile",
|
||||
"fish",
|
||||
"git_config",
|
||||
"gitcommit",
|
||||
"gitignore",
|
||||
"go",
|
||||
"html",
|
||||
"javascript",
|
||||
"jq",
|
||||
"json",
|
||||
"latex",
|
||||
"lua",
|
||||
"org",
|
||||
"php",
|
||||
"python",
|
||||
"query",
|
||||
"ruby",
|
||||
"rust",
|
||||
"scss",
|
||||
"todotxt",
|
||||
"toml",
|
||||
"typescript",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"vue",
|
||||
"xml",
|
||||
"yaml",
|
||||
},
|
||||
ensure_installed = "all",
|
||||
|
||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||
sync_install = false,
|
||||
|
@@ -1,7 +1,4 @@
|
||||
return {
|
||||
"inkch/vim-yah",
|
||||
lazy = false,
|
||||
config = function()
|
||||
vim.cmd[[colorscheme yah]]
|
||||
end,
|
||||
}
|
||||
|
1
dot_config/nvim/lua/utils/chezmoi-tmpl.lua
Normal file
1
dot_config/nvim/lua/utils/chezmoi-tmpl.lua
Normal file
@@ -0,0 +1 @@
|
||||
vim.cmd([[ autocmd BufNewFile,BufRead */chezmoi/*.tmpl execute 'set filetype='..matchlist(expand('<afile>'), '.*\.\(.*\)\.tmpl$')[1] ]])
|
@@ -1,3 +1,4 @@
|
||||
require("utils.zenkaku")
|
||||
require("utils.trim")
|
||||
require("utils.setindent")
|
||||
require("utils.chezmoi-tmpl")
|
||||
|
@@ -23,7 +23,11 @@ margin-bottom = 0
|
||||
[bar/top]
|
||||
enable-ipc = true
|
||||
bottom = false
|
||||
monitor = ${env:MONITOR:DP-2}
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
monitor = DP-2
|
||||
{{- else if eq .chezmoi.hostname "buzz" }}
|
||||
monitor = eDP-1
|
||||
{{- end }}
|
||||
width = 100%
|
||||
height = 16
|
||||
offset-x = 0
|
||||
@@ -54,9 +58,16 @@ font-3 = "Font Awesome 6 Free:style=Solid:pixelsize=8;2"
|
||||
font-4 = "Font Awesome 6 Brands:pixelsize=8;2"
|
||||
font-5 = "Symbols Nerd Font:pixelsize=12;2"
|
||||
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
modules-left = i3 clicker xwindow
|
||||
modules-center = date
|
||||
modules-right = pueue filesystem temp cpu memory eth-down eth-up ipv6 caffeine cam tray
|
||||
modules-right = pueue filesystem temp cpu memory eth-down eth-up ipv6 ollama caffeine cam tray
|
||||
{{- else if eq .chezmoi.hostname "buzz" }}
|
||||
modules-left = i3 xwindow
|
||||
modules-center = date
|
||||
modules-right = wired-network wireless-network filesystem temp cpu memory battery tray
|
||||
{{- end }}
|
||||
|
||||
|
||||
; tray-position = right
|
||||
; tray-padding = 4
|
||||
@@ -70,6 +81,82 @@ type = internal/tray
|
||||
tray-padding = 4
|
||||
tray-size = 75%
|
||||
|
||||
{{ if eq .chezmoi.hostname "buzz" }}
|
||||
[module/battery]
|
||||
type = internal/battery
|
||||
|
||||
; This is useful in case the battery never reports 100% charge
|
||||
; Default: 100
|
||||
full-at = 98
|
||||
|
||||
; format-low once this charge percentage is reached
|
||||
; Default: 10
|
||||
; New in version 3.6.0
|
||||
low-at = 15
|
||||
|
||||
; Use the following command to list batteries and adapters:
|
||||
; $ ls -1 /sys/class/power_supply/
|
||||
battery = BAT0
|
||||
adapter = AC
|
||||
|
||||
; If an inotify event haven't been reported in this many
|
||||
; seconds, manually poll for new values.
|
||||
;
|
||||
; Needed as a fallback for systems that don't report events
|
||||
; on sysfs/procfs.
|
||||
;
|
||||
; Disable polling by setting the interval to 0.
|
||||
;
|
||||
; Default: 5
|
||||
poll-interval = 5
|
||||
|
||||
[module/wired-network]
|
||||
; All labels support the following tokens:
|
||||
; %ifname% [wireless+wired]
|
||||
; %local_ip% [wireless+wired]
|
||||
; %local_ip6% [wireless+wired]
|
||||
; %essid% [wireless]
|
||||
; %signal% [wireless]
|
||||
; %upspeed% [wireless+wired]
|
||||
; %downspeed% [wireless+wired]
|
||||
; %netspeed% [wireless+wired] (%upspeed% + %downspeed%) (New in version 3.6.0)
|
||||
; %linkspeed% [wired]
|
||||
; %mac% [wireless+wired] (New in version 3.6.0)
|
||||
|
||||
label-connected = %local_ip%
|
||||
label-connected-foreground = #ccc
|
||||
label-disconnected = x
|
||||
label-disconnected-foreground = #666666
|
||||
|
||||
format-connected = <label-connected>
|
||||
format-disconnected = <label-disconnected>
|
||||
type = internal/network
|
||||
interface = enp3s0
|
||||
|
||||
[module/wireless-network]
|
||||
; All labels support the following tokens:
|
||||
; %ifname% [wireless+wired]
|
||||
; %local_ip% [wireless+wired]
|
||||
; %local_ip6% [wireless+wired]
|
||||
; %essid% [wireless]
|
||||
; %signal% [wireless]
|
||||
; %upspeed% [wireless+wired]
|
||||
; %downspeed% [wireless+wired]
|
||||
; %netspeed% [wireless+wired] (%upspeed% + %downspeed%) (New in version 3.6.0)
|
||||
; %linkspeed% [wired]
|
||||
; %mac% [wireless+wired] (New in version 3.6.0)
|
||||
|
||||
label-connected = %local_ip%
|
||||
label-connected-foreground = #ccc
|
||||
label-disconnected = x
|
||||
label-disconnected-foreground = #666666
|
||||
|
||||
format-connected = <label-connected>
|
||||
format-disconnected = <label-disconnected>
|
||||
type = internal/network
|
||||
interface = wlan0
|
||||
{{ end }}
|
||||
|
||||
[module/pueue]
|
||||
type = custom/script
|
||||
interval = 5
|
||||
@@ -90,6 +177,7 @@ type = custom/script
|
||||
interval = 5
|
||||
exec = /home/inkch/.config/polybar/scripts/vm-stat.py
|
||||
|
||||
{{ if eq .chezmoi.hostname "arch" }}
|
||||
[module/clicker]
|
||||
type = custom/script
|
||||
format = <label>
|
||||
@@ -98,15 +186,21 @@ interval = 1
|
||||
format-background = ${colors.alert}
|
||||
label-padding-left = 2
|
||||
label-padding-right = 2
|
||||
|
||||
|
||||
exec = /home/inkch/.config/polybar/scripts/clicker-stat.sh
|
||||
|
||||
[module/ollama]
|
||||
type = custom/script
|
||||
format = <label>
|
||||
label = %output%
|
||||
interval = 3
|
||||
exec = /home/inkch/.config/polybar/scripts/ollama.sh
|
||||
{{- end }}
|
||||
|
||||
[module/caffeine]
|
||||
type = custom/script
|
||||
format = <label>
|
||||
label = %output%
|
||||
interval = 1
|
||||
interval = 3
|
||||
|
||||
exec = /home/inkch/.config/polybar/scripts/caffeine-check-status.py
|
||||
click-left = /home/inkch/.config/polybar/scripts/caffeine-toggle.py
|
||||
@@ -144,9 +238,13 @@ format-warn-underline = ${colors.alert}
|
||||
type = internal/fs
|
||||
interval = 30
|
||||
|
||||
{{ if eq .chezmoi.hostname "arch" }}
|
||||
mount-0 = /
|
||||
mount-1 = /mnt/hdd
|
||||
mount-2 = /mnt/hdd2
|
||||
{{ else if eq .chezmoi.hostname "buzz" }}
|
||||
mount-0 = /
|
||||
{{ end }}
|
||||
|
||||
label-mounted = %free:2%
|
||||
label-mounted-foreground = ${colors.foreground-alt}
|
||||
@@ -187,6 +285,9 @@ label-visible-padding = 1
|
||||
type = internal/cpu
|
||||
interval = 1
|
||||
format-underline = ${colors.primary}
|
||||
{{ if eq .chezmoi.hostname "buzz" }}
|
||||
format-foreground = ${colors.foreground-alt}
|
||||
{{ end }}
|
||||
label = %percentage:2%%
|
||||
|
||||
[module/memory]
|
||||
@@ -194,10 +295,17 @@ type = internal/memory
|
||||
interval = 1
|
||||
format-underline = #32bbc2
|
||||
label = %percentage_used:2%%
|
||||
{{ if eq .chezmoi.hostname "buzz" }}
|
||||
format-foreground = ${colors.foreground-alt}
|
||||
{{ end }}
|
||||
|
||||
[module/eth-up]
|
||||
type = internal/network
|
||||
{{ if eq .chezmoi.hostname "arch" }}
|
||||
interface = enp34s0
|
||||
{{ else if eq .chezmoi.hostname "buzz" }}
|
||||
interface = enp3s0
|
||||
{{ end }}
|
||||
interval = 1.0
|
||||
|
||||
format-connected = <label-connected>
|
||||
@@ -210,7 +318,11 @@ label-disconnected-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/eth-down]
|
||||
type = internal/network
|
||||
{{ if eq .chezmoi.hostname "arch" }}
|
||||
interface = enp34s0
|
||||
{{ else if eq .chezmoi.hostname "buzz" }}
|
||||
interface = enp3s0
|
||||
{{ end }}
|
||||
interval = 1.0
|
||||
|
||||
format-connected = <label-connected>
|
||||
|
6
dot_config/polybar/scripts/executable_ollama.sh
Normal file
6
dot_config/polybar/scripts/executable_ollama.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/dash
|
||||
if systemctl --user is-active ollama >/dev/null; then
|
||||
echo 'ol'
|
||||
else
|
||||
echo ''
|
||||
fi
|
@@ -15,7 +15,7 @@ abbr Vim "vim"
|
||||
|
||||
abbr bash 'bash --rcfile ~/.config/bash/bashrc'
|
||||
|
||||
abbr df 'df -h'
|
||||
abbr df 'df -Thx tmpfs -x squashfs'
|
||||
abbr mv 'mv'
|
||||
abbr less 'less -R'
|
||||
abbr grep 'grep -n --color=always'
|
||||
@@ -120,13 +120,13 @@ abbr .... 'cd ../../..'
|
||||
abbr ..... 'cd ../../../..'
|
||||
abbr D 'cd ~/dl'
|
||||
abbr M 'fuzzy-find -t d --exec /run/media/inkch/ 3'
|
||||
abbr srv 'fuzzy-find -t d --exec /srv 3'
|
||||
abbr jelly 'fuzzy-find -t d --exec /srv/jellyfin 3'
|
||||
abbr hdd 'fuzzy-find -t d --exec /mnt/hdd 3'
|
||||
abbr hdd2 'fuzzy-find -t d --exec /mnt/hdd2 3'
|
||||
abbr BK 'fuzzy-find -t d --exec /mnt/hdd/bk 3'
|
||||
abbr R 'fuzzy-find -t d --exec /mnt/rpi4 2'
|
||||
abbr hdd2 'fuzzy-find -t d --exec /mnt/hdd2 3'
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
abbr T 'cd /mnt/hdd/torrent'
|
||||
{{- else if eq .chezmoi.hostname "buzz" }}
|
||||
abbr T 'cd ~/dl/torrent'
|
||||
{{- end }}
|
||||
abbr cdw 'fuzzy-find -t d --exec ~/ws'
|
||||
abbr f. 'fuzzy-find -t d --exec . 5'
|
||||
abbr f.. 'bd'
|
||||
@@ -138,6 +138,7 @@ abbr cdk "fuzzy-find -t d --exec $XDG_DOCUMENTS_DIR/vimwiki 2"
|
||||
abbr cdh 'fuzzy-find -t d --exec ~/hack'
|
||||
abbr cdj "cd $XDG_DOCUMENTS_DIR/fons/journal"
|
||||
abbr cdn "cd $XDG_DOCUMENTS_DIR/fons/notes"
|
||||
abbr cdo "cd $HOME/org"
|
||||
abbr cdr "cd $XDG_DOCUMENTS_DIR/fons/review"
|
||||
abbr cds "cd $XDG_DATA_HOME/myscripts"
|
||||
abbr cdsys "cd $XDG_CONFIG_HOME/systemd/user"
|
||||
@@ -160,8 +161,6 @@ abbr e. "fuzzy-find -t f --exec $PWD 5"
|
||||
abbr e~ "fuzzy-find -t f --exec $HOME 7"
|
||||
abbr ec "fuzzy-find -t f --exec $XDG_CONFIG_HOME 4"
|
||||
abbr em "$EDITOR $XDG_DOCUMENTS_DIR/morningnote/(date +%Y-%m-%d).md"
|
||||
abbr eci "$EDITOR $XDG_CONFIG_HOME/i3/config"
|
||||
abbr ecp "$EDITOR $XDG_CONFIG_HOME/polybar/config"
|
||||
abbr ew "fuzzy-find -t f --exec $XDG_DOCUMENTS_DIR/vimwiki"
|
||||
# Edit fish-shell config/func/abbr
|
||||
abbr ef "fuzzy-find -t f --exec $XDG_CONFIG_HOME/fish 2"
|
||||
@@ -180,25 +179,30 @@ abbr trl "transmission-remote -l"
|
||||
abbr trc "transmission-remote-cli"
|
||||
|
||||
# Git
|
||||
abbr g 'git'
|
||||
abbr gs 'git status'
|
||||
abbr gfe 'git fetch'
|
||||
abbr gfa 'git fetch --all'
|
||||
abbr gco 'git checkout'
|
||||
abbr gcob 'git checkout -b'
|
||||
abbr gcm 'git commit -m'
|
||||
abbr gcma 'git commit -am'
|
||||
abbr gbr 'git branch'
|
||||
abbr gbra 'git branch -a'
|
||||
abbr gd 'git diff'
|
||||
abbr gl 'git log --graph --decorate --oneline --date=iso'
|
||||
abbr gdd 'git diff --no-ext-dff'
|
||||
abbr gl 'git log -p --ext-diff'
|
||||
abbr glg 'git log --graph --decorate --oneline --date=iso'
|
||||
abbr gemp 'git commit --allow-empty -m'
|
||||
abbr gps "git remote | fzf -1 | xargs -I'{}' git push {}"
|
||||
abbr gpl "git remote | fzf -1 | xargs -I'{}' git pull {}"
|
||||
abbr gdel "git delete-merged-branch"
|
||||
|
||||
## Use interactive option all time
|
||||
abbr rm 'rm -i'
|
||||
abbr rmi 'rm -I'
|
||||
abbr rmr 'rm -rI'
|
||||
abbr rmd 'rmdir (fd -t d -t e)'
|
||||
abbr rmd 'rmdir --ignore-fail-on-non-empty --parents (fd -t d -t e)'
|
||||
|
||||
# abbr for `wishlist` (fish function)
|
||||
abbr wish 'wishlist'
|
||||
@@ -229,7 +233,7 @@ if type -q exa;
|
||||
end
|
||||
|
||||
if type -q watchexec;
|
||||
abbr wax 'watchexec'
|
||||
abbr wex 'watchexec'
|
||||
end
|
||||
|
||||
## Use enhanced 'find'
|
||||
@@ -248,12 +252,16 @@ if type -q docker;
|
||||
abbr docrmi "docker images | fzf | awk '{ print $1 }' | xargs -I'{}' docker rmi {}"
|
||||
end
|
||||
|
||||
if type -q bat;
|
||||
abbr cat 'bat'
|
||||
abbr bh 'bat -l help'
|
||||
end
|
||||
|
||||
if type -q grc;
|
||||
abbr blkid 'grc blkid'
|
||||
abbr cat 'bat'
|
||||
abbr cpgrep 'colorpgrep'
|
||||
abbr cvs 'grc cvs'
|
||||
abbr df 'grc df -h'
|
||||
abbr df 'grc df -Thx tmpfs -x squashfs'
|
||||
abbr diff 'colordiff'
|
||||
abbr digg 'grc digg'
|
||||
abbr dnf 'grc dnf'
|
||||
@@ -405,5 +413,22 @@ if type -q mcomix
|
||||
end
|
||||
|
||||
if type -q chezmoi
|
||||
abbr cz chezmoi
|
||||
abbr cz 'chezmoi'
|
||||
abbr czd 'chezmoi diff'
|
||||
abbr cza 'chezmoi apply'
|
||||
abbr czc 'chezmoi cd'
|
||||
end
|
||||
|
||||
if type -q hledger
|
||||
abbr hl hledger
|
||||
end
|
||||
|
||||
if type -q chot
|
||||
abbr ch chot
|
||||
abbr che chot edit
|
||||
end
|
||||
|
||||
if type -q lefthook
|
||||
abbr lh lefthook
|
||||
abbr lhr lefthook run
|
||||
end
|
||||
|
@@ -12,6 +12,13 @@ if status --is-interactive
|
||||
set -q fish_private_mode && set -x FISH_IS_IN_PRIVATE 1
|
||||
command -v zoxide > /dev/null && zoxide init fish | source
|
||||
command -v starship > /dev/null && starship init fish | source
|
||||
command -v pyenv > /dev/null && pyenv init - fish | source
|
||||
# command -v fnm > /dev/null && fnm env | source
|
||||
command -v rbenv >/dev/null && rbenv init - --no-rehash fish | source
|
||||
|
||||
if not set -q FISH_IS_IN_PRIVATE
|
||||
command -v atuin > /dev/null && atuin init fish --disable-up-arrow | source
|
||||
end
|
||||
|
||||
if type -q tmux; and test -z "$TMUX"
|
||||
tmux attach -t default || tmux new-session -s default
|
||||
|
@@ -1,5 +1,7 @@
|
||||
{{- if (and (eq .chezmoi.os "linux") (eq .hosttype "desktop" "laptop")) }}
|
||||
# XDG directory settings have been already done in /home/inkch/.config/X11/xprofile
|
||||
# For Qt (GUI) Applications
|
||||
set -x QT_QPA_PLATFORMTHEME qt5ct
|
||||
{{- end }}
|
||||
set -x XDG_RUNTIME_DIR /run/user/{{ .chezmoi.uid }}
|
||||
set -x XDG_CONFIG_HOME "$HOME/.config"
|
||||
@@ -13,7 +15,7 @@ set -x XDG_PICTURES_DIR "$HOME/vc/pix"
|
||||
set -x XDG_VIDEOS_DIR "$HOME/vc/vids"
|
||||
set -x PATH $HOME/.local/bin $PATH
|
||||
|
||||
|
||||
set -x SCRIPTS_DIR "$HOME"/dev/scripts
|
||||
|
||||
# Editor
|
||||
if type -q nvim;
|
||||
@@ -40,8 +42,14 @@ set -x LESS '-RI'
|
||||
set -x LESSHISTFILE '-'
|
||||
|
||||
# nnn (filemanager) settings
|
||||
set -x NNN_CONTEXT_COLORS '4231'
|
||||
set -x NNN_BMS 'j:/mnt/hdd2;l:/mnt/hdd2/vids/films;m:/mnt/;h:/mnt/hdd/;d:~/dl;t:~/dl/torrent;.:~/.config'
|
||||
if type -q nnn
|
||||
set -x NNN_CONTEXT_COLORS '4231'
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
set -x NNN_BMS 'm:/mnt/;h:/mnt/hdd/;t:/mnt/hdd/torrent;v:/mnt/hdd/vids;B:/mnt/hdd/bass;b:/mnt/hdd/books;M:/mnt/hdd/books/manga;d:~/dl;.:~/.config'
|
||||
{{- else if eq .chezmoi.hostname "buzz" }}
|
||||
set -x NNN_BMS 'u:/usbkey;m:/mnt/;d:~/dl;t:~/dl/torrent;.:~/.config'
|
||||
{{- end }}
|
||||
end
|
||||
|
||||
# python
|
||||
set -x PYTHONSTARTUP $XDG_CONFIG_HOME/pythonrc
|
||||
@@ -74,13 +82,26 @@ set -x PYLINTHOME "$XDG_CACHE_HOME"/pylint
|
||||
|
||||
# golang
|
||||
set -x GOPATH "$XDG_DATA_HOME/go"
|
||||
set -x PATH $GOPATH/bin $PATH
|
||||
set -ax PATH "$GOPATH"/bin
|
||||
set -ax PATH /usr/local/go/bin
|
||||
|
||||
# Rust
|
||||
set -x RUSTUP_HOME $XDG_DATA_HOME/rustup
|
||||
set -x CARGO_HOME $XDG_DATA_HOME/cargo
|
||||
set -x PATH $PATH $CARGO_HOME/bin
|
||||
|
||||
# Nim
|
||||
set -ax PATH $HOME/.nimble/bin
|
||||
|
||||
# Perl local::lib setup (XDG-compliant)
|
||||
set -l perlroot $XDG_DATA_HOME/perl5
|
||||
set -x PATH $perlroot/bin $PATH
|
||||
set -x PERL5LIB $perlroot/lib/perl5
|
||||
set -x PERL_LOCAL_LIB_ROOT $perlroot
|
||||
set -x PERL_MB_OPT "--install_base \"$perlroot\""
|
||||
set -x PERL_MM_OPT "INSTALL_BASE=$perlroot"
|
||||
set -x PERL_CPANM_HOME $XDG_DATA_HOME/cpanm
|
||||
|
||||
# Parallel
|
||||
set -x PARALLEL_HOME $XDG_CACHE_HOME/parallel
|
||||
|
||||
@@ -151,10 +172,22 @@ if type -q vidir;
|
||||
set -x VIDIR_EDITOR_ARGS '-c :set nolist | :set ft=vidir-ls'
|
||||
end
|
||||
|
||||
if type -q stack: # Haskell
|
||||
if type -q stack; # Haskell
|
||||
set -x STACK_ROOT "$XDG_DATA_HOME"/stack
|
||||
end
|
||||
|
||||
if type -q hledger;
|
||||
set -x LEDGER_FILE "$HOME/vc/accounting/hledger/main.journal"
|
||||
end
|
||||
|
||||
if type -q zoxide
|
||||
set -x _ZO_FZF_OPTS "-1"
|
||||
end
|
||||
|
||||
if type -q chot; and test -d "$SCRIPTS_DIR"
|
||||
set -x CHOT_SCRIPT "$SCRIPTS_DIR"/chot
|
||||
end
|
||||
|
||||
{{- if (and (eq .chezmoi.os "linux") (eq .hosttype "desktop" "laptop")) }}
|
||||
if test -d "$XDG_DATA_HOME/flatpak/exports/bin"
|
||||
set -ax PATH "$XDG_DATA_HOME/flatpak/exports/bin"
|
||||
@@ -170,8 +203,22 @@ if type -q calibre;
|
||||
set -x CALIBRE_USE_DARK_PALETTE 1
|
||||
end
|
||||
|
||||
if type -q ksshaskpass:
|
||||
if type -q ksshaskpass
|
||||
set -x SSH_ASKPASS (which ksshaskpass)
|
||||
set -x SUDO_ASKPASS (which ksshaskpass)
|
||||
end
|
||||
|
||||
if type -q gpodder
|
||||
set -x GPODDER_HOME "$XDG_CONFIG_HOME/gpodder"
|
||||
end
|
||||
{{- end }}
|
||||
|
||||
{{- if (eq .chezmoi.hostname "arch") }}
|
||||
if type -q ollama
|
||||
set -x OLLAMA_HOST "10.0.2.1:11434"
|
||||
end
|
||||
|
||||
if type -q gpodder
|
||||
set -x GPODDER_DOWNLOAD_DIR "/mnt/hdd/gpodder"
|
||||
end
|
||||
{{- end }}
|
||||
|
31
dot_config/private_fish/functions/dailyrec.fish
Normal file
31
dot_config/private_fish/functions/dailyrec.fish
Normal file
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/fish
|
||||
function dailyrec
|
||||
__dep_check recsel recins recset
|
||||
|
||||
set recfile "$HOME/org/daily.rec"
|
||||
|
||||
read -P 'Date (yyyy-mm-dd) (default: today)> ' date
|
||||
if test -z "$date"
|
||||
set date (date +%Y-%m-%d)
|
||||
else
|
||||
set date (date -d "$date" +%Y-%m-%d)
|
||||
end
|
||||
|
||||
if not date -d "$date" > /dev/null 2>&1
|
||||
echo "Invalid date: $date (should be yyyy-mm-dd)"
|
||||
exit 1
|
||||
end
|
||||
|
||||
echo Date: $date
|
||||
|
||||
if test (recsel -e "Date = '$date'" --count "$recfile") -eq 0
|
||||
recins --verbose -t Daily -f "Date" -v "$date" "$recfile"
|
||||
end
|
||||
|
||||
|
||||
for field in Morning Mood Eating Walking Bass Reading
|
||||
read -P "$field > " value
|
||||
if test -z "$value"; continue; end
|
||||
recset --verbose -e "Date = '$date'" -f "$field" -S "$value" "$recfile"
|
||||
end
|
||||
end
|
@@ -1,10 +1,10 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRVlBFdDZsRDROL0FmNUxh
|
||||
ak8xYm5DdlZVWDYybldGeFBiZ1QybzRKaFEwCkJUVWdRSDBNSG5sSmo5TzJjdHh1
|
||||
aUw1Mkt6VGxWUEVjSFRvZ0RLbU4xcW8KLS0tIDhVV1orQlUrbmkwVVk2eG54Q3Y3
|
||||
U2RhWk9XZGcwMXBNTFowVHFQTWFrVk0KQqirA7nr+wmlZ7BEpJfwPsutFdatfBGU
|
||||
EjalgcokWmMmcaUosSbKOIHZdToHVNJrJn09fCcMSjULX4KY2xt9QkFL0he52E26
|
||||
Dt0m+XZT4xYHqwrfMVUT2IvCy13IYEFgWgJ5qSXBYQ1dI3ZjfarvnzbpWeoVMHY1
|
||||
pfIz51xV9BahSdMIgaSxvQCfs9qmqnoGuZ0COsZmAH41A8ZTi0205Ayn0LKQkLvn
|
||||
vTg/TPHpT8nova7g3r9w8OzA5zmg5+ZIV+NqkB66/qc60vNdUwBeXLHLtZLm2Q==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2TVUya24zb1pQNnVwaXlQ
|
||||
ZTNyKzhHckhqbDRSaFpJVkpEVURFcVkzN3lvCnlyRk0wSlFUelU1bndwWVVITEVR
|
||||
SzMzNlJ3UUxmdDF5RFpXeFhqSkxVNjQKLS0tIC9Gd09kQ3JhcFVhdnlvbWpQWW9m
|
||||
RTZNRWRqdFFoQTVORjI1KzdqdXZpQnMKlBY4Wi/oFtonpYZKVSVx07So0GxnaZwA
|
||||
HiOl9bS4IWrlhiUzywfFoGBTkFtFG+/8MPWbGeWMRwPjEhJS7ukzSfQmMDF55rGl
|
||||
5R7g5ybqblyQsqKuchJ/svLXW9Dazuc/p6/KsPqououJ+vkQ4w00zMT0nue0z8Y6
|
||||
OyW1dZuS7fyrvU5xtHJBmplaQDK4sdpbvBRfoO07M9qzoNDID4lCBD8/6cRvwBfh
|
||||
TE8b0eRlZQqv77d23+2LBgRmcrbn3KJRyBPN7bEvj+iqnd8OnR6RUyOOaknRCg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
@@ -1,96 +1,101 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOZitjaTdJZWJja1FmT05Y
|
||||
MC8ybE1PQ2xsMVZENE4ycHFhTjUwL3pTalVjCk10ekluL1JxSjJ5eGR6QVJPV1Bo
|
||||
YzlKaVJsM05ta2RpL25UVjlzMFdvRnMKLS0tIFFRRFBlYUZLRUhUa0pIcTNObUlO
|
||||
aVc4cm5Hcm52T0swYjZpcE5qWWFnb3cKMm4/hfjA+Q/mnSZoRVV7VquTXfPX4mSH
|
||||
ftPQhoK59q1ZD8DELaptKtT+D4tzziLn27GjSLyZxl/9SuwtOH673up8wuikI+Km
|
||||
fYUF5SjkuIsv51GptrDmKEHx0PXlncv4pAOtUcmzzmcx6xmx5cEJNdqGpoqAhKKB
|
||||
9rugbA7zw9DUzGXpDt5CGTEN0WZ0Fr/mylB8yiiVPARuRGaNvX6Hf+nczLO7jUwg
|
||||
mKHlZxMz1fAz/nFRApg0oL1k6CV+Glbb+vdCLORZ8oyMFm25xBaukQc8WEY52e58
|
||||
6d6bfiF86LiP8vu2+RgOmHPXtxScsrHAjUXptGN9xl6ZwWVPN2RtPtwg4H+I6Q5I
|
||||
S+ow7l16GGqx6L5aZg0K21tJYsGoXRDCDLqQ9u420KZv2tYyySzzMqb811aEJbGO
|
||||
wsRMI50zBWAAiQsrpQ+TaN6LrXuh2GlDtD2Lwr3c4kAgjL4JjiUpQGemDA5iAq+C
|
||||
Qkxzr+Oitr+8US977DFf/2c/sWLXMMVZ18tqoiuJjmajsREZJFunJ1P5ZCbmNoOg
|
||||
KFmeN3aZN6s/Qc4EJpi/1sdhsJu2oMu6mUPSTAbeMTNSHiZV71x5HK+kAIRLgyWo
|
||||
8JYzxCLXO/7ZQkoG/eDCUeETGgZoFkN93LQ1SJ+jNK2Dv0h4musnIjOjz8UyOpkK
|
||||
WqojX6hl+ABfQf2NiyDnDXX2c6gCByeorUN2g+DbY8r+2URTfwuia1Ui22eTOdei
|
||||
hNgliH/XsVUGCc+hhvKwUskM/Jbpy5bXQXf7aSGHQigCpyXnKbBnUhULqnbrr1Qy
|
||||
yHv0R7yma3cralCBNeUuZTDlQOr2GpE5hRM9E/GWivCu9GmcYOsplAPM8dO7Tbyf
|
||||
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
|
||||
6Cl2+y4w4JYrrh4LwvLMqyxJ+PZq+2LZxKx8faKbylGElBhdHL47/MagtDnlfGf2
|
||||
Gl6N/9rFdfOlIw2o/8f5o1yL/AiovKeubCQSQD14dpcIx+CUoCb4i8PbdiJWHECt
|
||||
O6zCsdFKORVZF4ZpndbA136HS8677dNK5wPuFcKxzC9f94xmp9jhDcSNZbvrJQHN
|
||||
lBbehJqJQxAMj5ZqhWyPb+4pjZMEHJ/xLVH9dLqM+EvFnDhh4XDY58cL/jba1Y7X
|
||||
XUp3qTlx3s0j0QQ8/Gw2as52PFxZW8gyjVfMmJJYaZVrJ4OR5Wxy4BjclFH/ETep
|
||||
xVfXFTbxzeaDbMh4YyLAFIzZyy4YiUF7ImGBl/VPsZ3Y7pPEPE7IO9qMlkFZZt0S
|
||||
nAHo+PNkaaoNM4AS9FxGsnxeyqyeBOPdV/3Nk0RS/td0NHO/aLszZF7rPULgDLbL
|
||||
sfFTskG1yI8RoRlyLxU7JimDQNd7TwNwtgn9hTBt1yPLWMTRrSX6IMHiClxZtRfR
|
||||
GAEPA7AXojhvgEoiltGb8hYZOI4vpeH41XIUgMTcFHz5bA==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQNUtzakNwZXh1dFNHZ3ZD
|
||||
MUxTZEtpK1dpRWREdjZyclZ5T0gxM21mSkV3CmZMVkIwdThxcHpQVnNJV0wvc08r
|
||||
eFprb3B2QldBb2h3dGxONVBwaTFRODgKLS0tIFlpUml2K1RBSVRYWWJCWFhsQUZQ
|
||||
MjNlcmJ5RENRc3B0MVpzdlFKM1VXUjQKQPkzE+jgc52AlUeXRmggzDENLAmG7+Lk
|
||||
HZJBb/tO4k1n+p7NcKzWiSDFPfko+t4shc9pZAuAiVgrrUaqrLVuoHHVurB6odZV
|
||||
iKsQ2rK75ztNTd807DUZq69mm9k1Pot9yjeqv7Whp4UUuv3u72ScwpmoQOPpsBO9
|
||||
/SlfxiHQg5GAawX5wksZozaSHtWJqBr5uzmabk4zlurB7/je4WjExZ8Yw7uIYL1U
|
||||
Raps/p2UMI8IHFQBj7gstYqRrNRWEW0jn45q9kU3kwbd2r40GiUPidbpu4WC+LWf
|
||||
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
|
||||
SVc=
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
@@ -1,13 +1,13 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6a2RIU1laeFZ4dGk0Zjhs
|
||||
Q3lyYVErc3k5OHFUaVl2c0FOMXBFNUtZMGdNCnNXeXRjamQ2SVFQU2tBdTBEd1dV
|
||||
Yk9QZ0pzdUZDYkx0QktVZVlXWlgrYUUKLS0tIFFEdzRuazBmVUprR2NEY3BmU0FP
|
||||
enpwaUZzMWxIOUNPblJFbjR1N3gydlkK4urPUfvuK+lqSJzaTL7bOlAVxATDNuWS
|
||||
ZBbeMtYSRksipIiYE9xkdEtyFc0fmHkHMCvsGYMEfBX4gk5rca9F3x3eLNXxuI3N
|
||||
aD33gLyIytVS+tbhtrOaE9CTj4mME9rjKKOJnODX2yrk0NeHPGB7RZFVeMhkLTUe
|
||||
ul9XQb5USJeTiMPptt0jXLTShTkHT4Y3CQScpppa92ajrRnYBu+BfHtO42fs8I33
|
||||
fU9/b/imWXJks/UoQxOhwdbvHJl27r/QFyEz40XMCexrwEj1rDiUeiW4pXnWf2xL
|
||||
2y9onNxcVo5WeB6WQiChS+8qe4hWBqWItD5vK9olXKAnXqMvVOiAWcngh5wbumdz
|
||||
OnaYN6BMB0UUMGKAb/m4Qiy6YfdE3QvoPIFJKejeEk0nG9FilUzZ2eXxa/ktTflB
|
||||
N5A=
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1K0V1akJxek56enAvdXVi
|
||||
VVVEV0NTeFRwbllZTzhlS3J2V21ZMjJoRkRJClphbmhsN090eFVlSDducTVTSTdq
|
||||
NzhCR3NaRnRqckxOLyt3cW9OcWpXSTgKLS0tIEJWTWJ4d2tQOHFQalQ1UVlXelZP
|
||||
RkVUcDFSZVpBVUZMcTRlaThiMWR6a1EKJJZbivi7z/iKOp9X9odzRTa4X+oEwpyJ
|
||||
HwyavvKw2Lk1QaMZPCCr1MyjlwPP6rucy+xSU1Z3pOCqSoUdG7NS2ie60mX54S93
|
||||
1jlhA0CV/3dPy532PaeyTlv4xSMgDLc8zZoM0IJHcRelMqCOGzOlX8h88haPehjN
|
||||
QWuI0OjAdlmRhG9wfp35RsnS4PdOOQFFdifhQHfqTITBFZEF/hdaj/GpD0aP/SY5
|
||||
luwg8Ilz0sUgwYzP7lFgXIxjY3vVZoS6zrixg2FalUBN6BDymcKqLTkaG751v8ud
|
||||
MCGfBw/723PlHwV2Y3QoLYdENEWoV+n08EkCfLPE2MMbyI2fb2qmJw1WkBFb+7vr
|
||||
B7FT3XQ2CAr++q5DRYdXwtv78/2MPY99kZSRqnn1VfUakoPWHd2a1TPoly6g+1g+
|
||||
HSGaq/n9sQbsJFVliV/OxJSEU9Y/VIVov4nCZBh8VQV/iZ+XbILvIyjJYA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
@@ -1,60 +1,61 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhL0tCam02VlRDSGZ4ck1K
|
||||
N2lzSldyV2hEZkh5N3dUcnRzb0ZGcVZJZXpVCm5RaExOSHNIeUlJMm5FcndmWlRz
|
||||
OE0waVpkQS9lVnpPa0lNbS8wcDNBcDgKLS0tIEhrNjBnWTlXU1E5UEp0S2c1ampx
|
||||
ODJnL1lCOGIyeG5UdXNtNnVMYWE3UlUKiCW9bCJWT/fSKDwLbbwuo+hPmJ58ekBL
|
||||
5dwZKmyvfEFgjiqwpnUmr6ZRsJjZ1hoKW/7jxH4C9g/Z95lggoMUTA0mhBVhnb1g
|
||||
52E1MkrpEFBcueGtfeG4q6ekkDAG4iHIjZsAJ05CPTMLoh5CKmGyeetXkC9v6NuE
|
||||
esZMvxUA+leiB0HT5U7aDTYW6dPnA235Jf351mB0jjgIJKh9MOaj69DIhahk/fc2
|
||||
hEPazp0jOnH+Fh0otjbcEjjaqqJ3DoXfFZTkn/ekVr464EyLaeKrqFr13Lm82nJZ
|
||||
ccXm6L55OhMzl80kOtYIe6z8zhv3ngnTZ3pMULGB8DnaVdNonbuDwjclLTFXkpgx
|
||||
efiPhf+sG5jeTwRvGbYhcF6zxWBYYrwJ95hmoLTDUasRgEEGskWj1D8E4pFRdzbn
|
||||
NuyQ6BVKVXE0xN+fYifiZKdbwF+utXxrhHp6nr0AITFibUiE9/PLVd0drCliIsZM
|
||||
Itqob4jRjKwSOEDE3ZfBzudKHFAwMeyqU2maZ9LfP9amIS3k1RtZgijR4XcNSpgK
|
||||
rRhiYRFeo10+uXn+KgDcduYN/bU6O4cbKAKaX4pSjd0o03Hpq0ywV3TEqScUSYIn
|
||||
rR7KDKARFx6yb2+mp1XLohcdU0eYZVBxqcaoDw0dKLIK1ZXLMqD6DjLgL2IgUdhe
|
||||
yt2LzzBPsh+2PhSt2AMosLmazdnp9Qmk31rwfqUpb+QyvmP2QxnAM/x38HoaYtKD
|
||||
jKRTCSK4le35Q6HCNWRMdde400Vgueeq0ECdqR26edUUWNR8VRoqvQ7ng8zvIWnK
|
||||
L3fpdmZEIWXeZLCebN9dG0/dxclQcfQ4KD5vEc71sOlHNoDsIIOyjyaLUKNWmXBT
|
||||
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
|
||||
KkWIDiTe
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByc285NHk1YXNkV0tDQ2Np
|
||||
c0t2TlV3MnlQRWFPVi9yVEhXR0FGQkZOUkhBCityWVN3OWpYSVRrRlVjNDZ5UWhk
|
||||
bVlabC9oeGI5SHpOWUlXRW1NcHNURTgKLS0tIFdSZDBKMW5CaUUzSUNab0VYUVdh
|
||||
Q1hhaGtwNjdIV1V4bEFMbDJzZW1GYmcK0g9z+pygnTlsrcZ6jE0LGOVcrsTQjoq/
|
||||
ogEIMhbWlbwcZgxRGqAfof2RzQOILSNmpgGnroO6pVKhTRC6808kKrk5vd7a8aKn
|
||||
vGm2QaHskf9ClTwR3eOqX1maGbENiTG9ziSvkdWaTN5ppuOH2hIYaosV+QaB3hZW
|
||||
nBq83G3eM1zEkMgcRGpzMtyQtUBkt3Gy5w0aqqi9/nCper88E3tu9pez8iovLC6m
|
||||
gAw+RFZxhd384cBEemWbKA8rXICa4tV9PUykaZSDOy32YnTv1r8PAf/HtiUYC81Y
|
||||
VqtS+4+WL+2cwlmCvJnEj1IcmVtYzkOgI5jAAZv+Uv2Quc3I0wpO5jiroNRPnaLz
|
||||
G6dgMPHhl5HbaKRJNV7gEscQKrzRPQ2KvI1HUuTlgcOArfFZlUu/JwVVm5pA6QpL
|
||||
/h3Jm51U/JfPioI8Hr1YRJlNclt/O+BieGVre0wxN0yGRUNi1lldGmq8hqjslAuA
|
||||
CzHY9Q9gbjg5ODKVglcZxiEmgpEhqA8T+SxznU7KO5S+nidllXGD9DR6HgeF0+KR
|
||||
uxqD2kqF+eTzxvQA4bm7ABYGAbJrXKlo2QmKdK2MHaiNFQqORYJ7bkDq0HICGdFe
|
||||
in/eVkbgpv8z6a8/WMBK5oculylv4lLkfvEndnXpNghVzKkQBO6WYhEVpo0/LYl7
|
||||
3txmwh2RfGhOMLI5KTr+lB1CGlsfnY0gVzGZGKYUoDa6YN2CmJCFQ7cJZLkuULSa
|
||||
FWQxGXs/+2JiI0CAocn74TAZy4WNOGCUVL0q8hP8n20Cs+YzQJUZupPlxT2mia7k
|
||||
0LRLuHuAAeOWCfVfMbPlCUfKRTn4mhQRzr35iECufdHpQ6333LqdgJpdaanVVUMw
|
||||
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
|
||||
q7X0uvVgcCFmK54CO0ANWgOSnFI=
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
@@ -1,36 +1,36 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDaTNQbktYa25sZEhFMEYy
|
||||
TWh2TGdTQnQzRncyWXplb0pPWjY0V3RDaGlFCjJwd1FmenJ3TmZIZERvcExORHla
|
||||
MjlDQ0YzRlJKME9yWVJhS1dISWgxSkEKLS0tIDFybnZOcTVmcE1COTRqc2xBNkFZ
|
||||
c05tcHB4Q3FOREJ5NWNpd1FOMEozMVEKJiBlYprN4Lv9ezBLHPwb3uReGTLu5iH/
|
||||
0+dzxQppM/Vt00Aq+YjgkgqeGibkLGSsccvAPDZk5LfipifFUI9JncJXT+d9Bcgk
|
||||
PE0KoPH07i6XMR4Y+gkLsOWz0kVTR+Fw3j9L37wZvEeZen0Za5xb4htfuoTO6Y8Q
|
||||
rkHGEIGV79fo9u3/OsgZp+gfdk/c+46j6Cd+fIntTpcLHPApc835g/0BKiULFltr
|
||||
29IwFtLb3uiGwcH0i3M9lxxsjxjPJ28blx3yannHb0VRnnqbZS1vnhl56JIpgbve
|
||||
M1bPF5cCbaPOKDuUy+EYBO+eBmffRU1DSvw601ABz3Xl79j2JTa5Ed2Am4BroKj3
|
||||
q18jZvULwfYJ10NsFPpgIOJZKzIBgbQ+UaCjfZTzOTmgmW1LoDpEkrRACXCsp8Mo
|
||||
z7F0iJ57E/pskvUA57wn/dCMibITMeY30U6QcUL2I/0uvihnjdNNJ0CD+docdUjm
|
||||
OhmcbxgKGMAk5zXUpPhQy9Sw8RxoW4q5HsxiCs5GiKiIxgS9G8hu8nHhZJ1E9TPT
|
||||
VtX+BCMrAtagIqOTRVsTusXKl834dt2vsVYYRiD+qGIul45CcGNfXNwHR2lRroFO
|
||||
RRrPe7OvL257nA/Q6Y6s7lBDekrYm9sn4HVNw+N71+ywHFXV3mWzuzXBECbM/Hbg
|
||||
3O+JfQQynx7UxZawXUFEqUMYNRaMvlmSXOEujznvHl+qAHr6DNSXLE16BvLN98D8
|
||||
pKkSFf0/Xd7UMJkafgLSwiJICbkS8S+0f3Whq9Sd3jRjhsgAR0AYH/UsXi2h9C/Z
|
||||
k/BeuS1KgLauliACm5sSJ+PE5Wn5obPFRU3NXOVyugPMgXRUEqpMLhorjCwPIH/x
|
||||
GTEeiRaEMD7uOIf+/0g3QaCFh0Ob04kYJ1lEo0TMEZxlQxuyyPvpaulxrHMF8lSX
|
||||
UuZTG7MAPVXFAIjpNnCE5AT6PCUxdi5xAQF74auSchE6aIZJHnZ69THy1JzP0X44
|
||||
RjN5/xQbgjpnMLG/XlS3sw9HQQU7RS/ipLKrGOLpmTYHC9EM+a0k4WnAGxpr2qU5
|
||||
BUMuKVd4FR651N7QoWZ2HsfhF4SeBf251sNMtRV2m6QCwN7ITejbIdu+DPyeCfqP
|
||||
yMkxhPHsZT+BL7J7sshRKn0bx+jupqAlrYjEZbDjqWmqsMgh8oy6gSrYjdGRPTYw
|
||||
c9f5gShDRQmNmuAqZsTODKpdWNzzLRtjlXknQ7egGfJL5TuDgu1k+KybckCjsC0V
|
||||
7ldZMqXRMdoTDuFytXNlc8KKlFjkfX0j/ZNWtubx9OfqJWyoDIemQ6/V9yEum8bI
|
||||
LxEDG0Ls+OyBwL/WT69B3mfs0Z+OfIbZ09iFYn0vyzP7voiOfhiI7UMPEhz/03Aj
|
||||
dSMse+/ORSV4gy7S36vA3wJPPBu/79qbEfXMd+EEUfI2ghqq3OnFdKaj3tPFa2Fo
|
||||
3SW/yKWujcUDg4H11EG9EwsADjtKPn+aivsj24GrVhW+T25JQnsUFTxjP6Vjvnym
|
||||
uEPXqLUmZIB0zS/PXKUpbD4TbsSfrs7HKrMhNoqvO4WueyoFJirhp3TmeTP66Jig
|
||||
X5vEQNYIaw2ZARzi3AHchIOCAX2pMv2Zr0ZgiNn86wCx1tWnUlaU6X01dlRufetR
|
||||
IV0SMuTepBSxZzmKwPK6mmXvcVFlwF8O94kjW5ca1tyXpnykFjJ7Rkh5JNmv87Lu
|
||||
BUIA+rD+eMdnw9cwfprdfwa/E+tCEnnlL2cXMANZdiCySPTAVXrWslElE4PMzcg5
|
||||
FVmJsvcTV0Byvk1S+tnMdJothlkf7qfE3Q306l6jpXkfsA/MSyG7k2PRtmSkyWji
|
||||
XEhuhRwMQbGM3mejSKFUb9DM0ZpE4a2DjyWpHMuW03a6ToTmo5Y9mvWwBpp+fgb7
|
||||
J3GTHxq0sm1qwVQ=
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPMGhscnowTEFVTm9jZEVH
|
||||
N0xCWEdvd2lUTERIeHNVWEI3aEFkNFJma0dVCm5uMUR4SVg3Z08zYzF5aXREelZn
|
||||
YXV0OTdvbElFT2UwSGFwTm5OWDVVQnMKLS0tIDFGb1lYblpRc1JVQUNjYVdydG9q
|
||||
dnpta0NrOXlOdXhMbkFkd1ZKTlpmWVEKfsbTX4z91153J2XxT24f/Uw/fHsqDWNP
|
||||
4l/Ni0d8AIqzphrJLGIfj0Z8tsbOO0Ta+PqNMLjdpPMVFXyAhnQWqNVbxXlKhAFI
|
||||
a2Ln7sMVLcdNTAwDGt0eHfyhzi3seV0YKXYw/a0WS6lYp8ZF6HbIcQyWLEvXGWso
|
||||
RpfnIzKPanEpTVGtP01NdFpn60cxpAgza5ke7ePgVma8OWICdQ4dP7X4BUiR4B9V
|
||||
gb7yixcXt08754nfjLIUHY0DOiu/VB/kplcthWkpJNsD+STPMt8mLkbYRbM9AfLR
|
||||
bRfSHyQFoCIMGd1GFrwjtyxw9QiV4tp/UmZ6LjVhjW/2rRPghnqQnZKRh3kX3+0l
|
||||
WV/Visw15EJhUYtoAmQhBt8IspgRooSolvghsWuDUZw0oCICziyYhws7KtC9j71m
|
||||
QEI44LJHU/QlCbHOWYvutclVxCaNpJQqHIWzgvvpL0mo2p8/QIofWe+5jts9NsnH
|
||||
vHO2+Cx9ybfhSsJaogod9o+0sXBhrfpGFFlLJ0fmt5+r23O71LVFuJl1/0R0zsWz
|
||||
/wX7E3BD8PeXN2aC8fId+S8QCwQzwewYtx8nL2fMZdtFwnU+uR/04Di7h9ea3Rqt
|
||||
qN0NKNvpmmziLbGaTw6gF/ZHqvLI1gtQ8a2ZRaOfXt77HINor7r5282PgxdpmpxP
|
||||
SmtftTNGX/CBkY+dQxKnY7b2BQ9aTMeCqmnJZMK6KN1EO52Q/m5r2e+4QqsLZEHb
|
||||
TAs9FUhdXr3q+H7wJWJDx6SqAmPqERxVuJkBuMQACofoXXhLOH4Dx3POZ47kjjel
|
||||
ljGb/r3LzjygRpxLva3qqpCQcrkfj9V7xC+M6Scf8ERg0IpryqM81EmaEKTQMy1e
|
||||
RBA7oqUf6tbXP0nz6CDMTEfLXlzFr4ciXXx+BzanzkVhNY1eXyTxaBP8hhR19wus
|
||||
KoMU/4urZxipTRkIxvnt1R6PUyl4yVkzZpqQTiUfo+RV2kDAJvJxeBpTsSqT7eaX
|
||||
qr1Qjoxn2utsYVTyLb1C6h1M0MNRjGXHjXfJeUJZnnXgbcRJLLcCR6db5oss/X+7
|
||||
FXxTMLtDIhXDjuCQ49xZcScnSkZscUytlXCsdc3uflqtip8KHIonLNKFYCcybI1u
|
||||
hZ1l0QKYIG9gP/Ct1D76+PfnF1GeBZ+kEHb9wMybfWnVFO3SZ/cGDc8iunkKCK0m
|
||||
K2O/+yY680NqIICto0J8X7Xi875PDjLHUZ7LTRQ8nqJ7G0Csss/6IFJytO6qAhRN
|
||||
mmBAZd8TReqsRY5EiqW5ZOjo2rqLYzqLDwRPwkYiIr03IUwhXkCeZFYGwxuX2yW3
|
||||
rEgX98jNxNBc+dpqa6/mXKfygdFOgmCR67ywdxNarlldIGe/8Du4BzkcOGQRtgZ7
|
||||
edud9oq6jqxo1NqlymWRVTMKdS3PfRWa0pYLBY/FBC9i4L//8i20TAWeqQnGMTNg
|
||||
9wSAZ9zzaGVWPo4khhCoviZ2IAISOUD59rKah51uwC9aP2Vyy9CE4B0IeJGW/w0H
|
||||
uoDo90L5AZRjpZ6dwejZAHcwWnysXAQ1uw1rUhMSPMDabFWfjePuWLcZ18thTWam
|
||||
LP3zXcPuYsURimW6cz4c3lYk/hJVERH1tg4Q7mrMC8yyQkCyRboA28NQ+q72/lsE
|
||||
oOKscYht7NfD50BafwdnpbooYt4f4GSeszKVPq2JNtPbRVKAM0SEOgLX2ZBSXo0q
|
||||
UAm3DkA4hHnPFvOlcYTK3h+3NAbCjBUYVfDnOVTg77nnsLCv61Nf9JK3KMI5v71J
|
||||
mKhoOo0dmifHw7h1wf2/Yo+Yq5A6unua0kRzH8VoJNpviiFnMpDG7kO43t+9AxzJ
|
||||
VvL25QUfK9q+KHy6aBeiuovic8JkB72aBX0jPOpI1VtcXC0SMWyLov59Afk/RC/z
|
||||
YsZsr2n9DleAakMkYV93trMROHbDpK5mzGjVulmcZO/aJBrH2M3F
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
@@ -1,57 +1,57 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5dVNIMlRRa0JSTmsycGFp
|
||||
Q2FCc2NRSktsR25ZSysxVGQzeUNUWUxNeWtBCjJkNzhJZnZTZDdLSnRHVFlDMUdo
|
||||
MWMrb0VLSFRMZ0tMNks4VUtuRXE2b2MKLS0tIExuUDdYSTM2ZWpXRnJvMUR3ZTZR
|
||||
alJiVHRFaW9iRisyKy9oSnBFcEJKUVUKEmmj6QWfmT5k47zACyb0tsbsAj6jU4mQ
|
||||
ml3uZ0B3BQbw5GdG6J/m1UzY5u9pikSVrlYuwoFRFcMO/kQfoneAk0ZTIWeNGndT
|
||||
5uSs9RphadJdgfvRki0nXXk+GvxYhppPVOAP28LWsn4UnJ0gfOV41rcXpfMUlyt0
|
||||
9SDXZPf3WzV89t81aPLEvWfygsKvAZffN564yvlCZi0bTQ2vDIfIVhsu/PjBxlCa
|
||||
9njjYosnqQxqsrNxV+GKpFPrhM92VXasjpFanFI+qJ6nH4zN5pg/LPY2H28zNSyN
|
||||
jlfYspUZ6xj3f3UGa7JGeCZfLtEGVPifRLjtye9TlbizT0WU8x7QBE12XT1ur7gi
|
||||
9pb6AXoQHF7vW1czLV2hAwV7f1rALIRrfZimNRIy3i3St7CHhEobMZS12+hqaafU
|
||||
pqvC7YtE4+agutVCyTgSwENPjxWz6tDDNWFWI7YCeFuPZpAXYLGtnRuZEjqY3QGY
|
||||
xgdTU+PtdXUn1OtcYBKujbM/AwmvMrYI+NRDeL96y8iSNFkQacN4NCTrJfwcSAAs
|
||||
3Wn3S0I3mQUchRvztBxJygmKboTuLaYsDmulXy7YKGw/yXQbgspJfVBwW+M2bsBW
|
||||
w+dgvuGC8LWhdOChjOZIaG1mkqiFH8WP9uvh2qgDdNcx5WWL/mVDgZyK6L1qF/zy
|
||||
0j2cEuFb5DVGnIitA6RGairydZq3M4JFblUqRvu1tfYnRceSUVYNy3q00EebGa4q
|
||||
RGTjMXsLLdCXUZNGx+PveH6uyvpx90EH6XHO8sv7pk4uEI++znQphcniEbLv1Lcx
|
||||
oyDoCSnu2pcH2i3ZGLnxEuYFBE1mZqsgIrjPPbTlfJntsgqFKvfeLaz36P/qwblS
|
||||
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
|
||||
JBUB3o8jMQ4=
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkeml0aE1HOVNjL3hTZExQ
|
||||
ckJtREpPNDNVK0l6dEpNTXFBYnZ0T0JiREdrCkVuRXBCbCtISHZzRDY2cTk5ZWlH
|
||||
THpWa2oxdCtDNzdTRnp1SUlHKzh0ZE0KLS0tIHIxTHh3V255eTl1L0JOSnV2S2pF
|
||||
ai9zYXJsL1RULzkrUU5nY0lqZ1krcncKPIF+AZc4bs9FwOkAkoPBhNEpY/4yUqn3
|
||||
Bz/4eYvEMPqAkSveY3VNVhVYIt9N1F+t5CdZTkgCwJ7HYMO96YKcNaXUvXuX6QnI
|
||||
OFM8B5oNBS2wshabHa9/KuOh+Mxwf5SXCopXpsVx11SsCoA7cSwzINiqgI8oWAEY
|
||||
ln0RhyYcI+vseJsJWvUNRUVoyYVks/ezSX+GRIw1evup/IslbWO1TUcN+mZzcgnJ
|
||||
qIxS6D8+SWTOjWLzJ2LGoR3xTmtkOa6R6ryy3+Y+M5xtxyN6P9Ci9ZDbph3gI1Vz
|
||||
FntdSvA3d3oU+CfgjFGEdUxjKxPnBmQ0LKy4TaBt04O/vda1j/bqwHNqPhG0Lkt4
|
||||
hMmfDKes1/8RZEndCyVVqsSs7uerkPscxDxv3gvEDVd8RlyVF1X3l3DIwBbDDgWb
|
||||
bpxSc+g+J57nxEmZuzkkqy656ssLK04dK9J9nQ5JfmOO46/UzSY+Q0KC+9Txh6JP
|
||||
VMo2mEFL129tugw38OhOcerWpIn19O40MbemJGeyFoSQo6WZgkEs/AH2pD45CCJa
|
||||
YjB906Y3vXNicpZFtcDcqrDc8anlDRXKVJSQs/LBqgVx+lAsVchTkFJcINR7vz27
|
||||
9pZjrooBX1T0t28L9VIsu2jZiMDhi1J2TUTL8wmNjvW1FCrI0WXJ2utzcA1ir+h9
|
||||
msN4XX5jX/I26Yq8dvfLYqVbAZVDyJOkm9X9ziOJ7jojQbWY+tQDpDc4XrQ8Cfqb
|
||||
Renve3AX9jQaZwc/yhTp8Rr5+jebpi5KmTNaL5aSyiSRzbd1OOhQgVLh14iNs9be
|
||||
Emebp655/Ry+1NGy4QZXuUXljRO2IuEkY5E1JKifpXfdl1hBaQ6pMDQlmW+92Ekw
|
||||
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
|
||||
WdldjAe2eIo=
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
@@ -1,22 +0,0 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZZDhwYzVWQ1cxVGlSVXg5
|
||||
WDdlMTRwOGFzZ0o0cW42K2U5N1lVVFJBalFJCnUzamlJUGxxYXcwNXh0cndPeEJY
|
||||
dTFOZ1ErZElXRjlpeStOb3NGZ1hod2MKLS0tIFpKaE9wSXh0VXdONk9yaHBCN3N0
|
||||
alRURDA0dEo0bU5FaWRtQnhvWkFPQ2MKNY51uhS3K9/65zUKkYWgAHXPqotRvopy
|
||||
qDzq6HfR5dVU378aGPm9eEDGoagNfB7rqD6EEZyQOIo4BNwGVM1GKroY0NLPkg6Q
|
||||
IiGyWuU1ndsnlEfRPBZEiL1tp8KRszOCT8/biRzZGU0FB+OVp+Ksf9mMA8Or+d0H
|
||||
Re82Oyg8HLqFRmuaWwEHz8Krf6Pf7bTGFEIzguLQsTElh0zOGO/qz3gTvcY5L+Xx
|
||||
7Cs53m98VClZTrV1Qca3Ridf3Xxe4EgZyX5BTvGfG6JwUnCcmk/bGQHMj45dCusH
|
||||
7pffZWurqddTvsYH+COIipVqXSE7jMDotQWoJjQqxzah537VNUe7TR6DOmEMgc1q
|
||||
xzVAO8ypCtBunVpMNHoeBsTzClD1op8NqpBeEyipAXCgmF3g6ByEeaqE2aTHlNRw
|
||||
ikFsaoyaVh/Nsi+kTMtH/697oGD8cWU5WzYz5i26Xkl/Lp1cHUAV1FPVcbCuW12I
|
||||
ypIqygr8km5UmjlmDIyCYHhjXZcqqsq53myWCPJA9BH3+VCzlYAD42iwp3EJECCw
|
||||
Gk0XEwRMxyLuRHBm/zVDl4H6wW5kzaj+/SfvjKRCALOAV0An+yLw5DYDa/BuDa2V
|
||||
oKYEN0rv4Uhe0zpjn6CdJLCtQFSYD/gsABf92Bmr7ZrNTBcVRlFCSMU2rkbwQqAE
|
||||
j0PQqJQolmapECmktVkSPR2Ou29+J0WRpb4WMckDsPMUDic9/rylsFn4wgg2rC+z
|
||||
Hu6mTJ4gNnfGwFg97zkbys62zfMp1QpouucxOMIVk5xckju8ojqyd4p/Ijwfm0XJ
|
||||
ptsCBtn0fde8qFmcu/pcQdlaH7r9aIlvEJ8MWpo8HidD9eLq8RjmlSEJnLNzA6ql
|
||||
C80EH8GEi+ylHtTx3fGGmZ65bGarSBbPo4IaFO6f9gjwwdgkE/JbqUWKq9Fum9zE
|
||||
nWIantyiAQd4wyFgk2rpEpUxLb5aGmADrOtk5AMi65h6Bk8gTBsOtRjrFNrVikFA
|
||||
mhq9AByM5FUIRTfDri3l3oBoD3PlF28TooIvb3EBcb4EXa4=
|
||||
-----END AGE ENCRYPTED FILE-----
|
@@ -1,19 +1,25 @@
|
||||
, 、
|
||||
- ー
|
||||
~ ~
|
||||
. 。
|
||||
/ ・
|
||||
; っ
|
||||
[ 「
|
||||
] 」
|
||||
'l →
|
||||
'- ――
|
||||
'. …
|
||||
'h ←
|
||||
'j ↓
|
||||
'k ↑
|
||||
'l →
|
||||
'y ¥
|
||||
'. …
|
||||
, 、
|
||||
- ー
|
||||
. 。
|
||||
/ ・
|
||||
:ar ありがとう
|
||||
:ii 良い
|
||||
:im 今
|
||||
:nr なるほど
|
||||
:sk しかし
|
||||
; っ
|
||||
[ 「
|
||||
] 」
|
||||
a あ
|
||||
ba ば
|
||||
bb 僕
|
||||
bd べん
|
||||
be べ
|
||||
bh ぶう
|
||||
@@ -25,9 +31,9 @@ bn ばん
|
||||
bo ぼ
|
||||
bp ぼう
|
||||
bq ばい
|
||||
bv ばい
|
||||
bt びと
|
||||
bu ぶ
|
||||
bv ばい
|
||||
bw べい
|
||||
bya びゃ
|
||||
byd びぇん
|
||||
@@ -39,8 +45,8 @@ byn びゃん
|
||||
byo びょ
|
||||
byp びょう
|
||||
byq びゃい
|
||||
byv びゃい
|
||||
byu びゅ
|
||||
byv びゃい
|
||||
byw びぇい
|
||||
byz びゃん
|
||||
bz ばん
|
||||
@@ -56,28 +62,29 @@ cn ちゃん
|
||||
co ちょ
|
||||
cp ちょう
|
||||
cq ちゃい
|
||||
cv ちゃい
|
||||
cu ちゅ
|
||||
cv ちゃい
|
||||
cw ちぇい
|
||||
cz ちゃん
|
||||
da だ
|
||||
dd でん
|
||||
de で
|
||||
df で
|
||||
dh づう
|
||||
dg だが
|
||||
dh では
|
||||
di ぢ
|
||||
dj づん
|
||||
dk ぢん
|
||||
dk だけ
|
||||
dl どん
|
||||
dm でも
|
||||
dn だん
|
||||
do ど
|
||||
dp どう
|
||||
dq だい
|
||||
dv だい
|
||||
ds です
|
||||
dt だち
|
||||
dt だって
|
||||
du づ
|
||||
dv だい
|
||||
dw でい
|
||||
dya ぢゃ
|
||||
dyd ぢぇん
|
||||
@@ -91,8 +98,8 @@ dyn ぢゃん
|
||||
dyo ぢょ
|
||||
dyp ぢょう
|
||||
dyq ぢゃい
|
||||
dyv ぢゃい
|
||||
dyu ぢゅ
|
||||
dyv ぢゃい
|
||||
dyw ぢぇい
|
||||
dyz ぢゃん
|
||||
dz だん
|
||||
@@ -109,8 +116,8 @@ fn ふぁん
|
||||
fo ふぉ
|
||||
fp ふぉー
|
||||
fq ふぁい
|
||||
fv ふぁい
|
||||
fu ふ
|
||||
fv ふぁい
|
||||
fw ふぇー
|
||||
fz ふぁん
|
||||
ga が
|
||||
@@ -121,14 +128,15 @@ gi ぎ
|
||||
gj ぐん
|
||||
gk ぎん
|
||||
gl ごん
|
||||
gm ございます
|
||||
gn がん
|
||||
go ご
|
||||
gp ごう
|
||||
gq がい
|
||||
gv がい
|
||||
gr がら
|
||||
gt ごと
|
||||
gu ぐ
|
||||
gv がい
|
||||
gw げい
|
||||
gya ぎゃ
|
||||
gyd ぎぇん
|
||||
@@ -140,8 +148,8 @@ gyn ぎゃん
|
||||
gyo ぎょ
|
||||
gyp ぎょう
|
||||
gyq ぎゃい
|
||||
gyv ぎゃい
|
||||
gyu ぎゅ
|
||||
gyv ぎゃい
|
||||
gyw ぎぇい
|
||||
gyz ぎゃん
|
||||
gz がん
|
||||
@@ -159,8 +167,8 @@ hgn ひゃん
|
||||
hgo ひょ
|
||||
hgp ひょう
|
||||
hgq ひゃい
|
||||
hgv ひゃい
|
||||
hgu ひゅ
|
||||
hgv ひゃい
|
||||
hgw ひぇい
|
||||
hgz ひゃん
|
||||
hh ふう
|
||||
@@ -172,9 +180,9 @@ hn はん
|
||||
ho ほ
|
||||
hp ほう
|
||||
hq はい
|
||||
hv はい
|
||||
ht ひと
|
||||
hu ふ
|
||||
hv はい
|
||||
hw へい
|
||||
hya ひゃ
|
||||
hyd ひぇん
|
||||
@@ -186,8 +194,8 @@ hyn ひゃん
|
||||
hyo ひょ
|
||||
hyp ひょう
|
||||
hyq ひゃい
|
||||
hyv ひゃい
|
||||
hyu ひゅ
|
||||
hyv ひゃい
|
||||
hyw ひぇい
|
||||
hyz ひゃん
|
||||
hz はん
|
||||
@@ -205,8 +213,8 @@ jn じゃん
|
||||
jo じょ
|
||||
jp じょう
|
||||
jq じゃい
|
||||
jv じゃい
|
||||
ju じゅ
|
||||
jv じゃい
|
||||
jw じぇい
|
||||
jz じゃん
|
||||
ka か
|
||||
@@ -214,6 +222,7 @@ kd けん
|
||||
ke け
|
||||
kf き
|
||||
kga きゃ
|
||||
kge 考え
|
||||
kgh きゅう
|
||||
kgj きゅん
|
||||
kgl きょん
|
||||
@@ -221,8 +230,8 @@ kgn きゃん
|
||||
kgo きょ
|
||||
kgp きょう
|
||||
kgq きゃい
|
||||
kgv きゃい
|
||||
kgu きゅ
|
||||
kgv きゃい
|
||||
kgz きゃん
|
||||
kh くう
|
||||
ki き
|
||||
@@ -234,11 +243,12 @@ kn かん
|
||||
ko こ
|
||||
kp こう
|
||||
kq かい
|
||||
kv かい
|
||||
kr から
|
||||
kt こと
|
||||
ku く
|
||||
kv かい
|
||||
kw けい
|
||||
kx ください
|
||||
kya きゃ
|
||||
kyd きぇん
|
||||
kye きぇ
|
||||
@@ -249,8 +259,8 @@ kyn きゃん
|
||||
kyo きょ
|
||||
kyp きょう
|
||||
kyq きゃい
|
||||
kyv きゃい
|
||||
kyu きゅ
|
||||
kyv きゃい
|
||||
kyw きぇい
|
||||
kyz きゃん
|
||||
kz かん
|
||||
@@ -266,8 +276,8 @@ ln ぁん
|
||||
lo ぉ
|
||||
lp ぉう
|
||||
lq ぁい
|
||||
lv ぁい
|
||||
lu ぅ
|
||||
lv ぁい
|
||||
lw ぇい
|
||||
lya ゃ
|
||||
lyh ゅう
|
||||
@@ -277,8 +287,8 @@ lyn ゃん
|
||||
lyo ょ
|
||||
lyp ょう
|
||||
lyq ゃい
|
||||
lyv ゃい
|
||||
lyu ゅ
|
||||
lyv ゃい
|
||||
lyz ゃん
|
||||
lz ぁん
|
||||
ma ま
|
||||
@@ -295,8 +305,8 @@ mgn みゃん
|
||||
mgo みょ
|
||||
mgp みょう
|
||||
mgq みゃい
|
||||
mgv みゃい
|
||||
mgu みゅ
|
||||
mgv みゃい
|
||||
mgw みぇい
|
||||
mgz みゃん
|
||||
mh むう
|
||||
@@ -308,11 +318,12 @@ mn もの
|
||||
mo も
|
||||
mp もう
|
||||
mq まい
|
||||
mv まい
|
||||
ms ます
|
||||
mt また
|
||||
mu む
|
||||
mv まい
|
||||
mw めい
|
||||
mx むしろ
|
||||
mya みゃ
|
||||
myd みぇん
|
||||
mye みぇ
|
||||
@@ -323,8 +334,8 @@ myn みゃん
|
||||
myo みょ
|
||||
myp みょう
|
||||
myq みゃい
|
||||
myv みゃい
|
||||
myu みゅ
|
||||
myv みゃい
|
||||
myw みぇい
|
||||
myz みゃん
|
||||
mz まん
|
||||
@@ -343,8 +354,8 @@ ngn にゃん
|
||||
ngo にょ
|
||||
ngp にょう
|
||||
ngq にゃい
|
||||
ngv にゃい
|
||||
ngu にゅ
|
||||
ngv にゃい
|
||||
ngw にぇい
|
||||
ngz にゃん
|
||||
nh ぬう
|
||||
@@ -357,11 +368,12 @@ nn ん
|
||||
no の
|
||||
np のう
|
||||
nq ない
|
||||
nv ない
|
||||
nr なる
|
||||
nt にち
|
||||
nu ぬ
|
||||
nv ない
|
||||
nw ねい
|
||||
nx なの
|
||||
nya にゃ
|
||||
nyd にぇん
|
||||
nye にぇ
|
||||
@@ -372,11 +384,10 @@ nyn にゃん
|
||||
nyo にょ
|
||||
nyp にょう
|
||||
nyq にゃい
|
||||
nyv にゃい
|
||||
nyu にゅ
|
||||
nyv にゃい
|
||||
nyw にょう
|
||||
nyz にゃん
|
||||
nx なの
|
||||
nz なん
|
||||
o お
|
||||
pa ぱ
|
||||
@@ -393,8 +404,8 @@ pgn ぴゃん
|
||||
pgo ぴょ
|
||||
pgp ぴょう
|
||||
pgq ぴゃい
|
||||
pgv ぴゃい
|
||||
pgu ぴゅ
|
||||
pgv ぴゃい
|
||||
pgw ぴぇい
|
||||
pgz ぴゃん
|
||||
ph ぷう
|
||||
@@ -406,8 +417,8 @@ pn ぱん
|
||||
po ぽ
|
||||
pp ぽう
|
||||
pq ぱい
|
||||
pv ぱい
|
||||
pu ぷ
|
||||
pv ぱい
|
||||
pw ぺい
|
||||
pya ぴゃ
|
||||
pyd ぴぇん
|
||||
@@ -419,8 +430,8 @@ pyn ぴゃん
|
||||
pyo ぴょ
|
||||
pyp ぴょう
|
||||
pyq ぴゃい
|
||||
pyv ぴゃい
|
||||
pyu ぴゅ
|
||||
pyv ぴゃい
|
||||
pyw ぴぇい
|
||||
pyz ぴゃん
|
||||
pz ぱん
|
||||
@@ -437,9 +448,9 @@ rn らん
|
||||
ro ろ
|
||||
rp ろう
|
||||
rq らい
|
||||
rv らい
|
||||
rr られ
|
||||
ru る
|
||||
rv らい
|
||||
rw れい
|
||||
rya りゃ
|
||||
ryd りぇん
|
||||
@@ -451,8 +462,8 @@ ryn りゃん
|
||||
ryo りょ
|
||||
ryp りょう
|
||||
ryq りゃい
|
||||
ryv りゃい
|
||||
ryu りゅ
|
||||
ryv りゃい
|
||||
ryw りぇい
|
||||
ryz りゃん
|
||||
rz らん
|
||||
@@ -465,16 +476,18 @@ si し
|
||||
sj すん
|
||||
sk しん
|
||||
sl そん
|
||||
sm しま
|
||||
sn さん
|
||||
so そ
|
||||
sp そう
|
||||
sq さい
|
||||
sv さい
|
||||
sr する
|
||||
ss せい
|
||||
st した
|
||||
su す
|
||||
sv さい
|
||||
sw せい
|
||||
sx してください
|
||||
sya しゃ
|
||||
syd しぇん
|
||||
sye しぇ
|
||||
@@ -485,8 +498,8 @@ syn しゃん
|
||||
syo しょ
|
||||
syp しょう
|
||||
syq しゃい
|
||||
syv しゃい
|
||||
syu しゅ
|
||||
syv しゃい
|
||||
syw しぇい
|
||||
syz しゃん
|
||||
sz さん
|
||||
@@ -507,10 +520,10 @@ tn たん
|
||||
to と
|
||||
tp とう
|
||||
tq たい
|
||||
tv たい
|
||||
tr たら
|
||||
tt たち
|
||||
tu つ
|
||||
tv たい
|
||||
tw てい
|
||||
tya ちゃ
|
||||
tyd ちぇん
|
||||
@@ -522,8 +535,8 @@ tyn ちゃん
|
||||
tyo ちょ
|
||||
typ ちょう
|
||||
tyq ちゃい
|
||||
tyv ちゃい
|
||||
tyu ちゅ
|
||||
tyv ちゃい
|
||||
tyw ちぇい
|
||||
tyz ちゃん
|
||||
tz たん
|
||||
@@ -540,8 +553,8 @@ vn ヴぁん
|
||||
vo ヴぉ
|
||||
vp ヴぉー
|
||||
vq ヴぁい
|
||||
vv ヴぁい
|
||||
vu ヴ
|
||||
vv ヴぁい
|
||||
vw ヴぇい
|
||||
vz ヴぁん
|
||||
wa わ
|
||||
@@ -549,16 +562,18 @@ wd うぇん
|
||||
we うぇ
|
||||
wf わい
|
||||
wi うぃ
|
||||
wj 私自身
|
||||
wk うぃん
|
||||
wl うぉん
|
||||
wn わん
|
||||
wo を
|
||||
wp うぉー
|
||||
wq わい
|
||||
wv わい
|
||||
wr われ
|
||||
wso うぉ
|
||||
wt わた
|
||||
wv わい
|
||||
ww 私
|
||||
wz わん
|
||||
xa しゃ
|
||||
xd しぇん
|
||||
@@ -570,8 +585,8 @@ xn しゃん
|
||||
xo しょ
|
||||
xp しょう
|
||||
xq しゃい
|
||||
xv しゃい
|
||||
xu しゅ
|
||||
xv しゃい
|
||||
xw しぇい
|
||||
xz しゃん
|
||||
ya や
|
||||
@@ -583,10 +598,10 @@ yn やん
|
||||
yo よ
|
||||
yp よう
|
||||
yq やい
|
||||
yv やい
|
||||
yr よる
|
||||
yt よって
|
||||
yu ゆ
|
||||
yv やい
|
||||
yz やん
|
||||
za ざ
|
||||
zc ざ
|
||||
@@ -602,10 +617,13 @@ zn ざん
|
||||
zo ぞ
|
||||
zp ぞう
|
||||
zq ざい
|
||||
zv ざい
|
||||
zr ざる
|
||||
zu ず
|
||||
zv ざい
|
||||
zv ざい
|
||||
zw ぜい
|
||||
zx ぜい
|
||||
zz ざん
|
||||
{ 『
|
||||
} 』
|
||||
~ ~
|
||||
|
12
dot_config/rclone/encrypted_private_rclone.conf.age
Normal file
12
dot_config/rclone/encrypted_private_rclone.conf.age
Normal file
@@ -0,0 +1,12 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjeGcwVElWTVFtU2VoVlBV
|
||||
YUg5R2U2L0g2NFRjWDhabGptZERFZDRFSzM0CjA5b2lWejBZd1N4azZCS3pGaHJy
|
||||
eStEWDBMcW1ONk1hcjZ4eTg5UDIxd1UKLS0tIFcvSk5GMndkTlRndEJENk5UZkZ6
|
||||
VXdZc0dSbSs5YUcwc0FTbDJlSm42SHMKEx+DpwASAeu6tZYUAtCfi19zS12Scy+x
|
||||
B8m/cRGS2onKbmZoRcOhnRoPRLasPZ3ELot4q+uYazxZSwJJX0ZbvvJ+4FKkLtWs
|
||||
jDoDIyrbSGfJBnHs7aCnAk1SR19JFYU96SBScvOLelXcdDHUDNE9DW8aEiayRPhi
|
||||
MaLT791iSkeQZM2DgWGHsqHAd3CX3SXKJsl7eaQ1hbDdKoSJuNKR4DhYjz2Uaqzr
|
||||
+IEp6GeBYKmOXwBcCPk4o7nWx7rJg7WTciVv23Ex9o6QZj8Wds3TsFTGHMxM87US
|
||||
3d0MQwIKNYoWaWjd+quAieOs+DOaHEPKBrvdFWvLdwrzVcs/ZIKjXXO3LiFfUorj
|
||||
79Lu6/CWZJq5d+UgAikV7r4fFMKR38wMMpauhW96+LtQUlIUDKIHljLml3eP
|
||||
-----END AGE ENCRYPTED FILE-----
|
@@ -57,8 +57,8 @@ adjustment-method=randr
|
||||
; Keep in mind that longitudes west of Greenwich (e.g. the Americas)
|
||||
; are negative numbers.
|
||||
[manual]
|
||||
lat=37.32
|
||||
lon=139.26
|
||||
lat=35.66
|
||||
lon=139.21
|
||||
|
||||
; Configuration of the adjustment-method
|
||||
; type 'redshift -m METHOD:help' to see the settings.
|
||||
|
@@ -40,7 +40,7 @@ success_symbol = "[#](bold green)"
|
||||
error_symbol = "[#](bold red)"
|
||||
{{- else }}
|
||||
success_symbol = "[>](bold green)"
|
||||
error_symbol = "[>](bold red)"
|
||||
error_symbol = "[x](bold red)"
|
||||
vicmd_symbol = "[<](bold green)"
|
||||
{{- end }}
|
||||
|
||||
|
38
dot_config/tealdeer/config.toml
Normal file
38
dot_config/tealdeer/config.toml
Normal file
@@ -0,0 +1,38 @@
|
||||
[style.description]
|
||||
underline = false
|
||||
bold = false
|
||||
italic = false
|
||||
|
||||
[style.command_name]
|
||||
foreground = "cyan"
|
||||
underline = false
|
||||
bold = false
|
||||
italic = false
|
||||
|
||||
[style.example_text]
|
||||
foreground = "green"
|
||||
underline = false
|
||||
bold = false
|
||||
italic = false
|
||||
|
||||
[style.example_code]
|
||||
foreground = "cyan"
|
||||
underline = false
|
||||
bold = false
|
||||
italic = false
|
||||
|
||||
[style.example_variable]
|
||||
foreground = "cyan"
|
||||
underline = true
|
||||
bold = false
|
||||
italic = false
|
||||
|
||||
[display]
|
||||
compact = false
|
||||
use_pager = false
|
||||
|
||||
[updates]
|
||||
auto_update = true
|
||||
auto_update_interval_hours = 240
|
||||
|
||||
[directories]
|
4
dot_config/tmux/bootstraps/dev.sh
Normal file
4
dot_config/tmux/bootstraps/dev.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
# Create new window
|
||||
tmux neww -n dev
|
||||
tmux send-keys -t 0 'cdd' C-m
|
7
dot_config/tmux/bootstraps/nvim.sh
Normal file
7
dot_config/tmux/bootstraps/nvim.sh
Normal file
@@ -0,0 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Create new window
|
||||
tmux neww -n nvim
|
||||
d=$(date +'%Y%m%dT%H%M%S')
|
||||
rnd=$(diceware -n 2 --no-cap -d -)
|
||||
|
||||
tmux send-keys -t 0 "nvim -c startinsert -c 'set ft=markdown' /tmp/${d}-${rnd}" C-m
|
4
dot_config/tmux/bootstraps/remote.sh
Normal file
4
dot_config/tmux/bootstraps/remote.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
# Create new window
|
||||
tmux neww -n remote
|
||||
# tmux send-keys -t 0 'cowsay remote' C-m
|
@@ -1,10 +1,6 @@
|
||||
# 256 color
|
||||
{{- if eq .hosttype "desktop" "laptop" }}
|
||||
set -g default-terminal "screen-256color"
|
||||
{{- else }}
|
||||
set -g default-terminal "tmux-256color"
|
||||
{{- end }}
|
||||
set -ga terminal-overrides ',xterm-256color:RGB'
|
||||
set-option -a terminal-features 'xterm-256color:RGB'
|
||||
|
||||
# increase limit of "scrollback buffer"
|
||||
set -g history-limit 1000000
|
||||
@@ -34,13 +30,29 @@ bind r source-file $XDG_CONFIG_HOME/tmux/tmux.conf \; display-message "Config Re
|
||||
bind C-l split-window -h -c '#{pane_current_path}'
|
||||
bind C-j split-window -v -c '#{pane_current_path}'
|
||||
|
||||
# Switch vertical and horizontal
|
||||
bind C-v run-shell 'tmux break-pane\; last-window\; join-pane -s "!" -v'
|
||||
bind C-h run-shell 'tmux break-pane\; last-window\; join-pane -s "!" -h'
|
||||
|
||||
# Break pane
|
||||
bind ! break-pane
|
||||
|
||||
# Pane layout
|
||||
bind g run-shell 'tmux select-layout even-vertical\; break-pane\; last-window\; join-pane -s "!" -v'
|
||||
bind 1 select-layout even-horizontal
|
||||
bind 2 select-layout even-vertical
|
||||
bind 3 select-layout main-horizontal
|
||||
bind 4 select-layout main-vertical
|
||||
bind 5 select-layout tiled
|
||||
bind 6 select-layout main-horizontal-mirrored
|
||||
bind 7 select-layout main-vertical-mirrored
|
||||
|
||||
# Session control
|
||||
bind C-c new-session
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
bind C-t run "tmuxsh >/dev/null"
|
||||
bind 0 run "tmuxsh wiki >/dev/null"
|
||||
bind 1 run "tmuxsh blog >/dev/null"
|
||||
bind 3 run "tmuxsh tessoku >/dev/null"
|
||||
bind C-y run "tmuxsh remote >/dev/null"
|
||||
bind C-u run "tmuxsh dev >/dev/null"
|
||||
{{- if eq .chezmoi.hostname "arch" }}
|
||||
bind 8 run "tmuxsh music >/dev/null"
|
||||
bind 9 run "tmuxsh util >/dev/null"
|
||||
{{- end }}
|
||||
@@ -134,27 +146,27 @@ bind -T off M-q \
|
||||
|
||||
|
||||
|
||||
#######################
|
||||
# Plugins
|
||||
#######################
|
||||
|
||||
## List of plugins
|
||||
set-environment -g TMUX_PLUGIN_MANAGER_PATH "$XDG_CACHE_HOME/tmux/plugins"
|
||||
|
||||
# Tmux Plugin Manager
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
|
||||
set -g @plugin 'wfxr/tmux-fzf-url'
|
||||
|
||||
set -g @plugin 'fcsonline/tmux-thumbs'
|
||||
set -g @thumbs-contrast 4
|
||||
set -g @thumbs-bg-color 'black'
|
||||
set -g @thumbs-fg-color 'yellow'
|
||||
set -g @thumbs-hint-fg-color 'red'
|
||||
set -g @thumbs-hint-bg-color 'black'
|
||||
set -g @thumbs-position 'right'
|
||||
set -g @thumbs-command 'echo -n {} | xsel -ib'
|
||||
|
||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||
run -b "$XDG_CACHE_HOME/tmux/plugins/tpm/tpm"
|
||||
########################
|
||||
## Plugins
|
||||
########################
|
||||
#
|
||||
### List of plugins
|
||||
#set-environment -g TMUX_PLUGIN_MANAGER_PATH "$XDG_CACHE_HOME/tmux/plugins"
|
||||
#
|
||||
## Tmux Plugin Manager
|
||||
#set -g @plugin 'tmux-plugins/tpm'
|
||||
#
|
||||
#set -g @plugin 'wfxr/tmux-fzf-url'
|
||||
#
|
||||
#set -g @plugin 'fcsonline/tmux-thumbs'
|
||||
#set -g @thumbs-contrast 4
|
||||
#set -g @thumbs-bg-color 'black'
|
||||
#set -g @thumbs-fg-color 'yellow'
|
||||
#set -g @thumbs-hint-fg-color 'red'
|
||||
#set -g @thumbs-hint-bg-color 'black'
|
||||
#set -g @thumbs-position 'right'
|
||||
#set -g @thumbs-command 'echo -n {} | xsel -ib'
|
||||
#
|
||||
## Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||
#run -b "$XDG_CACHE_HOME/tmux/plugins/tpm/tpm"
|
||||
{{- end }}
|
||||
|
@@ -1,5 +0,0 @@
|
||||
-f b
|
||||
--prefer-free-formats
|
||||
-o /mnt/hdd/vids/yt/%(uploader)s/%(title).250s.%(ext)s
|
||||
--downloader 'aria2c'
|
||||
--downloader-args 'aria2c:--console-log-level=warn -x 16 -s 32 -k 1M -U "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36 Edg/96.0.1054.34"'
|
9
dot_config/yt-dlp/config.tmpl
Normal file
9
dot_config/yt-dlp/config.tmpl
Normal file
@@ -0,0 +1,9 @@
|
||||
-f b
|
||||
--prefer-free-formats
|
||||
{{ if eq .chezmoi.hostname "arch" }}
|
||||
-o "/mnt/hdd/vids/yt/%(uploader)s/%(upload_date)s - %(title).200s [%(id)s].%(ext)s"
|
||||
{{ else if eq .chezmoi.hostname "buzz" }}
|
||||
-o "~/vc/vids/yt/%(uploader)s/%(upload_date)s - %(title).200s [%(id)s].%(ext)s"
|
||||
{{ end }}
|
||||
--downloader 'aria2c'
|
||||
--downloader-args 'aria2c:--console-log-level=warn -j 8 -x 8 -s 8 -k 4M -U "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"'
|
@@ -1 +1,6 @@
|
||||
set selection-clipboard clipboard
|
||||
set page-padding 1
|
||||
map j navigate next
|
||||
map k navigate previous
|
||||
map <S-j> scroll down
|
||||
map <S-k> scroll up
|
||||
|
Reference in New Issue
Block a user