Merge branch 'master' of git.hornquist.se:git/wiki-public

13 files changed, 215 insertions, 2 deletions

diff --git a/.vimwiki_tags b/.vimwiki_tags
index 802b021..ffd6d70 100644
--- a/.vimwiki_tags
+++ b/.vimwiki_tags
@@ -1,3 +1,5 @@
 !_TAG_FILE_SORTED	1	
+PSU	Dator/4.wiki	2;"	vimwiki:Dator/4\tDator/4#Pinout
+PSU	Dator/5.wiki	2;"	vimwiki:Dator/5\tDator/5#Pinout
 shs+	Lysator.wiki	57;"	vimwiki:Lysator\tLysator#shs+
 y+y	Lysator.wiki	77;"	vimwiki:Lysator\tLysator#y+y
diff --git a/Bookmarks.wiki b/Bookmarks.wiki
new file mode 100644
index 0000000..5d72041
--- /dev/null
+++ b/Bookmarks.wiki
@@ -0,0 +1,33 @@
+= Bookmarks =
+
+== Feature list ==
+- work offline
+- full CLI interface
+- full HTTP/HTML interface
+- accessible from mobile
+  - [share] button
+- Data
+  - Link
+  - Title
+  - Abstract
+  - Notes
+  - [possibly]
+    - Tags
+    - Images
+    - Path?
+  - Remote TOC
+- Built in RSS reader?
+
+http://ogp.me/
+
+Possible data format:
+
+{{{lisp
+(entry
+    (name "Wolfenstein Fast Ray Tracing")
+    (url "http://blog.hornquist.se/hugo/?filename=20190615Wolenometry.md")
+    (page-title "Wolfenometry")
+    (site-name "HugoNikanors blogg")
+    (abstract "As is well known Wolfenstein 3D is a 2D game, which uses simple raycasting to figure out the distance from the player to the wall's in front of her. As a small hobby project I set out to recreate this. Since my levels (like the original) are bound to a strict grid we don't actually have to do a \"real\" ray-caster. But can instead just calculate the distance to next tile-border the ray will pass through, and immediately jump there.")
+    )
+}}}
diff --git a/Dator.wiki b/Dator.wiki
new file mode 100644
index 0000000..5c53b93
--- /dev/null
+++ b/Dator.wiki
@@ -0,0 +1,23 @@
+= Dator =
+
+== Ny ==
+
+[[Dator/Ny]]
+
+
+
+== Invetarie ==
+
+Inventarie över mina datorkomponenter.  Nummer bör aldrig återanvändas
+Vidare kommentarer läggs i fil `Dator/##.wiki` (`##` är löpnummret).
+
+1. GPU MSI
+2. GPU Wallenberg
+3. GPU Radeon HD 6870
+  - Hugo 2012
+4. [[Dator/4|PSU Fujitsu]]
+5. [[Dator/5|PSU Corsair]]
+6. Disk 500GB
+7. Disk 3TB
+8. Disk 1TB Wallenberg
+9. Disk 2TB Stupan
diff --git a/Dator/4.wiki b/Dator/4.wiki
new file mode 100644
index 0000000..4f4ce26
--- /dev/null
+++ b/Dator/4.wiki
@@ -0,0 +1,13 @@
+= Pinout =
+:PSU:
+
+Från i7-datorn i LiU:s kattakomber
+
+| 12 gul | 0 sv        |
+| 12 gul | 0 sv        |
+| 12 gul | 0 sv        |
+| 0 sv   | 12 gul      |
+| 0 sv   | 12 gul      |
+| 0 sv   | 12 gul      |
+| 0? grå | grön        |
+| -      | 12 gul/brun |
diff --git a/Dator/5.wiki b/Dator/5.wiki
new file mode 100644
index 0000000..7824fd0
--- /dev/null
+++ b/Dator/5.wiki
@@ -0,0 +1,19 @@
+= Pinout =
+:PSU:
+
+800W, köpt ca. 2015
+
+== "Stora kontakten" ==
+| 3.4 orange | 3.4 orange |
+| 11.5 blå   | 3.4 orange |
+| 0 svart    | 3.4 svart  |
+| grön       | 5.1 röd    |
+| 0 svart    | 0 svart    |
+| 0 svart    | 5.1 röd    |
+| 0 svart    | 0 svart    |
+| -          | 5.1 grå    |
+| 5.1 röd    | 5.1 lila   |
+| 5.1 röd    | 12.1 gul   |
+|------------|------------|
+| 5.1 röd    | 12.1 gul   |
+| 0 svart    | 3.4 orange |
diff --git a/Dator/Ny.wiki b/Dator/Ny.wiki
new file mode 100644
index 0000000..3ec6644
--- /dev/null
+++ b/Dator/Ny.wiki
@@ -0,0 +1,17 @@
+= Dator =
+
+| Moderkort | MSI B450 Tomahawk     | 1200 | https://www.prisjakt.nu/produkt.php?p=4894211     |
+| RAM       | God. T. DDR4 2x8GB    | _800 |                                                   |
+| CPU       | Ryzen 5 3600          | 2400 | https://www.prisjakt.nu/produkt.php?p=5139853 [1] |
+| GPU       | Radeon RX Vego 56 8GB | 3100 | https://www.prisjakt.nu/produkt.php?p=4639778     |
+|           |                       |      |                                                   |
+| Totalt    |                       | 7500 |                                                   |
+[1]: https://www.prisjakt.nu/kategori.php?k=s409738967&catId=500 
+
+== Moderkort ==
+
+1500 https://www.prisjakt.nu/produkt.php?p=4759611
+1200 https://www.prisjakt.nu/produkt.php?p=4894211
+https://www.prisjakt.nu/jamfor/produkter/4759611,4894211?categoryId=1320
+
+MSI B450-A PRO Moderkort - AMD B450 - AMD AM4 socket - DDR4 RAM - ATX
diff --git a/Kläder.wiki b/Kläder.wiki
new file mode 100644
index 0000000..4534c2f
--- /dev/null
+++ b/Kläder.wiki
@@ -0,0 +1,17 @@
+= Contents =
+  - [[#Kläder, klädstorlekar, m.m.|Kläder, klädstorlekar, m.m.]]
+    - [[#Kläder, klädstorlekar, m.m.#Dressmann "Slim Fit" measurements|Dressmann "Slim Fit" measurements]]
+
+= Kläder, klädstorlekar, m.m. =
+
+== Dressmann "Slim Fit" measurements ==
+
+| size | collar | Chest | Waist width | Back length | Sleeve length |
+|------|--------|-------|-------------|-------------|---------------|
+| XS   | 35/36  | 92    | 84          | 73          | 87            |
+| S    | 37/38  | 100   | 92          | 76          | 88            |
+| M    | 39/40  | 108   | 100         | 79          | 90            |
+| L    | 41/42  | 116   | 108         | 82          | 92            |
+| XL   | 43/44  | 126   | 118         | 85          | 94            |
+| XXL  | 45/46  | 134   | 126         | 88          | 95            |
+| 3XL  | 47/48  | 142   | 134         | 88          | 96            |
diff --git a/LiuformulaStudent.wiki b/LiuformulaStudent.wiki
new file mode 100644
index 0000000..d9eb135
--- /dev/null
+++ b/LiuformulaStudent.wiki
@@ -0,0 +1,3 @@
+joomla för frontend
+
+https://liuformulastudent.se/administrator
diff --git a/Lysator/WWW.wiki b/Lysator/WWW.wiki
index e8c5866..15ba92f 100644
--- a/Lysator/WWW.wiki
+++ b/Lysator/WWW.wiki
@@ -22,6 +22,9 @@ Roxen
 llvm direkt på disken
 xfs eller ext4 på det
 
+1429
+2711
+3822
 
 https://wiki.archlinux.org/index.php/LVM
 {{{sh
diff --git a/Media.wiki b/Media.wiki
index 5d53964..0eda7da 100644
--- a/Media.wiki
+++ b/Media.wiki
@@ -4,3 +4,4 @@ Teolog
 
 == Books ==
 - Player Piano
+- https://pragprog.com/book/tpp20/the-pragmatic-programmer-20th-anniversary-edition
diff --git a/Terminal Driver.wiki b/Terminal Driver.wiki
index ec7f2ed..a928543 100644
--- a/Terminal Driver.wiki
+++ b/Terminal Driver.wiki
@@ -77,6 +77,8 @@ Med skärmen till höger om headern.
 https://www.raspberrypi.org/documentation/hardware/raspberrypi/mechanical/rpi_MECH_3bplus.pdf
 
 
-`linux/arch/arm/boot/dts/bcm2837-rpi-3-b.dts`
+- `linux/arch/arm/boot/dts/bcm2837-rpi-3-b.dts`
+- `/usr/lib/modules/$(uname -r)/kernel`
+- '/usr/src/rpi-kernel-headers-$(uname -r)'
 
 compatible field
diff --git a/Västgöta/webbsida.wiki b/Västgöta/webbsida.wiki
index 1b33785..fb7a872 100644
--- a/Västgöta/webbsida.wiki
+++ b/Västgöta/webbsida.wiki
@@ -6,6 +6,7 @@
       - [[#Webbsida#Design#Förbättringar|Förbättringar]]
     - [[#Webbsida#Karta|Karta]]
     - [[#Webbsida#Ansvariga för Stupan|Ansvariga för Stupan]]
+      - [[#Webbsida#Ansvariga för Stupan#ICal|ICal]]
       - [[#Webbsida#Ansvariga för Stupan#Kommentar från /etc/vastgota/ansvariga|Kommentar från /etc/vastgota/ansvariga]]
       - [[#Webbsida#Ansvariga för Stupan#Text till webbsida|Text till webbsida]]
       - [[#Webbsida#Ansvariga för Stupan#Kodlistning|Kodlistning]]
@@ -15,6 +16,14 @@
     - [[#Kalender#Booking Calendar|Booking Calendar]]
 
 = Server =
+
+http://vastgota.nation.liu.se
+
+Det här är den officiella dokumentationen över hur Västgöta Nation i
+Linköpings webbsida fungerar.
+
+Sidor hostas av Lysator mailto:root@lysator.liu.se
+
 - Ubuntu 18.04 LTS.
 - Wordpress genom pakethanteraren, dock med vissa ombyggningar.
 - Nginx för HTTP
@@ -164,6 +173,12 @@ mistorik ska visas. Om inget argument ges visas full historik. På
 ättestupans webbsida visas historik fyra veckor bakåt, samt så länkas
 det till en sida med full historik.
 
+=== ICal ===
+Det finns också ett python-script (listat nedan) vilket läser igenom
+filen och dumpar ut det till en icalendar blob. Tyvärr kör den inte
+för nuvarande för att servern inte hade något bra sätt att integrera
+godtyckliga script.
+
 === Kommentar från /etc/vastgota/ansvariga ===
 {{{sh
 # The following is a list of people responsible for Ättestupan.
@@ -226,6 +241,60 @@ add_shortcode( 'ansvariga', function ($atts) {
 } );
 }}}
 
+{{{python
+#!/usr/bin/env python3
+
+# Simple program for generating a vcalendar of people responssible for
+# Ättestupan. Runs as a CGI script.
+# TODO Currently doesn't check that a line doesn't contain more that
+# 75 octets.
+
+vcal_fmt = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Västgöta Nation/2.0/
+{}
+END:VCALENDAR"""
+
+vevent_fmt = """BEGIN:VEVENT
+UID:vg_ansvarig_{date}@vastgota.nation.liu.se
+DTSTART:{date}T190000
+DTEND:{date}T220000
+SUMMARY:Stupan: {ansvarig} ans.
+END:VEVENT
+"""
+
+# Should DTSTAMP be added, should signal when the event was created,
+# which I can probably just set to the generation time (running time
+# of this script)k
+
+def get_vcalendar(ansvarig_file):
+    """
+    Returns a string containing a vcalendar of all people
+    responsible.
+    """
+    str = ""
+    with open(ansvarig_file, "r") as f:
+        for line in f:
+            line = line.replace("\n", "")
+            if not line: continue
+            if line[0] == "#": continue
+
+            date, ansvarig = line.split(" ", 1)
+            str += vevent_fmt.format(date=date.replace("-", ""), ansvarig=ansvarig)
+
+    return vcal_fmt.format(str).replace("\n", "\r\n")
+
+def get_header():
+    return """HTTP/1.1
+Connection: Close
+Content-type: text/calendar
+"""
+
+if __name__ == "__main__":
+    print(get_header())
+    print(get_vcalendar("/etc/vastgota/ansvariga"))
+}}}
+
 ---------------
 
 All kod på den här sidan är manuellt inklippt. Skillnader från det som
diff --git a/index.wiki b/index.wiki
index f132112..5b53d63 100644
--- a/index.wiki
+++ b/index.wiki
@@ -12,6 +12,8 @@
 - [[TeliaNet]]
 - [[TempSMS]] (burner)
 - [[Mimetypes]]
+- [[Dator]]
+- [[Dator/Ny]]
 - [[Dator/Hornquist]]
 - [[Dator/Hjalmar]]
 - [[luacrypto]]
@@ -36,6 +38,9 @@
 - [[Spel]]
 - [[Gamejam]]
 - [[LiTHeKod]]
+- [[LiuformulaStudent]]
+- [[Bookmarks]]
+- [[Kläder]]
 
     * [[diary/diary|Dagbok]]
 
@@ -43,9 +48,15 @@
 - [ ] http://tim.stoakes.net/remind/
 - [ ] Triwing -- 360/(Y) x50
 - [ ] Intel 5100 WiFi E2:5B:A8:1A:A8:2A iwlwifi wlp12s0
-- [ ] [[https://stumpwm.github.io|StumpWM]]
+- [X] [[https://stumpwm.github.io|StumpWM]]
+- [X] [[https://github.com/kori/Xlambda|Xlabmbda]]
+- [ ] https://bbs.archlinux.org/viewtopic.php?id=171655
 
 = Generated Tags =
+== PSU ==
+  - [[Dator/4#Pinout]]
+  - [[Dator/5#Pinout]]
+
 == shs+ ==
   - [[Lysator#shs+]]