hosts/randolph/home.nix

@@ -47,7 +47,6 @@ in {
       archivo = callPackage ../../pkgs/archivo/archivo.nix { };
       highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
       olympus = callPackage ../../pkgs/olympus/olympus.nix { };
-      kakmerge = callPackage ../../pkgs/kakmerge/kakmerge.nix { };
     in [ gcc tree-sitter ] ++ # Basic dev tools
     [ marksman nil ] ++ # Language servers except those installed through package sections
     [ texliveFull texlab ] ++ # LaTeX
@@ -76,7 +75,7 @@ in {
       upower
       glib # provides trash and mount (latter may supplant udisks2?)
     ] ++ # Basic utilities
-    [ bitwarden-cli htop snore hledger hledger-ui ]
+    [ bitwarden-cli htop snore hledger hledger-ui clifm ]
     ++ # Personalized selection of command-line (CLI/TUI) apps
     [ terminal ] ++ # Terminal emulator
     [
@@ -120,7 +119,7 @@ in {
     ] ++ # Fonts
     # [ papirus-icon-theme ] ++ # Icons
     # [ vanilla-dmz ] ++ # Cursor
-    [ kakmerge ] ++ # Temp
+    [ ] ++ # Temp
     [ ];
 
   programs.home-manager.enable = true;

pkgs/kakmerge/kakmerge.nix

@@ -1,17 +0,0 @@
-{ pkgs }:
-with pkgs;
-stdenv.mkDerivation rec {
-  name = "kakmerge";
-  version = "860b686";
-
-  src = fetchFromGitHub {
-    owner = "lenormf";
-    repo = "kakmerge";
-    rev = version;
-    hash = "sha256-DkZaa9qQhxfjuIJYY0MDWhfh8NAsoy7P7f04FK3FGWM=";
-  };
-
-  installPhase = ''
-    install -Dm755 kakmerge $out/bin/kakmerge
-  '';
-}

pkgs/stata/stata.nix

@@ -1,17 +0,0 @@
-{ pkgs }:
-with pkgs;
-stdenv.mkDerivation rec {
-  name = "stata-${version}";
-  version = "18";
-  src = requireFile {
-    name = "StataNow18Linux64.tar.gz";
-    url = "";
-    sha256 = "cfc1b872ecf345b2d0b3223ea8529b945b49cf1c0a1be8bd972f1d84fed37511";
-  };
-  installPhase = ''
-    mkdir $out
-    tar -xvf $src -C $out
-    cd $out
-    yes | ./install
-  '';
-}

programs/clifm.nix

@@ -1,19 +1,7 @@
-{pkgs, lib, ...}:
+{pkgs, ...}: {
-let
+
-  overlay = (final: prev: {
+  home.packages = with pkgs; [ clifm ];
-    clifm = prev.clifm.overrideAttrs (old: {
-      version = "1.21.13";
-      src = prev.fetchFromGitHub {
-        owner = "leo-arch";
-        repo = prev.clifm.pname;
-        rev = "b7b727b";
-        hash = "sha256-UEgCXAW/MlQy5FltciDAKCCRWK+McmpL1Cr3sNvwgUs=";
-      };
-    });
-  });
-in
-{
-  home.packages = with pkgs.extend overlay; [ clifm ];
   xdg.configFile."clifm/profiles/default/clifmrc".source = ./clifm/clifmrc;
   xdg.configFile."clifm/profiles/default/mimelist.clifm".source = ./clifm/mimelist.clifm;
+
 }

programs/git.nix

@@ -7,9 +7,6 @@
     extraConfig = {
       init.defaultBranch = "main";
       core.editor = "kak";
-      merge.tool = "kakmerge";
-      mergetool.kakmerge.trustExitCode = true;
-      mergetool.kakmerge.cmd = "env LOCAL=\"\${LOCAL}\" BASE=\"\${BASE}\" REMOTE=\"\${REMOTE}\" MERGED=\"\${MERGED}\" kakmerge";
     };
   };