diff --git a/flake.nix b/flake.nix
index dde124d..8b8d481 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,7 @@
       kcc = unstable.callPackage ./pkgs/kcc {};
       organize = unstable.callPackage ./pkgs/organize {inherit simplematch ExifRead;};
       obsidian-nvim = pkgs.callPackage ./pkgs/obsidian-nvim {};
+      cgvg-rs = pkgs.callPackage ./pkgs/rgvg {};
       nix = unstable.nix;
     };
 
@@ -67,8 +68,6 @@
       };
       extraSpecialArgs = {
         inherit my-dotfiles home-module unstable;
-        # nixpkgs = nixos-unstable;
-        cgvg = self.packages.${system}.cgvg;
       };
     in {
       # Include programs that need X or wayland
@@ -109,6 +108,7 @@
       organize = self.packages.${system}.organize;
       nixFlakes = self.packages.${system}.nix;
       obsidian-nvim = self.packages.${system}.obsidian-nvim;
+      cgvg-rs = self.packages.${system}.cgvg-rs;
     };
 
     nixosModules.overlay = {pkgs, ...}: {
diff --git a/homes/graphical.nix b/homes/graphical.nix
index 364dc37..050c332 100644
--- a/homes/graphical.nix
+++ b/homes/graphical.nix
@@ -97,7 +97,7 @@
       obsidian
 
       # loaded from this flake default overlay
-      pkgs.cgvg
+      pkgs.cgvg-rs
 
       # # Using this for the moment ... https://github.com/NixOS/nixpkgs/issues/273611
       # (lib.throwIf (lib.versionOlder "1.4.16" pkgs.obsidian.version) "Obsidian no longer requires EOL Electron" (
diff --git a/pkgs/rgvg/default.nix b/pkgs/rgvg/default.nix
new file mode 100644
index 0000000..c42d212
--- /dev/null
+++ b/pkgs/rgvg/default.nix
@@ -0,0 +1,29 @@
+{
+  pkgs,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "cgvg.rs";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "adfaure";
+    repo = "${pname}";
+    rev = "refs/heads/main";
+    sha256 = "sha256-8rQkUGtRJ2EvAcR1KxttTjmf2UMQTpfhhyt7LHT5tRA=";
+  };
+
+  cargoSha256 = "sha256-Y5HREuHh6Q99kWK2cgzL+2q8dJEIe2HSC++F1+lFx6I=";
+
+  meta = with pkgs.lib; {
+    description = "Commandline tools for searching and browsing sourcecode";
+    longDescription = ''
+    '';
+    homepage = "http://uzix.org/cgvg.html";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    broken = false;
+  };
+}