diff --git a/home-manager/roles/zettelkasten.nix b/home-manager/roles/zettelkasten.nix index 8ae59121..40650ac0 100644 --- a/home-manager/roles/zettelkasten.nix +++ b/home-manager/roles/zettelkasten.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let notesDir = "${config.home.homeDirectory}/git/zettelkasten"; - cmd = "${pkgs.myHaskellPackages.neuron}/bin/neuron -d ${notesDir} rib -wS"; + cmd = "${pkgs.home-pkgs.neuron}/bin/neuron -d ${notesDir} rib -wS"; in { systemd.user.services.neuron = { Unit.Description = "Neuron zettelkasten service"; diff --git a/nixos/roles/monitoring/nixpkgs.nix b/nixos/roles/monitoring/nixpkgs.nix index 5a616e43..eda04b13 100644 --- a/nixos/roles/monitoring/nixpkgs.nix +++ b/nixos/roles/monitoring/nixpkgs.nix @@ -25,6 +25,7 @@ let watchNixpkgsPackage name "release-20.03" "nixos/release-20.03/nixpkgs.haskellPackages.${name}.x86_64-linux"; watchedHaskellUpdatesPkgs = builtins.attrNames (pkgs.myHaskellPackages) ++ [ + "neuron" "jsaddle-warp" "snap" "dependent-sum-template" diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix index 486fb65b..0a3ea6dc 100644 --- a/overlays/30-ghc.nix +++ b/overlays/30-ghc.nix @@ -10,8 +10,8 @@ let makeHaskellPackages = p: { inherit (p) - brittany ormolu releaser cabal-fmt stack ghcid ghcide cabal-install dhall - aeson unordered-containers these neuron taskwarrior pandoc hlint + brittany ormolu releaser cabal-fmt stack ghcid ghcide haskell-language-server cabal-install dhall + aeson unordered-containers these taskwarrior pandoc hlint cabal2nix weeder reflex-dom password optics-th shh-extras; } // makeHaskellScriptPackages p; in { diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix index 80ee685f..6e1c04dc 100644 --- a/overlays/pkgSets.nix +++ b/overlays/pkgSets.nix @@ -47,6 +47,7 @@ self: super: { go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole nixfmt rnix-lsp tmate rustup kitty nix-top ghc ghcid ormolu; obelisk = (import self.sources.obelisk { }).command; + neuron = import self.sources.neuron { }; }; accounting-pkgs = { inherit (self.haskellPackages) hledger hledger-ui hledger-web;