diff options
| -rw-r--r-- | config/fish/config.fish | 4 | ||||
| -rw-r--r-- | config/nvim/lua/telescope-config.lua | 2 | ||||
| -rwxr-xr-x | config/x11/xinitrc | 11 | ||||
| -rw-r--r-- | config/xmobar/xmobarrc | 106 | ||||
| -rw-r--r-- | config/xmonad/xmonad.hs | 2 |
5 files changed, 117 insertions, 8 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index acb8634..e5912a6 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -1,5 +1,5 @@ if [ "$(uname)" = 'Linux' ] - set -gx PATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/cuda/bin" + set -gx PATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/cuda/bin:/usr/bin/vendor_perl" set -gx MAIL 'me@cacharle.xyz' set -gx SUDO 'doas' else if [ "$(uname)" = 'Darwin' ] @@ -19,7 +19,7 @@ set -gx PATH "$PATH:$HOME/git/odin" set -gx PATH "$PATH:$HOME/git/ols" # ESP32 rust toolchain -. "$HOME/export-esp.sh" +# . "$HOME/export-esp.sh" # applications set -gx EDITOR 'nvim' diff --git a/config/nvim/lua/telescope-config.lua b/config/nvim/lua/telescope-config.lua index 5f3fac4..fe245b9 100644 --- a/config/nvim/lua/telescope-config.lua +++ b/config/nvim/lua/telescope-config.lua @@ -2,7 +2,7 @@ local M = {} M.project_files = function() - local opts = { show_untracked = true } + local opts = { show_untracked = true, use_git_root = false } local ok = pcall(require"telescope.builtin".git_files, opts) if not ok then require"telescope.builtin".find_files(opts) diff --git a/config/x11/xinitrc b/config/x11/xinitrc index ecc8170..71ba76c 100755 --- a/config/x11/xinitrc +++ b/config/x11/xinitrc @@ -11,7 +11,7 @@ hsetroot -add '#111' -add '#222' -gradient 180 case "$(cat /etc/hostname)" in charles-main) - if xrandr | grep 'DisplayPort-0 connected' + if xrandr | grep -q 'DisplayPort-0 connected' then xrandr --output DisplayPort-0 --mode 3840x1080 --rate 68 elif xrandr | grep 'HDMI-0 connected' @@ -25,12 +25,12 @@ case "$(cat /etc/hostname)" in fi ;; charles-laptop) - xrandr | grep 'VGA1.*connected' && + xrandr | grep -q 'VGA1.*connected' && xrandr --output LVDS1 --primary --left-of VGA1 \ --output VGA1 --mode 1280x1024 ;; charles-fractal) - if xrandr | grep 'HTMI-1 connected' + if xrandr | grep -q 'HTMI-1 connected' then xrandr --output DP-2 --mode 3840x1080 --primary --left-of HDMI-1 \ --output HDMI-1 --mode 1920x1080 @@ -39,9 +39,10 @@ case "$(cat /etc/hostname)" in nvidia-settings --assign CurrentMetaMode="nvidia-auto-select +0+0 { ForceFullCompositionPipeline = On }" ;; charles-cleveron) - if xrandr | grep 'HTMI1 connected' + if xrandr | grep -q 'HDMI1 connected' then - xrandr --output eDP1 --primary --bellow HDMI1 + # Generated by arandr + xrandr --output eDP1 --primary --mode 1600x900 --pos 0x0 --rotate normal --output DP1 --off --output DP2 --off --output DP2-1 --off --output DP2-2 --mode 1600x900 --pos 3200x0 --rotate normal --output DP2-3 --off --output HDMI1 --mode 1600x900 --pos 1600x0 --rotate normal --output HDMI2 --off --output VIRTUAL1 --off fi esac diff --git a/config/xmobar/xmobarrc b/config/xmobar/xmobarrc new file mode 100644 index 0000000..b55c0a6 --- /dev/null +++ b/config/xmobar/xmobarrc @@ -0,0 +1,106 @@ +Config { + + -- appearance + font = "Bitstream Vera Sans Mono Bold 9" + , bgColor = "black" + , fgColor = "#646464" + , position = Top + , border = BottomB + , borderColor = "#646464" + + -- layout + , sepChar = "%" -- delineator between plugin names and straight text + , alignSep = "}{" -- separator between left-right alignment + , template = "%battery% | %multicpu% | %coretemp% | %memory% | %dynnetwork% }{ %RJTT% | %date% || %kbd% " + + -- 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 <fc></fc> tags. For more details + -- see http://projects.haskell.org/xmobar/#system-monitor-plugins. + , commands = + + -- weather monitor + [ Run Weather "RJTT" [ "--template", "<skyCondition> | <fc=#4682B4><tempC></fc>°C | <fc=#4682B4><rh></fc>% | <fc=#4682B4><pressure></fc>hPa" + ] 36000 + + -- network activity monitor (dynamic interface resolution) + , Run DynNetwork [ "--template" , "<dev>: <tx>kB/s|<rx>kB/s" + , "--Low" , "1000" -- units: B/s + , "--High" , "5000" -- units: B/s + , "--low" , "darkgreen" + , "--normal" , "darkorange" + , "--high" , "darkred" + ] 10 + + -- cpu activity monitor + , Run MultiCpu [ "--template" , "Cpu: <total0>%|<total1>%" + , "--Low" , "50" -- units: % + , "--High" , "85" -- units: % + , "--low" , "darkgreen" + , "--normal" , "darkorange" + , "--high" , "darkred" + ] 10 + + -- cpu core temperature monitor + , Run CoreTemp [ "--template" , "Temp: <core0>°C|<core1>°C" + , "--Low" , "70" -- units: °C + , "--High" , "80" -- units: °C + , "--low" , "darkgreen" + , "--normal" , "darkorange" + , "--high" , "darkred" + ] 50 + + -- memory usage monitor + , Run Memory [ "--template" ,"Mem: <usedratio>%" + , "--Low" , "20" -- units: % + , "--High" , "90" -- units: % + , "--low" , "darkgreen" + , "--normal" , "darkorange" + , "--high" , "darkred" + ] 10 + + -- battery monitor + , Run Battery [ "--template" , "Batt: <acstatus>" + , "--Low" , "10" -- units: % + , "--High" , "80" -- units: % + , "--low" , "darkred" + , "--normal" , "darkorange" + , "--high" , "darkgreen" + + , "--" -- battery specific options + -- discharging status + , "-o" , "<left>% (<timeleft>)" + -- AC "on" status + , "-O" , "<fc=#dAA520>Charging</fc>" + -- charged status + , "-i" , "<fc=#006000>Charged</fc>" + ] 50 + + -- time and date indicator + -- (%F = y-m-d date, %a = day of week, %T = h:m:s time) + , Run Date "<fc=#ABABAB>%F (%a) %T</fc>" "date" 10 + + -- keyboard layout indicator + , Run Kbd [ ("us(dvorak)" , "<fc=#00008B>DV</fc>") + , ("us" , "<fc=#8B0000>US</fc>") + ] + ] + } diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index c169e2b..aa37259 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -80,6 +80,7 @@ manageHook' = composeAll keys' = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down") , ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up") , ("<XF86AudioMute>", spawn "pulseaudio-ctl mute") + , ("<XF86AudioMicMute>", spawn "pulseaudio-ctl mute-input") , ("M--", spawn "pulseaudio-ctl down") , ("M-=", spawn "pulseaudio-ctl up") -- , ("M-g", layoutSplitScreen 2 (TwoPane 0.5 0.5)) @@ -93,6 +94,7 @@ keys' = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down") , ("M-o", spawn "project-open") , ("M-p", spawn "rofi -show run") + , ("<XF86Search>", spawn "rofi -show run") , ("M-s", spawn "rofi -show ssh") , ("M-s-w", spawn "rofi -show window") , ("M-i", spawn "insert-special-character") |