diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index e7344ca..6b2c8c2 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -6,7 +6,7 @@ "editor.fontFamily": "'Fira Code'", "editor.fontWeight": "400", "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "HookyQR.beautify" }, "[json]": { "editor.defaultFormatter": "HookyQR.beautify" diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 5ea4b4c..ba4391d 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -222,8 +222,8 @@ draw_bold_text_with_bright_colors: true colors: # Default colors primary: - background: '0x282c34' - foreground: '0xbbc2cf' + background: '0x121e31' + foreground: '0x9da5ae' # Bright and dim foreground colors # diff --git a/.config/xmobar/xmobarrc.hs b/.config/xmobar/xmobarrc.hs index 6563fdf..71749a9 100644 --- a/.config/xmobar/xmobarrc.hs +++ b/.config/xmobar/xmobarrc.hs @@ -1,19 +1,19 @@ Config { -- appearance - font = "xft:Fira Code:size=11:bold:antialias=true:hinting=true" - , bgColor = "#14071F" - , fgColor = "#646464" + font = "xft:Fira Code:size=12:antialias=true:hinting=true" + , bgColor = "#121e32" + , fgColor = "#9da5ae" , position = Top , border = BottomB - , borderColor = "#14071F" + , borderColor = "#121e32" , iconRoot = "/home/solomon/.xmonad/xpm/" -- default: "." -- layout , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "}{" -- separator between left-right alignment - , template = " %UnsafeStdinReader% | %cpu% | %memory% | %dynnetwork% } \ - \{ %date% | %updates% | %YPAD% | %battery% %trayerpad%" + , template = " %UnsafeStdinReader% | %cpu% %memory% %dynnetwork% } \ + \{ %date% | %YPAD% | %battery% | %updates% %trayerpad%" } -- general behavior @@ -44,7 +44,7 @@ Config { , "--Low" , "10" , "--High" , "25" , "--normal" , "#95C05D" - , "--high" , "red" + , "--high" , "#882410" , "--low" , "lightblue" ] 36000 @@ -65,7 +65,7 @@ Config { -- ] 10 -- network activity monitor (dynamic interface resolution) - , Run DynNetwork [ "--template" , ": kB/s kB/s" + , Run DynNetwork [ "--template" , "net: kB/s kB/s" , "--Low" , "100000" -- units: B/s , "--High" , "500000" -- units: B/s , "--low" , "#95C05D" @@ -86,7 +86,7 @@ Config { -- , Run Memory [ "--template" ,"mem: % (Mb)" , Run Memory [ "--template" ,"mem: %" , "--Low" , "20" -- units: % - , "--High" , "90" -- units: % + , "--High" , "70" -- units: % , "--low" , "#95C05D" , "--normal" , "#ee9a00" , "--high" , "#882410" @@ -105,9 +105,9 @@ Config { -- based upon your specific hardware. Or, for a desktop you may want -- to just remove this section entirely. , Run BatteryP ["BAT0"] - [ "--template", ": %, " + [ "--template", "%, " , "-L", "10", "-H", "80" - , "-l", "red", "-h", "green" + , "-l", "#882410", "-h", "#95C05D" , "--", "-O", "Charging", "-o", "Battery" ] 10 diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 3c64106..502e4d1 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -71,6 +71,15 @@ import XMonad.Util.EZConfig (additionalKeysP) import XMonad.Util.Run (runProcessWithInput, safeSpawn, spawnPipe) import XMonad.Util.SpawnOnce +--THEME +-- #e8e8e8 (120,120,120) +-- #9da5ae (157,165,174) +-- #6b788b (107,120,139) +-- #5c6776 (92,103,118) +-- #45526d (69,82,109) +-- #121e32 (18,30,49) + + -- The preferred terminal program, which is used in a binding below and by -- certain contrib modules. myTerminal :: String @@ -81,7 +90,7 @@ myFileManager = "thunar" -- The font to be used myFont :: String -myFont = "xft:Fira Code:bold:size=9:antialias=true:hinting=true" +myFont = "xft:Fira Code:size=9:antialias=true:hinting=true" -- Whether focus follows the mouse pointer. myFocusFollowsMouse :: Bool @@ -93,14 +102,14 @@ myClickJustFocuses = False -- Width of the window border in pixels. myBorderWidth :: Dimension -myBorderWidth = 5 +myBorderWidth = 3 -- Border colors for unfocused and focused windows, respectively. myNormalBorderColor :: String -myNormalBorderColor = "#551155" +myNormalBorderColor = "#121e32" myFocusedBorderColor :: String -myFocusedBorderColor = "#dddddd" +myFocusedBorderColor = "#6b788b" -- modMask lets you specify which modkey you want to use. The default -- is mod1Mask ("left alt"). You may also consider using mod3Mask @@ -383,21 +392,21 @@ tabs = renamed [Replace "tabs"] -- setting colors for tabs layout and tabs sublayout. myTabTheme = def { fontName = myFont - , activeColor = "#46d9ff" - , inactiveColor = "#313846" - , activeBorderColor = "#46d9ff" - , inactiveBorderColor = "#282c34" - , activeTextColor = "#282c34" - , inactiveTextColor = "#d0d0d0" + , activeColor = "#6b788b" + , inactiveColor = "#121e32" + , activeBorderColor = "#6b788b" + , inactiveBorderColor = "#121e32" + , activeTextColor = "#121e32" + , inactiveTextColor = "#e9e9e9" } -- Theme for showWName which prints current workspace when you change workspaces. myShowWNameTheme :: SWNConfig myShowWNameTheme = def - { swn_font = "xft:Ubuntu:bold:size=60" + { swn_font = myFont , swn_fade = 1.0 - , swn_bgcolor = "#1c1f24" - , swn_color = "#ffffff" + , swn_bgcolor = "#121e32" + , swn_color = "#e9e9e9" } @@ -488,7 +497,7 @@ myStartupHook = do spawnOnce "todoist &" -- Start trayer last - spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x14071F --height 20 &" + spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x121e32 --height 24 &" ------------------------------------------------------------------------ @@ -526,11 +535,11 @@ main = do logHook = myLogHook <+> dynamicLogWithPP xmobarPP { ppOutput = \x -> hPutStrLn xmproc x , ppCurrent = xmobarColor "#a8de45" "" . wrap "[" "]" -- Current workspace in xmobar - , ppVisible = xmobarColor "#98be65" "" . clickable -- Visible but not current workspace + , ppVisible = xmobarColor "#88ae55" "" . clickable -- Visible but not current workspace , ppHidden = xmobarColor "#82AAFF" "" . wrap "*" "" . clickable -- Hidden workspaces in xmobar - , ppHiddenNoWindows = xmobarColor "#c792ea" "" . clickable -- Hidden workspaces (no windows) + , ppHiddenNoWindows = xmobarColor "#9da5ae" "" . clickable -- Hidden workspaces (no windows) -- , ppTitle = xmobarColor "#b3afc2" "" . shorten 20 -- Title of active window in xmobar - , ppSep = " | " -- Separators in xmobar + , ppSep = " | " -- Separators in xmobar , ppUrgent = xmobarColor "#C45500" "" . wrap "!" "!" -- Urgent workspace -- , ppExtras = [windowCount] -- # of windows current workspace -- , ppOrder = \(ws:l:t:ex) -> [ws,l]++ex++[t] diff --git a/.xprofile b/.xprofile index 5a57048..3dadd3f 100644 --- a/.xprofile +++ b/.xprofile @@ -5,7 +5,7 @@ setxkbmap dvorak & nitrogen --restore & # compositor -compton & +picom & # numlock numlockx