Various formattings

apps/kassandra/backend/backend.cabal

@@ -58,7 +58,7 @@ library
   import:          common-config
   hs-source-dirs:  src
 
-  if impl(ghcjs -any)
+  if impl(ghcjs)
     buildable: False
 
   build-depends:
@@ -66,16 +66,16 @@ library
     , async
     , base
     , containers
-    , dhall
     , data-default-class
+    , dhall
     , frontend
-    , say
     , kassandra
     , network-simple
     , obelisk-backend
     , obelisk-route
     , password            >=2.0.1.0
     , relude
+    , say
     , snap-core
     , standalone
     , stm
@@ -93,7 +93,7 @@ executable backend
   main-is:        main.hs
   hs-source-dirs: src-bin
 
-  if impl(ghcjs -any)
+  if impl(ghcjs)
     buildable: False
 
   build-depends:

apps/kassandra/common-config.dhall

@@ -13,6 +13,8 @@ let extensions =
       , "FlexibleContexts"
       , "FlexibleInstances"
       , "GADTs"
+      , "GeneralizedNewtypeDeriving"
+      , "ImportQualifiedPost"
       , "LambdaCase"
       , "MultiParamTypeClasses"
       , "NamedFieldPuns"
@@ -54,8 +56,8 @@ in  ''
     -- BEGIN dhall generated common configuration
     -- generate with: dhall text --file common-config.dhall
     license-file:       LICENSE
-    author:             Malte Brandy
+    author:             maralorn
-    maintainer:         malte.brandy@maralorn.de
+    maintainer:         mail@maralorn.de
     build-type:         Simple
     extra-source-files: CHANGELOG.md
 

apps/kassandra/frontend/frontend.cabal

@@ -74,6 +74,7 @@ library
     , optics-th
     , reflex
     , reflex-dom
+    , relude
     , scientific
     , taskwarrior
     , text
@@ -81,7 +82,6 @@ library
     , time
     , unordered-containers
     , uuid
-    , relude
 
   exposed-modules:
     Frontend

apps/kassandra/kassandra/kassandra.cabal

@@ -5,14 +5,15 @@ version:            0.1.0.0
 -- BEGIN dhall generated common configuration
 -- generate with: dhall text --file common-config.dhall
 license-file:       LICENSE
-author:             Malte Brandy
+author:             maralorn
-maintainer:         malte.brandy@maralorn.de
+maintainer:         mail@maralorn.de
 build-type:         Simple
 extra-source-files: CHANGELOG.md
 
 common common-config
   default-extensions:
     AllowAmbiguousTypes
+    BlockArguments
     ConstraintKinds
     DataKinds
     DeriveAnyClass
@@ -24,6 +25,7 @@ common common-config
     FlexibleInstances
     GADTs
     GeneralizedNewtypeDeriving
+    ImportQualifiedPost
     LambdaCase
     MultiParamTypeClasses
     NamedFieldPuns

apps/kassandra/standalone/standalone.cabal

@@ -5,8 +5,8 @@ version:            0.1.0.0
 -- BEGIN dhall generated common configuration
 -- generate with: dhall text --file common-config.dhall
 license-file:       LICENSE
-author:             Malte Brandy
+author:             maralorn
-maintainer:         malte.brandy@maralorn.de
+maintainer:         mail@maralorn.de
 build-type:         Simple
 extra-source-files: CHANGELOG.md
 
@@ -24,6 +24,7 @@ common common-config
     FlexibleContexts
     FlexibleInstances
     GADTs
+    ImportQualifiedPost
     LambdaCase
     MultiParamTypeClasses
     NamedFieldPuns
@@ -109,4 +110,5 @@ executable kassandra2
     , base
     , kassandra
     , standalone
+
   ghc-options:    -threaded

apps/kassandra/weeder.dhall

@@ -1 +1,11 @@
-{ roots = [ "^Standalone.standalone$", "^Main.main$", "^Backend.backend$", "^Frontend.frontend$", "^Prelude.makeLabels$", "^Kassandra.Debug.log", "Kassandra.ReflexUtil" ], type-class-roots = True }
+{ roots =
+  [ "^Standalone.standalone\$"
+  , "^Main.main\$"
+  , "^Backend.backend\$"
+  , "^Frontend.frontend\$"
+  , "^Prelude.makeLabels\$"
+  , "^Kassandra.Debug.log"
+  , "Kassandra.ReflexUtil"
+  ]
+, type-class-roots = True
+}

apps/logfeed/logfeed.cabal

@@ -5,7 +5,6 @@ cabal-version:      >=1.10
 
 name:               logfeed
 version:            0.1.0.0
-
 author:             maralorn
 maintainer:         mail@maralorn.de
 
@@ -41,20 +40,20 @@ executable mail2rss
       base
     , containers
     , errors
+    , exceptions
     , extra
     , feed                  >=1.3.0.0
     , filepattern
     , lens
     , megaparsec
     , notmuch
+    , optparse-applicative
     , purebred-email
     , relude
     , say
     , string-interpolate
+    , tagsoup
     , text
     , time
-    , optparse-applicative
-    , exceptions
-    , tagsoup
 
   default-language: Haskell2010

apps/nixpkgs-bot/nixpkgs-bot.cabal

@@ -26,6 +26,7 @@ common common-config
     FlexibleInstances
     GADTs
     GeneralizedNewtypeDeriving
+    ImportQualifiedPost
     LambdaCase
     MultiParamTypeClasses
     NamedFieldPuns
@@ -38,7 +39,6 @@ common common-config
     TypeApplications
     TypeFamilies
     UndecidableInstances
-    ImportQualifiedPost
 
   build-depends:
     , aeson-schemas

apps/wizards-dialog/wizards-dialog.cabal

@@ -20,36 +20,39 @@ build-type:         Simple
 extra-source-files: CHANGELOG.md
 
 library
+  default-extensions: ImportQualifiedPost
   ghc-options:        -Wall
   exposed-modules:    Dialog
+
   -- other-extensions:
   build-depends:
-      base       >=4.13
+      ansi-terminal
+    , base           >=4.13
     , haskeline
-    , wizards
+    , process
-    , ansi-terminal
+    , relude
     , text
     , witch
-    , relude
+    , wizards
-    , process
 
   -- hs-source-dirs:
   default-language:   Haskell2010
 
 executable hotkeys
+  default-extensions: ImportQualifiedPost
   main-is:            Main.hs
-
   ghc-options:        -Wall
+
   -- other-extensions:
   build-depends:
-      base       >=4.13
+      aeson           >=2.0.1.0
-    , aeson      >= 2.0.1.0
-    , haskeline
-    , daemons
     , ansi-terminal
-    , text
+    , base            >=4.13
-    , relude
+    , daemons
+    , haskeline
     , process
+    , relude
+    , text
     , witch
     , wizards
     , wizards-dialog

flake.nix

@@ -46,6 +46,8 @@
               statix.enable = true;
               fourmolu.enable = true;
               shellcheck.enable = true;
+              cabal-fmt.enable = true;
+              dhall-format.enable = true;
             };
           };
         };

home-manager/machines.nix

@@ -71,7 +71,7 @@ let
         ./roles/mpd.nix
         ./roles/pythia.nix
         ./roles/research.nix
-        ./roles/night-shutdown.nix
+        # ./roles/night-shutdown.nix
         ./roles/tinkering.nix
         ./roles/wallpaper.nix
         ./roles/zettelkasten.nix

home-manager/roles/kassandra/backend.dhall

@@ -4,7 +4,7 @@ in  { users = toMap
         { maralorn =
           { filterTag = ""
           , passwordHash =
-              "$argon2id$v=19$m=65536,t=2,p=1$2capLVJQQBvndRxOKIVogQ==$wCGgmPx4yVyr+nMM9fWCtn1aPvi3uZDvpdhX85GuIxU="
+              "\$argon2id\$v=19\$m=65536,t=2,p=1\$2capLVJQQBvndRxOKIVogQ==\$wCGgmPx4yVyr+nMM9fWCtn1aPvi3uZDvpdhX85GuIxU="
           , userConfig =
             { localBackend =
                 types.LocalBackend.TaskwarriorBackend

home-manager/roles/status-script.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE ExtendedDefaultRules #-}
+{-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}