diff --git a/features/ema/emanote.nix b/features/ema/emanote.nix index 7155a3f..541c840 100644 --- a/features/ema/emanote.nix +++ b/features/ema/emanote.nix @@ -1,10 +1,5 @@ { pkgs, inputs, system, ... }: -let - emanote = inputs.emanote.outputs.defaultPackage.${system}; -in { - environment.systemPackages = [ emanote ]; - systemd.user.services.emanote = { description = "Emanote ~/Documents/Notes"; after = [ "network.target" ]; diff --git a/flake.lock b/flake.lock index 7b190fd..1aeeca9 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1630960838, - "narHash": "sha256-JWMNUbJ7Q57YKfP3QVr2Kk4sl0d4zZxZ93pymvsj+g0=", + "lastModified": 1631462427, + "narHash": "sha256-GnHAZ8KC4QBZxWUKeQfCq8tt6EnEEMgE8v/X6b23o3c=", "owner": "srid", "repo": "ema", - "rev": "97aca66a3b5a4c1f2ac77c7474e97b74054929fb", + "rev": "efc47f95299e8f528310e297f517e28af2bc7db6", "type": "github" }, "original": { @@ -129,16 +129,15 @@ "ema", "nixpkgs" ], - "pandoc-link-context": "pandoc-link-context", "tagtree": "tagtree", "windicss": "windicss" }, "locked": { - "lastModified": 1631224851, - "narHash": "sha256-eI11imyDg95pjkwOj46/b+RIWzzp+yPFtJBfMHfFSkY=", + "lastModified": 1631463089, + "narHash": "sha256-/Vxu1ctkXSDjYoxyE3KSsMKv/YzBd0t1pBHsSEVinzY=", "owner": "srid", "repo": "emanote", - "rev": "cbff9a3704684988468a7e72b200842a8bc8c48d", + "rev": "ebe763c130fd6a34862c61109de44933be3341f5", "type": "github" }, "original": { @@ -396,11 +395,11 @@ ] }, "locked": { - "lastModified": 1630994117, - "narHash": "sha256-48kEZupGc1BKeTDLK1ctgMCxLOaiVt5KLliKf7qwWNM=", + "lastModified": 1631134124, + "narHash": "sha256-C17wJ2HyuFZllJ/PbpFuuDjkzWvg8np9UIAdSrpuwS0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0dab813748b86c5bde5fdfebcbce4bc184c93b32", + "rev": "039f786e609fdb3cfd9c5520ff3791750c3eaebf", "type": "github" }, "original": { @@ -523,17 +522,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1630850248, - "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=", + "lastModified": 1631315520, + "narHash": "sha256-Y8j0JYtZMifrHaWdTfTp1mYVXZ2PLJO/P0XZxMvo7KU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4", + "rev": "b72ad04a8a324697d3fb92e19cd840379a902813", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4", + "rev": "b72ad04a8a324697d3fb92e19cd840379a902813", "type": "github" } }, @@ -601,17 +600,17 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1631206977, - "narHash": "sha256-o3Dct9aJ5ht5UaTUBzXrRcK1RZt2eG5/xSlWJuUCVZM=", + "lastModified": 1631295156, + "narHash": "sha256-jIriDkYUU09njpjvpRiS2/Yy+iKpmalCGJ2HnC41ZSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f6d8095fd51954120a1d08ea5896fe42dc3923b", + "rev": "bbbe2b35f736d039884e082ecc6d6e631e126029", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "4f6d8095fd51954120a1d08ea5896fe42dc3923b", + "rev": "bbbe2b35f736d039884e082ecc6d6e631e126029", "type": "github" } }, @@ -695,22 +694,6 @@ "type": "github" } }, - "pandoc-link-context": { - "flake": false, - "locked": { - "lastModified": 1629759974, - "narHash": "sha256-jJeZajdPpfLo+oq6cMhzQlluULMxhKSzpKjXVjVjgfM=", - "owner": "srid", - "repo": "pandoc-link-context", - "rev": "71e4061789884bc3030a9686add9b7fa58aea14e", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "pandoc-link-context", - "type": "github" - } - }, "php-extras": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 079a1ca..e8de26e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # https://status.nixos.org/ # # This ensures that we always use the official nix cache. - nixpkgs.url = "github:nixos/nixpkgs/4f6d8095fd51954120a1d08ea5896fe42dc3923b"; + nixpkgs.url = "github:nixos/nixpkgs/bbbe2b35f736d039884e082ecc6d6e631e126029"; nixos-hardware.url = github:NixOS/nixos-hardware/master; home-manager.url = "github:nix-community/home-manager"; diff --git a/home.nix b/home.nix index 12b8362..e17727d 100644 --- a/home.nix +++ b/home.nix @@ -4,6 +4,7 @@ let #himalayaSrc = inputs.himalaya; #himalaya = import ./features/email/himalaya.nix { inherit pkgs inputs system; }; neovim-nightly = inputs.neovim-nightly-overlay.packages.${system}.neovim; + emanote = inputs.emanote.outputs.defaultPackage.${system}; in rec { # Let Home Manager install and manage itself. @@ -18,6 +19,8 @@ rec { # inputs.nix-doom-emacs.hmModule; home.packages = with pkgs; lib.optionals (!bare) [ + emanote + gnumake cachix tig