hm/git/default.nix

@@ -5,7 +5,6 @@ in
 {
   config = lib.mkIf cfg.enable {
     home.packages = [
-      (pkgs.callPackage ./jjui.nix {})
       (pkgs.writeShellApplication {
         name = "git-sync";
         text = (lib.strings.concatLines

hm/git/jjui.nix

@@ -1,21 +0,0 @@
-{ buildGoModule, fetchFromGitHub }:
-buildGoModule {
-  pname = "jjui";
-  version = "2024-11-28";
-
-  src = fetchFromGitHub {
-    owner = "GeoffreyFrogeye";
-    repo = "jjui";
-    rev = "push-sszqvsmvqxmy"; # base16 colors
-    sha256 = "sha256-jNi5Ek3Qy/MojlQXBNlqREy7UxnyMaJuUtKPysWBoNU=";
-  };
-
-  vendorHash = "sha256-kg5b3tzwyAhn00GwdUDf4OdYZvCJZHgkgpzHFWy5SxI=";
-
-  postInstall = ''
-    mv $out/bin/cmd $out/bin/jjui
-  '';
-
-  doCheck = false; # Some tests are not working
-
-}

hm/scripts/jlab

@@ -209,15 +209,17 @@ elif sys.argv[1] in ("merge", "mr"):
         to_glab()
     elif sys.argv[2] == "checkout":
         # Bypass the original checkout command so it doesn't run git commands.
-        mr = glab_get_mr(sys.argv[3])
-        jj.run("git", "fetch")
-        jj.run("new", mr.source_branch)
         # If there's no commit on the branch, add one with the MR title
         # so jj has a current bookmark.
+        mr = glab_get_mr(sys.argv[3])
+        jj.run("git", "fetch")
         if len(jj.log(f"{mr.source_branch} | {mr.target_branch}")) == 1:
             title = re.sub(r"^(WIP|Draft): ", "", mr.title)
+            jj.run("new", mr.source_branch)
             jj.run("describe", "-m", title)
             jj.run("bookmark", "move", mr.source_branch)
+        else:
+            jj.run("edit", mr.source_branch)
     elif sys.argv[2] in (
         # If no MR number/branch is given, insert the current bookmark,
         # as the current branch concept doesn't exist in jj

options.nix

@@ -12,7 +12,6 @@ in
       description = "top-level flake";
       type = lib.types.attrs;
     };
-    cuda = lib.mkEnableOption "Use CUDA for some libraries";
     extra = lib.mkEnableOption "Big software";
     gaming = lib.mkEnableOption "Games";
     polarity = lib.mkOption {

os/cuda/default.nix

@@ -1,31 +0,0 @@
-# Need nvidia proprietary drivers to work
-{ pkgs, nixpkgs, config, lib, ... }:
-{
-  config = lib.mkIf config.frogeye.cuda {
-    nix.settings = {
-      substituters = [
-        "https://cuda-maintainers.cachix.org"
-      ];
-      trusted-public-keys = [
-        "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
-      ];
-    };
-    nixpkgs.overlays = [
-      (self: super:
-        let
-          pkgs_uf = import nixpkgs {
-            inherit (super) system;
-            config.allowUnfree = true;
-          };
-        in
-        {
-          ctranslate2 = (pkgs_uf.ctranslate2.override {
-            withCUDA = true;
-            withCuDNN = true;
-            stdenv = pkgs.gcc12Stdenv; # 24.11 Remove, as nvcc and gcc versions align again
-            # Takes more than 16 GiB RAM to compile with the above, but fine if not
-          });
-        })
-    ];
-  };
-}

os/default.nix

@@ -6,7 +6,6 @@
     ./battery.nix
     ./boot
     ./ccc
-    ./cuda
     ./common.nix
     ./desktop
     ./dev