From c48e5826ee495c6beff5c971b6813abe4cb695e7 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Sat, 14 Nov 2020 17:54:50 -0800 Subject: [PATCH] Initial linux changes --- .Xdefaults | 14 +- .config/picom/picom.conf | 424 +++++++++++++++++++++++++++++++++++++++ .gnupg/gpg-agent.conf | 5 +- .xinitrc | 13 +- .xmonad/xmonad.hs | 9 +- .zshrc | 4 +- local/bin/battery.sh | 17 +- 7 files changed, 461 insertions(+), 25 deletions(-) create mode 100644 .config/picom/picom.conf diff --git a/.Xdefaults b/.Xdefaults index 95e1454..4201019 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -18,13 +18,13 @@ *color14: rgb:a1/b5/cd *color15: rgb:de/de/de -Xft.autohint: 0 -Xft.dpi: 150 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight -Xft.lcdfilter: lcddefault +#Xft.dpi: 157 +#Xft.autohint: 0 +#Xft.lcdfilter: lcddefault +#Xft.hintstyle: hintslight +#Xft.hinting: true +#Xft.antialias: true +#Xft.rgba: rgb URxvt*scrollBar: false URxvt*background: rgba:0000/0000/0000/dddd URxvt.depth: 32 diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf new file mode 100644 index 0000000..442c8b7 --- /dev/null +++ b/.config/picom/picom.conf @@ -0,0 +1,424 @@ +################################# +# Shadows # +################################# + + +# Enabled client-side shadows on windows. Note desktop windows +# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, +# unless explicitly requested using the wintypes option. +# +shadow = false +#shadow = true; + +# The blur radius for shadows, in pixels. (defaults to 12) +# shadow-radius = 12 +shadow-radius = 7; + +# The opacity of shadows. (0.0 - 1.0, defaults to 0.75) +# shadow-opacity = .75 + +# The left offset for shadows, in pixels. (defaults to -15) +# shadow-offset-x = -15 +shadow-offset-x = -7; + +# The top offset for shadows, in pixels. (defaults to -15) +# shadow-offset-y = -15 +shadow-offset-y = -7; + +# Avoid drawing shadows on dock/panel windows. This option is deprecated, +# you should use the *wintypes* option in your config file instead. +# +# no-dock-shadow = false + +# Don't draw shadows on drag-and-drop windows. This option is deprecated, +# you should use the *wintypes* option in your config file instead. +# +# no-dnd-shadow = false + +# Red color value of shadow (0.0 - 1.0, defaults to 0). +# shadow-red = 0 + +# Green color value of shadow (0.0 - 1.0, defaults to 0). +# shadow-green = 0 + +# Blue color value of shadow (0.0 - 1.0, defaults to 0). +# shadow-blue = 0 + +# Do not paint shadows on shaped windows. Note shaped windows +# here means windows setting its shape through X Shape extension. +# Those using ARGB background is beyond our control. +# Deprecated, use +# shadow-exclude = 'bounding_shaped' +# or +# shadow-exclude = 'bounding_shaped && !rounded_corners' +# instead. +# +# shadow-ignore-shaped = '' + +# Specify a list of conditions of windows that should have no shadow. +# +# examples: +# shadow-exclude = "n:e:Notification"; +# +# shadow-exclude = [] +shadow-exclude = [ + "name = 'Notification'", + "class_g = 'Conky'", + "class_g ?= 'Notify-osd'", + "class_g = 'Cairo-clock'", + "_GTK_FRAME_EXTENTS@:c" +]; + +# Specify a X geometry that describes the region in which shadow should not +# be painted in, such as a dock window region. Use +# shadow-exclude-reg = "x10+0+0" +# for example, if the 10 pixels on the bottom of the screen should not have shadows painted on. +# +# shadow-exclude-reg = "" + +# Crop shadow of a window fully on a particular Xinerama screen to the screen. +# xinerama-shadow-crop = false + + +################################# +# Fading # +################################# + + +# Fade windows in/out when opening/closing and when opacity changes, +# unless no-fading-openclose is used. +fading = false +# fading = true + +# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028) +# fade-in-step = 0.028 +fade-in-step = 0.03; + +# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03) +# fade-out-step = 0.03 +fade-out-step = 0.03; + +# The time between steps in fade step, in milliseconds. (> 0, defaults to 10) +# fade-delta = 10 + +# Specify a list of conditions of windows that should not be faded. +# fade-exclude = [] + +# Do not fade on window open/close. +# no-fading-openclose = false + +# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc. +# no-fading-destroyed-argb = false + + +################################# +# Transparency / Opacity # +################################# + + +# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) +# inactive-opacity = 1 +inactive-opacity = 0.8; + +# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) +# frame-opacity = 1.0 +frame-opacity = 0.7; + +# Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) +# menu-opacity = 1.0 + +# Let inactive opacity set by -i override the '_NET_WM_OPACITY' values of windows. +# inactive-opacity-override = true +inactive-opacity-override = false; + +# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) +# active-opacity = 1.0 + +# Dim inactive windows. (0.0 - 1.0, defaults to 0.0) +# inactive-dim = 0.0 + +# Specify a list of conditions of windows that should always be considered focused. +# focus-exclude = [] +focus-exclude = [ "class_g = 'Cairo-clock'" ]; + +# Use fixed inactive dim value, instead of adjusting according to window opacity. +# inactive-dim-fixed = 1.0 + +# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, +# like `50:name *= "Firefox"`. picom-trans is recommended over this. +# Note we don't make any guarantee about possible conflicts with other +# programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows. +# example: +# opacity-rule = [ "80:class_g = 'URxvt'" ]; +# +# opacity-rule = [] + + +################################# +# Background-Blurring # +################################# + + +# Parameters for background blurring, see the *BLUR* section for more information. +# blur-method = +# blur-size = 12 +# +# blur-deviation = false + +# Blur background of semi-transparent / ARGB windows. +# Bad in performance, with driver-dependent behavior. +# The name of the switch may change without prior notifications. +# +# blur-background = false + +# Blur background of windows when the window frame is not opaque. +# Implies: +# blur-background +# Bad in performance, with driver-dependent behavior. The name may change. +# +# blur-background-frame = false + + +# Use fixed blur strength rather than adjusting according to window opacity. +# blur-background-fixed = false + + +# Specify the blur convolution kernel, with the following format: +# example: +# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; +# +# blur-kern = '' +blur-kern = "3x3box"; + + +# Exclude conditions for background blur. +# blur-background-exclude = [] +blur-background-exclude = [ + "window_type = 'dock'", + "window_type = 'desktop'", + "_GTK_FRAME_EXTENTS@:c" +]; + +################################# +# General Settings # +################################# + +# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. +# daemon = false + +# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. +# `xrender` is the default one. +# +# backend = 'glx' +backend = "xr_glx_hybrid"; + +# Enable/disable VSync. +# vsync = false +vsync = true + +# Enable remote control via D-Bus. See the *D-BUS API* section below for more details. +# dbus = false + +# Try to detect WM windows (a non-override-redirect window with no +# child that has 'WM_STATE') and mark them as active. +# +# mark-wmwin-focused = false +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; + +# Try to detect windows with rounded corners and don't consider them +# shaped windows. The accuracy is not very high, unfortunately. +# +# detect-rounded-corners = false +detect-rounded-corners = true; + +# Detect '_NET_WM_OPACITY' on client windows, useful for window managers +# not passing '_NET_WM_OPACITY' of client windows to frame windows. +# +# detect-client-opacity = false +detect-client-opacity = true; + +# Specify refresh rate of the screen. If not specified or 0, picom will +# try detecting this with X RandR extension. +# +# refresh-rate = 60 +refresh-rate = 0 + +# Limit picom to repaint at most once every 1 / 'refresh_rate' second to +# boost performance. This should not be used with +# vsync drm/opengl/opengl-oml +# as they essentially does sw-opti's job already, +# unless you wish to specify a lower refresh rate than the actual value. +# +# sw-opti = + +# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, +# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, +# provided that the WM supports it. +# +# use-ewmh-active-win = false + +# Unredirect all windows if a full-screen opaque window is detected, +# to maximize performance for full-screen windows. Known to cause flickering +# when redirecting/unredirecting windows. +# +unredir-if-possible = true + +# Delay before unredirecting the window, in milliseconds. Defaults to 0. +# unredir-if-possible-delay = 0 + +# Conditions of windows that shouldn't be considered full-screen for unredirecting screen. +# unredir-if-possible-exclude = [] + +# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows +# in the same group focused at the same time. +# +# detect-transient = false +detect-transient = true + +# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same +# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if +# detect-transient is enabled, too. +# +# detect-client-leader = false +detect-client-leader = true + +# Resize damaged region by a specific number of pixels. +# A positive value enlarges it while a negative one shrinks it. +# If the value is positive, those additional pixels will not be actually painted +# to screen, only used in blur calculation, and such. (Due to technical limitations, +# with use-damage, those pixels will still be incorrectly painted to screen.) +# Primarily used to fix the line corruption issues of blur, +# in which case you should use the blur radius value here +# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, +# with a 5x5 one you use `--resize-damage 2`, and so on). +# May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly. +# +# resize-damage = 1 + +# Specify a list of conditions of windows that should be painted with inverted color. +# Resource-hogging, and is not well tested. +# +# invert-color-include = [] + +# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. +# Might cause incorrect opacity when rendering transparent content (but never +# practically happened) and may not work with blur-background. +# My tests show a 15% performance boost. Recommended. +# +# glx-no-stencil = false +glx-no-stencil = true + +# GLX backend: Avoid rebinding pixmap on window damage. +# Probably could improve performance on rapid window content changes, +# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). +# Recommended if it works. +# +# glx-no-rebind-pixmap = false + +# Disable the use of damage information. +# This cause the whole screen to be redrawn everytime, instead of the part of the screen +# has actually changed. Potentially degrades the performance, but might fix some artifacts. +# The opposing option is use-damage +# +# no-use-damage = false +use-damage = true + +# Use X Sync fence to sync clients' draw calls, to make sure all draw +# calls are finished before picom starts drawing. Needed on nvidia-drivers +# with GLX backend for some users. +# +# xrender-sync-fence = false + +# GLX backend: Use specified GLSL fragment shader for rendering window contents. +# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` +# in the source tree for examples. +# +# glx-fshader-win = '' + +# Force all windows to be painted with blending. Useful if you +# have a glx-fshader-win that could turn opaque pixels transparent. +# +# force-win-blend = false + +# Do not use EWMH to detect fullscreen windows. +# Reverts to checking if a window is fullscreen based only on its size and coordinates. +# +# no-ewmh-fullscreen = false + +# Dimming bright windows so their brightness doesn't exceed this set value. +# Brightness of a window is estimated by averaging all pixels in the window, +# so this could comes with a performance hit. +# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) +# +# max-brightness = 1.0 + +# Make transparent windows clip other windows like non-transparent windows do, +# instead of blending on top of them. +# +# transparent-clipping = false + +# Set the log level. Possible values are: +# "trace", "debug", "info", "warn", "error" +# in increasing level of importance. Case doesn't matter. +# If using the "TRACE" log level, it's better to log into a file +# using *--log-file*, since it can generate a huge stream of logs. +# +# log-level = "debug" +log-level = "warn"; + +# Set the log file. +# If *--log-file* is never specified, logs will be written to stderr. +# Otherwise, logs will to written to the given file, though some of the early +# logs might still be written to the stderr. +# When setting this option from the config file, it is recommended to use an absolute path. +# +# log-file = '/path/to/your/log/file' + +# Show all X errors (for debugging) +# show-all-xerrors = false + +# Write process ID to a file. +# write-pid-path = '/path/to/your/log/file' + +# Window type settings +# +# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: +# "unknown", "desktop", "dock", "toolbar", "menu", "utility", +# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", +# "tooltip", "notification", "combo", and "dnd". +# +# Following per window-type options are available: :: +# +# fade, shadow::: +# Controls window-type-specific shadow and fade settings. +# +# opacity::: +# Controls default opacity of the window type. +# +# focus::: +# Controls whether the window of this type is to be always considered focused. +# (By default, all window types except "normal" and "dialog" has this on.) +# +# full-shadow::: +# Controls whether shadow is drawn under the parts of the window that you +# normally won't be able to see. Useful when the window has parts of it +# transparent, and you want shadows in those areas. +# +# redir-ignore::: +# Controls whether this type of windows should cause screen to become +# redirected again after been unredirected. If you have unredir-if-possible +# set, and doesn't want certain window to cause unnecessary screen redirection, +# you can set this to `true`. +# +wintypes: +{ + tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; + dock = { shadow = false; } + dnd = { shadow = false; } + popup_menu = { opacity = 0.8; } + dropdown_menu = { opacity = 0.8; } +}; diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index f32733c..0437626 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -2,5 +2,6 @@ default-cache-ttl 3600 max-cache-ttl 3600 enable-ssh-support #disable-scdaemon -pinentry-program /usr/local/bin/pinentry-mac -extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra +#pinentry-program /usr/local/bin/pinentry-mac +#pinentry-program /usr/bin/pinentry-curses +#extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra diff --git a/.xinitrc b/.xinitrc index 2ef40ee..995fbe7 100644 --- a/.xinitrc +++ b/.xinitrc @@ -7,14 +7,21 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -setxkbmap us dvorak ctrl:nocaps +#export GDK_DPI_SCALE=0.5 +systemctl --user import-environment DISPLAY +#setxkbmap us dvorak ctrl:nocaps # remap powerkey to insert xmodmap -e "keycode 124 = NoSymbol Insert" xmodmap -e "keycode 62 = Scroll_Lock Scroll_Lock" xmodmap -e "keycode 37 = Control_R Control_R" -xset r rate 220 32 -feh --bg-fill ~/Dropbox/Photos/Adventurous\ Kate.jpg +redshift & +CM_DIR=~/.config/clipmenu clipmenud & +#picom -b +hsetroot -solid '#000000' +xrdb -merge ~/.Xresources +#feh --bg-fill ~/Dropbox/Photos/Adventurous\ Kate.jpg eval `ssh-agent -s` battery.sh & +xset r rate 220 32 exec xmonad diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index c1ffb45..eb55a73 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -62,6 +62,7 @@ mKeys = [ ("M-S-n" , sendMessage MirrorShrink ) -- Expand current window , ("M-M1-C-8", spawn "xcalib -i -a" ) -- Invert screen color , ("M-S-b" , spawn "ps -U hunner|grep dzen2|awk '{print $1}'|xargs kill -USR1") -- Bring dzen to the front , ("M-p" , spawn "dmenu_run") + , ("M-C-c" , spawn "CM_DIR=~/.config/clipmenu clipmenu") , ("", spawn "xlock -mode fzort -echokeys -usefirst" ) -- SCReen LocK -- Sticky/unsticky windows (does not work on workspaces created after the fact) @@ -80,13 +81,13 @@ mKeys = [ ("M-S-n" , sendMessage MirrorShrink ) -- Expand current window , ("" , spawn "mpc stop" ) -- stop mpd , ("" , spawn "mpc prev" ) -- prev song , ("" , spawn "mpc next" ) -- next song - , ("" , spawn "amixer -q set Master 4%-" ) -- volume down - , ("" , spawn "amixer -q set Master 4%+" ) -- volume up - , ("" , spawn "amixer -q set Headphone toggle") -- toggle mute + , ("" , spawn "pamixer --decrease 4" ) -- volume down + , ("" , spawn "pamixer --increase 4" ) -- volume up + , ("" , spawn "pamixer --toggle-mute") -- toggle mute , ("M-" , spawn "amixer -q set Speaker toggle" ) -- Dynamic workspace commands - , ("M-S-" , removeWorkspace) + --, ("M-S-" , removeWorkspace) , ("M-S-w" , selectWorkspace mXPConfig) , ("M-S-r" , renameWorkspace mXPConfig) , ("M-m" , withWorkspace mXPConfig (windows . W.shift)) diff --git a/.zshrc b/.zshrc index 9abb05a..f89659c 100644 --- a/.zshrc +++ b/.zshrc @@ -111,7 +111,7 @@ if [ -f ~/.zsh/private ] ; then fi export NETHACKOPTIONS='autopickup,color,!cmdassist,!number_pad,hilite_pet,boulder:0,pickup_types:$"=/!?+,menustyle:partial,!legacy,suppress_alert:3.3.1' export DEV_ROOT="$HOME/Documents/work/git/" -export JAVA_HOME=$(/usr/libexec/java_home) +[ -e /usr/libexec/java_home ] && export JAVA_HOME=$(/usr/libexec/java_home) export OVFTOOL='/Applications/VMware OVF Tool/ovftool' #export DOCKER_HOST='tcp://192.168.99.100:2375' if whence rg > /dev/null ; then @@ -181,7 +181,7 @@ fi # GPG 2.1.x SSH support # See : http://incenp.org/notes/2015/gnupg-for-ssh-authentication.html -export SSH_AUTH_SOCK="$HOME/.gnupg/S.gpg-agent.ssh" +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ## Add extra fonts #xset fp+ /usr/APL2/fonts/X11 diff --git a/local/bin/battery.sh b/local/bin/battery.sh index a2950db..023dea5 100755 --- a/local/bin/battery.sh +++ b/local/bin/battery.sh @@ -5,14 +5,17 @@ BG='#000' # dzen backgrounad FG='#ddd' # dzen foreground -W=157 # width of the dzen bar -GW=100 # width of the gauge -GFG='#057' # color of the gauge -GH=12 # height of the gauge +W=112 # width of the dzen bar +H=12 # height of the dzen bar +GW=80 # width of the gauge +#GFG='#5e81ac' # color of the gauge +GFG='#379' # color of the gauge +GH=10 # height of the gauge GBG='#333' # color of gauge background -X=2722 # x position +#X=1807 # x position +X="$(expr "$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+)x[0-9]+.*$/\1/')" - $W - 1)" # x position Y=1 # y position -FN='"xft:Liberation Mono:size=7"' # font +FN='xft:Liberation Mono:size=8' # font STATEFILE='/sys/class/power_supply/BAT0/status' # battery's state file CAPFILE='/sys/class/power_supply/BAT0/capacity' # battery's capacity file @@ -54,4 +57,4 @@ while true; do echo -n "$(date +"$DATE_FORMAT") " eval echo $RPERC | $gdbar -h $GH -w $GW -fg $GFGC -bg $GBG sleep $TIME_INT; -done | dzen2 -ta c -tw $W -y $Y -x $X -fg "$FG" -bg "$BG" -fn "$FN" -h 18 -e "sigusr1=raise" +done | dzen2 -ta c -tw $W -y $Y -x $X -fg "$FG" -bg "$BG" -fn "$FN" -h $H -e "sigusr1=raise"