diff options
| -rw-r--r-- | flake.lock | 57 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 5 |
3 files changed, 54 insertions, 9 deletions
diff --git a/flake.lock b/flake.lock index d98470be..bfd7151a 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,40 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1665516664, + "narHash": "sha256-2sZ5KEKmmKyCDvpR1ldFqpACBlgAuZb6wmer7cC4VKw=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "f5dd8b46c50a2d22c450c9628b955f970412cc8c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -29,11 +63,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1665476539, - "narHash": "sha256-NDs0qfTSfG+vEvB3HN2GOOZgMBPAYBpFeIC4hrN5wjk=", + "lastModified": 1665520899, + "narHash": "sha256-N8BYMgvrAYhiXeyrcEeLgngZZaU6MVVocSa+tIfyMyg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b37a909508edb8d7fdcd04ac90761b2cfa2a5f28", + "rev": "5597b3a7425a9e3f41128308cb1105d3e780f633", "type": "github" }, "original": { @@ -59,6 +93,20 @@ }, "nixpkgs": { "locked": { + "lastModified": 1665483364, + "narHash": "sha256-sisuhAPPjYB92YlcyoVEcTh5teuAkL9NW8UVexRsfoo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e0ed589d7422c1d7a1bdd1e81289e2428c6ec2a3", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { "lastModified": 1665349835, "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "owner": "NixOS", @@ -76,9 +124,10 @@ "root": { "inputs": { "darwin": "darwin", + "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } }, "utils": { diff --git a/flake.nix b/flake.nix index eb5eecd8..24620fcb 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = github:nix-community/home-manager; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + emacs-overlay.url = github:nix-community/emacs-overlay; }; outputs = { self, darwin, home-manager, nixpkgs, ... }@attrs: diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 3eec261b..5179b975 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -34,11 +34,6 @@ in imports = [ ../modules/eshell.nix ]; - nixpkgs.overlays = [ - (import (builtins.fetchTarball { - url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; - })) - ]; programs.emacs = { enable = true; |