working rust package override

plus flake update :P

flake.lock

@@ -64,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1760808459,
+        "lastModified": 1761172581,
-        "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
+        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
+        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1760580664,
+        "lastModified": 1761016216,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
         "type": "github"
       },
       "original": {
@@ -156,13 +156,48 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1761100675,
+        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {

flake.nix

@@ -12,6 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
+    rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
   outputs = inputs @ {
@@ -21,6 +22,7 @@
     darwin,
     home-manager,
     ghostty,
+    rust-overlay,
     ...
   }: let
     userName = "wyatt";
@@ -31,6 +33,7 @@
 
     myOverlays = { ... }: {
       nixpkgs.overlays = [
+        rust-overlay.overlays.default
         self.common.overlays
       ];
     };
@@ -59,6 +62,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -83,6 +87,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -108,6 +113,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.backupFileExtension = "bak";
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -137,6 +143,7 @@
       #     home-manager.useGlobalPkgs = true;
       #     home-manager.useUserPackages = true;
       #     home-manager.extraSpecialArgs = extraSpecialArgs;
+      #     home-manager.backupFileExtension = "bak";
       #     home-manager.users.${userName}.imports = [
       #       ./home
       #     ];

home/atuin.nix

@@ -1,6 +1,7 @@
-{...}: {
+{ pkgs, ...}: {
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
+    package = pkgs.atuinLatest;
   };
 }

modules/common/core.nix

@@ -8,6 +8,9 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [
+    "mbedtls-2.28.10"
+  ];
 
   nix.package = pkgs.nix;
 

modules/common/overlays.nix

@@ -1,4 +1,10 @@
-_: prev: {
+final: prev: let
+  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
+  myRustPlatform = prev.makeRustPlatform {
+    cargo = rust_1_90_0;
+    rustc = rust_1_90_0;
+  };
+in {
   lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
     version = "0.55.1";
     src = prev.fetchFromGitHub {
@@ -9,17 +15,30 @@ _: prev: {
     };
   });
 
-  # atuin = prev.atuin.overrideAttrs (oldAttrs: rec {
+  atuinLatest = (prev.atuin.override {
-  #   version = "18.10.0";
+    rustPlatform = myRustPlatform;
-  #
+  }).overrideAttrs (oldAttrs: rec {
-  #   src = prev.fetchFromGitHub {
+    version = "18.10.0";
-  #     owner = "atuinsh";
+
-  #     repo = "atuin";
+    src = prev.fetchFromGitHub {
-  #     rev = "v${version}";
+      owner = "atuinsh";
-  #     hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
+      repo = "atuin";
-  #   };
+      rev = "v${version}";
-  #
+      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
-  #   # cargoDeps = null;
+    };
-  #   cargoHash = prev.lib.fakeSha256;
+
-  # });
+    cargoDeps = myRustPlatform.fetchCargoVendor {
+      # name = "atuin-${version}-vendor.tar.gz";
+      inherit src;
+      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
+    };
+
+    preCheck = (oldAttrs.preCheck or "") + ''
+      export HOME="$TMPDIR"
+      export XDG_CONFIG_HOME="$TMPDIR/.config"
+      export XDG_DATA_HOME="$TMPDIR/.local/share"
+      export XDG_STATE_HOME="$TMPDIR/.local/state"
+      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
+    '';
+  });
 }