move nonce into prelude

Author: functora

nix/configuration.nix

@@ -493,7 +493,7 @@ in {
         # "soundcloud"
         "spotify"
         "steam"
-        "telegram"
+        # "telegram"
         "temu"
         "tidal"
         "tiktok"
@@ -746,40 +746,45 @@ in {
     #
     programs.firejail.enable = true;
     programs.firejail.wrappedBinaries =
-      fj.mkFirejailSimple "xonotic"
-      // fj.mkFirejailSimple "chromium"
+      fj.mkFirejailSimple "chromium"
       // mkOpenArena "rat"
-      // mkOpenArena "omega"
-      // mkOpenArena "excessiveplus"
       // fj.mkFirejailCustom {
-        pkg = "doom-free2";
+        pkg = "doom-infinite";
         dir = "doom";
         exe = ''
-          ${unst.gzdoom}/bin/gzdoom \
+          ${pkgs.gzdoom}/bin/gzdoom \
             -iwad ./freedoom-0.13.0/freedoom2.wad \
-            -file ./Project_Brutality-PB_Staging.zip \
+            -file ./DOOM_Infinite_DEMO_0978_6.pk3 \
+            -file ./flashlight_plus_plus_v9_1.pk3 \
+            -file ./DoomBSMS.wad \
+            -file ./mod.pk3 \
+            -file ./nashgore.pk3 \
             -file ./SimpleSlots.1.1.pk7
         '';
       }
       // fj.mkFirejailCustom {
-        pkg = "doom-free1";
+        pkg = "doom-64";
         dir = "doom";
         exe = ''
           ${unst.gzdoom}/bin/gzdoom \
-            -iwad ./freedoom-0.13.0/freedoom1.wad \
-            -file ./Project_Brutality-PB_Staging.zip \
+            -iwad ./freedoom-0.13.0/freedoom2.wad \
+            -file ./BD64-VoH_game.pk3 \
+            -file ./BD64-VoH_maps.pk3 \
+            -file ./relite_0.7.3b.pk3 \
             -file ./SimpleSlots.1.1.pk7
         '';
       }
       // fj.mkFirejailCustom {
-        pkg = "doom-dsc";
+        pkg = "doom-dragon";
         dir = "doom";
         exe = ''
-          ${vkdoom}/bin/vkdoom \
+          ${unst.gzdoom}/bin/gzdoom \
             -iwad ./freedoom-0.13.0/freedoom2.wad \
-            -file ./dsc/DSC-1.0.2.pk3 \
-            -file ./dsc/DSCmaterialPack.pk3 \
             -file ./Project_Brutality-PB_Staging.zip \
+            -file ./dragon/KAI-main.pk3 \
+            -file ./dragon/dragon-sector-remake-v1.0.pk3 \
+            -file ./flashlight_plus_plus_v9_1.pk3 \
+            -file ./relite_0.7.3b.pk3 \
             -file ./SimpleSlots.1.1.pk7
         '';
       }

pub/bfx/src/Bfx/Data/Web.hs

@@ -5,10 +5,6 @@ module Bfx.Data.Web
     ApiKey (..),
     RequestMethod (..),
     BaseUrl (..),
-    Nonce,
-    unNonce,
-    NonceGen,
-    newNonceGen,
     withNonce,
     parseJsonBs,
     utcTimeToMicros,
@@ -73,68 +69,6 @@ newtype BaseUrl = BaseUrl
       IsString
     )
 
-newtype Nonce = Nonce
-  { unNonce :: Natural
-  }
-  deriving newtype
-    ( Eq,
-      Ord,
-      Show
-    )
-  deriving stock
-    ( Data,
-      Generic
-    )
-
-mkNonce :: (MonadIO m) => m Nonce
-mkNonce =
-  liftIO
-    $ Nonce
-    . utcTimeToMicros
-    <$> getCurrentTime
-
-newtype NonceGen
-  = NonceGen (MVar Nonce)
-  deriving stock
-    ( Eq
-    )
-
-instance Prelude.Show NonceGen where
-  show =
-    const "NonceGen"
-
-newNonceGen ::
-  ( MonadIO m
-  ) =>
-  m NonceGen
-newNonceGen = do
-  nonce <- mkNonce
-  var <- liftIO $ newMVar nonce
-  pure $ NonceGen var
-
-withNonce ::
-  ( MonadUnliftIO m
-  ) =>
-  NonceGen ->
-  (Nonce -> m a) ->
-  m a
-withNonce (NonceGen var) this = do
-  nextNonce <- mkNonce
-  bracket
-    (takeMVar var)
-    (putMVar var . max nextNonce)
-    (const $ this nextNonce)
-
-utcTimeToMicros :: UTCTime -> Natural
-utcTimeToMicros x =
-  Prelude.fromInteger
-    $ diffTimeToPicoseconds
-      ( fromRational
-          . toRational
-          $ diffUTCTime x epoch
-      )
-    `div` 1000000
-
 parseJsonBs ::
   forall a.
   ( Typeable a,

pub/functora/src/prelude/Functora/Prelude.hs

@@ -119,6 +119,11 @@ module Functora.Prelude
     dropAround,
     dropWhileEnd,
     AscOrDesc (..),
+    Nonce,
+    unNonce,
+    NonceGen,
+    newNonceGen,
+    withNonce,
 
     -- * FixedPoint
     -- $fixedPoint
@@ -1162,6 +1167,68 @@ data AscOrDesc
       Bounded
     )
 
+newtype Nonce = Nonce
+  { unNonce :: Natural
+  }
+  deriving newtype
+    ( Eq,
+      Ord,
+      Show
+    )
+  deriving stock
+    ( Data,
+      Generic
+    )
+
+mkNonce :: (MonadIO m) => m Nonce
+mkNonce =
+  liftIO
+    $ Nonce
+    . utcTimeToMicros
+    <$> getCurrentTime
+
+newtype NonceGen
+  = NonceGen (MVar Nonce)
+  deriving stock
+    ( Eq
+    )
+
+instance Prelude.Show NonceGen where
+  show =
+    const "NonceGen"
+
+newNonceGen ::
+  ( MonadIO m
+  ) =>
+  m NonceGen
+newNonceGen = do
+  nonce <- mkNonce
+  var <- liftIO $ newMVar nonce
+  pure $ NonceGen var
+
+withNonce ::
+  ( MonadUnliftIO m
+  ) =>
+  NonceGen ->
+  (Nonce -> m a) ->
+  m a
+withNonce (NonceGen var) this = do
+  nextNonce <- mkNonce
+  bracket
+    (takeMVar var)
+    (putMVar var . max nextNonce)
+    (const $ this nextNonce)
+
+utcTimeToMicros :: UTCTime -> Natural
+utcTimeToMicros x =
+  Prelude.fromInteger
+    $ diffTimeToPicoseconds
+      ( fromRational
+          . toRational
+          $ diffUTCTime x epoch
+      )
+    `div` 1000000
+
 -- $fixedPoint
 -- Fixed point numbers.