feat(haskell): ormolu

configs/hedgedoc.nix

@@ -9,7 +9,7 @@
     '';
   };
 
-  services.codimd = {
+  services.hedgedoc = {
     enable = true;
     configuration = {
       allowAnonymous = false;

configs/nextcloud.nix

@@ -44,7 +44,7 @@ in
 
   services.nginx.virtualHosts."cloud.xn--kiern-0qa.de" = {
     enableACME = true;
-    addSSL = true;
+    forceSSL = true;
   };
 
   # Ensure that postgres is running before running the setup

configs/packages/default.nix

@@ -1,5 +1,7 @@
-{ pkgs, lib, ... }: 
-let hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
+{ pkgs, lib, ... }:
+let
+  hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
+  inherit (import <niveum/lib>) nixpkgs-unstable;
 in {
   imports = [
     ./krebs.nix
@@ -97,7 +99,7 @@ in {
     audacity
     calibre
     inkscape
-    zoom-us # video conferencing
+    nixpkgs-unstable.zoom-us # video conferencing
     pdfgrep # search in pdf
     pdftk # pdf toolkit
     evince # for viewing pdf annotations

configs/packages/haskell/default.nix

@@ -32,8 +32,7 @@
       cabal2nix
       cabal-install
       hlint
-      haskellPackages.brittany
-      # haskellPackages.hfmt
+      haskellPackages.ormolu
       (haskellPackages.ghcWithHoogle (import ./packages.nix))
     ] ++ map haskell.lib.justStaticExecutables [
       haskellPackages.ghcid

configs/packages/writing.nix

@@ -2,8 +2,6 @@
 let
   inherit (import <niveum/lib>) nixpkgs-unstable;
 
-  unstable = import nixpkgs-unstable {};
-
   zoteroStyle = { name, sha256 }: {
     name = "${name}.csl";
     path = pkgs.fetchurl {
@@ -70,7 +68,7 @@ in {
     libreoffice
     # gnumeric
     dia
-    unstable.pandoc
+    nixpkgs-unstable.pandoc
     # proselint
     asciidoctor
     wordnet

lib/default.nix

@@ -1,8 +1,9 @@
-{
-  nixpkgs-unstable = builtins.fetchGit {
+rec {
+  nixpkgs-src = builtins.fetchGit {
     url = "https://github.com/NixOS/nixpkgs";
-    rev = "c40f06022a83d6f286dd2a906e1d5fefcc05dfa1";
+    rev = "f3042e30785437f6cb2d99b15625b962fb96799f";
   };
+  nixpkgs-unstable = import nixpkgs-src { config.allowUnfree = true; };
 
   sshPort = 22022;
 

lib/vim/init.vim

@@ -182,7 +182,7 @@ let g:pandoc#spell#default_langs = ['en', 'de']
 
 let g:ale_linters = {
       \ 'css': ['csslint'],
-      \ 'haskell': ['ghc', 'cabal-ghc', 'hlint'],
+      \ 'haskell': ['ghc', 'cabal-ghc', 'hlint', 'ormolu'],
       \ 'html': ['tidy', 'proselint'],
       \ 'latex': ['lacheck', 'chktex', 'proselint'],
       \ 'pandoc': ['proselint'],

modules/retiolum.nix

@@ -4,7 +4,7 @@ let
   netname = "retiolum";
   cfg = config.networking.retiolum;
 in {
-  imports = [ "${(import <niveum/lib>).nixpkgs-unstable}/nixos/modules/services/networking/tinc.nix" ];
+  imports = [ "${(import <niveum/lib>).nixpkgs-src}/nixos/modules/services/networking/tinc.nix" ];
   disabledModules = [ "services/networking/tinc.nix" ];
 
   options = {

systems/makanek/configuration.nix

@@ -5,7 +5,7 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    <niveum/configs/codimd.nix>
+    <niveum/configs/hedgedoc.nix>
     <niveum/configs/spacetime.nix>
     <niveum/configs/sshd.nix>
     <niveum/configs/nextcloud.nix>

systems/wilde/configuration.nix

@@ -1,9 +1,6 @@
 { config, pkgs, lib, ... }:
 let
   inherit (import <niveum/lib>) nixpkgs-unstable;
-  unstable = import nixpkgs-unstable {
-    config.allowUnfree = true;
-  };
 in
 {
   imports = [
@@ -39,7 +36,7 @@ in
   nix.buildCores = 1;
   nix.maxJobs = 2;
 
-  environment.systemPackages = [ unstable.minecraft ];
+  environment.systemPackages = [ nixpkgs-unstable.minecraft ];
 
   boot.loader.systemd-boot = {
     enable = true;