feat(colours): increase contrast on owickstrom

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/87edbd74246ccdfa64503f334ed86fa04010bab9' (2023-04-12)
  → 'github:NixOS/nixpkgs/fda0d99c2cbbb5c89d8855d258cb0821bd9113ad' (2023-04-14)
• Updated input 'nur':
    'github:nix-community/NUR/8a35714f0be00235e2a1c8b759e6dc3888763d8b' (2023-04-14)
  → 'github:nix-community/NUR/c9e3bd49580c525989f6ce9803e1c5875ab8548a' (2023-04-15)

configs/stardict.nix

@@ -161,11 +161,11 @@
     turkish = {
       BabylonTurkishEnglish = pkgs.fetchzip {
         url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
-        sha256 = "17rv46r95nkikg7aszqmfrbgdhz9ny52w423m8n01g3p93shdb4i";
+        sha256 = "1zpzgk3w0536gww31bj58cmn3imnkndyjwbcr7bay8ibq2kzv44z";
       };
       BabylonEnglishTurkish = pkgs.fetchzip {
         url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
-        sha256 = "063dl02s8ii8snsxgma8wi49xwr6afk6ysq0v986fygx5511353f";
+        sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
       };
     };
   };

flake.lock

@@ -363,11 +363,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1681269223,
-        "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=",
+        "lastModified": 1681482634,
+        "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9",
+        "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
         "type": "github"
       },
       "original": {
@@ -458,11 +458,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1681454031,
-        "narHash": "sha256-JOamj7vKkFRp5mJ7FKt5dPfCmWj33sZLnBGDt15c/sc=",
+        "lastModified": 1681601319,
+        "narHash": "sha256-R/UmDcWLxks3WjA95MA2oPLgqnVN2TZHF+C5s4VaEpo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8a35714f0be00235e2a1c8b759e6dc3888763d8b",
+        "rev": "c9e3bd49580c525989f6ce9803e1c5875ab8548a",
         "type": "github"
       },
       "original": {

lib/colours/owickstrom-dark.nix

@@ -1,37 +1,37 @@
-rec {
+rec { # all dark colours are 20% darker than the bright ones
   black = {
-    bright = "#282c34";
-    dark = "#282c34";
+    bright = "#4c5363"; # "#282c34";
+    dark = "#20232a";
   };
   red = {
-    bright = "#e06c75";
-    dark = "#e06c75";
+    bright = "#e68990"; #"#e06c75";
+    dark = "#d43541";
   };
   green = {
-    bright = "#98c379";
-    dark = "#98c379";
+    bright = "#acce93"; #"#98c379";
+    dark = "#77af4e";
   };
   yellow = {
-    bright = "#e5c07b";
-    dark = "#e5c07b";
+    bright = "#eacc95"; #"#e5c07b";
+    dark = "#d9a440";
   };
   blue = {
-    bright = "#61afef";
-    dark = "#61afef";
+    bright = "#80bff2"; #"#61afef";
+    dark = "#2490e9";
   };
   magenta = {
-    bright = "#c678dd";
-    dark = "#c678dd";
+    bright = "#d193e3"; #"#c678dd";
+    dark = "#af42cf";
   };
   cyan = {
-    bright = "#56b6c2";
-    dark = "#56b6c2";
+    bright = "#77c4ce"; #"#56b6c2";
+    dark = "#3b99a5";
   };
   white = {
-    bright = "#dcdfe4";
-    dark = "#dcdfe4";
+    bright = "#e3e5e9"; #"#dcdfe4";
+    dark = "#a9b1bd";
   };
-  background = black.dark;
-  foreground = white.bright;
+  background = "#282c34"; #black.dark;
+  foreground = "#dcdfe4"; #white.bright;
   cursor = "#a3b3cc";
 }

lib/colours/owickstrom-light.nix

@@ -29,9 +29,9 @@ rec {
   };
   white = {
     bright = "#8c00ec";
-    dark = "#efefef";
+    dark = "#bfbfbf";
   };
-  background = white.dark;
+  background = "#efefef";
   foreground = "#181818";
-  cursor = "#bbbbbb";
+  cursor = "#a3b3cc";
 }

packages/itl.nix

@@ -1,23 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, lib }:
-stdenv.mkDerivation rec {
-  pname = "itl";
-  version = "0.8.0";
-  src = fetchFromGitHub {
-    owner = "arabeyes-org";
-    repo = "ITL";
-    rev = "v${version}";
-    sha256 = "sha256-GTicTbZmFbPhzInFob3cfvtTxOpUZuqsQz1w9CoWu9w=";
-  };
-  nativeBuildInputs = [cmake];
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-  ];
-  meta = {
-    homepage = "https://www.arabeyes.org/ITL";
-    description = "Islamic Tools and Libraries";
-    license = lib.licenses.lgpl2;
-    platforms = lib.platforms.all;
-    maintainer = [lib.maintainers.kmein];
-  };
-}

packages/itools.nix

@@ -1,21 +0,0 @@
-{ stdenv, fetchFromGitHub, itl, lib, autoreconfHook }:
-stdenv.mkDerivation rec {
-  pname = "itools";
-  version = "1.0";
-  src = fetchFromGitHub {
-    owner = "arabeyes-org";
-    repo = "itools";
-    rev = version;
-    sha256 = "sha256-g9bsjupC4Sb5ywAgUNbjYLbHZ/i994lbNSnX2JyaP3g=";
-  };
-  preAutoreconf = "autoupdate";
-  nativeBuildInputs = [autoreconfHook];
-  buildInputs = [itl];
-  meta = {
-    homepage = "https://www.arabeyes.org/ITL";
-    description = "The itools package is a set of user friendly applications utilizing Arabeyes' ITL library. ";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.all;
-    maintainer = [lib.maintainers.kmein];
-  };
-}

systems/zaatar/moodle-dl-meinhark.nix

@@ -95,6 +95,11 @@ in {
         # WS 2022
         115414 # Nonnos
         116108 # Dialektologie
+
+        # SS 2023
+        117967 # Archaische Lyrik
+        119658 # Dyskolos
+        118963 # Antike Biographie
       ];
       download_submissions = true;
       download_descriptions = true;