my first merge, .gitattributes

.gitattributes

@@ -2,3 +2,6 @@
 *.md linguist-detectable=true
 *.org linguist-vendored=false
 *.org linguist-detectable=true
+
+.gitignore merge=ours
+.gitattributes merge=ours

404.html

@@ -1,4 +1,9 @@
 <title>404</title>
+<style>
+ body {
+     background-color: #f1f1f1;
+ }
+</style>
 <center>
 <img src="./images/404.png" alt="404.png"> 
 </center>

gopher_collections.gmi.txt

@@ -1 +0,0 @@
-gmi/gopher_collections.gmi

index.html

@@ -35,7 +35,7 @@
       (payment "<a href=https://dongdigua.github.io/xmr>Monero</a>")
       (pgp "<a href=https://dongdigua.github.io/pgpkey.txt>0x56CEE157C9F5334F</a>")
       (paid-service <font color="grey">; pay in monero</font>
-       '(("<a href="https://dongdigua.github.io/recover_udisk#ad">data recovery"</a> . 0.5)
+       '((">data recovery" . 0.5)
          ("kernel configure" . 0.1)))
       (interests
        '("computer science" "cyber security"
@@ -44,8 +44,6 @@
          "anime"
          (Lost (In (Suspicious (Parentheses))))))))
     </pre>
-    <br>
-    random-quote:
     <center>"<span id="quote"></span>"</center>
   </div>
 </body>

js/random-quote.js

@@ -12,9 +12,10 @@ var data = [
     "李无用地瓜碱水, 硒钫铕𬭶鿔合金",
     "There will be an answer: Let It Be",
     "<a id=quote href=https://calm.com>Take a deep breath</a>",
+    "怂: 从心",
 
     "The internet is FULL, go away!",
-    "<a id=quote href=https://git-scm.com/book>May the --force be with you</a>",
+    "<a id=quote href=new_blog_arch>May the --force be with you</a>",
     "<a id=quote href=https://suckless.org>Software that sucks less</a>",
     "whoami: No system is safe",
     "DROP it at <a id=quote href=https://lttstore.com>lttstore.com</a>",
@@ -26,11 +27,11 @@ var data = [
     "消除恐惧的最好办法就是面对恐惧,\n坚持, 才是胜利, 加油, 奥利给!",
     "Presenting to the emergency room, unconcious",
     "Never Gonna Give You Up",
-    "treat C compiler like your girlfriend",
+    "<treat C compiler like your girlfriend",
     "衬衫的价格是9磅15便士",
     "李彦宏: 我想中国人可以更加开放，对隐私问题没有那么敏感。\n如果他们愿意用隐私交换便捷性，很多情况下他们是愿意的。",
     "<a id=quote href=https://wiki.evageeks.org/A.T._Field>AT&T field</a>",
-    "I <EFBFBD> Unicode",
+    "I □ Unicode",
 ];
 
 var index = Math.floor((Math.random() * data.length));

org/cheatsheet.org

@@ -33,7 +33,6 @@
 |-----+--------------+------------------------|
 | C-v | 矩形区域选择 | S-i 插入, esc 批量执行 |
 
-
 ** file/split
 | key         | usage        |
 |-------------+--------------|
@@ -42,8 +41,6 @@
 | C-w h/j/k/l | 切换分屏窗口 |
 | ZZ          | :wq          |
 
-
-
 * EMACS
 ** org
 | key         | usage                         |
@@ -86,7 +83,7 @@ Git 能离线使用只是个传说, 你仍然需要联网搜索该用哪个命
 #+BEGIN_SRC shell
 git log --stat | perl -ne 'END { print $c } $c += $1 if /(\d+) insertions/;'
 git log --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s\n", add, subs, loc }'
-git log --color --graph --decorate -M --pretty=oneline --abbrev-commit -M
+git log --graph --color --decorate --abbrev-commit
 #+END_SRC
 
 * Fish

org/ideas.org

@@ -18,3 +18,4 @@ just a [[https://support.microsoft.com/en-us/windows/windows-7-support-ended-on-
 用于点踩和查看IP属地
 * 用 eww 实现苹果的 "灵动岛"?
 呵呵, 在B站看到这样的基本就是壁纸软件的广告
+* Nethack x Minecraft

org/internet_collections.org

@@ -250,11 +250,13 @@ plan9
 0:06 nonono all the opensource are controlled by coporation actually,
      they create a text editor plugin and sell the free code for $10 a month
 *** [[https://youtu.be/BAo5C2qbLq8][Computerphile: Network Time Protocol (NTP)]]
+*** [[https://www.youtube.com/playlist?list=PLknodeJt-I5H_zK-udgi5XhhYrnDoLHkP][Gavin Freeborn: Commandline tools and tips]]
 
 ** Cyber Security
 *** [[https://youtu.be/x_R1DeZxGc0][Discover Vulnerabilities in Intel CPUs!]]
 *** [[https://youtu.be/2--1ph-4IaY][shit express hacked]]
 *** [[https://www.youtube.com/playlist?list=PL5--8gKSku15NSeLgrZX9hSEnqPTWoSJ0][DT: Privacy & Security]]
+*** [[https://youtu.be/UeAKTjx_eKA][Student Finds Hidden Devices in the College Library]]
 *** [[https://youtu.be/QxNsyrftJ8I][Chris Titus Tech: The Biggest Linux Security Mistakes]]
 "Security is a journey, not a destination!"
 *** [[https://youtu.be/S4E4yAktjug?t=998][How To Become Invisible Online # level 3]]

org/new_blog_arch.org

@@ -0,0 +1,24 @@
+#+TITLE: New Blog Architecture
+#+DESCRIPTION: It's time
+#+DATE: <2022-11-20 Sun>
+
+I've never fully learnt git before(only search for garbage when meeted with problem), so I recently read [[https://git-scm.com/book][ProGit]].
+And I have some good ideas on my repo architecture: I should make use of branch, obviously.
+
+* Idea is:
+seperate the source file(org) and the generated files(html, feed.xml)
+so I can
+** clearly look at the diff
+** delete the generated files if I want
+because those static files are really unecessary and takes much space
+
+* So what
+** use =filter-branch= to remove the huge =feed.xml= in the full history
+** ignore the generated files in the source repo
+** merge the source repo into site repo when I think it's ok
+** and I will use the same stratagy on my YW sub-website if there's no problem
+
+* Need Advice
+I'm really new to do this.
+If you have a better idea, or this is somehow useful to you,
+*contact me, please!*

posts.md

@@ -1,5 +1,7 @@
 ## Table of Contents
 ### Posts (sorted by time)
+- [New Blog Repo Architecture](new_blog_arch)<br>
+please contct me if you have a better idea
 - [记一次帮老师修U盘](recover_udisk)<br>
 - [Clear Kernel Compile Error? Fix It](clear_kernel_compile_fix)<br>
 - [Gentoo LLVM\_TARGETS not Working?](gentoo_llvm_targets)<br>

re.gmi.txt

@@ -1 +0,0 @@
-gmi/re.gmi