diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 6de2ed9..c69ff12 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -6,7 +6,7 @@ offset = 0x19 padding = 2 horizontal_padding = 2 - font = Monospace 12 + font = Fira Code 12 format = "%s\n%b" [urgency_low] diff --git a/.config/x11/xprofile b/.config/x11/xprofile index 06ddc65..ad5573b 100755 --- a/.config/x11/xprofile +++ b/.config/x11/xprofile @@ -23,6 +23,10 @@ if [ "$HOST" == "archmetabox" ] ; then xrandr --auto fi +if [ "$HOST" == "archdesktop" ] ; then + $HOME/.screenlayout/normal_3_screen.sh +fi + autostart="" for program in $autostart; do diff --git a/.config/xmobar/xmobarrc-main.hs b/.config/xmobar/xmobarrc-main.hs index 2f6ba03..ba617af 100644 --- a/.config/xmobar/xmobarrc-main.hs +++ b/.config/xmobar/xmobarrc-main.hs @@ -2,6 +2,7 @@ Config { -- appearance font = "xft:Fira Code:size=12:antialias=true:hinting=true" + , additionalFonts = [ "xft:FiraCode Nerd Font:size=9:antialias=true:hinting=true" ] , bgColor = "#282a36" , fgColor = "#f8f8f2" , position = Top @@ -12,8 +13,8 @@ Config { -- layout , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "}{" -- separator between left-right alignment - , template = " %cpu% %memory% %dynnetwork% } %UnsafeStdinReader% { %date% | %YPAD% | %updates% %trayerpad%" - + , template = " %cpu% %memory% %network% %volume% | %UnsafeStdinReader% }{ %keyboard% | %date% | %YPAD% | %updates% %trayerpad%" + -- general behavior , lowerOnStart = True -- send to bottom of window stack on start , hideOnStart = False -- start with window unmapped (hidden) @@ -63,13 +64,13 @@ Config { -- ] 10 -- network activity monitor (dynamic interface resolution) - , Run DynNetwork [ "--template" , "net: kB/s kB/s" - , "--Low" , "100000" -- units: B/s - , "--High" , "500000" -- units: B/s - , "--low" , "#50fa7b" - , "--normal" , "#ffb86c" - , "--high" , "#ff5555" - ] 10 + -- , Run DynNetwork [ "--template" , "net: kB/s kB/s" + -- , "--Low" , "100000" -- units: B/s + -- , "--High" , "500000" -- units: B/s + -- , "--low" , "#50fa7b" + -- , "--normal" , "#ffb86c" + -- , "--high" , "#ff5555" + -- ] 10 -- cpu activity monitor , Run Cpu [ "--template" , "cpu: %" @@ -92,8 +93,8 @@ Config { -- time and date indicator -- (%F = y-m-d date, %a = day of week, %T = h:m:s time) - , Run Date "%a %d %b %H:%M" "date" 10 - + , Run Date "\xf073 %a %_d %b %Y | \xf017 %H:%M:%S" "date" 10 + -- keyboard layout indicator -- , Run Kbd [ ("us(dvorak)" , "DV") -- , ("us" , "US") @@ -120,6 +121,15 @@ Config { -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. , Run Com "/home/solomon/.config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 + -- Script that pulls network information and builds string to display + , Run Com "xmobar-status-net" [] "network" 5 + + -- Script that pulls keyboard layout and builds string to display + , Run Com "xmobar-status-keyboard" [] "keyboard" 20 + + -- Script that pulls volume related data and builds string to dislpay + , Run Com "xmobar-status-vol" [] "volume" 5 + -- Prints out the left side items such as workspaces, layout, etc. , Run UnsafeStdinReader diff --git a/.config/xmobar/xmobarrc0 b/.config/xmobar/xmobarrc0 deleted file mode 100755 index ccec1b0..0000000 --- a/.config/xmobar/xmobarrc0 +++ /dev/null @@ -1,122 +0,0 @@ -Config { - - -- appearance - font = "xft:Fira Code:size=14:bold:antialias=true:hinting=true" - , bgColor = "#14071F" - , fgColor = "#646464" - , position = Top - , border = BottomB - , borderColor = "#646464" - , iconRoot = "/home/solomon/.xmonad/xpm/" -- default: "." - - -- layout - , sepChar = "%" -- delineator between plugin names and straight text - , alignSep = "}{" -- separator between left-right alignment - , template = " %cpu% | %memory% | %dynnetwork% }\ - \{ %date% | %YPAD% | %kbd% | %uname% %trayerpad%" - } - -- , template = " %cpu% | %memory% | %dynnetwork% | %UnsafeStdinReader% }\ - -- \{ %date% | %YPAD% | %kbd% | %uname% %trayerpad%" - -- } - - -- general behavior - , lowerOnStart = True -- send to bottom of window stack on start - , hideOnStart = False -- start with window unmapped (hidden) - , allDesktops = True -- show on all desktops - , overrideRedirect = True -- set the Override Redirect flag (Xlib) - , pickBroadest = False -- choose widest display (multi-monitor) - , persistent = True -- enable/disable hiding (True = disabled) - - -- plugins - -- Numbers can be automatically colored according to their value. xmobar - -- decides color based on a three-tier/two-cutoff system, controlled by - -- command options: - -- --Low sets the low cutoff - -- --High sets the high cutoff - -- - -- --low sets the color below --Low cutoff - -- --normal sets the color between --Low and --High cutoffs - -- --High sets the color above --High cutoff - -- - -- The --template option controls how the plugin is displayed. Text - -- color can be set by enclosing in tags. For more details - -- see http://projects.haskell.org/xmobar/#system-monitor-plugins. - , commands = - -- weather monitor - [ Run Weather "YPAD" ["--template" , ": °C" - , "--Low" , "10" - , "--High" , "25" - , "--normal" , "#95C05D" - , "--high" , "red" - , "--low" , "lightblue" - ] 36000 - - -- -- network activity monitor - -- , Run Network "enp33s0" [ "--template" , "eth: kB/s kB/s" - -- , "--Low" , "100000" -- units: B/s - -- , "--High" , "500000" -- units: B/s - -- , "--low" , "#95C05D" - -- , "--normal" , "#ee9a00" - -- , "--high" , "#882410" - -- ] 10 - -- , Run Network "wlp36s0" [ "--template" , "wlan: kB/s kB/s" - -- , "--Low" , "100000" -- units: B/s - -- , "--High" , "500000" -- units: B/s - -- , "--low" , "#95C05D" - -- , "--normal" , "#ee9a00" - -- , "--high" , "#882410" - -- ] 10 - - -- network activity monitor (dynamic interface resolution) - , Run DynNetwork [ "--template" , ": kB/s kB/s" - , "--Low" , "100000" -- units: B/s - , "--High" , "500000" -- units: B/s - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- cpu activity monitor - , Run Cpu [ "--template" , "cpu: %" - , "--Low" , "30" -- units: % - , "--High" , "60" -- units: % - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- memory usage monitor - , Run Memory [ "--template" ,"mem: % (Mb)" - , "--Low" , "20" -- units: % - , "--High" , "90" -- units: % - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- time and date indicator - -- (%F = y-m-d date, %a = day of week, %T = h:m:s time) - , Run Date "%a %d %b %Y %H:%M:%S" "date" 10 - - -- keyboard layout indicator - , Run Kbd [ ("us(dvorak)" , "DV") - , ("us" , "US") - ] - - -- Runs a standard shell command 'uname -r' to get kernel version - , Run Com "uname" ["-r"] "" 3600 - - -- Runs a simple script that counts the number of system updates to apply - , Run Com "/home/solomon/.config/xmobar/count-updates.sh" [] "updates" 36000 - - -- Script that dynamically adjusts xmobar padding depending on nuf trayer icons. - , Run Com "/home/solomon/.config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 - - -- Prints out the left side items such as workspaces, layout, etc. - -- The workspaces are 'clickable' in my configs. - --, Run UnsafeStdinReader - - ] - } - - diff --git a/.config/xmobar/xmobarrc1 b/.config/xmobar/xmobarrc1 deleted file mode 100755 index e14f03a..0000000 --- a/.config/xmobar/xmobarrc1 +++ /dev/null @@ -1,119 +0,0 @@ -Config { - - -- appearance - font = "xft:Fira Code:size=14:bold:antialias=true:hinting=true" - , bgColor = "#14071F" - , fgColor = "#646464" - , position = Top - , border = BottomB - , borderColor = "#646464" - , iconRoot = "/home/solomon/.xmonad/xpm/" -- default: "." - - -- layout - , sepChar = "%" -- delineator between plugin names and straight text - , alignSep = "}{" -- separator between left-right alignment - , template = " %cpu% | %memory% | %dynnetwork% }\ - \{ %date% | %YPAD% | %kbd% | %uname% %trayerpad%" - } - -- , template = " %cpu% | %memory% | %dynnetwork% | %UnsafeStdinReader% }\ - -- \{ %date% | %YPAD% | %kbd% | %uname% %trayerpad%" - -- } - - -- general behavior - , lowerOnStart = True -- send to bottom of window stack on start - , hideOnStart = False -- start with window unmapped (hidden) - , allDesktops = True -- show on all desktops - , overrideRedirect = True -- set the Override Redirect flag (Xlib) - , pickBroadest = False -- choose widest display (multi-monitor) - , persistent = True -- enable/disable hiding (True = disabled) - - -- plugins - -- Numbers can be automatically colored according to their value. xmobar - -- decides color based on a three-tier/two-cutoff system, controlled by - -- command options: - -- --Low sets the low cutoff - -- --High sets the high cutoff - -- - -- --low sets the color below --Low cutoff - -- --normal sets the color between --Low and --High cutoffs - -- --High sets the color above --High cutoff - -- - -- The --template option controls how the plugin is displayed. Text - -- color can be set by enclosing in tags. For more details - -- see http://projects.haskell.org/xmobar/#system-monitor-plugins. - , commands = - -- weather monitor - [ Run Weather "YPAD" ["--template" , ": °C" - , "--Low" , "10" - , "--High" , "25" - , "--normal" , "#95C05D" - , "--high" , "red" - , "--low" , "lightblue" - ] 36000 - - -- -- network activity monitor - -- , Run Network "enp33s0" [ "--template" , "eth: kB/s kB/s" - -- , "--Low" , "100000" -- units: B/s - -- , "--High" , "500000" -- units: B/s - -- , "--low" , "#95C05D" - -- , "--normal" , "#ee9a00" - -- , "--high" , "#882410" - -- ] 10 - -- , Run Network "wlp36s0" [ "--template" , "wlan: kB/s kB/s" - -- , "--Low" , "100000" -- units: B/s - -- , "--High" , "500000" -- units: B/s - -- , "--low" , "#95C05D" - -- , "--normal" , "#ee9a00" - -- , "--high" , "#882410" - -- ] 10 - - -- network activity monitor (dynamic interface resolution) - , Run DynNetwork [ "--template" , ": kB/s kB/s" - , "--Low" , "100000" -- units: B/s - , "--High" , "500000" -- units: B/s - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- cpu activity monitor - , Run Cpu [ "--template" , "cpu: %" - , "--Low" , "30" -- units: % - , "--High" , "60" -- units: % - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- memory usage monitor - , Run Memory [ "--template" ,"mem: % (Mb)" - , "--Low" , "20" -- units: % - , "--High" , "90" -- units: % - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- time and date indicator - -- (%F = y-m-d date, %a = day of week, %T = h:m:s time) - , Run Date "%a %d %b %Y %H:%M:%S" "date" 10 - - -- keyboard layout indicator - , Run Kbd [ ("us(dvorak)" , "DV") - , ("us" , "US") - ] - - -- Runs a standard shell command 'uname -r' to get kernel version - , Run Com "uname" ["-r"] "" 3600 - - -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. - , Run Com "/home/solomon/.config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 - - -- Prints out the left side items such as workspaces, layout, etc. - -- The workspaces are 'clickable' in my configs. - --, Run UnsafeStdinReader - - ] - } - - diff --git a/.config/xmobar/xmobarrc2 b/.config/xmobar/xmobarrc2 deleted file mode 100755 index e14f03a..0000000 --- a/.config/xmobar/xmobarrc2 +++ /dev/null @@ -1,119 +0,0 @@ -Config { - - -- appearance - font = "xft:Fira Code:size=14:bold:antialias=true:hinting=true" - , bgColor = "#14071F" - , fgColor = "#646464" - , position = Top - , border = BottomB - , borderColor = "#646464" - , iconRoot = "/home/solomon/.xmonad/xpm/" -- default: "." - - -- layout - , sepChar = "%" -- delineator between plugin names and straight text - , alignSep = "}{" -- separator between left-right alignment - , template = " %cpu% | %memory% | %dynnetwork% }\ - \{ %date% | %YPAD% | %kbd% | %uname% %trayerpad%" - } - -- , template = " %cpu% | %memory% | %dynnetwork% | %UnsafeStdinReader% }\ - -- \{ %date% | %YPAD% | %kbd% | %uname% %trayerpad%" - -- } - - -- general behavior - , lowerOnStart = True -- send to bottom of window stack on start - , hideOnStart = False -- start with window unmapped (hidden) - , allDesktops = True -- show on all desktops - , overrideRedirect = True -- set the Override Redirect flag (Xlib) - , pickBroadest = False -- choose widest display (multi-monitor) - , persistent = True -- enable/disable hiding (True = disabled) - - -- plugins - -- Numbers can be automatically colored according to their value. xmobar - -- decides color based on a three-tier/two-cutoff system, controlled by - -- command options: - -- --Low sets the low cutoff - -- --High sets the high cutoff - -- - -- --low sets the color below --Low cutoff - -- --normal sets the color between --Low and --High cutoffs - -- --High sets the color above --High cutoff - -- - -- The --template option controls how the plugin is displayed. Text - -- color can be set by enclosing in tags. For more details - -- see http://projects.haskell.org/xmobar/#system-monitor-plugins. - , commands = - -- weather monitor - [ Run Weather "YPAD" ["--template" , ": °C" - , "--Low" , "10" - , "--High" , "25" - , "--normal" , "#95C05D" - , "--high" , "red" - , "--low" , "lightblue" - ] 36000 - - -- -- network activity monitor - -- , Run Network "enp33s0" [ "--template" , "eth: kB/s kB/s" - -- , "--Low" , "100000" -- units: B/s - -- , "--High" , "500000" -- units: B/s - -- , "--low" , "#95C05D" - -- , "--normal" , "#ee9a00" - -- , "--high" , "#882410" - -- ] 10 - -- , Run Network "wlp36s0" [ "--template" , "wlan: kB/s kB/s" - -- , "--Low" , "100000" -- units: B/s - -- , "--High" , "500000" -- units: B/s - -- , "--low" , "#95C05D" - -- , "--normal" , "#ee9a00" - -- , "--high" , "#882410" - -- ] 10 - - -- network activity monitor (dynamic interface resolution) - , Run DynNetwork [ "--template" , ": kB/s kB/s" - , "--Low" , "100000" -- units: B/s - , "--High" , "500000" -- units: B/s - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- cpu activity monitor - , Run Cpu [ "--template" , "cpu: %" - , "--Low" , "30" -- units: % - , "--High" , "60" -- units: % - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- memory usage monitor - , Run Memory [ "--template" ,"mem: % (Mb)" - , "--Low" , "20" -- units: % - , "--High" , "90" -- units: % - , "--low" , "#95C05D" - , "--normal" , "#ee9a00" - , "--high" , "#882410" - ] 10 - - -- time and date indicator - -- (%F = y-m-d date, %a = day of week, %T = h:m:s time) - , Run Date "%a %d %b %Y %H:%M:%S" "date" 10 - - -- keyboard layout indicator - , Run Kbd [ ("us(dvorak)" , "DV") - , ("us" , "US") - ] - - -- Runs a standard shell command 'uname -r' to get kernel version - , Run Com "uname" ["-r"] "" 3600 - - -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. - , Run Com "/home/solomon/.config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 - - -- Prints out the left side items such as workspaces, layout, etc. - -- The workspaces are 'clickable' in my configs. - --, Run UnsafeStdinReader - - ] - } - - diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index faa118a..4e3e6cb 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -70,7 +70,7 @@ import XMonad.Util.SpawnOnce -- A simple way to switch between desktop and laptop related things isLaptop :: Bool -isLaptop = True +isLaptop = False --THEME @@ -561,7 +561,7 @@ myLogHook = fadeInactiveLogHook fadeAmount myStartupHook = do -- System apps also in .xprofile spawnOnce "setxkbmap dvorak &" - spawnOnce "nitrogen --restore &" + spawnOnce "$HOME/.screenlayout/normal_3_screens.sh" spawnOnce "picom --experimental-backend &" spawnOnce "numlockx" spawnOnce "xsetroot -cursor_name left_ptr" diff --git a/.xprofile.tmpl b/.xprofile.tmpl new file mode 100644 index 0000000..b9bba70 --- /dev/null +++ b/.xprofile.tmpl @@ -0,0 +1,19 @@ +# keyboard layout +setxkbmap dvorak & + +# wallpaper +nitrogen --restore & + +# compositor +picom --experimental-backend & + +# numlock +numlockx + +# cursor +xsetroot -cursor_name left_ptr + +# screenlayout +#/home/solomon/.screenlayout/normal.sh +# or +#/home/solomon/.screenlayout/normal_3_screens.sh