From 9ffdf577ead8849b598a1c624f4c34302760dc5c Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Wed, 27 Jul 2022 11:43:46 -0500 Subject: [PATCH] Fixing file paths now that .xmonad is moved to .config/xmonad --- .config/xmobar/doom-one-xmobarrc | 2 +- .config/xmobar/dracula-xmobarrc | 2 +- .config/xmobar/gruvbox-dark-xmobarrc | 2 +- .config/xmobar/monokai-pro-xmobarrc | 2 +- .config/xmobar/nord-xmobarrc | 2 +- .config/xmobar/oceanic-next-xmobarrc | 2 +- .config/xmobar/palenight-xmobarrc | 2 +- .config/xmobar/solarized-dark-xmobarrc | 2 +- .config/xmobar/solarized-light-xmobarrc | 2 +- .config/xmobar/tomorrow-night-xmobarrc | 2 +- .config/xmobar/xmobarrc | 58 ------------------------- .config/xmobar/xmobarrc-no-battery | 54 ----------------------- .local/bin/dtos-colorscheme | 4 +- 13 files changed, 12 insertions(+), 124 deletions(-) delete mode 100644 .config/xmobar/xmobarrc delete mode 100644 .config/xmobar/xmobarrc-no-battery diff --git a/.config/xmobar/doom-one-xmobarrc b/.config/xmobar/doom-one-xmobarrc index b1bb290..89fb758 100644 --- a/.config/xmobar/doom-one-xmobarrc +++ b/.config/xmobar/doom-one-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/dracula-xmobarrc b/.config/xmobar/dracula-xmobarrc index bbe1e97..66a7612 100644 --- a/.config/xmobar/dracula-xmobarrc +++ b/.config/xmobar/dracula-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/gruvbox-dark-xmobarrc b/.config/xmobar/gruvbox-dark-xmobarrc index 6f83969..ab778e6 100644 --- a/.config/xmobar/gruvbox-dark-xmobarrc +++ b/.config/xmobar/gruvbox-dark-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/monokai-pro-xmobarrc b/.config/xmobar/monokai-pro-xmobarrc index 4882e7c..06efebf 100644 --- a/.config/xmobar/monokai-pro-xmobarrc +++ b/.config/xmobar/monokai-pro-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/nord-xmobarrc b/.config/xmobar/nord-xmobarrc index 6b0613d..535a742 100644 --- a/.config/xmobar/nord-xmobarrc +++ b/.config/xmobar/nord-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/oceanic-next-xmobarrc b/.config/xmobar/oceanic-next-xmobarrc index 50546d4..dd531f3 100644 --- a/.config/xmobar/oceanic-next-xmobarrc +++ b/.config/xmobar/oceanic-next-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/palenight-xmobarrc b/.config/xmobar/palenight-xmobarrc index 3a1e599..198cfcc 100644 --- a/.config/xmobar/palenight-xmobarrc +++ b/.config/xmobar/palenight-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/solarized-dark-xmobarrc b/.config/xmobar/solarized-dark-xmobarrc index 706cf0a..1a6b9a0 100644 --- a/.config/xmobar/solarized-dark-xmobarrc +++ b/.config/xmobar/solarized-dark-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/solarized-light-xmobarrc b/.config/xmobar/solarized-light-xmobarrc index 1948649..47bfc88 100644 --- a/.config/xmobar/solarized-light-xmobarrc +++ b/.config/xmobar/solarized-light-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/tomorrow-night-xmobarrc b/.config/xmobar/tomorrow-night-xmobarrc index 4c56444..879a03f 100644 --- a/.config/xmobar/tomorrow-night-xmobarrc +++ b/.config/xmobar/tomorrow-night-xmobarrc @@ -62,5 +62,5 @@ Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:h ] , sepChar = "%" , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" + , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" } diff --git a/.config/xmobar/xmobarrc b/.config/xmobar/xmobarrc deleted file mode 100644 index 8e6d84b..0000000 --- a/.config/xmobar/xmobarrc +++ /dev/null @@ -1,58 +0,0 @@ --- Xmobar (http://projects.haskell.org/xmobar/) --- This is the default xmobar configuration for DTOS. --- This config is packaged in the DTOS repo as dtos-xmobar --- Dependencies: otf-font-awesome ttf-mononoki ttf-ubuntu-font-family trayer --- Also depends on scripts from dtos-local-bin from the dtos-core-repo. - -Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=true" - , additionalFonts = [ "xft:Mononoki:pixelsize=11:antialias=true:hinting=true" - , "xft:Font Awesome 6 Free Solid:pixelsize=12" - , "xft:Font Awesome 6 Brands:pixelsize=12" - ] - , bgColor = "#282c34" - , fgColor = "#ff6c6b" - -- 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 = TopSize L 100 24 - , lowerOnStart = True - , hideOnStart = False - , allDesktops = True - , persistent = True - , iconRoot = ".xmonad/xpm/" -- default: "." - , commands = [ - -- Echos a "penguin" icon in front of the kernel output. - Run Com "echo" ["\xf17c"] "penguin" 3600 - -- Get kernel version (script found in .local/bin) - , Run Com ".local/bin/kernel" [] "kernel" 36000 - -- Cpu usage in percent - , Run Cpu ["-t", "\xf108 cpu: (%)","-H","50","--high","red"] 20 - -- Ram used number and percent - , Run Memory ["-t", "\xf233 mem: M (%)"] 20 - -- Disk space free - , Run DiskU [("/", "\xf0c7 hdd: free")] [] 60 - -- Echos an "up arrow" icon in front of the uptime output. - , Run Com "echo" ["\xf0aa"] "uparrow" 3600 - -- Uptime - , Run Uptime ["-t", "uptime: d h"] 360 - -- Echos a "bell" icon in front of the pacman updates. - , Run Com "echo" ["\xf0f3"] "bell" 3600 - -- Check for pacman updates (script found in .local/bin) - , Run Com ".local/bin/pacupdate" [] "pacupdate" 36000 - -- Echos a "battery" icon in front of the pacman updates. - , Run Com "echo" ["\xf242"] "baticon" 3600 - -- Battery - , Run BatteryP ["BAT0"] ["-t", " (%)"] 360 - -- Time and date - , Run Date "\xf017 %b %d %Y - (%H:%M) " "date" 50 - -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. - , Run Com ".config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 - -- Prints out the left side items such as workspaces, layout, etc. - , Run UnsafeStdinReader - ] - , sepChar = "%" - , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %baticon% %battery% %date% %trayerpad%" - } diff --git a/.config/xmobar/xmobarrc-no-battery b/.config/xmobar/xmobarrc-no-battery deleted file mode 100644 index c6bd04d..0000000 --- a/.config/xmobar/xmobarrc-no-battery +++ /dev/null @@ -1,54 +0,0 @@ --- Xmobar (http://projects.haskell.org/xmobar/) --- This is the default xmobar configuration for DTOS. --- This config is packaged in the DTOS repo as dtos-xmobar --- Dependencies: otf-font-awesome ttf-mononoki ttf-ubuntu-font-family trayer --- Also depends on scripts from dtos-local-bin from the dtos-core-repo. - -Config { font = "xft:Ubuntu:weight=bold:pixelsize=11:antialias=true:hinting=true" - , additionalFonts = [ "xft:Mononoki:pixelsize=11:antialias=true:hinting=true" - , "xft:Font Awesome 6 Free Solid:pixelsize=12" - , "xft:Font Awesome 6 Brands:pixelsize=12" - ] - , bgColor = "#282c34" - , fgColor = "#ff6c6b" - -- 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 = TopSize L 100 24 - , lowerOnStart = True - , hideOnStart = False - , allDesktops = True - , persistent = True - , iconRoot = ".xmonad/xpm/" -- default: "." - , commands = [ - -- Echos a "penguin" icon in front of the kernel output. - Run Com "echo" ["\xf17c"] "penguin" 3600 - -- Get kernel version (script found in .local/bin) - , Run Com ".local/bin/kernel" [] "kernel" 36000 - -- Cpu usage in percent - , Run Cpu ["-t", "\xf108 cpu: (%)","-H","50","--high","red"] 20 - -- Ram used number and percent - , Run Memory ["-t", "\xf233 mem: M (%)"] 20 - -- Disk space free - , Run DiskU [("/", "\xf0c7 hdd: free")] [] 60 - -- Echos an "up arrow" icon in front of the uptime output. - , Run Com "echo" ["\xf0aa"] "uparrow" 3600 - -- Uptime - , Run Uptime ["-t", "uptime: d h"] 360 - -- Echos a "bell" icon in front of the pacman updates. - , Run Com "echo" ["\xf0f3"] "bell" 3600 - -- Check for pacman updates (script found in .local/bin) - , Run Com ".local/bin/pacupdate" [] "pacupdate" 36000 - -- Time and date - , Run Date "\xf017 %b %d %Y - (%H:%M) " "date" 50 - -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. - , Run Com ".config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 - -- Prints out the left side items such as workspaces, layout, etc. - , Run UnsafeStdinReader - ] - , sepChar = "%" - , alignSep = "}{" - , template = " | %UnsafeStdinReader% }{ %penguin% %kernel% %cpu% %memory% %disku% %uparrow% %uptime% %bell% %pacupdate% %date% %trayerpad%" - } diff --git a/.local/bin/dtos-colorscheme b/.local/bin/dtos-colorscheme index 04153f0..3babbc7 100755 --- a/.local/bin/dtos-colorscheme +++ b/.local/bin/dtos-colorscheme @@ -29,8 +29,8 @@ options=("DoomOne" choice=$(printf '%s\n' "${options[@]}" | ${DMENU} 'Choose color scheme:' "${@}") if [ "$choice" ]; then - sed -i "s/import Colors.*/import Colors.$choice/g" "$HOME"/.xmonad/README.org || echo "Cannot modify README.org" - sed -i "s/import Colors.*/import Colors.$choice/g" "$HOME"/.xmonad/xmonad.hs || echo "Cannot modify xmonad.hs" + sed -i "s/import Colors.*/import Colors.$choice/g" "$HOME"/.config/xmonad/README.org || echo "Cannot modify README.org" + sed -i "s/import Colors.*/import Colors.$choice/g" "$HOME"/.config/xmonad/xmonad.hs || echo "Cannot modify xmonad.hs" xmonad --restart sed -i "s/^colors: .*/colors: \*$choice/g" "$HOME"/.config/alacritty/alacritty.yml