From d243e6c32ff2dee0c5ef4017ea4f6a3b5ce05ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 5 Nov 2025 08:54:06 +0800 Subject: [PATCH] vanadium/xmonad: refactor --- nix/configurations/vanadium/home/xmonad/leanamonad.cabal | 6 +++--- .../lib/{Leanamonad/GreekChar.hs => Data/Char/Greek.hs} | 2 +- .../ReflectMsg.hs => XMonad/Layout/Reflect/Message.hs} | 2 +- .../Layout/ResizableTile/FixDescription.hs} | 5 ++--- nix/configurations/vanadium/home/xmonad/xmonad.hs | 7 +++---- 5 files changed, 10 insertions(+), 12 deletions(-) rename nix/configurations/vanadium/home/xmonad/lib/{Leanamonad/GreekChar.hs => Data/Char/Greek.hs} (95%) rename nix/configurations/vanadium/home/xmonad/lib/{Leanamonad/Layout/ReflectMsg.hs => XMonad/Layout/Reflect/Message.hs} (94%) rename nix/configurations/vanadium/home/xmonad/lib/{Leanamonad/Layout/ResizableTile.hs => XMonad/Layout/ResizableTile/FixDescription.hs} (86%) diff --git a/nix/configurations/vanadium/home/xmonad/leanamonad.cabal b/nix/configurations/vanadium/home/xmonad/leanamonad.cabal index c1978c6c..250a2d53 100644 --- a/nix/configurations/vanadium/home/xmonad/leanamonad.cabal +++ b/nix/configurations/vanadium/home/xmonad/leanamonad.cabal @@ -24,9 +24,9 @@ library import: common hs-source-dirs: lib exposed-modules: - Leanamonad.Layout.ReflectMsg - Leanamonad.Layout.ResizableTile - Leanamonad.GreekChar + XMonad.Layout.Reflect.Message + XMonad.Layout.ResizableTile.FixDescription + Data.Char.Greek executable leanamonad import: common diff --git a/nix/configurations/vanadium/home/xmonad/lib/Leanamonad/GreekChar.hs b/nix/configurations/vanadium/home/xmonad/lib/Data/Char/Greek.hs similarity index 95% rename from nix/configurations/vanadium/home/xmonad/lib/Leanamonad/GreekChar.hs rename to nix/configurations/vanadium/home/xmonad/lib/Data/Char/Greek.hs index 844e05b5..43e8b23f 100644 --- a/nix/configurations/vanadium/home/xmonad/lib/Leanamonad/GreekChar.hs +++ b/nix/configurations/vanadium/home/xmonad/lib/Data/Char/Greek.hs @@ -1,4 +1,4 @@ -module Leanamonad.GreekChar where +module Data.Char.Greek where import Data.List (find) diff --git a/nix/configurations/vanadium/home/xmonad/lib/Leanamonad/Layout/ReflectMsg.hs b/nix/configurations/vanadium/home/xmonad/lib/XMonad/Layout/Reflect/Message.hs similarity index 94% rename from nix/configurations/vanadium/home/xmonad/lib/Leanamonad/Layout/ReflectMsg.hs rename to nix/configurations/vanadium/home/xmonad/lib/XMonad/Layout/Reflect/Message.hs index 8b69af56..61811072 100644 --- a/nix/configurations/vanadium/home/xmonad/lib/Leanamonad/Layout/ReflectMsg.hs +++ b/nix/configurations/vanadium/home/xmonad/lib/XMonad/Layout/Reflect/Message.hs @@ -1,7 +1,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} -module Leanamonad.Layout.ReflectMsg where +module XMonad.Layout.Reflect.Message where import XMonad ( Resize (Expand, Shrink), diff --git a/nix/configurations/vanadium/home/xmonad/lib/Leanamonad/Layout/ResizableTile.hs b/nix/configurations/vanadium/home/xmonad/lib/XMonad/Layout/ResizableTile/FixDescription.hs similarity index 86% rename from nix/configurations/vanadium/home/xmonad/lib/Leanamonad/Layout/ResizableTile.hs rename to nix/configurations/vanadium/home/xmonad/lib/XMonad/Layout/ResizableTile/FixDescription.hs index 7692147d..18a813cd 100644 --- a/nix/configurations/vanadium/home/xmonad/lib/Leanamonad/Layout/ResizableTile.hs +++ b/nix/configurations/vanadium/home/xmonad/lib/XMonad/Layout/ResizableTile/FixDescription.hs @@ -1,9 +1,8 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-} -module Leanamonad.Layout.ResizableTile - ( module XMonad.Layout.ResizableTile - , RTFixDescription(..) +module XMonad.Layout.ResizableTile.FixDescription + ( RTFixDescription(..) ) where import XMonad diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index d7921849..d4ec6659 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -12,8 +12,10 @@ import XMonad.Hooks.RefocusLast import XMonad.Hooks.StatusBar import XMonad.Layout.NoBorders import XMonad.Layout.Reflect +import XMonad.Layout.Reflect.Message import XMonad.Layout.Renamed import XMonad.Layout.ResizableTile +import XMonad.Layout.ResizableTile.FixDescription import XMonad.Layout.Spacing import qualified XMonad.StackSet as W import XMonad.Util.EZConfig @@ -26,10 +28,7 @@ import qualified Data.Map.Strict as M import System.Posix import Graphics.X11.ExtraTypes.XF86 -import Leanamonad.Layout.ReflectMsg --- TODO: rename this module -import Leanamonad.Layout.ResizableTile -import Leanamonad.GreekChar +import Data.Char.Greek main :: IO () main =