From 127c13518857fd51185ff674e068b99d3ea95020 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Tue, 22 Nov 2022 16:33:20 +0100
Subject: [PATCH] Fix eval

---
 home-manager/roles/taskwarrior.nix   | 2 +-
 home-manager/roles/zettelkasten.nix  | 5 ++++-
 overlays/10-previews.nix             | 2 +-
 overlays/pkgSets.nix                 | 2 --
 overlays/taskwarrior-git/default.nix | 3 ---
 5 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 overlays/taskwarrior-git/default.nix

diff --git a/home-manager/roles/taskwarrior.nix b/home-manager/roles/taskwarrior.nix
index 70379375..0c49a7d3 100644
--- a/home-manager/roles/taskwarrior.nix
+++ b/home-manager/roles/taskwarrior.nix
@@ -8,7 +8,7 @@
     sed 's/dep_\[[^ ]* //' -i ~/.task/*.data
   '';
 in {
-  home.packages = [pkgs.taskwarrior-git fix-tasks];
+  home.packages = [fix-tasks];
   services.taskwarrior-sync = {
     enable = true;
     frequency = "*:0/1";
diff --git a/home-manager/roles/zettelkasten.nix b/home-manager/roles/zettelkasten.nix
index 5e818d5e..3ab6c6c5 100644
--- a/home-manager/roles/zettelkasten.nix
+++ b/home-manager/roles/zettelkasten.nix
@@ -2,7 +2,10 @@
   config,
   pkgs,
   ...
-}: {
+}: let
+  emanote_commit = (builtins.fromJSON (builtins.readFile ../../nix/sources.json)).emanote.rev;
+  emanote = builtins.getFlake "github:srid/emanote/${emanote_commit}";
+in {
   imports = [emanote.homeManagerModule];
   services.emanote = {
     enable = true;
diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index b718b4c8..ede14fb5 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -6,6 +6,6 @@ in {
   inherit unstable;
   unstableHaskellPackages = unstable.haskellPackages;
   unstableGhc = unstable.ghc;
-  inherit (unstable) nix home-assistant vscode-extensions vscodium cachix cabal2nix chrysalis nil taplo tut;
+  inherit (unstable) nix home-assistant vscode-extensions vscodium cachix cabal2nix chrysalis nil taplo tut emanote;
   nixpkgs-bot = bot.packages.x86_64-linux.default;
 }
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index 38ced682..b20abadf 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -1,6 +1,5 @@
 self: super: {
   # pkgs assumed to be present on a non nixos host
-  nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --log-format bar-with-logs "$@"'';
   core-system-pkgs = {
     inherit
       (self)
@@ -148,7 +147,6 @@ self: super: {
       lazygit
       gh
       ;
-    obelisk = (import self.sources.obelisk {}).command;
     pass-fzf = self.writeShellScriptBin "pass-fzf" (builtins.readFile ./pass-fzf.sh);
   };
   accounting-pkgs = {
diff --git a/overlays/taskwarrior-git/default.nix b/overlays/taskwarrior-git/default.nix
deleted file mode 100644
index ffa48e5c..00000000
--- a/overlays/taskwarrior-git/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-self: super: {
-  taskwarrior-git = self.haskellPackages.callCabal2nix "taskwarrior-git" self.sources.taskwarrior-git-backend {};
-}