From 41e97a6fc98509bfb5bd206d653fb0c739d4b339 Mon Sep 17 00:00:00 2001
From: jasmine <its.jassy@pm.me>
Date: Sun, 28 Jul 2024 20:22:05 +0800
Subject: [PATCH] Rice

---
 pkgs/xmobar-config/src/xmobar-top.hs | 23 ++---------------------
 pkgs/xmonad-config/src/xmonad.hs     | 27 +++++++++------------------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/pkgs/xmobar-config/src/xmobar-top.hs b/pkgs/xmobar-config/src/xmobar-top.hs
index 64424fa..bff0084 100644
--- a/pkgs/xmobar-config/src/xmobar-top.hs
+++ b/pkgs/xmobar-config/src/xmobar-top.hs
@@ -6,8 +6,8 @@ config = defaultConfig
   -- general settings
   { font            = "Fira Code Semi Bold 9"
   , additionalFonts = [ "Symbols Nerd Font 2048-em 24" ]
-  , bgColor         = bg1
-  , fgColor         = fg0
+  , bgColor         = "#282828"
+  , fgColor         = "#d4be98"
   , position        = Static { xpos = 1920, ypos = 0, width = 2560, height = 24 }
   -- commands to run
   , commands =
@@ -24,24 +24,5 @@ config = defaultConfig
   , template = "<hspace=6/><fn=1>\59255</fn>  <fc=#a9b665>%uname%</fc> <fc=#7c6f64>|</fc>%_XMONAD_LOG_1%}{%YPJT% <fc=#7c6f64>|</fc> %date%<hspace=6/>"
   }
 
--- | Gruvbox material
-bg0, bg1, fg0, fg1, red, orange, yellow, green, aqua, blue, purple :: String
--- backgrounds
-bg0    = "#1d2021"
-bg1    = "#282828"
--- foregrounds
-fg0    = "#d4be98"
-fg1    = "#ddc7a1"
--- greys
-grey0  = "#7c6f64"
--- colors
-red    = "#ea6962"
-orange = "#e78a4e"
-yellow = "#d8a658"
-green  = "#a9b665"
-aqua   = "#89b482"
-blue   = "#7daea3"
-purple = "#d3869b"
-
 main :: IO ()
 main = configFromArgs config >>= xmobar
diff --git a/pkgs/xmonad-config/src/xmonad.hs b/pkgs/xmonad-config/src/xmonad.hs
index cef412a..e914e4c 100644
--- a/pkgs/xmonad-config/src/xmonad.hs
+++ b/pkgs/xmonad-config/src/xmonad.hs
@@ -57,9 +57,9 @@ myKeys =
     , ((noModMask, xF86XK_AudioRaiseVolume     ), spawn volUp                               ) -- %! Volume up
 
     -- layouts
-    , ((myModMask,                 xK_t        ), sendMessage $ JumpToLayout "Spacing Tiled") -- %! Jump to our tiled layout
-    , ((myModMask,                 xK_m        ), sendMessage $ JumpToLayout "Maximized"    ) -- %! Jump to our maximized layout
-    , ((myModMask,                 xK_f        ), sendMessage $ JumpToLayout "Fullscreen"   ) -- %! Jump to our fullscreen layout
+    , ((myModMask,                 xK_t        ), sendMessage $ JumpToLayout "spacing tiled") -- %! Jump to our tiled layout
+    , ((myModMask,                 xK_m        ), sendMessage $ JumpToLayout "maximized"    ) -- %! Jump to our maximized layout
+    , ((myModMask,                 xK_f        ), sendMessage $ JumpToLayout "fullscreen"   ) -- %! Jump to our fullscreen layout
     , ((myModMask .|. shiftMask,   xK_t        ), withFocused $ windows . W.sink            ) -- %! Push window back into tiling
 
     -- window stack
@@ -95,21 +95,20 @@ myLayout = tiled ||| max ||| full
     -- Add a configurable amount of space around windows.
     gaps     = spacingRaw False (Border 10 10 10 10) True (Border 10 10 10 10) True
     -- Our layouts
-    tiled    = renamed [Replace "Spacing Tiled"] . avoidStruts . gaps $ Tall nmaster delta ratio
-    max      = renamed [Replace "Maximized"    ] . avoidStruts . gaps $ Full
-    full     = renamed [Replace "Fullscreen"   ] . noBorders          $ Full
+    tiled    = renamed [Replace "spacing tiled"] . avoidStruts . gaps $ Tall nmaster delta ratio
+    max      = renamed [Replace "maximized"    ] . avoidStruts . gaps $ Full
+    full     = renamed [Replace "fullscreen"   ] . noBorders          $ Full
     -- Layout settings
     nmaster  = 1      -- Default number of windows in the master pane
     ratio    = 1/2    -- Default proportion of screen occupied by master pane
     delta    = 3/100  -- Percent of screen to increment by when resizing panes
 
 -- | Xmobar
-xmobarTop    = statusBarPropTo "_XMONAD_LOG_1" "xmobar-top"    (pure ppTop)
+xmobarTop = statusBarPropTo "_XMONAD_LOG_1" "xmobar-top" (pure ppTop)
 
 ppTop :: PP
 ppTop = def
     { ppSep             = grey0 " | "
-    , ppTitleSanitize   = xmobarStrip
     -- workspace labels
     , ppCurrent         = purple . wrap " " ""
     , ppVisible         = blue   . wrap " " ""
@@ -117,18 +116,10 @@ ppTop = def
     , ppHiddenNoWindows = grey0  . wrap " " ""
     , ppUrgent          = red    . wrap " " ""
     -- misc
-    , ppOrder           = \[ws, l, _, wins] -> [ws, l, wins]
-    , ppExtras          = [logTitles formatFocused formatUnfocused]
+    , ppLayout          = aqua  . wrap "" ""
+    , ppOrder           = \[ws, l, _] -> [ws, l]
     }
   where
-    formatFocused   = wrap (grey0 "") (grey0 " ") . purple . ppWindow
-    formatUnfocused = wrap (grey0 "") (grey0 " ") . blue   . ppWindow
-
-    -- | Windows should have *some* title, which should not not exceed a
-    -- sane length.
-    ppWindow :: String -> String
-    ppWindow = xmobarRaw . (\w -> if null w then "untitled" else w) . shorten 30
-    
     -- | Gruvbox material
     bg0, bg1, fg0, fg1, red, orange, yellow, green, aqua, blue, purple :: String -> String
     -- backgrounds