diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 3b8393c..81bac17 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -16,7 +16,10 @@ rounded-corners-exclude = [ #"window_type = 'normal'", "class_g = 'Rofi'", "class_g = 'TelegramDesktop'", - "class_g = 'Dunst'" + "class_g = 'Dunst'", + "name = 'xmobar'", + "class_g = 'trayer'", + "name = 'panel'", ]; round-borders = 1; round-borders-exclude = [ @@ -148,11 +151,11 @@ fade-exclude = [ # Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) # inactive-opacity = 1 -inactive-opacity = 0.8; +inactive-opacity = 1; # Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) # frame-opacity = 1.0 -frame-opacity = 0.7; +#frame-opacity = 0.7; # Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) # menu-opacity = 1.0 @@ -171,7 +174,7 @@ inactive-opacity-override = false; active-opacity = 1.0; # Dim inactive windows. (0.0 - 1.0, defaults to 0.0) -# inactive-dim = 0.0 +inactive-dim = 0.06; # Specify a list of conditions of windows that should always be considered focused. # focus-exclude = [] @@ -182,7 +185,7 @@ focus-exclude = [ ]; # Use fixed inactive dim value, instead of adjusting according to window opacity. -# inactive-dim-fixed = 1.0 +inactive-dim-fixed = false; # Specify a list of opacity rules, in the format `PERCENT:PATTERN`, # like `50:name *= "Firefox"`. picom-trans is recommended over this. @@ -302,7 +305,7 @@ mark-wmwin-focused = true; # Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused. # mark-ovredir-focused = false -mark-ovredir-focused = true; +mark-ovredir-focused = false; # Try to detect windows with rounded corners and don't consider them # shaped windows. The accuracy is not very high, unfortunately. @@ -320,7 +323,7 @@ detect-client-opacity = true; # try detecting this with X RandR extension. # # refresh-rate = 60 -refresh-rate = 0 +#refresh-rate = 0 # Limit picom to repaint at most once every 1 / 'refresh_rate' second to # boost performance. This should not be used with diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index fa10860..f3b304c 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -2,6 +2,7 @@ configuration { font: "FiraCode Nerd Font Mono 16"; show-icons: true; } -@theme "~/.config/rofi/themes/teal.rasi" +//@theme "~/.config/rofi/themes/teal.rasi" +@theme "/usr/share/rofi/themes/gruvbox-dark-hard.rasi" diff --git a/.config/xmobar/scripts/cpu_temp.sh b/.config/xmobar/scripts/cpu_temp.sh index 70dc8b8..81522d4 100755 --- a/.config/xmobar/scripts/cpu_temp.sh +++ b/.config/xmobar/scripts/cpu_temp.sh @@ -13,10 +13,10 @@ else fi if [ "$temp" -ge "$temp2" ] ; then - echo "$temp°C" + echo " $temp°C" elif [ "$temp" -ge "$temp1" ] ; then - echo "$temp°C" + echo " $temp°C" else - echo "$temp°C" + echo " $temp°C" fi diff --git a/.config/xmobar/scripts/disk.sh b/.config/xmobar/scripts/disk.sh index bc4969f..dba295b 100755 --- a/.config/xmobar/scripts/disk.sh +++ b/.config/xmobar/scripts/disk.sh @@ -1,3 +1,3 @@ #!/bin/sh freespace=$(btrfs fi usage / | grep -Po 'Free \(estimated\):.*' | awk '{print $3}') -echo " $freespace" +echo " $freespace" diff --git a/.config/xmobar/scripts/updates.sh b/.config/xmobar/scripts/updates.sh index ed93d23..3af2a8f 100755 --- a/.config/xmobar/scripts/updates.sh +++ b/.config/xmobar/scripts/updates.sh @@ -1,4 +1,4 @@ #!/bin/bash update_number=$(checkupdates | wc -l) -echo "󰣇 $update_number" +echo "󰣇 $update_number" diff --git a/.config/xmobar/xmobar-git b/.config/xmobar/xmobar-git index 42630b2..3500eb6 160000 --- a/.config/xmobar/xmobar-git +++ b/.config/xmobar/xmobar-git @@ -1 +1 @@ -Subproject commit 42630b2973cd624fceb33ae442dea4bf565ee5b1 +Subproject commit 3500eb6c7ba57fd2ce32f89fdde6edd6918679f9 diff --git a/.config/xmobar/xmobarrc b/.config/xmobar/xmobarrc index dd4773d..d942a4c 100644 --- a/.config/xmobar/xmobarrc +++ b/.config/xmobar/xmobarrc @@ -8,14 +8,9 @@ Config {font = "Ubuntu bold 10" , "Font Awesome 6 Free Solid 17" , "Font Awesome 6 Free Solid 13" ] - , bgColor = "#2B2E37" - , fgColor = "#929AAD" - -- Position TopSize and BottomSize take 3 arguments: - -- an alignment parameter (L/R/C) for Left, Right or Center. - -- an integer for the percentage width, so 100 would be 100%. - -- an integer for the minimum pixel height for xmobar, so 24 would force a height of at least 24 pixels. - -- NOTE: The height should be the same as the trayer (system tray) height. - , position = TopHM 36 8 8 4 0 + , bgColor = "#282828" + , fgColor = "#ebdbb2" + , position = TopH 36 , lowerOnStart = True , hideOnStart = False , allDesktops = True @@ -23,9 +18,9 @@ Config {font = "Ubuntu bold 10" , iconRoot = "/home/afonso/.config/xmobar/xpm/" -- default: "." , commands = [ Run XMonadLog - , Run Date "%a, %d %b  %H:%M" "date" 10 - , Run Mpris2 "playerctld" ["-t", " - </fc>"] 10 - , Run Memory ["-t","<fn=6></fn> <fc=#AAC0F0><usedratio></fc>%"] 50 + , Run Date "<fc=#A89984>%a, %d %b <fn=1></fn> %H:%M</fc>" "date" 10 + , Run Mpris2 "playerctld" ["-t", "<artist> - <title>"] 10 + , Run Memory ["-t","<fc=#7C6F64><fn=6></fn></fc> <fc=#B8BB26> <usedratio>%</fc>"] 50 , Run Com "/home/afonso/.config/xmobar/scripts/disk.sh" [] "disk" 100 , Run Com "/home/afonso/.config/xmobar/scripts/cpu_temp.sh" [] "cpu" 50 , Run Com "/home/afonso/.config/xmobar/scripts/battery.sh" [] "battery" 50 @@ -41,7 +36,7 @@ Config {font = "Ubuntu bold 10" \%date%\ \<hspace=20/>\ \{\ - \Playing: %mpris2%\ + \<fc=#7C6F64>Playing:</fc> <fc=#B8BB26>%mpris2%</fc>\ \ \ \|\ \ \ @@ -54,10 +49,10 @@ Config {font = "Ubuntu bold 10" \%cpu%\ \ \ \ \ - \%disk%\ - \ \ - \ \ - \%battery%\ - \|\ + \%disk%\ + \ \ + \ \ + \%battery%\ + \|\ \%trayerpad%" } diff --git a/.config/xmonad/lib/Colors/GruvBox.hs b/.config/xmonad/lib/Colors/GruvBox.hs new file mode 100644 index 0000000..84bc077 --- /dev/null +++ b/.config/xmonad/lib/Colors/GruvBox.hs @@ -0,0 +1,17 @@ +module Colors.GruvBox where + +import XMonad + +colorScheme = "gruvbox" + +colorTrayer :: String +colorTrayer = "--tint 0x282828" + +blue = "#83A598" +aqua = "#8EC07C" +orange = "#FE8019" +red = "#FB4934" +green = "#B8BB26" +gray0 = "#7C6F64" +gray1 = "#928374" +gray2 = "#A89984" diff --git a/.config/xmonad/lib/Colors/Teal.hi b/.config/xmonad/lib/Colors/Teal.hi deleted file mode 100644 index fe0b1d1..0000000 Binary files a/.config/xmonad/lib/Colors/Teal.hi and /dev/null differ diff --git a/.config/xmonad/lib/Colors/Teal.hs b/.config/xmonad/lib/Colors/Teal.hs deleted file mode 100644 index a50e6e3..0000000 --- a/.config/xmonad/lib/Colors/Teal.hs +++ /dev/null @@ -1,25 +0,0 @@ - -module Colors.Teal where - -import XMonad - -colorScheme = "teal" - -colorBack = "#282c34" -colorFore = "#bbc2cf" - -color01 = "#006666" -color02 = "#01F9C1" -color03 = "#5b6268" -color04 = "#b2d8d8" -color05 = "#02CB9E" - -colorTrayer :: String -colorTrayer = "--tint 0x282c34" - -grey1 = "#2B2E37" -grey2 = "#555E70" -grey3 = "#697180" -grey4 = "#8691A8" -cyan = "#8BABF0" -orange = "#C45500" diff --git a/.config/xmonad/lib/Colors/Teal.o b/.config/xmonad/lib/Colors/Teal.o deleted file mode 100644 index c933d59..0000000 Binary files a/.config/xmonad/lib/Colors/Teal.o and /dev/null differ diff --git a/.config/xmonad/xmonad-contrib-git b/.config/xmonad/xmonad-contrib-git index ec5c751..2973c28 160000 --- a/.config/xmonad/xmonad-contrib-git +++ b/.config/xmonad/xmonad-contrib-git @@ -1 +1 @@ -Subproject commit ec5c751b35c1c9b07bd4361617f7c4076aeaa85f +Subproject commit 2973c283ae190dfe6545510e844b77fb9a74e780 diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index b5b00cf..3380abd 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -40,11 +40,11 @@ import qualified Data.Map as M import System.Exit --Color Scheme -import Colors.Teal +import Colors.GruvBox -myTerminal = "alacritty" +myTerminal = "wezterm" myTextEditor = "nvim" myWebBrowser = "firefox" myModMask = mod4Mask @@ -138,12 +138,12 @@ myStartupHook = do spawnOnce "nitrogen --restore &" spawnOnce "playerctld" spawnOnce "qpwgraph" - spawnOnce "picom &" + spawnOnce "killall picom;sleep1;picom &" setWMName "LG3D" spawnOnce "nm-applet" spawnOnce "$HOME/.local/bin/desktopres" spawnOnce "xsetroot -cursor_name left_ptr" - spawnOnce "killall trayer ;sleep 1 && trayer --monitor 0 --edge top --align right --margin 4 --widthtype request --padding 8 --iconspacing 12 --SetDockType true --SetPartialStrut true --expand true --transparent true --alpha 0 --tint 0x2B2E37 --height 30 --distance 5 &" + spawnOnce "killall trayer ;sleep 1 && trayer --monitor 0 --edge top --align right --widthtype request --padding 16 --iconspacing 12 --SetDockType true --SetPartialStrut true --expand true --transparent true --alpha 0 --tint 0x282828 --height 26 --distancefrom top --distance 4 &" spawnOnce "nextcloud" spawnOnOnce "web" myWebBrowser spawnOnOnce "main" myTerminal @@ -155,10 +155,10 @@ myXmobarPP :: PP myXmobarPP = def { ppSep = "" , ppWsSep = "" - , ppCurrent = xmobarColor cyan "" . const wsIconFull - , ppVisible = xmobarColor grey4 "" . const wsIconFull - , ppHidden = xmobarColor grey4 "" . const wsIconFull - , ppHiddenNoWindows = xmobarColor grey4 "" . const wsIconFull + , ppCurrent = xmobarColor red "" . const wsIconFull + , ppVisible = xmobarColor gray0 "" . const wsIconFull + , ppHidden = xmobarColor gray0 "" . const wsIconFull + , ppHiddenNoWindows = xmobarColor gray0 "" . const wsIconFull , ppOrder = \(ws : _ : _ : extras) -> ws : extras } where diff --git a/.local/bin/xmobar b/.local/bin/xmobar index edee424..2598474 100755 Binary files a/.local/bin/xmobar and b/.local/bin/xmobar differ diff --git a/.local/bin/xmonad b/.local/bin/xmonad index 414f8a5..0703c82 100755 Binary files a/.local/bin/xmonad and b/.local/bin/xmonad differ