From 63b23a01ad02ed9aa2e8a853149ce6a1fe2621f2 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Tue, 30 Jan 2024 08:13:08 +0100
Subject: fix(treewide): Fully remove grades

---
 flake.lock                               | 30 ------------------------------
 flake.nix                                | 11 -----------
 flake/default.nix                        |  2 --
 hm/default.nix                           |  2 --
 hm/soispha/conf/yambar/config/config.yml | 12 ++++++------
 hm/soispha/conf/yambar/config/laptop.yml | 12 ++++++------
 hm/soispha/conf/yambar/default.nix       | 17 ++++++++---------
 7 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9b5c81ec..303a1589 100644
--- a/flake.lock
+++ b/flake.lock
@@ -244,35 +244,6 @@
         "type": "github"
       }
     },
-    "grades": {
-      "inputs": {
-        "crane": [
-          "crane"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "rust-overlay"
-        ]
-      },
-      "locked": {
-        "lastModified": 1688237666,
-        "narHash": "sha256-2q7oy/MtoAFCyd1JlYp3X1WY6kf3CI/mtOzQE+33GcY=",
-        "ref": "refs/heads/prime",
-        "rev": "e41b20a28b1a9977a02b7817330fb1bb9615dda5",
-        "revCount": 50,
-        "type": "git",
-        "url": "https://codeberg.org/soispha/grades.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/soispha/grades.git"
-      }
-    },
     "haumea": {
       "inputs": {
         "nixpkgs": [
@@ -691,7 +662,6 @@
         "flake_version_update": "flake_version_update",
         "generate_firefox_extensions": "generate_firefox_extensions",
         "gitignore": "gitignore",
-        "grades": "grades",
         "haumea": "haumea",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
diff --git a/flake.nix b/flake.nix
index c91a5333..ba1b8e3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,15 +160,6 @@
     };
 
     # my bins
-    grades = {
-      url = "git+https://codeberg.org/soispha/grades.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        crane.follows = "crane";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
-      };
-    };
     lf_rename = {
       url = "git+https://codeberg.org/soispha/lf-rename.git";
       inputs = {
@@ -282,7 +273,6 @@
     river_init_lesser,
     yambar_memory,
     yambar_cpu,
-    grades,
     ...
   }: let
     sysLib = shell_library.lib.${system};
@@ -327,7 +317,6 @@
         river_init_lesser
         yambar_memory
         yambar_cpu
-        grades
         ;
     };
   in
diff --git a/flake/default.nix b/flake/default.nix
index e05b0021..00d11f89 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -27,7 +27,6 @@
   river_init_lesser,
   yambar_memory,
   yambar_cpu,
-  grades,
 }: let
   home_manager_config = import ../hm {
     inherit
@@ -44,7 +43,6 @@
       lf_rename
       strip_js_comments
       river_init_lesser
-      grades
       shell_library
       # external deps
       
diff --git a/hm/default.nix b/hm/default.nix
index 3017f8f2..debff0f5 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -10,7 +10,6 @@
   lf_rename,
   strip_js_comments,
   river_init_lesser,
-  grades,
   shell_library,
   # external deps
   user_js,
@@ -37,7 +36,6 @@
         lf_rename
         strip_js_comments
         river_init_lesser
-        grades
         shell_library
         # external deps
         
diff --git a/hm/soispha/conf/yambar/config/config.yml b/hm/soispha/conf/yambar/config/config.yml
index 0237014e..3d9f0687 100644
--- a/hm/soispha/conf/yambar/config/config.yml
+++ b/hm/soispha/conf/yambar/config/config.yml
@@ -168,12 +168,12 @@ bar:
               ~muted:
                 string: {text: "  {volume}% ", deco: *combutil}
 
-    - script:   # Grade average
-        path: @grade_average_script@
-        content:
-          string:
-            text: "   {grade} "
-            deco: *combmem
+    # - script:   # Grade average
+    #     path: @grade_average_script@
+    #     content:
+    #       string:
+    #         text: "   {grade} "
+    #         deco: *combmem
 
     #- backlight:
     #   name: intel_backlight
diff --git a/hm/soispha/conf/yambar/config/laptop.yml b/hm/soispha/conf/yambar/config/laptop.yml
index 720786ed..8de2f508 100644
--- a/hm/soispha/conf/yambar/config/laptop.yml
+++ b/hm/soispha/conf/yambar/config/laptop.yml
@@ -168,12 +168,12 @@ bar:
               ~muted:
                 string: {text: "  {volume}% ", deco: *combutil}
 
-    - script:   # Grade average
-        path: @grade_average_script@
-        content:
-          string:
-            text: "   {grade} "
-            deco: *combmem
+    # - script:   # Grade average
+    #     path: @grade_average_script@
+    #     content:
+    #       string:
+    #         text: "   {grade} "
+    #         deco: *combmem
 
     - backlight:
        name: @backlight@
diff --git a/hm/soispha/conf/yambar/default.nix b/hm/soispha/conf/yambar/default.nix
index 67a77d8f..abc0c85e 100644
--- a/hm/soispha/conf/yambar/default.nix
+++ b/hm/soispha/conf/yambar/default.nix
@@ -3,7 +3,6 @@
   sysLib,
   system,
   pkgs,
-  grades,
   yambar_cpu,
   yambar_memory,
   ...
@@ -41,14 +40,14 @@ in {
       file = ./scripts/sound-volume;
     };
 
-    grade_average_script = makeScript {
-      dependencies =
-        [
-          grades.outputs.packages.${system}.default
-        ]
-        ++ (builtins.attrValues {inherit (pkgs) coreutils gawk;});
-      file = ./scripts/grades-average;
-    };
+    # grade_average_script = makeScript {
+    #   dependencies =
+    #     [
+    #       grades.outputs.packages.${system}.default
+    #     ]
+    #     ++ (builtins.attrValues {inherit (pkgs) coreutils gawk;});
+    #   file = ./scripts/grades-average;
+    # };
 
     cpu_script = yambar_cpu.app.${system}.default.program;
 
-- 
cgit 1.4.1