fix: remove nixpkgs-extra, add encore-flake

fmway · Nov 30, 2024 · 77c5ae1 · 77c5ae1
1 parent de97b52
commit 77c5ae1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 62 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -22,11 +22,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     fmpkgs.url = "github:fmway/fmpkgs/master";
-    nixpkgs-extra = {
-      url = "github:luisnquin/nixpkgs-extra";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    encore.url = "github:encoredev/encore-flake";
+    encore.inputs.nixpkgs.follows = "nixpkgs";
     # TODO
     # nix-colors.url = "github:misterio77/nix-colors";
     home-manager.url = "github:nix-community/home-manager/master";

diff --git a/programs/cli/default.nix b/programs/cli/default.nix
@@ -41,7 +41,7 @@
     # aerc # neomutt alternative
     # frogmouth # tui markdown viewer. awesome but, very lag
     # manix # nix options search
-    extra.encore # awesome tools for developing go and typescript
+    encore # awesome tools for developing go and typescript
     nix-init # automate builder nix derivation
     # nurl # ?
     rclone

diff --git a/programs/extra/encore.nix b/programs/extra/encore.nix
@@ -0,0 +1,2 @@
+{ inputs, self, ... }:
+inputs.encore.packages.${self.system}.encore
diff --git a/programs/overlays.nix b/programs/overlays.nix
@@ -12,7 +12,6 @@
   ;
   inherit (builtins) 
     foldl'
-    getAttr
     ;
   nixpkgs-overlay = self: super: let
     overlayNixpkgs = arr: obj: foldl' (acc: curr: let
@@ -31,7 +30,6 @@
     fmpkgs = import inputs.fmpkgs {
       inherit system pkgs lib;
     };
-    extra = inputs.nixpkgs-extra.packages.${system};
   };
 
   package-overlay = self: super: treeImport {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{ inputs, self, ... }:
		inputs.encore.packages.${self.system}.encore