Merge remote-tracking branch 'refs/remotes/origin/flakes' into flakes

Author: DieracDelta

darwin/config.nix

@@ -1,24 +1,60 @@
 { pkgs, home-manager, ... }:
 {
   fonts = {
-    packages = with pkgs;[ nerd-fonts.fira-code fira-code-symbols fira-math hack-font ];
+    packages = with pkgs; [
+      nerd-fonts.fira-code
+      fira-code-symbols
+      fira-math
+      hack-font
+    ];
   };
 
-  environment.variables = { EDITOR = "nvim"; };
+  environment.variables = {
+    EDITOR = "nvim";
+  };
   system.stateVersion = 5;
 
-
   programs.fish.enable = true;
   users.users.jrestivo.home = "/Users/jrestivo";
   users.users.jrestivo.shell = pkgs.fish;
 
   environment.systemPackages = with pkgs; [
-    ghc ripgrep tree
-    tdf
+    ghc
+    moonlight-qt
+    ripgrep
+    tree
+    # tdf
+    gitoxide
+    fselect
     pngpaste
     moreutils
-    jq zoxide starship direnv fzf eza  bat tldr neofetch bottom htop coreutils fd
-    nix-top nixfmt entr fish syncthing /* colmena */ zellij /* colima */ zellij jless git-filter-repo lima zathura emacs /* agda */  docker  awscli emacs /* neovide */ /* nyxt-3 */
+    jq
+    zoxide
+    starship
+    direnv
+    fzf
+    eza
+    bat
+    tldr
+    neofetch
+    bottom
+    htop
+    coreutils
+    fd
+    nix-top
+    entr
+    fish
+    syncthing # colmena
+    zellij # colima
+    zellij
+    jless
+    git-filter-repo
+    lima
+    zathura
+    emacs # agda
+    docker
+    awscli
+    emacs # neovide nyxt-3
     atuin
     #(rWrapper.override{ packages = with rPackages; [ ggplot2 dplyr xts languageserver ]; })
     gh
@@ -31,7 +67,9 @@
     yazi
     corepack_latest
     nodejs_latest
-    delta duf broot
+    delta
+    duf
+    broot
     mosh
     dive
     nix-output-monitor
@@ -41,12 +79,13 @@
     john
   ];
 
-
   nix.package = pkgs.nix;
   nix.extraOptions = "experimental-features = nix-command flakes pipe-operators";
 
   # environment.systemPath = [ "/opt/homebrew/bin" ];
-  environment.variables = { HOMEBREW_NO_ANALYTICS = "1"; };
+  environment.variables = {
+    HOMEBREW_NO_ANALYTICS = "1";
+  };
   homebrew.onActivation.autoUpdate = true;
   homebrew.onActivation.cleanup = "zap";
   homebrew.global.brewfile = true;

flake.nix

@@ -180,7 +180,6 @@
               rapidocr-onnxruntime = python-prev.rapidocr-onnxruntime.overridePythonAttrs (oldAttrs: {
                 doCheck = false;
               });
-
               # psycopg = python-prev.psycopg.overridePythonAttrs (oldAttrs: {
               #   doCheck = false;
               # });
@@ -263,6 +262,30 @@
             nixpkgs.overlays = [
               (final: prev: {
                 nvim = my-nvim.defaultPackage.aarch64-darwin;
+                tdf = prev.tdf.overrideAttrs (
+                  finalAttrs: prevAttrs: {
+                    pname = "tdf";
+                    version = "custom";
+                    useFetchCargoVendor = true;
+                    src = prev.fetchFromGitHub {
+                      owner = "itsjunetime";
+                      repo = "tdf";
+                      fetchSubmodules = false;
+                      rev = "d01da40f13a29371d7a705f822597923dab1a9e7";
+                      hash = "sha256-a82m0d1cFi5EwnDrgeZQnsS5ScPdLo/D9NPFN27hvo4=";
+                    };
+                    nativeBuildInputs = [ final.rustPlatform.bindgenHook ];
+                    RUSTC_BOOTSTRAP = true;
+                    # cargoHash = lib.fakeHash;
+                    cargoDeps = final.rustPlatform.fetchCargoVendor {
+                      inherit (finalAttrs) src;
+                      name = "${finalAttrs.pname}-${finalAttrs.version}";
+                      hash = "sha256-DxD+Zu6e/YkbFP/R0kBHpuj7E9ZJ2aRpF01VQwMAfkU=";
+                    };
+
+                  }
+                );
+
               })
             ];
           }

home/config.fish

@@ -10,6 +10,7 @@ if test $os = "Darwin"
   # ssh-add ~/.ssh/id_rsa_old
   fish_add_path /run/current-system/sw/bin
   fish_add_path /opt/homebrew/bin
+  fish_add_path /Users/jrestivo/dev/tdf/target/release/
   export EDITOR="/Users/jrestivo/dev/vimconfig/result/bin/nvim"
 else if test $os = "Linux"
   ssh-add ~/.ssh/id_rsa