From 2a69182c569b190ae0d95244707db4d1209de6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Fri, 9 Jun 2023 22:15:56 +0200
Subject: [PATCH] Revert "maintainers: add rasmus-kirk as a maintainer" (#4076)

* Revert "maintainers: add rasmus-kirk as a maintainer"

This reverts commit 301b3648927c050b224daa90cb4a99e4329456f2.

* Revert "joshuto: add the joshuto file manager"

This reverts commit e7fdcb40b2ddb79ed0b166e9694b361581c3dddb.
---
 modules/lib/maintainers.nix  |  6 ---
 modules/misc/news.nix        |  7 ---
 modules/modules.nix          |  1 -
 modules/programs/joshuto.nix | 88 ------------------------------------
 4 files changed, 102 deletions(-)
 delete mode 100644 modules/programs/joshuto.nix

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 978d2b30b..2ad490f11 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -329,12 +329,6 @@
     github = "sebtm";
     githubId = 17243347;
   };
-  rasmus-kirk = {
-    name = "Rasmus Kirk";
-    email = "mail@rasmuskirk.com";
-    github = "rasmus-kirk";
-    githubId = 57323869;
-  };
   rosuavio = {
     name = "Rosario Pulella";
     email = "RosarioPulella@gmail.com";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index af5684448..3c665eb77 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1062,13 +1062,6 @@ in
           A new module is available: 'programs.imv'.
         '';
       }
-
-      {
-        time = "2023-06-09T19:18:42+00:00";
-        message = ''
-          A new module is available: 'programs.joshuto'.
-        '';
-      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 7350863ad..0ee8ee54f 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -104,7 +104,6 @@ let
     ./programs/java.nix
     ./programs/jq.nix
     ./programs/jujutsu.nix
-    ./programs/joshuto.nix
     ./programs/just.nix
     ./programs/k9s.nix
     ./programs/kakoune.nix
diff --git a/modules/programs/joshuto.nix b/modules/programs/joshuto.nix
deleted file mode 100644
index 3fb4df906..000000000
--- a/modules/programs/joshuto.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.joshuto;
-  tomlFormat = pkgs.formats.toml { };
-in {
-  meta.maintainers = [ maintainers.rasmus-kirk ];
-
-  options.programs.joshuto = {
-    enable = mkEnableOption "joshuto file manager";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.joshuto;
-      defaultText = literalExpression "pkgs.joshuto";
-      description = "The package to use for joshuto.";
-    };
-
-    settings = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      description = ''
-        Configuration written to
-        <filename>$XDG_CONFIG_HOME/joshuto/joshuto.toml</filename>.
-        </para><para>
-        See <link xlink:href="https://github.com/kamiyaa/joshuto/blob/main/docs/configuration/joshuto.toml.md" />
-        for the full list of options.
-      '';
-    };
-
-    keymap = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      description = ''
-        Configuration written to
-        <filename>$XDG_CONFIG_HOME/joshuto/keymap.toml</filename>.
-        </para><para>
-        See <link xlink:href="https://github.com/kamiyaa/joshuto/blob/main/docs/configuration/keymap.toml.md" />
-        for the full list of options. Note that this option will overwrite any existing keybinds.
-      '';
-    };
-
-    mimetype = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      description = ''
-        Configuration written to
-        <filename>$XDG_CONFIG_HOME/joshuto/mimetype.toml</filename>.
-        </para><para>
-        See <link xlink:href="https://github.com/kamiyaa/joshuto/blob/main/docs/configuration/mimetype.toml.md" />
-        for the full list of options
-      '';
-    };
-
-    theme = mkOption {
-      type = tomlFormat.type;
-      default = { };
-      description = ''
-        Configuration written to
-        <filename>$XDG_CONFIG_HOME/joshuto/theme.toml</filename>.
-        </para><para>
-        See <link xlink:href="https://github.com/kamiyaa/joshuto/blob/main/docs/configuration/theme.toml.md" />
-        for the full list of options
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-
-    xdg.configFile = {
-      "joshuto/joshuto.toml" = mkIf (cfg.settings != { }) {
-        source = tomlFormat.generate "joshuto-settings" cfg.settings;
-      };
-      "joshuto/keymap.toml" = mkIf (cfg.keymap != { }) {
-        source = tomlFormat.generate "joshuto-keymap" cfg.keymap;
-      };
-      "joshuto/mimetype.toml" = mkIf (cfg.mimetype != { }) {
-        source = tomlFormat.generate "joshuto-mimetype" cfg.mimetype;
-      };
-      "joshuto/theme.toml" = mkIf (cfg.theme != { }) {
-        source = tomlFormat.generate "joshuto-theme" cfg.theme;
-      };
-    };
-  };
-}