aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2022-04-10 13:26:16 -0600
committerJosh Rahm <joshuarahm@gmail.com>2022-04-10 13:26:16 -0600
commitfada61902291aeb29914fff288301a8c487c4ecd (patch)
tree047655195f50efcbd51db8f825acf589dc6abead
parentbf2e2459f800f953d95681a937051fcf56ac79aa (diff)
downloadrde-fada61902291aeb29914fff288301a8c487c4ecd.tar.gz
rde-fada61902291aeb29914fff288301a8c487c4ecd.tar.bz2
rde-fada61902291aeb29914fff288301a8c487c4ecd.zip
Rename Internal to Rahm.Desktop
-rw-r--r--src/Main.hs18
-rw-r--r--src/Rahm/Desktop/CornerLayout.hs (renamed from src/Internal/CornerLayout.hs)2
-rw-r--r--src/Rahm/Desktop/DMenu.hs (renamed from src/Internal/DMenu.hs)2
-rw-r--r--src/Rahm/Desktop/Hash.hs (renamed from src/Internal/Hash.hs)2
-rw-r--r--src/Rahm/Desktop/Keys.hs (renamed from src/Internal/Keys.hs)34
-rw-r--r--src/Rahm/Desktop/KeysM.hs (renamed from src/Internal/KeysM.hs)2
-rw-r--r--src/Rahm/Desktop/Layout.hs (renamed from src/Internal/Layout.hs)8
-rw-r--r--src/Rahm/Desktop/LayoutDraw.hs (renamed from src/Internal/LayoutDraw.hs)6
-rw-r--r--src/Rahm/Desktop/LayoutList.hs (renamed from src/Internal/LayoutList.hs)2
-rw-r--r--src/Rahm/Desktop/Lib.hs (renamed from src/Internal/Lib.hs)10
-rw-r--r--src/Rahm/Desktop/Logger.hs (renamed from src/Internal/Logger.hs)4
-rw-r--r--src/Rahm/Desktop/Marking.hs (renamed from src/Internal/Marking.hs)4
-rw-r--r--src/Rahm/Desktop/MouseMotion.hs (renamed from src/Internal/MouseMotion.hs)6
-rw-r--r--src/Rahm/Desktop/NoPersist.hs (renamed from src/Internal/NoPersist.hs)2
-rw-r--r--src/Rahm/Desktop/PassMenu.hs (renamed from src/Internal/PassMenu.hs)2
-rw-r--r--src/Rahm/Desktop/PromptConfig.hs (renamed from src/Internal/PromptConfig.hs)2
-rw-r--r--src/Rahm/Desktop/RebindKeys.hs (renamed from src/Internal/RebindKeys.hs)6
-rw-r--r--src/Rahm/Desktop/ScreenRotate.hs (renamed from src/Internal/ScreenRotate.hs)2
-rw-r--r--src/Rahm/Desktop/Submap.hs (renamed from src/Internal/Submap.hs)2
-rw-r--r--src/Rahm/Desktop/Swallow.hs (renamed from src/Internal/Swallow.hs)2
-rw-r--r--src/Rahm/Desktop/SwapMaster.hs (renamed from src/Internal/SwapMaster.hs)4
-rw-r--r--src/Rahm/Desktop/Windows.hs (renamed from src/Internal/Windows.hs)2
-rw-r--r--src/Rahm/Desktop/XMobarLog.hs (renamed from src/Internal/XMobarLog.hs)6
23 files changed, 65 insertions, 65 deletions
diff --git a/src/Main.hs b/src/Main.hs
index 0b4a181..c8cdd19 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -12,15 +12,15 @@ import System.Environment (setEnv)
import Data.Monoid
import qualified Data.Map as Map
-import Internal.Swallow
-import Internal.Windows
-import Internal.XMobarLog
-import Internal.Keys
-import Internal.Layout
-import Internal.Logger
-import Internal.DMenu (menuCommandString)
-import Internal.RebindKeys
-import Internal.KeysM
+import Rahm.Desktop.Swallow
+import Rahm.Desktop.Windows
+import Rahm.Desktop.XMobarLog
+import Rahm.Desktop.Keys
+import Rahm.Desktop.Layout
+import Rahm.Desktop.Logger
+import Rahm.Desktop.DMenu (menuCommandString)
+import Rahm.Desktop.RebindKeys
+import Rahm.Desktop.KeysM
import qualified XMonad as X
import qualified XMonad.StackSet as W
diff --git a/src/Internal/CornerLayout.hs b/src/Rahm/Desktop/CornerLayout.hs
index 5545aef..33f439e 100644
--- a/src/Internal/CornerLayout.hs
+++ b/src/Rahm/Desktop/CornerLayout.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
-- Creates a layout, the "corner layout" that keeps the master window in the
-- corner and the other windows go around it.
-module Internal.CornerLayout where
+module Rahm.Desktop.CornerLayout where
import Data.Typeable (Typeable)
import XMonad (LayoutClass(..), Rectangle(..), Resize(..), fromMessage)
diff --git a/src/Internal/DMenu.hs b/src/Rahm/Desktop/DMenu.hs
index 0d22b55..62ecdd3 100644
--- a/src/Internal/DMenu.hs
+++ b/src/Rahm/Desktop/DMenu.hs
@@ -1,4 +1,4 @@
-module Internal.DMenu where
+module Rahm.Desktop.DMenu where
import XMonad.Util.Dmenu
import XMonad
diff --git a/src/Internal/Hash.hs b/src/Rahm/Desktop/Hash.hs
index 272808b..dc58d96 100644
--- a/src/Internal/Hash.hs
+++ b/src/Rahm/Desktop/Hash.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE OverloadedStrings #-}
-module Internal.Hash where
+module Rahm.Desktop.Hash where
import Numeric (showHex)
import qualified Data.ByteString as BS
diff --git a/src/Internal/Keys.hs b/src/Rahm/Desktop/Keys.hs
index ad9d719..9712f84 100644
--- a/src/Internal/Keys.hs
+++ b/src/Rahm/Desktop/Keys.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE RankNTypes, FlexibleContexts, ViewPatterns #-}
-module Internal.Keys (applyKeys) where
+module Rahm.Desktop.Keys (applyKeys) where
import XMonad.Util.Run (safeSpawn)
import Data.Monoid (Endo(..))
@@ -9,8 +9,8 @@ import Control.Monad.Writer
import Control.Monad.Loops (iterateWhile)
import Control.Monad.Fix (fix)
import Graphics.X11.ExtraTypes.XF86;
-import Internal.KeysM
-import Internal.SwapMaster (swapMaster)
+import Rahm.Desktop.KeysM
+import Rahm.Desktop.SwapMaster (swapMaster)
import XMonad.Hooks.ManageDocks
import XMonad.Layout.MosaicAlt
import Graphics.X11.ExtraTypes.XorgDefault
@@ -26,13 +26,13 @@ import Data.Char
import Data.List hiding ((!!))
import Data.List.Safe ((!!))
import Data.Map (Map)
-import Internal.Layout
-import Internal.Marking
-import Internal.PromptConfig
+import Rahm.Desktop.Layout
+import Rahm.Desktop.Marking
+import Rahm.Desktop.PromptConfig
import System.IO
import Text.Printf
import XMonad
-import Internal.Submap
+import Rahm.Desktop.Submap
import XMonad.Actions.WindowNavigation
import XMonad.Prompt
import XMonad.Prompt.Input
@@ -46,16 +46,16 @@ import XMonad.Actions.SpawnOn as SpawnOn
import qualified Data.Map as Map
import qualified XMonad.StackSet as W
-import Internal.LayoutList
-import Internal.MouseMotion
-import Internal.Windows
-import Internal.Lib
-import Internal.DMenu
-import Internal.PassMenu
-import Internal.Logger
-import Internal.RebindKeys
-import Internal.Swallow
-import Internal.ScreenRotate (screenRotateForward, screenRotateBackward)
+import Rahm.Desktop.LayoutList
+import Rahm.Desktop.MouseMotion
+import Rahm.Desktop.Windows
+import Rahm.Desktop.Lib
+import Rahm.Desktop.DMenu
+import Rahm.Desktop.PassMenu
+import Rahm.Desktop.Logger
+import Rahm.Desktop.RebindKeys
+import Rahm.Desktop.Swallow
+import Rahm.Desktop.ScreenRotate (screenRotateForward, screenRotateBackward)
type KeyMap l = XConfig l -> Map (KeyMask, KeySym) (X ())
type ButtonsMap l = XConfig l -> Map (KeyMask, Button) (Window -> X ())
diff --git a/src/Internal/KeysM.hs b/src/Rahm/Desktop/KeysM.hs
index e490b89..ef52c24 100644
--- a/src/Internal/KeysM.hs
+++ b/src/Rahm/Desktop/KeysM.hs
@@ -1,6 +1,6 @@
{-# Language GeneralizedNewtypeDeriving, MultiParamTypeClasses,
FunctionalDependencies, FlexibleInstances, TypeFamilies, FlexibleContexts #-}
-module Internal.KeysM where
+module Rahm.Desktop.KeysM where
import Data.List
import Data.Bits ((.&.))
diff --git a/src/Internal/Layout.hs b/src/Rahm/Desktop/Layout.hs
index 229e958..95854b8 100644
--- a/src/Internal/Layout.hs
+++ b/src/Rahm/Desktop/Layout.hs
@@ -1,10 +1,10 @@
{-# LANGUAGE MultiParamTypeClasses, ViewPatterns, FlexibleInstances, KindSignatures, DataKinds, GADTs, RankNTypes, PolyKinds #-}
-module Internal.Layout where
+module Rahm.Desktop.Layout where
import GHC.TypeLits
import Data.Proxy (Proxy(..))
-import Internal.CornerLayout (Corner(..))
+import Rahm.Desktop.CornerLayout (Corner(..))
import Control.Arrow (second)
import XMonad.Hooks.ManageDocks
import XMonad.Layout.Circle
@@ -25,8 +25,8 @@ import XMonad
import XMonad.Core
import XMonad.Layout.NoBorders (smartBorders, noBorders)
-import Internal.LayoutList
-import Internal.Windows
+import Rahm.Desktop.LayoutList
+import Rahm.Desktop.Windows
import qualified Data.Map as M
import qualified XMonad.StackSet as W
diff --git a/src/Internal/LayoutDraw.hs b/src/Rahm/Desktop/LayoutDraw.hs
index a105c98..c3d8c9e 100644
--- a/src/Internal/LayoutDraw.hs
+++ b/src/Rahm/Desktop/LayoutDraw.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE FlexibleInstances, FlexibleContexts, MultiParamTypeClasses,
ScopedTypeVariables, BangPatterns #-}
-module Internal.LayoutDraw (drawLayout) where
+module Rahm.Desktop.LayoutDraw (drawLayout) where
import Control.Monad
@@ -10,8 +10,8 @@ import Control.Exception (handle)
import Control.Monad.Writer (execWriter, tell)
import Data.Foldable (find)
import Data.Maybe (fromMaybe)
-import Internal.Hash (quickHash)
-import Internal.Layout (ZoomModifier(..))
+import Rahm.Desktop.Hash (quickHash)
+import Rahm.Desktop.Layout (ZoomModifier(..))
import System.Directory (createDirectoryIfMissing, doesFileExist)
import System.FilePath ((</>))
import Text.Printf (printf)
diff --git a/src/Internal/LayoutList.hs b/src/Rahm/Desktop/LayoutList.hs
index 2405f71..3bc09d3 100644
--- a/src/Internal/LayoutList.hs
+++ b/src/Rahm/Desktop/LayoutList.hs
@@ -9,7 +9,7 @@
- The indexing uses a type-safe zipper to keep track of the currently-selected
- layout.
-}
-module Internal.LayoutList (
+module Rahm.Desktop.LayoutList (
LayoutList,
layoutZipper,
LCons,
diff --git a/src/Internal/Lib.hs b/src/Rahm/Desktop/Lib.hs
index fdbc9a5..c90a5d7 100644
--- a/src/Internal/Lib.hs
+++ b/src/Rahm/Desktop/Lib.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE RankNTypes #-}
-module Internal.Lib where
+module Rahm.Desktop.Lib where
import Prelude hiding ((!!))
@@ -9,22 +9,22 @@ import XMonad.Prompt
import XMonad.Prompt.Input
import XMonad.Prompt.Shell
-import Internal.PromptConfig
+import Rahm.Desktop.PromptConfig
import Data.Char
import Data.List hiding ((!!))
import Data.List.Safe ((!!))
import Data.Maybe
-import Internal.Marking
+import Rahm.Desktop.Marking
import Text.Printf
import XMonad hiding (workspaces, Screen)
import XMonad.StackSet hiding (filter, focus)
import qualified Data.Map as Map
-import Internal.DMenu
+import Rahm.Desktop.DMenu
import Data.Ord (comparing)
import qualified XMonad.StackSet as S
-import Internal.Windows
+import Rahm.Desktop.Windows
type WorkspaceName = Char
newtype Selector = Selector (forall a. (Eq a) => a -> [a] -> a)
diff --git a/src/Internal/Logger.hs b/src/Rahm/Desktop/Logger.hs
index e5824a4..c73942f 100644
--- a/src/Internal/Logger.hs
+++ b/src/Rahm/Desktop/Logger.hs
@@ -1,10 +1,10 @@
-module Internal.Logger where
+module Rahm.Desktop.Logger where
import XMonad
import qualified XMonad.Util.ExtensibleState as XS
import System.IO
-import Internal.NoPersist
+import Rahm.Desktop.NoPersist
newtype LoggerState =
LoggerState {
diff --git a/src/Internal/Marking.hs b/src/Rahm/Desktop/Marking.hs
index 3ffb411..8e9867d 100644
--- a/src/Internal/Marking.hs
+++ b/src/Rahm/Desktop/Marking.hs
@@ -1,12 +1,12 @@
{-# LANGUAGE ScopedTypeVariables #-}
-module Internal.Marking (
+module Rahm.Desktop.Marking (
historyNext, historyPrev,
markCurrentWindow, pushHistory,
jumpToMark, jumpToLast, swapWithLastMark,
swapWithMark
) where
-import Internal.Windows (mapWindows, findWindow, getLocationWorkspace)
+import Rahm.Desktop.Windows (mapWindows, findWindow, getLocationWorkspace)
import XMonad
import XMonad.StackSet hiding (focus)
import Data.IORef
diff --git a/src/Internal/MouseMotion.hs b/src/Rahm/Desktop/MouseMotion.hs
index c72c824..488f06a 100644
--- a/src/Internal/MouseMotion.hs
+++ b/src/Rahm/Desktop/MouseMotion.hs
@@ -1,14 +1,14 @@
{-# LANGUAGE ViewPatterns, BangPatterns #-}
-module Internal.MouseMotion where
+module Rahm.Desktop.MouseMotion where
import XMonad
import Control.Monad (void, forever)
import Text.Printf
-import Internal.Submap
+import Rahm.Desktop.Submap
import Control.Monad.Loops (iterateWhile)
import Control.Monad.Fix (fix)
-import Internal.Logger
+import Rahm.Desktop.Logger
import Linear.V2
import Linear.Metric
diff --git a/src/Internal/NoPersist.hs b/src/Rahm/Desktop/NoPersist.hs
index a67e649..66e52da 100644
--- a/src/Internal/NoPersist.hs
+++ b/src/Rahm/Desktop/NoPersist.hs
@@ -1,6 +1,6 @@
-- Module for not persisting XMonad state. To be used with ExtensibleState
-- for data types that cannot be persisted.
-module Internal.NoPersist where
+module Rahm.Desktop.NoPersist where
import Data.Default (Default, def)
import Data.Typeable
diff --git a/src/Internal/PassMenu.hs b/src/Rahm/Desktop/PassMenu.hs
index 5b031c0..4c0b4c5 100644
--- a/src/Internal/PassMenu.hs
+++ b/src/Rahm/Desktop/PassMenu.hs
@@ -1,4 +1,4 @@
-module Internal.PassMenu where
+module Rahm.Desktop.PassMenu where
import XMonad
import XMonad.Util.Run
diff --git a/src/Internal/PromptConfig.hs b/src/Rahm/Desktop/PromptConfig.hs
index 0db3027..ce45cb2 100644
--- a/src/Internal/PromptConfig.hs
+++ b/src/Rahm/Desktop/PromptConfig.hs
@@ -1,4 +1,4 @@
-module Internal.PromptConfig where
+module Rahm.Desktop.PromptConfig where
import XMonad.Prompt
diff --git a/src/Internal/RebindKeys.hs b/src/Rahm/Desktop/RebindKeys.hs
index 38af754..0b4d768 100644
--- a/src/Internal/RebindKeys.hs
+++ b/src/Rahm/Desktop/RebindKeys.hs
@@ -2,7 +2,7 @@
-- Module for intercepting key presses not explicity mapped in the key bindings.
-- This uses some deep magic with grabKey and windows and everything else, but
-- it makes window-specific key bindings awesome!
-module Internal.RebindKeys where
+module Rahm.Desktop.RebindKeys where
import XMonad
@@ -15,8 +15,8 @@ import qualified Data.Map as Map
import qualified XMonad.Util.ExtensibleState as XS
import Data.Monoid (All(..))
-import Internal.Logger
-import Internal.NoPersist
+import Rahm.Desktop.Logger
+import Rahm.Desktop.NoPersist
type WindowHook = Query ()
diff --git a/src/Internal/ScreenRotate.hs b/src/Rahm/Desktop/ScreenRotate.hs
index 8108381..1f238b1 100644
--- a/src/Internal/ScreenRotate.hs
+++ b/src/Rahm/Desktop/ScreenRotate.hs
@@ -1,4 +1,4 @@
-module Internal.ScreenRotate where
+module Rahm.Desktop.ScreenRotate where
import XMonad.StackSet as W
diff --git a/src/Internal/Submap.hs b/src/Rahm/Desktop/Submap.hs
index 0e54c43..f3b9e23 100644
--- a/src/Internal/Submap.hs
+++ b/src/Rahm/Desktop/Submap.hs
@@ -1,4 +1,4 @@
-module Internal.Submap (
+module Rahm.Desktop.Submap (
mapNextString,
mapNextStringWithKeysym,
submapButtonsWithKey,
diff --git a/src/Internal/Swallow.hs b/src/Rahm/Desktop/Swallow.hs
index 3e4112f..1939c58 100644
--- a/src/Internal/Swallow.hs
+++ b/src/Rahm/Desktop/Swallow.hs
@@ -1,4 +1,4 @@
-module Internal.Swallow (
+module Rahm.Desktop.Swallow (
swallowHook, setSwallowEnabled, isSwallowEnabled, toggleSwallowEnabled) where
import XMonad
diff --git a/src/Internal/SwapMaster.hs b/src/Rahm/Desktop/SwapMaster.hs
index e7ade19..b039fdb 100644
--- a/src/Internal/SwapMaster.hs
+++ b/src/Rahm/Desktop/SwapMaster.hs
@@ -1,9 +1,9 @@
{- Swap window with the master, but save it. -}
-module Internal.SwapMaster (swapMaster) where
+module Rahm.Desktop.SwapMaster (swapMaster) where
import qualified XMonad.StackSet as W
-import Internal.Windows (mapWindows, getMaster, swapWindows)
+import Rahm.Desktop.Windows (mapWindows, getMaster, swapWindows)
import Control.Monad.Trans.Maybe
import XMonad (Window, ExtensionClass(..), X(..), windows, windowset)
import Control.Monad (void)
diff --git a/src/Internal/Windows.hs b/src/Rahm/Desktop/Windows.hs
index 35f093c..d525aac 100644
--- a/src/Internal/Windows.hs
+++ b/src/Rahm/Desktop/Windows.hs
@@ -1,4 +1,4 @@
-module Internal.Windows where
+module Rahm.Desktop.Windows where
import XMonad (windowset, X, Window, get)
diff --git a/src/Internal/XMobarLog.hs b/src/Rahm/Desktop/XMobarLog.hs
index c0aa2a7..f3beb86 100644
--- a/src/Internal/XMobarLog.hs
+++ b/src/Rahm/Desktop/XMobarLog.hs
@@ -1,4 +1,4 @@
-module Internal.XMobarLog ( XMobarLog, spawnXMobar, xMobarLogHook ) where
+module Rahm.Desktop.XMobarLog ( XMobarLog, spawnXMobar, xMobarLogHook ) where
import Control.Arrow (second)
import Control.Monad (forM_)
@@ -6,12 +6,12 @@ import Control.Monad.Writer (tell, execWriter)
import Data.List (sortBy)
import Data.Maybe (mapMaybe)
import Data.Ord (comparing)
-import Internal.LayoutDraw (drawLayout)
+import Rahm.Desktop.LayoutDraw (drawLayout)
import System.IO (Handle, hSetEncoding, hPutStrLn, utf8)
import XMonad.Util.NamedWindows (getName)
import XMonad.Util.Run (spawnPipe)
import XMonad (X)
-import Internal.Lib (getPopulatedWorkspaces, WorkspaceState(..))
+import Rahm.Desktop.Lib (getPopulatedWorkspaces, WorkspaceState(..))
import qualified XMonad as X
import qualified XMonad.StackSet as S