feat: emacs/bsd moved

13 files changed, 95 insertions, 221 deletions

diff --git a/assets/content_images/freebsd-setup-fs.png b/assets/content_images/freebsd-setup-fs.png
deleted file mode 100644
index e33a71a..0000000
--- a/assets/content_images/freebsd-setup-fs.png
+++ /dev/null
diff --git a/content-org/.#bsd.org b/content-org/.#bsd.org
new file mode 120000
index 0000000..380ef18
--- /dev/null
+++ b/content-org/.#bsd.org
@@ -0,0 +1 @@
+mms@voyager.7249:1726686014
\ No newline at end of file
diff --git a/content-org/blog.org b/content-org/blog.org
index b1b0283..0e87758 100644
--- a/content-org/blog.org
+++ b/content-org/blog.org
@@ -8,13 +8,25 @@
 #+HUGO_SECTION: blog
 
 
-* 2024  [68/69]                                                       :@blog:
+* 2024  [69/70]                                                       :@blog:
 :PROPERTIES:
 :EXPORT_HUGO_SECTION: blog/2024
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :image_dir "blog/images" :image_max_width 600
 :EXPORT_HUGO_PAIRED_SHORTCODES: image yt
 :END:
 
+** DONE Another two websites moved
+CLOSED: [2024-09-20 Fri 20:05]
+:PROPERTIES:
+:EXPORT_FILE_NAME: emacs-bsd-moved
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Third site moved to my flat
+:END:
+
+Technical update: [[https://emacs.crys.site][Cool Emacs]] is now moved to crys site; [[https://bsd.crys.site][my BSD site]] was also extracted and moved.
+This leaves me with Star Trek and then the blog itself.
+
+I'm becoming an internet mogul.
+
 ** DONE Brain Rots moved
 CLOSED: [2024-09-14 Sat 22:33]
 :PROPERTIES:
diff --git a/content-org/bsd.org b/content-org/bsd.org
index 2fbbaf0..bb54ee8 100644
--- a/content-org/bsd.org
+++ b/content-org/bsd.org
@@ -3,9 +3,9 @@
 #+URL: https://michal.sapka.me/unix-history/
 #+STARTUP: show2levels indent logdone
 
-#+HUGO_BASE_DIR: ~/ghq/vcs.sapka.me/michal-sapka-me/
+#+HUGO_BASE_DIR: ~/sites/site-crys-bsd/
 #+HUGO_WEIGHT: auto
-#+HUGO_SECTION: bsd
+#+HUGO_SECTION:
 
 * DONE BSD
 CLOSED: [2024-03-06 Wed 14:45]
@@ -15,6 +15,11 @@ CLOSED: [2024-03-06 Wed 14:45]
 :EXPORT_HUGO_PAIRED_SHORTCODES: recent-updates menu img-r
 :END:
 
+#+attr_shortcode: "bsd"
+#+begin_menu
+Dune
+#+end_menu
+
 
 * BSDs
 :PROPERTIES:
@@ -33,6 +38,7 @@ CLOSED: [2024-05-01 Wed 21:48]
 :EXPORT_HUGO_MENU_OVERRIDE: :post "but"
 :END:
 
+
 There's multitude of Operating Systems to choose from.
 You may have been using something like Windows or MacOS and be perfectly happy with it.
 You can step up and use Linux, Haiku or even Amiga OS.
@@ -238,6 +244,7 @@ CLOSED: [2024-04-20 Sat 22:13]
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override_end_li true
 :END:
 
+
 Changing GNU/Linux distribution can be done on a whim, as underneath all of that you've got the same basic operating systems.
 With BSDs it's not the same.
 One should try to understand the downsides, as not to waste the next 20 years exploring an OS that simply is not a good fit.
@@ -603,6 +610,7 @@ CLOSED: [2023-12-11 Mon 19:08]
 :EXPORT_HUGO_MENU_OVERRIDE:  :parent "obsdweb" :name "Blocking bad bots using Relayd"
 :END:
 
+
 The bane of existence for most of small pages: web crawlers.
 They create most traffic this site sees and makes my [[https://michal.sapka.me/site/info/#site-stats][site stats]] overly optimistic.
 We can go with [[https://en.wikipedia.org/wiki/Robots_Exclusion_Protocol][robots.txt]], but what if it's not enough?
@@ -671,6 +679,7 @@ CLOSED: [2023-07-19 Mon 19:30]
 One thing that OpenBSD doesn't provide (yet?) is an HTTP proxy.
 I use [[https://plausible.io/][[Plausible]][fn:nope] for basic visitor analytics [fn:privacy] here, and one of the cool things you can do is to break all adblockers via serving Plausible from my own domain[fn:adblock]
 
+
 After two evenings of failed attempts, I reminded myself that I am a programmer, and I wrote one myself.
 You can find it on my [no longer available].
 It was a great learning exercise and  a chance to touch Golang[fn:ruby] for the first time.
@@ -746,7 +755,6 @@ A very common use pattern on FreeBSD desktop is to use Jails to encapsulate depe
 Don't want that pesky Pyton? Straight to Jail.
 Java? Straight to jail!
 
-
 *** Simple jail - Ltex-Ls
 
 I am not a native speaker, so my English skills are far from perfect.
@@ -878,7 +886,7 @@ Our tinfoil friends will be proud of us.
 [this article will be expanded with more examples in the near future]
 ** Thinkpad                                                           :@bsd:
 :PROPERTIES:
-:EXPORT_HUGO_SECTION: bsd/thinkpad
+:EXPORT_HUGO_SECTION: thinkpad
 :EXPORT_HUGO_MENU: :menu bsd-thinkpad
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER: :primary_menu bsd-thinkpad
 :END:
@@ -892,6 +900,7 @@ CLOSED: [2024-04-10 Wed 22:42]
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER: :primary_menu bsd
 :END:
 
+
 This is my personal machine, where I run FreeBSD-release daily.
 
 **** Current status of components:  
@@ -936,6 +945,7 @@ CLOSED: [2023-02-25 Mon 22:30]
 :END:
 My wife got a new computer, so I can easily break my laptop whenever I want - so it's time for FreeBSD!
 
+
 *All this applies to FreeBSD 13.1 at the time of publishing.
 I'll add links to any additions and errata in the future*
 
@@ -1088,6 +1098,7 @@ I want my laptop to switch to wired headphones when I attach them.
 FreeBSD has its own [[https://wiki.freebsd.org/Sound][Sound System]], so it's a great learning experience.
 I have yet to automate it (it is possible, but an attempt to do so forced me to do a complete rollback of the system state), but for now, this is working.
 
+
 First, check which audio outputs your device supports:
 
 #+begin_src shell
@@ -1135,6 +1146,7 @@ CLOSED: [2023-03-16 Mon 23:02]
 :END:
 *This applies to FreeBSD 13.1*
 
+
 Recently I [[/2023/freebsd-on-thinkpad-x1-extreme-g2][posted]] about my problems with FreeBSD.
 One of them was resume.
 After installing FreeBSD, I was able to put my laptop to sleep via
@@ -1177,6 +1189,7 @@ To ensure this, open BIOS and:
 3. Graphics Device
 4. select `Discrete Graphics`
 
+   
 Then, log in as root and install the drivers:
 
 #+begin_src shell
diff --git a/content/blog/2024/emacs-bsd-moved.md b/content/blog/2024/emacs-bsd-moved.md
new file mode 100644
index 0000000..d59fff7
--- /dev/null
+++ b/content/blog/2024/emacs-bsd-moved.md
@@ -0,0 +1,16 @@
++++
+title = "Another two websites moved"
+author = ["Michał Sapka"]
+date = 2024-09-20T20:05:00+02:00
+categories = ["blog"]
+draft = false
+weight = 2001
+image_dir = "blog/images"
+image_max_width = 600
+abstract = "Third site moved to my flat"
++++
+
+Technical update: [Cool Emacs](https://emacs.crys.site) is now moved to crys site; [my BSD site](https://bsd.crys.site) was also extracted and moved.
+This leaves me with Star Trek and then the blog itself.
+
+I'm becoming an internet mogul.
diff --git a/layouts/bsd/baseof.html b/layouts/bsd/baseof.html
new file mode 100644
index 0000000..8bed0a0
--- /dev/null
+++ b/layouts/bsd/baseof.html
@@ -0,0 +1,13 @@
+{{ block "main" . }}
+{{ end }}
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{ .Title }}</title>
+    <link rel="canonical" href="/unix-history/"/>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="refresh" content="0; url=https://bsd.crys.site/{{ replace .RelPermalink "/bsd/" ""}}"/>
+  </head>
+
+</html>
diff --git a/layouts/bsd/list.html b/layouts/bsd/list.html
new file mode 100644
index 0000000..e4e4a83
--- /dev/null
+++ b/layouts/bsd/list.html
@@ -0,0 +1,2 @@
+{{ define "main" }}
+{{ end }}
diff --git a/layouts/bsd/redirect.html b/layouts/bsd/redirect.html
new file mode 100644
index 0000000..599d57b
--- /dev/null
+++ b/layouts/bsd/redirect.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{ .Title }}</title>
+    <link rel="canonical" href="/unix-history/"/>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="refresh" content="0; url=/unix-history/#{{ .Page.Params.link }}"/>
+  </head>
+</html>
diff --git a/layouts/bsd/single.html b/layouts/bsd/single.html
new file mode 100644
index 0000000..e4e4a83
--- /dev/null
+++ b/layouts/bsd/single.html
@@ -0,0 +1,2 @@
+{{ define "main" }}
+{{ end }}
diff --git a/layouts/cool-emacs/baseof.html b/layouts/cool-emacs/baseof.html
index f9c60e4..944354d 100644
--- a/layouts/cool-emacs/baseof.html
+++ b/layouts/cool-emacs/baseof.html
@@ -1,156 +1,13 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta charset="utf-8">
-    <title> {{ .Page.Title }} | Cool Emacs </title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-      
-    {{- $header_rect := resources.Get "cool-emacs/header-rect.png" }}
-    {{- $header_rect_180 := $header_rect.Resize "180x webp q90"}}
-    <link rel="apple-touch-icon" sizes="180x180" href="{{ $header_rect_180.Permalink }}">
-      
-    {{- $header_rect_32 := $header_rect.Resize "32x webp q90"}}
-    <link rel="icon" type="image/png" sizes="32x32" href="{{ $header_rect_32.Permalink }}">
-    
-    {{- $header_rect_16 := $header_rect.Resize "16x webp q90"}}
-    <link rel="icon" type="image/png" sizes="16x16" href="{{ $header_rect_16.Permalink }}">
-    
-    <meta name="description" content="{{ .Params.Abstract | default .Site.Params.DefaultDescription}}">
-    
-    <meta property="og:title" content="{{ .Page.Title }}">
-    <meta property="og:type" content="website">
-    <meta property="og:url" content="{{ .Permalink }}">
-    <meta property="og:image" content="{{ $header_rect.Permalink }}">
-    <meta property="og:description" content="{{ .Params.Abstract | default .Site.Params.DefaultDescription}}">
-    
-    <link rel="canonical" href="{{ .Permalink }}">
-    <link rel='alternate' type='application/rss+xml' title="Feed with all changes" href='/index.xml'>
-    <link rel='alternate' type='application/rss+xml' title="Feed with Cool Emacs changes" href='/cool-emacs/index.xml'>
-    <meta name="robots" content="index, follow">
-    <link rel="me" href="https://emacs.ch/@mms">
-    
-    <link rel="webmention" href="https://webmention.io/d-s.sh/webmention">
-    <link rel="pingback" href="https://webmention.io/d-s.sh/xmlrpc">
-
-  {{- $bg := resources.Get "cool-emacs/bg.gif" -}}
-  <style>
-    :root {
-        --bg-color: #F5F5F5;
-        --text-color: #000;
-        --heading-color: #9b0000;
-        --heading-shadow: 14px 7px 16px rgba(166, 168, 191, 1);
-    }
-    body {
-        font-family: serif;
-        background-color: #B2BEB5;
-        font-size: 1em;
-        background-image: url({{ $bg.Permalink }});
-        background-repeat: repeat-y;
-        background-size: 30px;
-        background-color: var(--bg-color);
-        color: var(--text-color);
-    }
-
-    .site {
-        width: 800px;
-        max-width: 80%;
-        margin-top: 0;
-        margin-bottom: 0;
-        padding: 20px;
-        margin-left: 50px;
-    }
-    @media only screen and (max-width: 600px) {
-        .site {
-            margin-left: 10px;
-        }
-    }
-
-    article figure {
-        text-align: center;
-        margin: 0;
-        max-width: 100%;
-        font-size: 0.8em;
-    }
-    
-    img {
-        max-width: 60%;
-        height: auto;
-    }
-
-    figure img {
-        border-width: 5px;
-        border-style: solid;
-        border-color: var(--heading-color);
-    }
-    
-    
-    p, ul {
-        line-height: 1.4em;
-        text-align: justify;
-    }
-    p, ul, .highlight, pre code {
-        margin-left: 40px;
-    }
-    @media only screen and (max-width: 600px) {
-        p, ul, .highlight, pre code {
-            margin-left: 20px;
-        }
-    }
-    .highlight {
-        display: block;
-        max-width: 90%;
-        overflow-x: scroll;
-        width: 750px;
-    }
-    pre {
-        padding: 10px;
-    }
-    h1 {
-        padding-bottom: 50px;
-        text-shadow: var(--heading-shadow);
-    }
-    h2, h3 {
-        text-shadow: var(--heading-shadow);
-        font-family: monospace;
-        color: var(--heading-color);
-    }
-    .no-border img {
-        border: 0;
-    }
-    .right {
-        float: right;
-        max-width: 40%;
-    }
+{{ block "main" . }}
+{{ end }}
 
-  </style>
-  
-
-</head>
-<body>
-  <div class="site">
-    <header>
-      {{ block "head" . }}
-      {{ end }}  
-
-  </header>
-    <article>
-      <h1>{{ .Title }}</h1>
-
-      {{ block "main" . }}
-      {{ end }}
-    </article>
-
-    <footer>
-      <hr>
-      Website created and operated by <a href="https://michal.sapka.me">Michał</a>
-      <div style="padding: 15px; text-align: center;">
-        {{ partial "buttons/valid_html" . }}
-        {{ partial "button-31" (dict "file" "rss.gif" "alt" "RSS Feed" "href" "https://michal.sapka.me/cool-emacs/index.xml") }}
-        {{ partial "buttons/emacs" . }}
-        {{ partial "buttons/openbsd" . }}
-      </div>
-    </footer>
-  </div>
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{ .Title }}</title>
+    <link rel="canonical" href="/unix-history/"/>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="refresh" content="0; url=https://emacs.crys.site/{{ replace .RelPermalink "/cool-emacs/" ""}}"/>
+  </head>
+
+</html>
diff --git a/layouts/cool-emacs/list.html b/layouts/cool-emacs/list.html
index 6295d15..e4e4a83 100644
--- a/layouts/cool-emacs/list.html
+++ b/layouts/cool-emacs/list.html
@@ -1,33 +1,2 @@
-{{ define "head"}}
-<a href="/">Back</a>
-<hr>
-{{end}}
-
-
-
 {{ define "main" }}
-
-{{if .Page.Content}}
-  {{ .Page.Content }}
-  {{- if .Params.primary_menu  }}
-    {{ partial "single/bottom_nav.html" (dict "menuID" .Page.Params.primary_menu "page" .) }}
-  {{- end }}
-
-  {{ partial "single/dates.html" . }}
-{{ else }}
-
-  {{ if in .Page.Params.Categories "blog" }}
-      {{ partial "partials/blog_index.html" . }}
-  {{ else if in .Page.Params.Categories "article" }}
-      {{ partial "partials/article_index.html" . }}
-  {{ else }}
-
-    <h2>Articles</h2>
-    {{ range .Data.Pages }}
-      {{ partial "partials/article_list_item.html" . }}
-    {{ end }}
-
-  {{ end }}
-{{end}}
-
 {{ end }}
diff --git a/layouts/cool-emacs/redirect.html b/layouts/cool-emacs/redirect.html
new file mode 100644
index 0000000..599d57b
--- /dev/null
+++ b/layouts/cool-emacs/redirect.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{ .Title }}</title>
+    <link rel="canonical" href="/unix-history/"/>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="refresh" content="0; url=/unix-history/#{{ .Page.Params.link }}"/>
+  </head>
+</html>
diff --git a/layouts/cool-emacs/single.html b/layouts/cool-emacs/single.html
index 855124b..e4e4a83 100644
--- a/layouts/cool-emacs/single.html
+++ b/layouts/cool-emacs/single.html
@@ -1,31 +1,2 @@
-{{ define "head"  }}
-<a href="/cool-emacs">
-{{- $header_rect := resources.Get "unix-history/header-top.png" }}
-{{- $header_rect_180 := $header_rect.Resize "50x webp q90"}}
-<!-- <img -->
-<!--   style=" -->
-<!--          height: 1.5em; -->
-<!--          width: auto; -->
-<!--          margin-right: 0.5em; -->
-<!--          " -->
-<!--   src="{{ $header_rect_180.Permalink }}" -->
-<!--   ></a> -->
-
-<b><i>Cool Emacs</i></b></a>
-<hr>
-
-{{ end }}
-  
 {{ define "main" }}
-
-<article>
-  {{ .Page.Content }}
-</article>
-
-{{- if .Params.primary_menu  }}
-  {{ partial "single/bottom_nav.html" (dict "menuID" .Page.Params.primary_menu "page" .) }}
-{{- end }}
-
-{{ partial "single/dates.html" . }}
-
-{{- end }}
+{{ end }}