Personal dotfiles for Linux, mostly for Nixpkgs/NixOS-based and Termux setups. Mirrored using GitLab's push mirroring feature. gitlab.com/andreijiroh-dev/dotfiles
linux dotfiles

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

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>

+29 -6
+21
.config/caddyfiles/hackclub.app.Caddyfile
··· 26 26 bind unix/.matrix.andreijiroh.dev.webserver.sock|777 27 27 28 28 } 29 + 30 + http://blog.andreijiroh.dev { 31 + bind unix/.blog.andreijiroh.dev.webserver.sock|777 32 + reverse_proxy localhost:33291 { 33 + header_up X-Forwarded-Proto https 34 + } 35 + } 36 + 37 + http://notepad.recaptime.dev { 38 + bind unix/.notepad.recaptime.dev.webserver.sock|777 39 + reverse_proxy localhost:34171 { 40 + header_up X-Forwarded-Proto https 41 + } 42 + } 43 + 44 + http://blog.recaptime.dev { 45 + bind unix/.blog.recaptime.dev.webserver.sock|777 46 + reverse_proxy localhost:37023 { 47 + header_up X-Forwarded-Proto https 48 + } 49 + }
+4 -6
.config/htop/htoprc
··· 19 19 find_comm_in_cmdline=1 20 20 strip_exe_from_cmdline=1 21 21 show_merged_command=1 22 - tree_view=1 23 - tree_view_always_by_pid=0 24 22 header_margin=1 25 23 screen_tabs=0 26 24 detailed_cpu_time=1 ··· 40 38 column_meter_modes_0=1 1 1 1 1 41 39 column_meters_1=Hostname Tasks LoadAverage Uptime DateTime 42 40 column_meter_modes_1=2 2 2 2 2 43 - tree_view=1 44 - sort_key=46 41 + tree_view=0 42 + sort_key=47 45 43 tree_sort_key=47 46 44 sort_direction=-1 47 45 tree_sort_direction=-1 48 46 tree_view_always_by_pid=0 49 47 all_branches_collapsed=0 50 48 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command 51 - .sort_key=PERCENT_CPU 49 + .sort_key=PERCENT_MEM 52 50 .tree_sort_key=PERCENT_MEM 53 - .tree_view=1 51 + .tree_view=0 54 52 .tree_view_always_by_pid=0 55 53 .sort_direction=-1 56 54 .tree_sort_direction=-1
+4
.gitconfig
··· 69 69 signoff-commit = commit --signoff 70 70 signoff = signoff-commit 71 71 remotes = remote -v 72 + 72 73 [filter "lfs"] 73 74 clean = git-lfs clean -- %f 74 75 smudge = git-lfs smudge -- %f 75 76 process = git-lfs filter-process 76 77 required = true 78 + 77 79 [core] 78 80 # editor = flatpak run re.sonny.Commit 79 81 ··· 93 95 [includeIf "gitdir/i:/workspaces/recaptime-dev/"] 94 96 path = ~/.config/git/recaptime-dev.include.gitconfig 95 97 [includeIf "gitdir/i:/var/git/recaptime-dev/"] 98 + path = ~/.config/git/recaptime-dev.include.gitconfig 99 + [includeIf "gitdir/i:~/git/recaptime-dev/"] 96 100 path = ~/.config/git/recaptime-dev.include.gitconfig 97 101 [includeIf "gitdir/i:/workspaces/lorebooks.wiki/"] 98 102 path = ~/.config/git/recaptime-dev.include.gitconfig