diff --git a/default.nix b/default.nix index 5712ca4..4ed5330 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,10 @@ let name = if builtins.isString args then args else args.name; system = if args ? system then args.system else "x86_64-linux"; extraModules = if args ? extraModules then args.extraModules else [ ]; - extraOverlays = if args ? extraOverlays then args.extraOverlays else [ overlay-unstable overlay-comma ]; + extraOverlays = if args ? extraOverlays then args.extraOverlays else [ + overlay-unstable + # overlay-comma + ]; pkgs = flakes.nixpkgs; configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix {inherit extraOverlays system pkgs name flakes flakeOutputs;} ; overlay-unstable = final: prev: { @@ -15,9 +18,9 @@ let }; }; - overlay-comma = final: prev: { - comma = flakes.comma.packages."${system}"; - }; + # overlay-comma = final: prev: { + # comma = flakes.comma.packages."${system}"; + # }; in { inherit name; diff --git a/flake.lock b/flake.lock index 49e2980..83689e3 100644 --- a/flake.lock +++ b/flake.lock @@ -84,8 +84,7 @@ "type": "github" } }, - "flake-compat": { - "flake": false, + "flake-utils": { "locked": { "lastModified": 1650374568, "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", @@ -95,8 +94,8 @@ "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 0647f3a..990a74c 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -53,7 +53,7 @@ let free-keys highlight-indentation helm - helm-bbdb + #helm-bbdb helm-company helm-flx helm-descbinds