andreijiroh-dev/dotfiles
1
1
Fork 0
mirror of https://mau.dev/andreijiroh-dev/dotfiles.git synced 2025-05-15 18:13:08 +00:00
Code Issues Releases Packages Activity Actions

chore(global): fix some merge conflicts while syncing from nest

Browse source 
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
This commit is contained in:
Andrei Jiroh Halili 2024-10-08 13:33:59 +00:00
parent 5c84218091
commit f0e3f5c93b
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.config/caddyfiles/hackclub.app.Caddyfile
View file

@ -26,3 +26,24 @@ http://matrix.andreijiroh.dev {
bind unix/.matrix.andreijiroh.dev.webserver.sock|777 bind unix/.matrix.andreijiroh.dev.webserver.sock|777
} }
http://blog.andreijiroh.dev {
bind unix/.blog.andreijiroh.dev.webserver.sock|777
reverse_proxy localhost:33291 {
header_up X-Forwarded-Proto https
}
}
http://notepad.recaptime.dev {
bind unix/.notepad.recaptime.dev.webserver.sock|777
reverse_proxy localhost:34171 {
header_up X-Forwarded-Proto https
}
}
http://blog.recaptime.dev {
bind unix/.blog.recaptime.dev.webserver.sock|777
reverse_proxy localhost:37023 {
header_up X-Forwarded-Proto https
}
}

10
.config/htop/htoprc
View file

@ -19,8 +19,6 @@ highlight_changes_delay_secs=5
find_comm_in_cmdline=1 find_comm_in_cmdline=1
strip_exe_from_cmdline=1 strip_exe_from_cmdline=1
show_merged_command=1 show_merged_command=1
tree_view=1
tree_view_always_by_pid=0
header_margin=1 header_margin=1
screen_tabs=0 screen_tabs=0
detailed_cpu_time=1 detailed_cpu_time=1
@ -40,17 +38,17 @@ column_meters_0=AllCPUs Memory Swap DiskIO NetworkIO
column_meter_modes_0=1 1 1 1 1 column_meter_modes_0=1 1 1 1 1
column_meters_1=Hostname Tasks LoadAverage Uptime DateTime column_meters_1=Hostname Tasks LoadAverage Uptime DateTime
column_meter_modes_1=2 2 2 2 2 column_meter_modes_1=2 2 2 2 2
tree_view=1 tree_view=0
sort_key=46 sort_key=47
tree_sort_key=47 tree_sort_key=47
sort_direction=-1 sort_direction=-1
tree_sort_direction=-1 tree_sort_direction=-1
tree_view_always_by_pid=0 tree_view_always_by_pid=0
all_branches_collapsed=0 all_branches_collapsed=0
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
.sort_key=PERCENT_CPU .sort_key=PERCENT_MEM
.tree_sort_key=PERCENT_MEM .tree_sort_key=PERCENT_MEM
.tree_view=1 .tree_view=0
.tree_view_always_by_pid=0 .tree_view_always_by_pid=0
.sort_direction=-1 .sort_direction=-1
.tree_sort_direction=-1 .tree_sort_direction=-1

4
.gitconfig
View file

@ -69,11 +69,13 @@
signoff-commit = commit --signoff signoff-commit = commit --signoff
signoff = signoff-commit signoff = signoff-commit
remotes = remote -v remotes = remote -v
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[core] [core]
# editor = flatpak run re.sonny.Commit # editor = flatpak run re.sonny.Commit
@ -94,6 +96,8 @@
path = ~/.config/git/recaptime-dev.include.gitconfig path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:/var/git/recaptime-dev/"] [includeIf "gitdir/i:/var/git/recaptime-dev/"]
path = ~/.config/git/recaptime-dev.include.gitconfig path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:~/git/recaptime-dev/"]
path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:/workspaces/lorebooks.wiki/"] [includeIf "gitdir/i:/workspaces/lorebooks.wiki/"]
path = ~/.config/git/recaptime-dev.include.gitconfig path = ~/.config/git/recaptime-dev.include.gitconfig
[includeIf "gitdir/i:/workspaces/lorebooks-wiki/"] [includeIf "gitdir/i:/workspaces/lorebooks-wiki/"]