From 952a7d50886091a11b5457628d10e5b9116013a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 9 Jul 2022 21:06:22 +0100 Subject: [PATCH] add emanote --- config/home-manager/darkkirb.nix | 2 +- config/programs/zk.nix | 10 +- flake.lock | 183 ++++++++++++++++++++++++++----- flake.nix | 1 + 4 files changed, 167 insertions(+), 29 deletions(-) diff --git a/config/home-manager/darkkirb.nix b/config/home-manager/darkkirb.nix index 9152a132..2e3d2d4a 100644 --- a/config/home-manager/darkkirb.nix +++ b/config/home-manager/darkkirb.nix @@ -8,7 +8,6 @@ ../programs/gpg.nix ../programs/git.nix ../programs/direnv.nix - ../programs/zk.nix ] ++ ( if desktop @@ -30,6 +29,7 @@ ../programs/misc.nix ../programs/mail.nix ../programs/kitty.nix + ../programs/zk.nix ] else [] ); diff --git a/config/programs/zk.nix b/config/programs/zk.nix index 7045570f..29566822 100644 --- a/config/programs/zk.nix +++ b/config/programs/zk.nix @@ -1,3 +1,11 @@ -{pkgs, ...}: { +{pkgs, emanote, ...}: { + imports = [ emanote.homeManagerModule ]; home.packages = [pkgs.zk]; + services.emanote = { + enable = true; + notes = [ + "/home/darkkirb/Data/notes" + ]; + package = emanote.packages.${pkgs.system}.default; + }; } diff --git a/flake.lock b/flake.lock index 08710e30..c3dbe426 100644 --- a/flake.lock +++ b/flake.lock @@ -34,8 +34,8 @@ "cargo2nix_2": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -158,6 +158,45 @@ "type": "github" } }, + "ema": { + "flake": false, + "locked": { + "lastModified": 1657035110, + "narHash": "sha256-5dEUMiLRJ8aEQ+dEfZsB/WwdY8KbYFMSovyiZd0j1FU=", + "owner": "srid", + "repo": "ema", + "rev": "29f0c73d6ae81200a30e5147548be7ff28620fdd", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "multisite", + "repo": "ema", + "type": "github" + } + }, + "emanote": { + "inputs": { + "ema": "ema", + "flake-parts": "flake-parts", + "haskell-flake": "haskell-flake", + "nixpkgs": "nixpkgs_3", + "tailwind-haskell": "tailwind-haskell" + }, + "locked": { + "lastModified": 1657205338, + "narHash": "sha256-Oa6fuz79gJz7PYdWQsGfFvET9o8taUbGvClkkC67Qgw=", + "owner": "EmaApps", + "repo": "emanote", + "rev": "69bd7031cae0a81be4e1e0083f9478ce8c8497c1", + "type": "github" + }, + "original": { + "owner": "EmaApps", + "repo": "emanote", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -206,6 +245,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs": [ + "emanote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1657102481, + "narHash": "sha256-62Fuw8JgPub38OdgNefkIKOodM9nC3M0AG6lS+7smf4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "608ed3502263d6f4f886d75c48fc2b444a4ab8d8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1652557277, @@ -237,6 +297,22 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "v1.0.0", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -251,7 +327,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -266,7 +342,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -283,7 +359,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -300,6 +376,21 @@ "type": "github" } }, + "haskell-flake": { + "locked": { + "lastModified": 1654001497, + "narHash": "sha256-GfrpyoQrVT9Z/j9its8BQs3I5O5X5Lc2IkK922bz7zg=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "4c0b0ff295f0b97238a600d2381c37ee46b67f9c", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "haskell-flake", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -627,7 +718,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -652,7 +743,7 @@ "copilot-cmp": "copilot-cmp", "copilot-lua": "copilot-lua", "drone-runner-docker": "drone-runner-docker", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gomod2nix": "gomod2nix", "hydra": "hydra", "hydra-base": "hydra-base", @@ -691,7 +782,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -712,7 +803,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -885,6 +976,20 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1657177452, + "narHash": "sha256-CojBqno3Zbw9/788+kCjRXXornpc4jJGC6RYvTYdVkg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5cbfadba693e0453f3a4090e83fbf845e18d184b", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1654275867, "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", @@ -900,7 +1005,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -916,21 +1021,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" - } - }, "nixpkgs_6": { "locked": { "lastModified": 1645296114, @@ -962,6 +1052,21 @@ } }, "nixpkgs_8": { + "locked": { + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1657241785, "narHash": "sha256-BTj7HYYahdy/hFnLJdguoFuJn/1Zr/4pnb0i7WDZFqk=", @@ -1050,12 +1155,13 @@ "inputs": { "chir-rs": "chir-rs", "dns": "dns", - "flake-utils": "flake-utils_3", + "emanote": "emanote", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "hosts-list": "hosts-list", "nix-packages": "nix-packages", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-noto-variable": "nixpkgs-noto-variable", "nur": "nur", "polymc": "polymc", @@ -1151,6 +1257,29 @@ "type": "github" } }, + "tailwind-haskell": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "emanote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1656944117, + "narHash": "sha256-YEvUO7OrRV1FkIZKWNgp73VZqU0wbqC7B0Gb8s8LnGI=", + "owner": "srid", + "repo": "tailwind-haskell", + "rev": "d3b1e27aa384bf295d05d1d716425d32b90e3e79", + "type": "github" + }, + "original": { + "owner": "srid", + "ref": "master", + "repo": "tailwind-haskell", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1653893745, diff --git a/flake.nix b/flake.nix index 51cb3ebc..0322f57e 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ rec { hosts-list.flake = false; nixos-hardware.url = "github:NixOS/nixos-hardware"; nixpkgs-noto-variable.url = "github:NixOS/nixpkgs/1988f9a17fc1c2ab11f5817adf34a4eb8d06454d"; + emanote.url = "github:EmaApps/emanote"; nix-packages.url = "github:DarkKirb/nix-packages/main"; nix-packages.inputs.nixpkgs.follows = "nixpkgs";