From 0a10f38b34893cdb5fcece862a3c3f2c4d707648 Mon Sep 17 00:00:00 2001 From: larstvei Date: Wed, 24 Apr 2024 16:14:39 +0200 Subject: [PATCH] Include emacs as a flake, not a submodule --- emacs | 1 - flake.lock | 175 ++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 4 +- modules/home.nix | 11 +-- 4 files changed, 170 insertions(+), 21 deletions(-) delete mode 160000 emacs diff --git a/emacs b/emacs deleted file mode 160000 index db24c37..0000000 --- a/emacs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit db24c3742ffcbe5566777f4f069c2c9f2f19300f diff --git a/flake.lock b/flake.lock index 1f9fa9b..c53e5da 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -20,6 +20,82 @@ "type": "github" } }, + "emacs-larstvei": { + "inputs": { + "emacs-overlay": "emacs-overlay", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1713962597, + "narHash": "sha256-GBAvchlWyMbBXbnzmweJjbgJ4FBWbCDa96xUx5RtQ/E=", + "owner": "larstvei", + "repo": "dot-emacs", + "rev": "db24c3742ffcbe5566777f4f069c2c9f2f19300f", + "type": "github" + }, + "original": { + "owner": "larstvei", + "repo": "dot-emacs", + "type": "github" + } + }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1713949624, + "narHash": "sha256-Er2cq+QeylfOs0KWKn0pA0v/3+pYLZN+sdrcl9DSQo8=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "7da709f57affaa4367e192a4ab4d70e44234a77e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -27,11 +103,11 @@ ] }, "locked": { - "lastModified": 1711915616, - "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", + "lastModified": 1713906585, + "narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=", "owner": "nix-community", "repo": "home-manager", - "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", + "rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa", "type": "github" }, "original": { @@ -42,11 +118,59 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1713725259, + "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1713805509, + "narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "type": "github" }, "original": { @@ -59,8 +183,39 @@ "root": { "inputs": { "darwin": "darwin", + "emacs-larstvei": "emacs-larstvei", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 7538973..b2d4e5c 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + emacs-larstvei.url = "github:larstvei/dot-emacs"; }; - outputs = { self, nixpkgs, darwin, home-manager, ... }@inputs: { + outputs = { self, nixpkgs, darwin, home-manager, emacs-larstvei, ... }@inputs: { darwinConfigurations."larstvei-macbookpro" = darwin.lib.darwinSystem { system = "aarch64-darwin"; @@ -28,6 +29,7 @@ useUserPackages = true; users.larstvei = { imports = [ + { _module.args = inputs; } # <- one could ask, why? ./modules/home.nix ]; }; diff --git a/modules/home.nix b/modules/home.nix index 8424dd2..55a9ac2 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,15 +1,8 @@ -{ pkgs, lib, config, home-manager, nix-darwin, inputs, ... }: { +{ pkgs, lib, config, home-manager, nix-darwin, inputs, emacs-larstvei, ... }: { home.packages = with pkgs; [ - ((emacsPackagesFor emacs29).emacsWithPackages - (epkgs: with epkgs; [ - vterm - pdf-tools - treesit-grammars.with-all-grammars - mu4e - pkgs.mu - ])) + emacs-larstvei.defaultPackage.${pkgs.system} (aspellWithDicts (dpkgs: with dpkgs; [ en