From 8d7535c9acd27be2aab9fd51db47db484d5cbcb0 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Wed, 31 Jul 2024 21:19:18 +0800
Subject: [PATCH] treewide: cleanup

---
 .helix/languages.toml              |  3 --
 home/default.nix                   |  5 ---
 nixos/modules/default.nix          |  1 -
 nixos/modules/services/rathole.nix | 50 ------------------------------
 treefmt.nix                        | 14 ---------
 5 files changed, 73 deletions(-)
 delete mode 100644 .helix/languages.toml
 delete mode 100644 nixos/modules/services/rathole.nix

diff --git a/.helix/languages.toml b/.helix/languages.toml
deleted file mode 100644
index e3987f3..0000000
--- a/.helix/languages.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[language]]
-name = "nix"
-formatter = { command = "alejandra", args = ["--quiet"] }
diff --git a/home/default.nix b/home/default.nix
index 5f88ba4..e1ed1fb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -56,11 +56,6 @@
       trashy
     ]);
 
-  home.shellAliases = {
-    ".." = "cd ..";
-    "farsee" = "curl -F 'c=@-' 'https://fars.ee/'"; # pb
-  };
-
   programs.fish.functions = let
     jq = lib.getExe pkgs.jq;
     nix = lib.getExe pkgs.nix;
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index b72fd19..65fbc61 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -2,6 +2,5 @@
   imports = [
     ./services/hysteria.nix
     ./services/pixivfe.nix
-    ./services/rathole.nix
   ];
 }
diff --git a/nixos/modules/services/rathole.nix b/nixos/modules/services/rathole.nix
deleted file mode 100644
index f922cb4..0000000
--- a/nixos/modules/services/rathole.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.services.rathole;
-in {
-  options.services.rathole = {
-    enable = lib.mkEnableOption "Rathole, a lightweight and high-performance reverse proxy for NAT traversal";
-
-    package = lib.mkPackageOption pkgs "rathole" {};
-
-    configFile = lib.mkOption {
-      default = null;
-      type = lib.types.nullOr lib.types.path;
-      description = "Configuration file to use.";
-    };
-
-    credentials = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [];
-      example = lib.literalExpression ''
-        [
-          "cert:/tmp/certificate.crt"
-          "key:/tmp/private-key.key"
-        ];
-      '';
-      description = ''
-        Extra credentials loaded by systemd, you can access them by `/run/credentials/rathole.service/foobar`.
-
-        See `systemd.exec(5)` for more information.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.rathole = {
-      description = "Rathole daemon, a lightweight and high-performance reverse proxy for NAT traversal.";
-      wantedBy = ["multi-user.target"];
-      after = ["network-online.target"];
-      wants = ["network-online.target"];
-      serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} $\{CREDENTIALS_DIRECTORY}/rathole.toml";
-        LoadCredential = ["rathole.toml:${cfg.configFile}"] ++ cfg.credentials;
-        DynamicUser = true;
-      };
-    };
-  };
-}
diff --git a/treefmt.nix b/treefmt.nix
index cd7b6f4..8e64a8a 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -6,20 +6,6 @@
   programs.statix.enable = true;
   programs.alejandra.enable = true;
 
-  ### shell
-  programs.shfmt.enable = true;
-  settings.formatter.shfmt.options = ["-i" "2" "-sr"];
-  programs.shellcheck.enable = true;
-  settings.formatter.shellcheck.options = [
-    "-s"
-    "bash"
-    "-e"
-    "SC2016" # shfmt kept doing it, didn't find a toggle to turn it off
-  ];
-
-  ### toml
-  programs.taplo.enable = true;
-
   ### misc
   programs.prettier.enable = true;
   settings.formatter.prettier.excludes = [