diff --git a/flake.lock b/flake.lock index af400dcb..4c26be4a 100644 --- a/flake.lock +++ b/flake.lock @@ -25,9 +25,7 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -119,16 +117,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703068421, - "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -181,12 +179,28 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1703068421, + "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix index 69efeed8..d6e7b900 100644 --- a/modules/dev/editors/emacs/default.nix +++ b/modules/dev/editors/emacs/default.nix @@ -15,11 +15,10 @@ in { daemon = mkEnableOption true; }; - nixpkgs.overlays = [ - inputs.emacs-overlay.overlay - ]; - config = mkIf cfg.enable { + nixpkgs.overlays = [ + inputs.emacs-overlay.overlay + ]; # ues daemon services.emacs = { enable = cfg.daemon;