merge

configs/cloud.nix

@@ -10,9 +10,9 @@
 
   niveum.seafile.enable = true;
 
-  niveum.google-drive = {
+  niveum.google-drive = rec {
     enable = true;
-    directory = "${config.users.users.me.home}/cloud/gdrive";
+    directory = "${user.home}/cloud/gdrive";
     user = config.users.users.me;
   };
 

configs/default.nix

@@ -18,9 +18,11 @@
     <configs/vscode.nix>
     <configs/htop.nix>
     <configs/dunst.nix>
+    # <configs/mopidy.nix>
     <configs/mail.nix>
+    <configs/default.nix>
     <configs/python.nix>
-    <configs/haskell.nix>
+    <configs/haskell>
     <configs/hu-berlin.nix>
     <configs/i3.nix>
     <configs/mpv.nix>
@@ -43,9 +45,9 @@
     <configs/zsh.nix>
     <configs/bluetooth.nix>
     <configs/theming.nix>
+    <configs/distrobump.nix>
     <configs/tmux.nix>
     <configs/themes/owickstrom-dark.nix>
-    <configs/distrobump.nix>
     {
       niveum.user = {
         github = "kmein";

configs/gollum.nix

@@ -0,0 +1,5 @@
+{
+  services.gollum = {
+    enable = true;
+  };
+}

configs/haskell/default.nix

@@ -20,13 +20,18 @@
     '';
   };
 
+  services.hoogle = {
+    enable = true;
+    packages = import ./packages.nix;
+  };
+
   environment.systemPackages = with pkgs; [
     cabal2nix
     stack2nix
     cabal-install
     hlint
     haskellPackages.brittany
-    (haskellPackages.ghcWithHoogle (import <dot/haskells.nix>))
+    (haskellPackages.ghcWithHoogle (import ./packages.nix))
   ] ++ map haskell.lib.justStaticExecutables [
     haskellPackages.ghcid
     haskellPackages.hakyll

configs/haskell/packages.nix

@@ -0,0 +1,99 @@
+haskellPackages:
+with haskellPackages; [
+  (callPackage <packages/blessings.nix> {})
+  HTTP
+  HUnit
+  MissingH
+  QuickCheck
+  ad
+  adjunctions
+  aeson
+  algebra
+  ansi-terminal
+  async
+  attoparsec
+  base-orphans
+  bifunctors
+  binary
+  blaze-html
+  blaze-markup
+  brick
+  bytes
+  bytestring
+  case-insensitive
+  cassava
+  cereal
+  clock
+  comonad
+  comonad-transformers
+  conduit
+  conduit-extra
+  constraints
+  containers
+  contravariant
+  criterion
+  data-default
+  directory
+  dlist
+  either
+  exceptions
+  extra
+  filepath
+  foundation
+  free
+  haskeline
+  hedgehog
+  hourglass
+  hspec
+  http-client
+  http-conduit
+  kan-extensions
+  lens
+  linear
+  lucid
+  megaparsec
+  microlens
+  monad-logger
+  mono-traversable
+  mtl
+  network
+  pandoc
+  parallel
+  parsec
+  persistent
+  pipes
+  pointed
+  pretty-show
+  primitive
+  process
+  profunctors
+  regex-tdfa
+  safe
+  scalpel
+  semigroupoids
+  semigroups
+  servant
+  servant-blaze
+  servant-client
+  servant-docs
+  servant-server
+  servant-swagger
+  split
+  stm
+  tagsoup
+  tasty
+  text
+  time
+  transformers
+  turtle
+  type-unary
+  unix-time
+  unordered-containers
+  vector
+  vinyl
+  void
+  vty
+  warp
+  wreq
+  yaml
+]

configs/hledger.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   imports = [ <modules/hledger.nix> ];
 
@@ -7,6 +7,8 @@
     server = {
       enable = true;
       user = config.users.users.me;
+      package = pkgs.unstable.hledger-web;
     };
+    package = pkgs.unstable.hledger;
   };
 }