diff --git a/flake.lock b/flake.lock index 5b7af9e..70045cb 100644 --- a/flake.lock +++ b/flake.lock @@ -3,9 +3,7 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -17,9 +15,8 @@ "type": "github" }, "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" + "id": "emacs-overlay", + "type": "indirect" } }, "flake-utils": { @@ -70,9 +67,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -91,11 +89,26 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1691368598, + "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5a8e9243812ba528000995b294292d3b5e120947", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } }, "systems": { diff --git a/flake.nix b/flake.nix index 630b1a5..b2d6851 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - emacs-overlay = { - url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, nixpkgs, home-manager, emacs-overlay, ... }: { @@ -23,7 +19,7 @@ homeConfigurations = { ivand = home-manager.lib.homeManagerConfiguration { modules = [ ./home/laptop.nix ]; - pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ emacs-overlay.overlay ]; }; + pkgs = import nixpkgs { system = "x86_64-linux"; }; }; }; }; diff --git a/home/laptop.nix b/home/laptop.nix index d0b95c1..76bab1a 100644 --- a/home/laptop.nix +++ b/home/laptop.nix @@ -109,7 +109,6 @@ }; emacs = { enable = true; - package = pkgs.emacsGit; }; zsh = { enable = true; @@ -183,7 +182,6 @@ services = { emacs = { enable = true; - package = pkgs.emacsGit; }; }; }