diff options
| -rw-r--r-- | flake.lock | 86 | ||||
| -rw-r--r-- | flake.nix | 10 | ||||
| -rw-r--r-- | modules/emacs.nix | 6 |
3 files changed, 79 insertions, 23 deletions
@@ -1,5 +1,24 @@ { "nodes": { + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1666691950, + "narHash": "sha256-0+gJByTBEY/GlXXaV6b40ZgRJ0tH7YZubLGCQdVJFww=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "87099c473e76a499ee78fcc4cda9f7c0a88db0ca", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -8,11 +27,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1666594927, - "narHash": "sha256-ESd0+5nb59Bpg6zzdGrpNWnQwwGW/KMWBIiabHNeUQU=", + "lastModified": 1666681245, + "narHash": "sha256-zrTNsPi/aGxixmdXC20gL2MZ1JbIG1ePPXovDSEO6Y4=", "owner": "nix-community", "repo": "fenix", - "rev": "ee0887d7cb28d1dc7527bb129dff888bf41de7cb", + "rev": "736b83b304d0a75e863170ecd2b60618e882825c", "type": "github" }, "original": { @@ -51,9 +70,24 @@ "type": "github" } }, + "flake-utils_3": { + "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" + } + }, "microvm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -76,16 +110,13 @@ "locked": { "lastModified": 1666528161, "narHash": "sha256-PFOQSC0x4xPD1p/GZIbpKuoEBu6M8HnEOeNRiBUCELA=", - "owner": "NixOS", - "repo": "nixpkgs", + "path": "/nix/store/ml0shjsrv72lsa3l43aci55wxpc18bpk-source", "rev": "471d92178b978fcbad8db27c2e8a4e737d4e0e27", - "type": "github" + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-22_05": { @@ -106,11 +137,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1666539104, - "narHash": "sha256-jeuC+d375wHHxMOFLgu7etseCQVJuPNKoEc9X9CsErg=", + "lastModified": 1666629043, + "narHash": "sha256-Yoq6Ut2F3Ol73yO9hG93x6ts5c4F5BhKTbcF3DtBEAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e6df35f39651504249a05191f9a78d251707e22", + "rev": "b39fd6e4edef83cb4a135ebef98751ce23becc33", "type": "github" }, "original": { @@ -120,12 +151,29 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1666610816, + "narHash": "sha256-q4F2VNe5bpxXOvp16DyLwE1SgNZMbNO29ZQJPIomedg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6107f97012a0c134c5848125b5aa1b149b76d2c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { + "emacs-overlay": "emacs-overlay", "fenix": "fenix", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "microvm": "microvm", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } @@ -133,11 +181,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1666540927, - "narHash": "sha256-rKESGm1up385ecSGp5txbvOkxRRS8SX88oWI8UubOkA=", + "lastModified": 1666620525, + "narHash": "sha256-XL/8MDKydIni4ObTvuXBOVT+i87TLlutFPxYcd0Cy8I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "43fb9563b2943d6abc5f3552195f3e27ac618966", + "rev": "53b6d69e931a52cca44ef94c3b713b4d255754b8", "type": "github" }, "original": { @@ -20,16 +20,19 @@ url = github:nix-community/fenix; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + emacs-overlay.url = github:nix-community/emacs-overlay; }; outputs = inputs@{ self + , emacs-overlay + , fenix + , flake-utils + , microvm , nixpkgs , nixpkgs-unstable - , flake-utils , sops-nix - , microvm - , fenix , ... }: @@ -57,6 +60,7 @@ ./modules/basic-tools.nix ./modules/binary-caches.nix ./modules/devtools.nix + ./modules/emacs.nix ./modules/gnupg.nix ./modules/graphical.nix ./modules/hw-accel-intel.nix diff --git a/modules/emacs.nix b/modules/emacs.nix index 526ce2c..0df6c08 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -1,10 +1,14 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { environment.systemPackages = with pkgs; [ direnv ]; + nixpkgs.overlays = [ + inputs.emacs-overlay.overlay + ]; + programs.zsh.shellInit = '' eval "$(direnv hook zsh)" ''; |