diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/fish/config.fish | 1 | ||||
| -rwxr-xr-x | config/x11/xinitrc | 37 | ||||
| -rw-r--r-- | config/xmonad/xmonad.hs | 5 |
3 files changed, 12 insertions, 31 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index 1aea8c3..ee26a6c 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -48,6 +48,7 @@ set -gx BUNDLE_USER_PLUGIN "$XDG_DATA_HOME"/bundle set -gx JULIA_DEPOT_PATH "$XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH" set -gx RLWRAP_HOME "$XDG_DATA_HOME/rlwrap" set -gx STARDICT_DATA_DIR "$XDG_DATA_HOME/stardict" # put dictionaries in a 'dic' subdirectory +set -gx VIRTUALFISH_HOME "$XDG_DATA_HOME/virtualfish" # cache set -gx HISTFILE "$XDG_CACHE_HOME/zsh/history" set -gx LESSHISTFILE '-' # no ~/.lesshst diff --git a/config/x11/xinitrc b/config/x11/xinitrc index 4f5cddf..7242d46 100755 --- a/config/x11/xinitrc +++ b/config/x11/xinitrc @@ -1,9 +1,9 @@ #!/bin/sh -keynav daemonize # moving the cursor around without the mouse +# keynav daemonize # moving the cursor around without the mouse redshift & # filter blue light dunst & # notification daemon -unclutter --timeout 10 --fork # hide mouse after 2s +unclutter --timeout 10 --fork # hide mouse after 10s clout push-watch & # could with rsync xrdb "$XDG_CONFIG_HOME/x11/Xresources" syncthing --no-browser > ~/.cache/syncthing.log 2>&1 & @@ -24,41 +24,20 @@ case "$(cat /etc/hostname)" in --output DVI-1 --mode 1920x1080 --primary fi ;; - charles-laptop) xrandr | grep 'VGA1.*connected' && xrandr --output LVDS1 --primary --left-of VGA1 \ --output VGA1 --mode 1280x1024 ;; + charles-fractal) + if xrandr | grep 'HTMI-1 connected' + then + xrandr --output DP-2 --mode 3840x1080 --primary --left-of HDMI-1 \ + --output HDMI-1 --mode 1920x1080 + fi esac # fix screen tearing nvidia-settings --assign CurrentMetaMode="nvidia-auto-select +0+0 { ForceFullCompositionPipeline = On }" # awesome xmonad || { xmonad --recompile; xmonad; } - -# keynav daemonize # moving the cursor around without the mouse -# redshift & # filter blue light -# dunst & # notification daemon -# unclutter --timeout 10 --fork # hide mouse after 2s -# clout push-watch & # could with rsync -# xrdb "$XDG_CONFIG_HOME/x11/Xresources" -# syncthing --no-browser & -# hsetroot -add '#111' -add '#222' -gradient 180 -# switch "$(cat /etc/hostname)" -# case 'charles-main' -# if xrandr | grep 'DisplayPort-0 connected' -# xrandr --output DisplayPort-0 --mode 3840x1080 --rate 68 -# else if xrandr | grep 'HDMI-0 connected' -# xrandr --output DVI-0 --auto --left-of DVI-1 \ -# --output DVI-1 --mode 1920x1080 --primary --left-of HDMI-0 \ -# --output HDMI-0 --mode 1920x1080 -# else -# xrandr --output DVI-0 --auto --left-of DVI-1 \ -# --output DVI-1 --mode 1920x1080 --primary -# end -# case 'charles-laptop' -# xrandr | grep 'VGA1.*connected' && -# xrandr --output LVDS1 --primary --left-of VGA1 \ -# --output VGA1 --mode 1280x1024 -# end diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index 1ef262f..a963905 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -78,13 +78,14 @@ keys' = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down") , ("<XF86MonBrightnessUp>", spawn "backlight-ctl up") , ("<XF86MonBrightnessDown>", spawn "backlight-ctl down") - , ("<XF86ScreenSaver>", spawn "slock") , ("<XF86TouchpadToggle>", spawn "touchpad-toggle") + , ("<XF86ScreenSaver>", spawn "i3lock") + , ("M-<Delete>", spawn "i3lock") , ("M-o", spawn "project-open") , ("M-p", spawn "rofi -show run") , ("M-s", spawn "rofi -show ssh") - , ("M-w", spawn "rofi -show window") + , ("M-i", spawn "rofi -show window") , ("M-S-d", spawn "notify-send -i x-office-calendar \"$(date +\"%H:%M %A %d/%m/%Y %B\")\"") , ("M-S-b", spawn $ "notify-send --hint=int:transient:1 " ++ "--hint=int:value:\"$(cat /sys/class/power_supply/BAT0/capacity)\" " ++ |