diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs index dfbbfc9..fa2ad75 100644 --- a/lib/KeyBindings.hs +++ b/lib/KeyBindings.hs @@ -20,7 +20,7 @@ import XMonad.Prompt.ConfirmPrompt import XMonad.Prompt.Shell import XMonad.Util.EZConfig import XMonad.Util.NamedScratchpad -import qualified Solarized as S +import qualified Nord as N import qualified Scratchpad as R import qualified XMonad.StackSet as W @@ -75,12 +75,15 @@ viewProject id = do promptConfig = def { position = Bottom , alwaysHighlight = True - , bgColor = S.magenta - , bgHLight = S.base0 - , borderColor = S.magenta + , borderColor = N.nord9 + -- Normal + , bgColor = N.nord9 + , fgColor = N.background + -- Selection + , bgHLight = N.nord6 + , fgHLight = N.background + -- , defaultText = "" - , fgColor = S.base02 - , fgHLight = S.base03 , font = "xft:Iosevka Samae:style=Regular:size=8" , height = 24 , promptBorderWidth = 5 diff --git a/lib/Nord.hs b/lib/Nord.hs new file mode 100644 index 0000000..54aa14d --- /dev/null +++ b/lib/Nord.hs @@ -0,0 +1,91 @@ +module Nord +( nord0 +, nord1 +, nord2 +, nord3 +, nord4 +, nord5 +, nord6 +, nord7 +, nord8 +, nord9 +, nord10 +, nord11 +, nord12 +, nord13 +, nord14 +, nord15 +, yellow +, orange +, red +, purple +, green +, background +, backgroundhl +, foreground +, foregroundhl +, foregroundll +) where + +-- POLAR NIGHT +-- The origin color or the Polar Night palette. +nord0 = "#2E3440"; + +-- A brighter shade color based on nord0. +nord1 = "#3B4252"; + +-- An even more brighter shade color of nord0. +nord2 = "#434C5E"; + +-- The brightest shade color based on nord0. +nord3 = "#4C566A"; + +-- SNOW STORM +-- The origin color or the Snow Storm palette. +nord4 = "#D8DEE9"; + +-- A brighter shade color of nord4. +nord5 = "#E5E9F0"; + +-- The brightest shade color based on nord4. +nord6 = "#ECEFF4"; + +-- FROST +-- A calm and highly contrasted color reminiscent of frozen polar water. +nord7 = "#8FBCBB"; + +-- The bright and shiny primary accent color reminiscent of pure and clear ice. +nord8 = "#88C0D0"; + +-- A more darkened and less saturated color reminiscent of arctic waters. +nord9 = "#81A1C1"; + +-- A dark and intensive color reminiscent of the deep arctic ocean. +nord10 = "#5E81AC"; + +-- AURORA +-- RED +nord11 = "#BF616A"; + +-- ORANGE +nord12 = "#D08770"; + +-- YELLOW +nord13 = "#EBCB8B"; + +-- GREEN +nord14 = "#A3BE8C"; + +-- PURPLE +nord15 = "#B48EAD"; + +foregroundhl = nord6 +foreground = nord5 +foregroundll = nord4 +backgroundhl = nord1 +background = nord0 +red = nord11 +orange = nord12 +yellow = nord13 +green = nord14 +purple = nord15 diff --git a/lib/StatusBar.hs b/lib/StatusBar.hs index 066f7c5..6b69c04 100644 --- a/lib/StatusBar.hs +++ b/lib/StatusBar.hs @@ -6,7 +6,7 @@ module StatusBar ( import Data.List import Data.Monoid -import Solarized as S +import Nord as N import XMonad.Core import XMonad.Hooks.DynamicBars (dynStatusBarStartup,dynStatusBarEventHook,multiPP) import XMonad.Hooks.DynamicLog @@ -38,17 +38,17 @@ killXmobar :: IO () killXmobar = return () otherPP = currentPP - { ppCurrent = xmobarColor S.foreground S.background - , ppVisible = xmobarColor S.foreground S.background - , ppHidden = xmobarColor S.foreground S.background - , ppHiddenNoWindows = xmobarColor S.backgroundhl S.background + { ppCurrent = xmobarColor N.foreground N.background + , ppVisible = xmobarColor N.foreground N.background + , ppHidden = xmobarColor N.foreground N.background + , ppHiddenNoWindows = xmobarColor N.backgroundhl N.background } currentPP = def - { ppCurrent = xmobarColor' S.orange - , ppVisible = xmobarColor' S.yellow -- other screen - , ppHidden = xmobarColor' S.foreground -- other workspaces with windows - , ppHiddenNoWindows = xmobarColor' S.foregroundll -- other workspaces + { ppCurrent = xmobarColor' N.orange + , ppVisible = xmobarColor' N.yellow -- other screen + , ppHidden = xmobarColor' N.foreground -- other workspaces with windows + , ppHiddenNoWindows = xmobarColor' N.foregroundll -- other workspaces , ppSep = " " , ppWsSep = " " , ppLayout = printLayout diff --git a/xmonad.hs b/xmonad.hs index ec3909c..79b5d4c 100755 --- a/xmonad.hs +++ b/xmonad.hs @@ -14,7 +14,7 @@ import XMonad.Layout.ResizableTile (ResizableTall(..)) import XMonad.Layout.Spacing import XMonad.Layout.ToggleLayouts (toggleLayouts) import XMonad.Util.EZConfig -import qualified Solarized as S +import qualified Nord as N -- Tidy modules import KeyBindings as Keys (modify) @@ -61,8 +61,8 @@ withConfig = { manageHook = myManageHook <+> manageHook desktopConfig , layoutHook = desktopLayoutModifiers layouts , terminal = "/run/current-system/sw/bin/st" - , normalBorderColor = S.base03 - , focusedBorderColor = S.violet + , normalBorderColor = N.backgroundhl + , focusedBorderColor = N.nord9 , borderWidth = 5 }