From ff3ddd258e437da0de546040910684f2bcf08952 Mon Sep 17 00:00:00 2001 From: dongdigua Date: Sun, 20 Nov 2022 15:10:14 +0800 Subject: [PATCH 1/4] new post: new blog architecture --- 404.html | 5 +++++ index.html | 4 +--- js/random-quote.js | 5 +++-- org/cheatsheet.org | 5 +---- org/ideas.org | 1 + org/internet_collections.org | 2 ++ org/new_blog_arch.org | 24 ++++++++++++++++++++++++ posts.md | 2 ++ 8 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 org/new_blog_arch.org diff --git a/404.html b/404.html index 963d1f9..622c8da 100644 --- a/404.html +++ b/404.html @@ -1,4 +1,9 @@ 404 +
404.png
diff --git a/index.html b/index.html index 931f939..45d1109 100644 --- a/index.html +++ b/index.html @@ -35,7 +35,7 @@ (payment "Monero") (pgp "0x56CEE157C9F5334F") (paid-service ; pay in monero - '(("data recovery" . 0.5) + '(("data recovery" . 0.5) ("kernel configure" . 0.1))) (interests '("computer science" "cyber security" @@ -44,8 +44,6 @@ "anime" (Lost (In (Suspicious (Parentheses)))))))) -
- random-quote:
""
diff --git a/js/random-quote.js b/js/random-quote.js index 2eaad3b..5f7ec22 100644 --- a/js/random-quote.js +++ b/js/random-quote.js @@ -12,9 +12,10 @@ var data = [ "李无用地瓜碱水, 硒钫铕𬭶鿔合金", "There will be an answer: Let It Be", "Take a deep breath", + "怂: 从心", "The internet is FULL, go away!", - "May the --force be with you", + "May the --force be with you", "Software that sucks less", "whoami: No system is safe", "DROP it at lttstore.com", @@ -30,7 +31,7 @@ var data = [ "衬衫的价格是9磅15便士", "李彦宏: 我想中国人可以更加开放，对隐私问题没有那么敏感。\n如果他们愿意用隐私交换便捷性，很多情况下他们是愿意的。", "AT&T field", - "I � Unicode", + "I □ Unicode", ]; var index = Math.floor((Math.random() * data.length)); diff --git a/org/cheatsheet.org b/org/cheatsheet.org index beefd0b..591df26 100644 --- a/org/cheatsheet.org +++ b/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 diff --git a/org/ideas.org b/org/ideas.org index d782015..d018718 100644 --- a/org/ideas.org +++ b/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 diff --git a/org/internet_collections.org b/org/internet_collections.org index dfe5cec..11d78f1 100644 --- a/org/internet_collections.org +++ b/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]] diff --git a/org/new_blog_arch.org b/org/new_blog_arch.org new file mode 100644 index 0000000..1f6953c --- /dev/null +++ b/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!* diff --git a/posts.md b/posts.md index b9092c5..423d45f 100644 --- a/posts.md +++ b/posts.md @@ -1,5 +1,7 @@ ## Table of Contents ### Posts (sorted by time) +- [New Blog Repo Architecture](new_blog_arch)
+please contct me if you have a better idea - [记一次帮老师修U盘](recover_udisk)
- [Clear Kernel Compile Error? Fix It](clear_kernel_compile_fix)
- [Gentoo LLVM\_TARGETS not Working?](gentoo_llvm_targets)
From 50f75fb3da1abb38eb99696cbde3dffcce482b12 Mon Sep 17 00:00:00 2001 From: dongdigua Date: Fri, 2 Dec 2022 13:47:08 +0800 Subject: [PATCH 2/4] misc update after two week at school --- gopher_collections.gmi.txt | 1 + index.html | 16 ++++++++------- js/random-quote.js | 3 ++- posts.md | 42 +++++++++++++++++++------------------- re.gmi.txt | 1 + 5 files changed, 34 insertions(+), 29 deletions(-) create mode 120000 gopher_collections.gmi.txt create mode 120000 re.gmi.txt diff --git a/gopher_collections.gmi.txt b/gopher_collections.gmi.txt new file mode 120000 index 0000000..599a1b0 --- /dev/null +++ b/gopher_collections.gmi.txt @@ -0,0 +1 @@ +gmi/gopher_collections.gmi \ No newline at end of file diff --git a/index.html b/index.html index 45d1109..9786690 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,9 @@ .home{position:absolute;width:100%;text-align:center} .home pre{max-width:80ch;padding:0 1rem;margin-left:auto;margin-right:auto;line-height:1.5em;overflow:auto;display:inline-block;text-align:left} pre{font-family:dejavu sans mono,monospace;margin:1rem} - #quote{color:#66ccff;font-style:italic} + #quote{color:#66ccff;font-style:italic;text-align:center} + #comment{color:grey;font-style:italic} + body,#normal{color:#dcdccc}