diff --git a/bin/xorg/umbreon/common b/bin/xorg/umbreon/common index 5bc8a69..d77022f 100644 --- a/bin/xorg/umbreon/common +++ b/bin/xorg/umbreon/common @@ -1,2 +1,3 @@ #!/bin/zsh source $HOME/.config/wryn/env.zsh +[ ! $DISPLAY ] && export DISPLAY=:0 diff --git a/bin/xorg/umbreon/homedock b/bin/xorg/umbreon/homedock index b16db50..731ff67 100755 --- a/bin/xorg/umbreon/homedock +++ b/bin/xorg/umbreon/homedock @@ -2,7 +2,7 @@ source ${0:a:h}/common xrandr \ - --output DP-3 \ + --output DP-3-1 \ --primary \ --auto \ --mode 1920x1080 \ @@ -15,5 +15,7 @@ xrandr \ xset dpms 0 0 0 && xset s noblank && xset s off \ && notify-send 'DPMS' 'disabled screen blank' +(pkill compton; sleep 0.5; compton;) & + $DOTWRYN/bin/set-background random PLAY_SFX gamedock diff --git a/bin/xorg/umbreon/runedock b/bin/xorg/umbreon/runedock index 1df17f5..45cdd7a 100755 --- a/bin/xorg/umbreon/runedock +++ b/bin/xorg/umbreon/runedock @@ -5,11 +5,14 @@ xrandr \ --output eDP-1 \ --primary \ --auto \ - --mode 1280x800 \ + --mode 960x600 \ --rotate normal \ + --rate 60 \ --pos 0x0 \ ; +pkill compton + xset dpms 0 0 0 && xset s noblank && xset s off \ && notify-send 'DPMS' 'disabled screen blank' diff --git a/bin/xorg/umbreon/undock b/bin/xorg/umbreon/undock index 050b597..01f628f 100755 --- a/bin/xorg/umbreon/undock +++ b/bin/xorg/umbreon/undock @@ -8,12 +8,14 @@ xrandr \ --mode 1920x1200 \ --rotate normal \ --pos 0x0 \ - --output DP-3 \ + --output DP-3-1 \ --off \ ; xset +dpms && xset s blank && xset s on \ && notify-send 'DPMS' 'enabled screen blank' +(pkill compton; sleep 0.5; compton;) & + $DOTWRYN/bin/set-background random PLAY_SFX gamedock diff --git a/config/gitconfig b/config/git.conf similarity index 100% rename from config/gitconfig rename to config/git.conf diff --git a/config/pylintrc b/config/pylint.conf similarity index 87% rename from config/pylintrc rename to config/pylint.conf index e655833..92d1134 100644 --- a/config/pylintrc +++ b/config/pylint.conf @@ -60,17 +60,7 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use "--disable=all --enable=classes # --disable=W". -disable=print-statement, - parameter-unpacking, - unpacking-in-except, - old-raise-syntax, - backtick, - long-suffix, - old-ne-operator, - old-octal-literal, - import-star-module-level, - non-ascii-bytes-literal, - raw-checker-failed, +disable=raw-checker-failed, bad-inline-option, locally-disabled, file-ignored, @@ -78,71 +68,8 @@ disable=print-statement, useless-suppression, deprecated-pragma, use-symbolic-message-instead, - apply-builtin, - basestring-builtin, - buffer-builtin, - cmp-builtin, - coerce-builtin, - execfile-builtin, - file-builtin, - long-builtin, - raw_input-builtin, - reduce-builtin, - standarderror-builtin, - unicode-builtin, - xrange-builtin, - coerce-method, - delslice-method, - getslice-method, - setslice-method, - no-absolute-import, - old-division, - dict-iter-method, - dict-view-method, - next-method-called, - metaclass-assignment, - indexing-exception, - raising-string, - reload-builtin, - oct-method, - hex-method, - nonzero-method, - cmp-method, - input-builtin, - round-builtin, - intern-builtin, - unichr-builtin, - map-builtin-not-iterating, - zip-builtin-not-iterating, - range-builtin-not-iterating, - filter-builtin-not-iterating, - using-cmp-argument, - eq-without-hash, - div-method, - idiv-method, - rdiv-method, - exception-message-attribute, - invalid-str-codec, - sys-max-int, - bad-python3-import, - deprecated-string-function, - deprecated-str-translate-call, - deprecated-itertools-function, - deprecated-types-field, - next-method-defined, - dict-items-not-iterating, - dict-keys-not-iterating, - dict-values-not-iterating, - deprecated-operator-function, - deprecated-urllib-function, - xreadlines-attribute, - deprecated-sys-function, - exception-escape, - comprehension-escape, # my ignored rules invalid-name, - bad-continuation, - bad-whitespace, missing-class-docstring, missing-function-docstring, missing-module-docstring, @@ -470,13 +397,6 @@ max-line-length=120 # Maximum number of lines in a module. max-module-lines=1000 -# List of optional constructs for which whitespace checking is disabled. `dict- -# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. -# `trailing-comma` allows a space between comma and closing bracket: (a, ). -# `empty-line` allows space-only lines. -no-space-check=trailing-comma, - dict-separator - # Allow the body of a class to be on the same line as the declaration if body # contains single statement. single-line-class-stmt=no diff --git a/config/xinitrc b/config/xinitrc index 7438a1f..8eb045a 100644 --- a/config/xinitrc +++ b/config/xinitrc @@ -1,34 +1,12 @@ #!/bin/zsh source "$HOME/.config/wryn/env.zsh" -##################################################################### - -X11_SCRIPTS='/etc/X11/xinit/xinitrc.d'; -if [ -d $X11_SCRIPTS ] -then - for script in $(find "$X11_SCRIPTS" -name \*.sh); do - source "$script" - done -fi +export PATH="$DOTWRYN/bin/xorg/$(hostnamectl --static):$PATH" +for SCRIPT in $(find /etc/x11/xinit/xinitrc.d); do source $SCRIPT; done command -v dex && dex -a -##################################################################### - -CUSTOM_DMENU_COMMANDS="$HOME/.local/dmenu" -[ ! -d $CUSTOM_DMENU_COMMANDS ] && mkdir $CUSTOM_DMENU_COMMANDS - -export PATH="$CUSTOM_DMENU_COMMANDS:$PATH" - -##################################################################### - -LAYOUT_DIR="$DOTWRYN/bin/xorg/$(hostnamectl --static)" -[ -d $LAYOUT_DIR ] && export PATH="$LAYOUT_DIR:$PATH" - $DOTWRYN/bin/xorg/activate-default & -##################################################################### - - cd exec i3 diff --git a/setup/config.setup.zsh b/setup/config.setup.zsh index e3af37d..22872b8 100644 --- a/setup/config.setup.zsh +++ b/setup/config.setup.zsh @@ -3,12 +3,12 @@ function SETUP__CONFIG() { # ~/.config/THE_REST .wryn/config/THE_REST CONFIG__SYMLINK '../.XCompose' 'xcompose.conf' CONFIG__SYMLINK '../.XConfig' 'xconfig.conf' - CONFIG__SYMLINK '../.gitconfig' 'gitconfig' CONFIG__SYMLINK '../.tmux.conf' 'tmux.conf' CONFIG__SYMLINK '../.xinitrc' 'xinitrc' CONFIG__SYMLINK 'bat/config' 'bat.conf' CONFIG__SYMLINK 'code-activator-zsh/settings.zsh' 'code-activator.conf' CONFIG__SYMLINK 'compton/compton.conf' 'compton.conf' + CONFIG__SYMLINK 'git/config' 'git.conf' CONFIG__SYMLINK 'i3/config' 'i3.conf' CONFIG__SYMLINK 'i3/utils' '../bin/i3/utils' CONFIG__SYMLINK 'i3status/config' 'i3status.conf' @@ -16,7 +16,7 @@ function SETUP__CONFIG() { CONFIG__SYMLINK 'kitty/theme.conf' '../colorschemes/kitty.main' CONFIG__SYMLINK 'mssqlcli/config' 'mssqlcli.conf' CONFIG__SYMLINK 'pgcli/config' 'pgcli.conf' - CONFIG__SYMLINK 'pylintrc' 'pylintrc' + CONFIG__SYMLINK 'pylintrc' 'pylint.conf' CONFIG__SYMLINK 'ripgrep/config' 'ripgrep.conf' ############################################################################################