Small cleanup

.github/workflows/ci.yml

@@ -147,20 +147,25 @@ jobs:
 
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
-      # TODO: This cache actually needs to be keyed on the hash of the
+      # TODO: These caches actually needs to be keyed on the hash of the
       # ./nix-helpers/simple-cabal-shell.nix derivation.  If that derivation
       # changes, then we really, really should not reuse the same
-      # ~/.cabal/store directory.
+      # ~/.cabal/store directory (since there is the possibility of getting
+      # into a cabal hell, where Haskell libraries in the Cabal store are linked to
+      # different, incompatible system libraries).
       #
       # It is possible to get the hash of this derivation with a command like:
       #
       # $ nix eval --impure --raw --expr 'with (import <nixpkgs> {}).lib; let simpleCabalShell = import ./.nix-helpers/simple-cabal-shell.nix {}; in builtins.elemAt (splitString "-" (removePrefix (builtins.storeDir + "/") simpleCabalShell)) 0'
       #
       # Just need to load this into a variable, and throw it in the following key name
       - uses: actions/cache@v3
-        name: Cache cabal-store
+        name: Cache cabal store
         with:
-          path: ~/.config/cabal/store
+          path: |
+            ~/.cabal/store
+            ~/.config/cabal/store
+            ~/.local/state/cabal/store
           key: nix-simple-cabal-shell
 
       - name: cabal update

.nix-helpers/simple-cabal-shell.nix

@@ -120,5 +120,6 @@ pkgs.mkShell {
     pkgs.xorg.libXdmcp
     pkgs.xorg.libxcb
     pkgs.xorg.libXtst
+    pkgs.zlib
   ];
 }

src/Termonad/App.hs

@@ -6,7 +6,6 @@
 
 import Config.Dyre (wrapMain, newParams)
 import Control.Lens ((^.), (^..), over, set, view, ix)
-import Control.Monad.Fail (fail)
 import Data.FileEmbed (embedFile)
 import Data.FocusList (focusList, moveFromToFL, updateFocusFL)
 import qualified Data.List as List
@@ -479,7 +478,7 @@
   copyAction <- simpleActionNew "copy" Nothing
   void $ onSimpleActionActivate copyAction $ \_ -> do
     maybeTerm <- getFocusedTermFromState mvarTMState tmWinId
     maybe (pure ()) terminalCopyClipboard maybeTerm
   actionMapAddAction win copyAction
   applicationSetAccelsForAction app "win.copy" ["<Shift><Ctrl>C"]
 
@@ -738,7 +737,7 @@
   terminalSetScrollbackLines term (fromIntegral (scrollbackLen options))
   terminalSetBoldIsBright term (boldIsBright options)
   terminalSetEnableSixelIfExists term (enableSixel options)
   terminalSetAllowBold term (allowBold options)
 
   let vScrollbarPolicy = showScrollbarToPolicy (options ^. lensShowScrollbar)
   scrolledWindowSetPolicy scrolledWin PolicyTypeAutomatic vScrollbarPolicy

src/Termonad/Config/Colour.hs

@@ -87,7 +87,7 @@ module Termonad.Config.Colour
     -- $setup
   ) where
 
-import Termonad.Prelude hiding ((\\), index)
+import Termonad.Prelude
 
 import Control.Lens ((%~), makeLensesFor)
 import Data.Colour
@@ -124,16 +124,14 @@ import GI.Vte
   , terminalSetColorHighlight
   , terminalSetColorHighlightForeground
   )
-import Text.Printf (printf)
-import Text.Show (showString)
-
 import Termonad.Lenses (lensCreateTermHook, lensHooks)
 import Termonad.Types
   ( Option(Unset)
   , TMConfig
   , TMState
   , whenSet
   )
+import Text.Printf (printf)
 
 -- $setup
 -- >>> import Data.Colour.Names (green, red)

src/Termonad/Gtk.hs

@@ -17,7 +17,6 @@
 
 import Termonad.Prelude
 
-import Control.Monad.Fail (MonadFail, fail)
 import Data.GI.Base (ManagedPtr, withManagedPtr)
 import Data.Text (unpack)
 import GHC.Stack (HasCallStack)
@@ -87,7 +86,7 @@
   => t -- ^ a Terminal
   -> Bool -- ^ whether to enable SIXEL images
   -> m ()
 terminalSetEnableSixelIfExists t b = do
 #ifdef VTE_VERSION_GEQ_0_63
   terminalSetEnableSixel t b
 #endif

src/Termonad/Term.hs

@@ -140,15 +140,23 @@
   , TMState
   , TMState'(TMState, tmStateConfig, tmStateFontDesc)
   , TMTerm
-  , TMWindow
+  , TMWindowId
   , assertInvariantTMState
   , createTMNotebookTab
+  , getNotebookFromTMState
+  , getTMNotebookFromTMState
+  , getTMNotebookFromTMState'
+  , getTMWindowFromTMState
+  , getTMWindowFromWins
   , newTMTerm
   , pid
   , tmNotebook
   , tmNotebookTabTerm
   , tmNotebookTabTermContainer
-  , tmNotebookTabs, TMWindowId, tmStateWindows, getTMWindowFromWins, tmWindowNotebook, getTMWindowFromTMState, getNotebookFromTMState, getTMNotebookFromTMState, getTMNotebookFromTMState', tmWindowAppWin
+  , tmNotebookTabs
+  , tmStateWindows
+  , tmWindowAppWin
+  , tmWindowNotebook
   )
 
 focusTerm :: Int -> TMState -> TMWindowId -> IO ()
@@ -384,7 +392,7 @@
   terminalSetCursorBlinkMode vteTerm (cursorBlinkMode curOpts)
   terminalSetBoldIsBright vteTerm (boldIsBright curOpts)
   terminalSetEnableSixelIfExists vteTerm (enableSixel curOpts)
   terminalSetAllowBold vteTerm (allowBold curOpts)
   widgetShow vteTerm
   pure vteTerm
 
@@ -404,7 +412,7 @@
   let argv = maybe ["/usr/bin/env", "bash"] pure mShell
   -- Launch the shell
   shellPid <-
     terminalSpawnSync
       vteTerm
       [PtyFlagsDefault]
       maybeCurrDir

src/Termonad/Types.hs

@@ -5,7 +5,6 @@ module Termonad.Types where
 import Termonad.Prelude
 
 import Control.Lens (ifoldMap)
-import Control.Monad.Fail (fail)
 import Data.FocusList (FocusList, emptyFL, getFocusItemFL, lengthFL)
 import Data.Foldable (toList)
 import Data.Unique (Unique, hashUnique, newUnique)
@@ -32,7 +31,6 @@ import GI.Vte (Terminal, CursorBlinkMode(..))
 import Termonad.Gtk (widgetEq)
 import Termonad.IdMap (IdMap, IdMapKey, singletonIdMap, lookupIdMap)
 import Text.Pretty.Simple (pPrint)
-import Text.Show (ShowS, showParen, showString)
 
 -- | A wrapper around a VTE 'Terminal'.  This also stores the process ID of the
 -- process running on this terminal, as well as a 'Unique' that can be used for