From d8e21e872ad053e879a7898cba9f86a445eab0e2 Mon Sep 17 00:00:00 2001
From: sajenim <its.jassy@pm.me>
Date: Tue, 25 Apr 2023 21:28:53 +0800
Subject: [PATCH] xmobar-config

---
 pkgs/candybar/candybar.cabal                 | 27 ------------------
 pkgs/candybar/candybar.hs                    | 20 -------------
 pkgs/default.nix                             |  2 +-
 pkgs/{candybar => xmobar-config}/default.nix |  0
 pkgs/xmobar-config/src/xmobar-top.hs         | 30 ++++++++++++++++++++
 pkgs/xmobar-config/xmobar-config.cabal       | 24 ++++++++++++++++
 6 files changed, 55 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/candybar/candybar.cabal
 delete mode 100644 pkgs/candybar/candybar.hs
 rename pkgs/{candybar => xmobar-config}/default.nix (100%)
 create mode 100644 pkgs/xmobar-config/src/xmobar-top.hs
 create mode 100644 pkgs/xmobar-config/xmobar-config.cabal

diff --git a/pkgs/candybar/candybar.cabal b/pkgs/candybar/candybar.cabal
deleted file mode 100644
index e002219..0000000
--- a/pkgs/candybar/candybar.cabal
+++ /dev/null
@@ -1,27 +0,0 @@
-cabal-version:      3.0
-name:               candybar
-version:            0.1.0.0
--- synopsis:
--- description:
-license:            BSD-3-Clause
--- license-file:       LICENSE
-author:             sajenim
-maintainer:         its.jassy@pm.me
--- copyright:
-build-type:         Simple
--- extra-doc-files:    CHANGELOG.md
--- extra-source-files:
-
-common warnings
-    ghc-options: -Wall
-                 -threaded
-
-executable candybar
-    import:           warnings
-    main-is:          candybar.hs
-    -- other-modules:
-    -- other-extensions:
-    build-depends:    base,
-                      xmobar
-    hs-source-dirs:   .
-    default-language: Haskell2010
diff --git a/pkgs/candybar/candybar.hs b/pkgs/candybar/candybar.hs
deleted file mode 100644
index 348f5aa..0000000
--- a/pkgs/candybar/candybar.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-import Xmobar
-
-config :: Config
-config =
-  defaultConfig
-    { font = "DejaVu Sans Mono 9",
-      allDesktops = True,
-      alpha = 200,
-      commands =
-        [ Run XMonadLog,
-          Run $ Memory ["t", "Mem: <usedratio>%"] 10,
-          Run $ Kbd [],
-          Run $ Date "%a %_d %b %Y <fc=#ee9a00>%H:%M:%S</fc>" "date" 10
-        ],
-      template = "%XMonadLog% }{ %kbd% | %date% | %memory%",
-      alignSep = "}{"
-    }
-
-main :: IO ()
-main = xmobar config  -- or: configFromArgs config >>= xmobar
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1f8f311..4a60de9 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,5 +3,5 @@
 
 { pkgs ? (import ../nixpkgs.nix) { } }: {
   # example = pkgs.callPackage ./example { };
-  candybar = pkgs.callPackage ./candybar { };
+  xmobar = pkgs.callPackage ./xmobar-config { };
 }
diff --git a/pkgs/candybar/default.nix b/pkgs/xmobar-config/default.nix
similarity index 100%
rename from pkgs/candybar/default.nix
rename to pkgs/xmobar-config/default.nix
diff --git a/pkgs/xmobar-config/src/xmobar-top.hs b/pkgs/xmobar-config/src/xmobar-top.hs
new file mode 100644
index 0000000..9613497
--- /dev/null
+++ b/pkgs/xmobar-config/src/xmobar-top.hs
@@ -0,0 +1,30 @@
+import Xmobar
+import System.Environment (getEnv)
+import System.IO.Unsafe   (unsafeDupablePerformIO)
+
+-- | Candybar
+config :: Config
+config = defaultConfig
+  -- general settings
+  { font            = "Fira Code Semi Bold 9"
+  , additionalFonts = [ ]
+  , bgColor         = "#282828"
+  , fgColor         = "#d4be98"
+  , position        = Static { xpos = 1920, ypos = 0, width = 2560, height = 24 }
+  , iconRoot        = homeDir <> "/.config/xmonad/icons"
+  -- commands to run
+  , commands = 
+      [ Run $ XMonadLog
+      ]
+  -- format our bar
+  , sepChar  = "%"
+  , alignSep = "}{"
+  , template = "\59255 %XMonadLog%"
+  }
+
+-- | Get home directory
+homeDir :: String
+homeDir = unsafeDupablePerformIO (getEnv "HOME")
+
+main :: IO ()
+main = configFromArgs config >>= xmobar
diff --git a/pkgs/xmobar-config/xmobar-config.cabal b/pkgs/xmobar-config/xmobar-config.cabal
new file mode 100644
index 0000000..1f75818
--- /dev/null
+++ b/pkgs/xmobar-config/xmobar-config.cabal
@@ -0,0 +1,24 @@
+cabal-version:      3.0
+name:               xmobar-config
+version:            0.1.0.0
+description:        xmobar configs
+author:             sajenim
+maintainer:         its.jassy@pm.me
+license:            BSD-3-Clause
+build-type:         Simple
+
+executable xmobar-top
+    main-is:          xmobar-top.hs
+    hs-source-dirs:   src
+    ghc-options:      -Wall -threaded
+    build-depends:    base,
+                      xmobar
+    default-language: Haskell2010
+
+-- executable xmobar-bottom
+--     main-is:          xmobar-bottom.hs
+--     hs-source-dirs:   src
+--     ghc-options:      -Wall -threaded
+--     build-depends:    base,
+--                       xmobar
+--     default-language: Haskell2010