use aider from nixpkgs

elohmeier · Aug 16, 2024 · 2a12b6f · 2a12b6f
1 parent db87771
commit 2a12b6f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 121 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -81,6 +81,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nixpkgs-rpi4.url = "github:elohmeier/nixpkgs/2bd04c7d2efbd5c7ce1d626baaa6303eb578dc27";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixvim = {
       url = "github:nix-community/nixvim";

diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix
@@ -72,7 +72,6 @@
           })).override
             { withNerdIcons = true; };
         prom-checktlsa = final.callPackage ../../packages/prom-checktlsa { };
-        aider = pkgsUnstable.callPackage ../../packages/aider { };
 
         fzf-no-fish = final.fzf.overrideAttrs (old: {
           postInstall =

diff --git a/modules/flake/packages.nix b/modules/flake/packages.nix
@@ -3,12 +3,7 @@ _: {
     { pkgs, ... }:
     {
       packages = {
-        inherit (pkgs)
-          aider
-          edge-tts
-          prom-checktlsa
-          zathura-darwin
-          ;
+        inherit (pkgs) edge-tts prom-checktlsa zathura-darwin;
       };
     };
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
@@ -1,10 +1,4 @@
-{
-  self,
-  lib,
-  withSystem,
-  inputs,
-  ...
-}:
+{ self, inputs, ... }:
 
 {
   flake.homeModules = {
@@ -37,6 +31,14 @@
       };
 
       extraSpecialArgs = {
+        pkgsMaster = import inputs.nixpkgs-master {
+          system = "aarch64-darwin";
+          overlays = [
+            self.overlays.default
+            inputs.nvim-config.overlays.default
+          ];
+          config.allowUnfree = true;
+        };
         pkgsUnstable = import inputs.nixpkgs-unstable {
           system = "aarch64-darwin";
           overlays = [

diff --git a/modules/home/packages.nix b/modules/home/packages.nix
@@ -2,6 +2,7 @@ p@{
   config,
   lib,
   pkgs,
+  pkgsMaster,
   ...
 }:
 
@@ -57,7 +58,7 @@ in
       age
       age-plugin-yubikey
       awscli2
-      aider
+      pkgsMaster.aider-chat
       azure-cli
       bat
       btop

diff --git a/packages/aider/default.nix b/packages/aider/default.nix
diff --git a/update-packages.sh b/update-packages.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ p@{ @@
       config,
       lib,
       pkgs,
+      pkgsMaster,
       ...
     }:
@@ Expand Down Expand Up / @@ -57,7 +58,7 @@ in @@
           age
           age-plugin-yubikey
           awscli2
-          aider
+          pkgsMaster.aider-chat
           azure-cli
           bat
           btop
@@ Expand Down @@