calcite: remove unused packages

modules/home-manager/alacritty.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:
 with lib;
 
 let
@@ -25,7 +25,14 @@ in
           resize_increments = true;
           dynamic_padding = true;
         };
+        import = [
+          "${config.xdg.configHome}/alacritty/catppuccin-macchiato.yml"  
+        ];
       };
     };
+    xdg.configFile."alacritty/catppuccin-macchiato.yml".source = builtins.fetchurl {
+      url = "https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-macchiato.yml";
+      sha256 = "sha256-+m8FyPStdh1A1xMVBOkHpfcaFPcyVL99tIxHuDZ2zXI=";
+    };
   };
 }

modules/home-manager/fish.nix

@@ -10,7 +10,7 @@ in
     enable = mkEnableOption "fish";
     plugins = mkOption {
       type = types.listOf types.str;
-      default = [ "pisces" "done" "hydro" ];
+      default = [ "pisces" "done" "hydro" "grc" ];
     };
     functions = {
       enable = mkOption {
@@ -26,26 +26,27 @@ in
     };
   };
 
-  config = {
-    programs.fish = mkIf cfg.enable {
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.grc ];
+    programs.fish = {
       enable = true;
-      plugins = with pkgs; filter (
+      plugins = with pkgs; (filter (
         e: hasAttr e.name (builtins.listToAttrs # { "xxx" = true; }
            (map (p: { name = p; value = true; }) cfg.plugins) # { name = "xxx"; value = true; }
       )) [
-        {
-          name = "pisces";
+        { name = "pisces";
           src = fishPlugins.pisces.src;
         }
-        {
-          name = "done";
+        { name = "done";
           src = fishPlugins.done.src;
         }
-        {
-          name = "hydro";
+        { name = "hydro";
           src = fishPlugins.hydro.src;
         }
-      ];
+        { name = "grc";
+          src = fishPlugins.grc.src;
+        }
+      ]);
       interactiveShellInit = let
         extraInit = if cfg.functions.enable then ''
           ${pkgs.nix-your-shell}/bin/nix-your-shell fish | source
@@ -61,7 +62,6 @@ in
           end
         '' else "";
       in ''
-        fish_config theme choose 'ayu Dark'
         fish_config prompt choose arrow
       '' + extraInit;
       functions = mkIf cfg.functions.enable {

modules/home-manager/vscode.nix

@@ -25,7 +25,6 @@ in
         ms-vscode-remote.remote-ssh
         vscodevim.vim
         github.vscode-pull-request-github
-        eamodio.gitlens
         gruntfuggly.todo-tree # todo highlight
 
         # Language support
@@ -35,6 +34,7 @@ in
         davidanson.vscode-markdownlint
         # C/C++
         ms-vscode.cmake-tools
+        twxs.cmake
         llvm-vs-code-extensions.vscode-clangd
         # Nix
         jnoortheen.nix-ide
@@ -43,6 +43,7 @@ in
         # Vue
         vue.volar
         # Scale / chisel
+        scala-lang.scala
         scalameta.metals
 
         sterben.fpga-support
@@ -50,6 +51,7 @@ in
         ms-vscode-remote.remote-ssh-edit
         mushan.vscode-paste-image
       ]) ++ (with pkgs.vscode-extensions; [
+        waderyan.gitblame
         catppuccin.catppuccin-vsc
         # Rust
         rust-lang.rust-analyzer
@@ -140,6 +142,7 @@ in
           "editor.wordWrapColumn" = 80;
           "editor.unicodeHighlight.ambiguousCharacters" = false;
         };
+        "cmake.configureOnEdit" = false;
       };
     };
   };