diff --git a/app/rofi-dev.hs b/app/rofi-dev.hs index 480e49e..62508ba 100644 --- a/app/rofi-dev.hs +++ b/app/rofi-dev.hs @@ -176,12 +176,12 @@ mountByAlias unmountFlag alias = do mkGroup :: NE.NonEmpty (Header, ProtoAction) -> RofiGroup MountConf mkGroup as = titledGroup h $ toRofiActions $ NE.toList $ alignEntries $ snd <$> as where - h = (T.pack $ show $ fst $ NE.head as) + h = T.pack $ show $ fst $ NE.head as alignSep :: T.Text alignSep = " | " -alignEntries :: NE.NonEmpty (ProtoAction) -> NE.NonEmpty (T.Text, MIO ()) +alignEntries :: NE.NonEmpty ProtoAction -> NE.NonEmpty (T.Text, MIO ()) alignEntries ps = NE.zip (align es) as where (es, as) = NE.unzip $ fmap (\(ProtoAction e a) -> (e, a)) ps @@ -190,10 +190,10 @@ alignEntries ps = NE.zip (align es) as . NE.transpose . fmap1 padAll . NE.transpose - fmap1 f (x :| xs) = (f x) :| xs + fmap1 f (x :| xs) = f x :| xs padAll xs = let m = maxNE $ fmap T.length xs in fmap (rpad m ' ') xs maxNE (x :| []) = x - maxNE (x :| (y : ys)) = maxNE $ (max x y) :| ys + maxNE (x :| (y : ys)) = maxNE $ max x y :| ys rpad :: Int -> Char -> T.Text -> T.Text rpad n c s = T.append s $ T.replicate (n - T.length s) $ T.singleton c @@ -270,7 +270,7 @@ class Mountable a where class Mountable a => Actionable a where -- | Return a string to go in the Rofi menu for the given type fmtEntry :: a -> NE.NonEmpty T.Text - fmtEntry d = (getLabel d :| []) + fmtEntry d = getLabel d :| [] groupHeader :: a -> Header @@ -283,7 +283,7 @@ class Mountable a => Actionable a where let h = groupHeader dev let action = when i $ mountMaybe dev $ mountedState m let entry = case fmtEntry dev of - (e :| es) -> (T.append (mountedPrefix m i) e) :| es + (e :| es) -> T.append (mountedPrefix m i) e :| es return (h, ProtoAction entry action) where mountedPrefix _ False = "! " @@ -346,7 +346,7 @@ instance Mountable a => Mountable (Tree a) where getLabel (Tree p _) = getLabel p instance Actionable (Tree DeviceConfig) where - fmtEntry (Tree p@DeviceConfig {deviceData = d} _) = (getLabel p :| [target d]) + fmtEntry (Tree p@DeviceConfig {deviceData = d} _) = getLabel p :| [target d] where target (CIFSConfig (CIFSData {cifsRemote = r})) = r target (SSHFSConfig (SSHFSData {sshfsRemote = r})) = r @@ -551,7 +551,7 @@ runPromptLoop n pwd = do configToPwd :: (HasLogFunc c, MonadReader c m, MonadUnliftIO m) => PasswordConfig -> PasswordGetter m configToPwd (PwdBW (BitwardenConfig {bwKey = k, bwTries = n})) = runPromptLoop n $ runBitwarden k -configToPwd (PwdLS s) = runSecret $ M.fromList $ fmap (\(SecretMap k v) -> (k, v)) $ secretAttributes s +configToPwd (PwdLS s) = runSecret $ M.fromList $ (\(SecretMap k v) -> (k, v)) <$> secretAttributes s configToPwd (PwdPr p) = flip runPromptLoop readPassword $ promptTries p withPasswordGetter @@ -593,7 +593,7 @@ instance Mountable Removable where getLabel Removable {removableLabel = l} = l instance Actionable Removable where - fmtEntry Removable {removablePath = d, removableLabel = l} = (l :| [d]) + fmtEntry Removable {removablePath = d, removableLabel = l} = l :| [d] groupHeader _ = RemovableHeader @@ -689,7 +689,7 @@ mtpExeInstalled :: MonadIO m => m Bool mtpExeInstalled = isJust <$> findExecutable mtpExe instance Actionable MTPFS where - fmtEntry d = (getLabel d :| []) + fmtEntry d = getLabel d :| [] groupHeader _ = MTPFSHeader