Various formattings
This commit is contained in:
parent
6b7bc306a8
commit
d9c681752d
14 changed files with 803 additions and 738 deletions
|
@ -58,7 +58,7 @@ library
|
||||||
import: common-config
|
import: common-config
|
||||||
hs-source-dirs: src
|
hs-source-dirs: src
|
||||||
|
|
||||||
if impl(ghcjs -any)
|
if impl(ghcjs)
|
||||||
buildable: False
|
buildable: False
|
||||||
|
|
||||||
build-depends:
|
build-depends:
|
||||||
|
@ -66,16 +66,16 @@ library
|
||||||
, async
|
, async
|
||||||
, base
|
, base
|
||||||
, containers
|
, containers
|
||||||
, dhall
|
|
||||||
, data-default-class
|
, data-default-class
|
||||||
|
, dhall
|
||||||
, frontend
|
, frontend
|
||||||
, say
|
|
||||||
, kassandra
|
, kassandra
|
||||||
, network-simple
|
, network-simple
|
||||||
, obelisk-backend
|
, obelisk-backend
|
||||||
, obelisk-route
|
, obelisk-route
|
||||||
, password >=2.0.1.0
|
, password >=2.0.1.0
|
||||||
, relude
|
, relude
|
||||||
|
, say
|
||||||
, snap-core
|
, snap-core
|
||||||
, standalone
|
, standalone
|
||||||
, stm
|
, stm
|
||||||
|
@ -93,7 +93,7 @@ executable backend
|
||||||
main-is: main.hs
|
main-is: main.hs
|
||||||
hs-source-dirs: src-bin
|
hs-source-dirs: src-bin
|
||||||
|
|
||||||
if impl(ghcjs -any)
|
if impl(ghcjs)
|
||||||
buildable: False
|
buildable: False
|
||||||
|
|
||||||
build-depends:
|
build-depends:
|
||||||
|
|
|
@ -13,6 +13,8 @@ let extensions =
|
||||||
, "FlexibleContexts"
|
, "FlexibleContexts"
|
||||||
, "FlexibleInstances"
|
, "FlexibleInstances"
|
||||||
, "GADTs"
|
, "GADTs"
|
||||||
|
, "GeneralizedNewtypeDeriving"
|
||||||
|
, "ImportQualifiedPost"
|
||||||
, "LambdaCase"
|
, "LambdaCase"
|
||||||
, "MultiParamTypeClasses"
|
, "MultiParamTypeClasses"
|
||||||
, "NamedFieldPuns"
|
, "NamedFieldPuns"
|
||||||
|
@ -54,8 +56,8 @@ in ''
|
||||||
-- BEGIN dhall generated common configuration
|
-- BEGIN dhall generated common configuration
|
||||||
-- generate with: dhall text --file common-config.dhall
|
-- generate with: dhall text --file common-config.dhall
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Malte Brandy
|
author: maralorn
|
||||||
maintainer: malte.brandy@maralorn.de
|
maintainer: mail@maralorn.de
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
extra-source-files: CHANGELOG.md
|
extra-source-files: CHANGELOG.md
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,7 @@ library
|
||||||
, optics-th
|
, optics-th
|
||||||
, reflex
|
, reflex
|
||||||
, reflex-dom
|
, reflex-dom
|
||||||
|
, relude
|
||||||
, scientific
|
, scientific
|
||||||
, taskwarrior
|
, taskwarrior
|
||||||
, text
|
, text
|
||||||
|
@ -81,7 +82,6 @@ library
|
||||||
, time
|
, time
|
||||||
, unordered-containers
|
, unordered-containers
|
||||||
, uuid
|
, uuid
|
||||||
, relude
|
|
||||||
|
|
||||||
exposed-modules:
|
exposed-modules:
|
||||||
Frontend
|
Frontend
|
||||||
|
|
|
@ -5,14 +5,15 @@ version: 0.1.0.0
|
||||||
-- BEGIN dhall generated common configuration
|
-- BEGIN dhall generated common configuration
|
||||||
-- generate with: dhall text --file common-config.dhall
|
-- generate with: dhall text --file common-config.dhall
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Malte Brandy
|
author: maralorn
|
||||||
maintainer: malte.brandy@maralorn.de
|
maintainer: mail@maralorn.de
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
extra-source-files: CHANGELOG.md
|
extra-source-files: CHANGELOG.md
|
||||||
|
|
||||||
common common-config
|
common common-config
|
||||||
default-extensions:
|
default-extensions:
|
||||||
AllowAmbiguousTypes
|
AllowAmbiguousTypes
|
||||||
|
BlockArguments
|
||||||
ConstraintKinds
|
ConstraintKinds
|
||||||
DataKinds
|
DataKinds
|
||||||
DeriveAnyClass
|
DeriveAnyClass
|
||||||
|
@ -24,6 +25,7 @@ common common-config
|
||||||
FlexibleInstances
|
FlexibleInstances
|
||||||
GADTs
|
GADTs
|
||||||
GeneralizedNewtypeDeriving
|
GeneralizedNewtypeDeriving
|
||||||
|
ImportQualifiedPost
|
||||||
LambdaCase
|
LambdaCase
|
||||||
MultiParamTypeClasses
|
MultiParamTypeClasses
|
||||||
NamedFieldPuns
|
NamedFieldPuns
|
||||||
|
|
|
@ -5,8 +5,8 @@ version: 0.1.0.0
|
||||||
-- BEGIN dhall generated common configuration
|
-- BEGIN dhall generated common configuration
|
||||||
-- generate with: dhall text --file common-config.dhall
|
-- generate with: dhall text --file common-config.dhall
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Malte Brandy
|
author: maralorn
|
||||||
maintainer: malte.brandy@maralorn.de
|
maintainer: mail@maralorn.de
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
extra-source-files: CHANGELOG.md
|
extra-source-files: CHANGELOG.md
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ common common-config
|
||||||
FlexibleContexts
|
FlexibleContexts
|
||||||
FlexibleInstances
|
FlexibleInstances
|
||||||
GADTs
|
GADTs
|
||||||
|
ImportQualifiedPost
|
||||||
LambdaCase
|
LambdaCase
|
||||||
MultiParamTypeClasses
|
MultiParamTypeClasses
|
||||||
NamedFieldPuns
|
NamedFieldPuns
|
||||||
|
@ -109,4 +110,5 @@ executable kassandra2
|
||||||
, base
|
, base
|
||||||
, kassandra
|
, kassandra
|
||||||
, standalone
|
, standalone
|
||||||
|
|
||||||
ghc-options: -threaded
|
ghc-options: -threaded
|
||||||
|
|
|
@ -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
|
||||||
|
}
|
||||||
|
|
|
@ -5,7 +5,6 @@ cabal-version: >=1.10
|
||||||
|
|
||||||
name: logfeed
|
name: logfeed
|
||||||
version: 0.1.0.0
|
version: 0.1.0.0
|
||||||
|
|
||||||
author: maralorn
|
author: maralorn
|
||||||
maintainer: mail@maralorn.de
|
maintainer: mail@maralorn.de
|
||||||
|
|
||||||
|
@ -41,20 +40,20 @@ executable mail2rss
|
||||||
base
|
base
|
||||||
, containers
|
, containers
|
||||||
, errors
|
, errors
|
||||||
|
, exceptions
|
||||||
, extra
|
, extra
|
||||||
, feed >=1.3.0.0
|
, feed >=1.3.0.0
|
||||||
, filepattern
|
, filepattern
|
||||||
, lens
|
, lens
|
||||||
, megaparsec
|
, megaparsec
|
||||||
, notmuch
|
, notmuch
|
||||||
|
, optparse-applicative
|
||||||
, purebred-email
|
, purebred-email
|
||||||
, relude
|
, relude
|
||||||
, say
|
, say
|
||||||
, string-interpolate
|
, string-interpolate
|
||||||
|
, tagsoup
|
||||||
, text
|
, text
|
||||||
, time
|
, time
|
||||||
, optparse-applicative
|
|
||||||
, exceptions
|
|
||||||
, tagsoup
|
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
|
@ -26,6 +26,7 @@ common common-config
|
||||||
FlexibleInstances
|
FlexibleInstances
|
||||||
GADTs
|
GADTs
|
||||||
GeneralizedNewtypeDeriving
|
GeneralizedNewtypeDeriving
|
||||||
|
ImportQualifiedPost
|
||||||
LambdaCase
|
LambdaCase
|
||||||
MultiParamTypeClasses
|
MultiParamTypeClasses
|
||||||
NamedFieldPuns
|
NamedFieldPuns
|
||||||
|
@ -38,7 +39,6 @@ common common-config
|
||||||
TypeApplications
|
TypeApplications
|
||||||
TypeFamilies
|
TypeFamilies
|
||||||
UndecidableInstances
|
UndecidableInstances
|
||||||
ImportQualifiedPost
|
|
||||||
|
|
||||||
build-depends:
|
build-depends:
|
||||||
, aeson-schemas
|
, aeson-schemas
|
||||||
|
|
|
@ -20,36 +20,39 @@ build-type: Simple
|
||||||
extra-source-files: CHANGELOG.md
|
extra-source-files: CHANGELOG.md
|
||||||
|
|
||||||
library
|
library
|
||||||
|
default-extensions: ImportQualifiedPost
|
||||||
ghc-options: -Wall
|
ghc-options: -Wall
|
||||||
exposed-modules: Dialog
|
exposed-modules: Dialog
|
||||||
|
|
||||||
-- other-extensions:
|
-- other-extensions:
|
||||||
build-depends:
|
build-depends:
|
||||||
base >=4.13
|
ansi-terminal
|
||||||
|
, base >=4.13
|
||||||
, haskeline
|
, haskeline
|
||||||
, wizards
|
, process
|
||||||
, ansi-terminal
|
, relude
|
||||||
, text
|
, text
|
||||||
, witch
|
, witch
|
||||||
, relude
|
, wizards
|
||||||
, process
|
|
||||||
|
|
||||||
-- hs-source-dirs:
|
-- hs-source-dirs:
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
executable hotkeys
|
executable hotkeys
|
||||||
|
default-extensions: ImportQualifiedPost
|
||||||
main-is: Main.hs
|
main-is: Main.hs
|
||||||
|
|
||||||
ghc-options: -Wall
|
ghc-options: -Wall
|
||||||
|
|
||||||
-- other-extensions:
|
-- other-extensions:
|
||||||
build-depends:
|
build-depends:
|
||||||
base >=4.13
|
aeson >=2.0.1.0
|
||||||
, aeson >= 2.0.1.0
|
|
||||||
, haskeline
|
|
||||||
, daemons
|
|
||||||
, ansi-terminal
|
, ansi-terminal
|
||||||
, text
|
, base >=4.13
|
||||||
, relude
|
, daemons
|
||||||
|
, haskeline
|
||||||
, process
|
, process
|
||||||
|
, relude
|
||||||
|
, text
|
||||||
, witch
|
, witch
|
||||||
, wizards
|
, wizards
|
||||||
, wizards-dialog
|
, wizards-dialog
|
||||||
|
|
|
@ -46,6 +46,8 @@
|
||||||
statix.enable = true;
|
statix.enable = true;
|
||||||
fourmolu.enable = true;
|
fourmolu.enable = true;
|
||||||
shellcheck.enable = true;
|
shellcheck.enable = true;
|
||||||
|
cabal-fmt.enable = true;
|
||||||
|
dhall-format.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -71,7 +71,7 @@ let
|
||||||
./roles/mpd.nix
|
./roles/mpd.nix
|
||||||
./roles/pythia.nix
|
./roles/pythia.nix
|
||||||
./roles/research.nix
|
./roles/research.nix
|
||||||
./roles/night-shutdown.nix
|
# ./roles/night-shutdown.nix
|
||||||
./roles/tinkering.nix
|
./roles/tinkering.nix
|
||||||
./roles/wallpaper.nix
|
./roles/wallpaper.nix
|
||||||
./roles/zettelkasten.nix
|
./roles/zettelkasten.nix
|
||||||
|
|
|
@ -4,7 +4,7 @@ in { users = toMap
|
||||||
{ maralorn =
|
{ maralorn =
|
||||||
{ filterTag = ""
|
{ filterTag = ""
|
||||||
, passwordHash =
|
, 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 =
|
, userConfig =
|
||||||
{ localBackend =
|
{ localBackend =
|
||||||
types.LocalBackend.TaskwarriorBackend
|
types.LocalBackend.TaskwarriorBackend
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,5 +1,6 @@
|
||||||
{-# LANGUAGE BlockArguments #-}
|
{-# LANGUAGE BlockArguments #-}
|
||||||
{-# LANGUAGE ExtendedDefaultRules #-}
|
{-# LANGUAGE ExtendedDefaultRules #-}
|
||||||
|
{-# LANGUAGE ImportQualifiedPost #-}
|
||||||
{-# LANGUAGE NamedFieldPuns #-}
|
{-# LANGUAGE NamedFieldPuns #-}
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
{-# LANGUAGE QuasiQuotes #-}
|
{-# LANGUAGE QuasiQuotes #-}
|
||||||
|
|
Loading…
Reference in a new issue