From 1c329c86f6264af12365580fe239a204e3ab28a9 Mon Sep 17 00:00:00 2001 From: yage Date: Wed, 20 Apr 2022 12:59:45 -0600 Subject: [PATCH] Umbreon install update --- bin/xorg/activate-default | 1 + bin/xorg/umbreon/common | 2 ++ bin/xorg/umbreon/homedock | 16 ++++++++++++++++ bin/xorg/umbreon/undock | 16 ++++++++++++++++ config/bat.conf | 6 ++++++ config/kitty.conf | 4 +++- config/xconfig.conf | 1 + config/xinitrc | 5 ++++- setup/config.setup.zsh | 3 +++ setup/os-dependencies/arch.txt | 2 +- setup/vim.setup.zsh | 2 +- vim/vundle.vim | 6 +++--- zsh/alias | 2 ++ zsh/plugins/fzf-tab | 2 +- zsh/rc | 2 +- 15 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 bin/xorg/umbreon/common create mode 100755 bin/xorg/umbreon/homedock create mode 100755 bin/xorg/umbreon/undock create mode 100644 config/bat.conf create mode 100644 config/xconfig.conf diff --git a/bin/xorg/activate-default b/bin/xorg/activate-default index 7f75e2c..192aec7 100755 --- a/bin/xorg/activate-default +++ b/bin/xorg/activate-default @@ -4,6 +4,7 @@ _HOSTNAME=$(hostnamectl --static) case $_HOSTNAME in butterfree ) DEFAULT=undock ;; altaria ) DEFAULT=hdmi4k ;; + umbreon ) DEFAULT=undock ;; esac LAYOUT="${0:a:h}/$_HOSTNAME/$DEFAULT" diff --git a/bin/xorg/umbreon/common b/bin/xorg/umbreon/common new file mode 100644 index 0000000..5bc8a69 --- /dev/null +++ b/bin/xorg/umbreon/common @@ -0,0 +1,2 @@ +#!/bin/zsh +source $HOME/.config/wryn/env.zsh diff --git a/bin/xorg/umbreon/homedock b/bin/xorg/umbreon/homedock new file mode 100755 index 0000000..082bc10 --- /dev/null +++ b/bin/xorg/umbreon/homedock @@ -0,0 +1,16 @@ +#!/bin/zsh +source ${0:a:h}/common + +xrandr \ + --output DP-3 \ + --primary \ + --auto \ + --mode 1920x1080 \ + --rotate normal \ + --pos 0x0 \ + --output eDP-1 \ + --off \ + ; + +$DOTWRYN/bin/set-background random +PLAY_SFX gamedock diff --git a/bin/xorg/umbreon/undock b/bin/xorg/umbreon/undock new file mode 100755 index 0000000..c142b33 --- /dev/null +++ b/bin/xorg/umbreon/undock @@ -0,0 +1,16 @@ +#!/bin/zsh +source ${0:a:h}/common + +xrandr \ + --output eDP-1 \ + --primary \ + --auto \ + --mode 1920x1200 \ + --rotate normal \ + --pos 0x0 \ + --output DP-3 \ + --off \ + ; + +$DOTWRYN/bin/set-background random +PLAY_SFX gamedock diff --git a/config/bat.conf b/config/bat.conf new file mode 100644 index 0000000..71689de --- /dev/null +++ b/config/bat.conf @@ -0,0 +1,6 @@ +--theme="ansi" + +--italic-text=always + +--map-syntax "*.clisp:lisp" +--map-syntax "Dockerfile*:Dockerfile" diff --git a/config/kitty.conf b/config/kitty.conf index 15c2810..83c5a76 100644 --- a/config/kitty.conf +++ b/config/kitty.conf @@ -1,8 +1,10 @@ background_opacity 0.85 font_family DejaVuSansMono Nerd Font Complete Mono -font_size 17.0 +font_size 14.0 allow_remote_control yes +confirm_os_window_close 0 + cursor_shape block shell_integration no-cursor diff --git a/config/xconfig.conf b/config/xconfig.conf new file mode 100644 index 0000000..b0d9b20 --- /dev/null +++ b/config/xconfig.conf @@ -0,0 +1 @@ +setxkbmap -option compose:ralt diff --git a/config/xinitrc b/config/xinitrc index a20bb83..7438a1f 100644 --- a/config/xinitrc +++ b/config/xinitrc @@ -7,10 +7,12 @@ X11_SCRIPTS='/etc/X11/xinit/xinitrc.d'; if [ -d $X11_SCRIPTS ] then for script in $(find "$X11_SCRIPTS" -name \*.sh); do - source "$script"; + source "$script" done fi +command -v dex && dex -a + ##################################################################### CUSTOM_DMENU_COMMANDS="$HOME/.local/dmenu" @@ -27,5 +29,6 @@ $DOTWRYN/bin/xorg/activate-default & ##################################################################### + cd exec i3 diff --git a/setup/config.setup.zsh b/setup/config.setup.zsh index a4a97db..edbd829 100644 --- a/setup/config.setup.zsh +++ b/setup/config.setup.zsh @@ -1,9 +1,11 @@ function SETUP__CONFIG() { ############################################################################################ # ~/.config/THE_REST .wryn/config/THE_REST + CONFIG__SYMLINK '../.XCompose' 'xcompose.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 'i3/config' 'i3.conf' @@ -30,6 +32,7 @@ function CONFIG__SYMLINK() { CHECK "linking $FRIENDLY_NAME" { + [ ! -d $(dirname $LOCAL_CONFIG) ] && mkdir -p $(dirname $LOCAL_CONFIG) mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" ln -s "$DOTWRYN_CONFIG" "$LOCAL_CONFIG" } >>$LOG 2>&1 && OK || WARN diff --git a/setup/os-dependencies/arch.txt b/setup/os-dependencies/arch.txt index ad1c778..3ca89d6 100644 --- a/setup/os-dependencies/arch.txt +++ b/setup/os-dependencies/arch.txt @@ -1,4 +1,4 @@ -aws-cli-v2 +aws-cli-v2-bin cmake cowsay figlet diff --git a/setup/vim.setup.zsh b/setup/vim.setup.zsh index 809c2bf..b50cbff 100644 --- a/setup/vim.setup.zsh +++ b/setup/vim.setup.zsh @@ -28,7 +28,7 @@ function VIM__CREATE_PANE_DEFAULT_APP() { CHECK 'updating vim to open in panes by default' { echo '#!/bin/sh' - echo "exec $(which vim) -p "'$@' + echo "exec $(which vim) -p "'"$@"' } > "$HOME/.local/bin/vim" && OK || WARN chmod +x "$HOME/.local/bin/vim" } diff --git a/vim/vundle.vim b/vim/vundle.vim index 7cf0cb0..abeea37 100644 --- a/vim/vundle.vim +++ b/vim/vundle.vim @@ -15,13 +15,13 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'tpope/vim-surround' " nerdtree - Plugin 'git://github.com/scrooloose/nerdtree.git' + Plugin 'https://github.com/scrooloose/nerdtree.git' " go-vim Plugin 'fatih/vim-go' " youCompleteMe - Plugin 'git://github.com/Valloric/YouCompleteMe.git' + Plugin 'https://github.com/Valloric/YouCompleteMe.git' " omnisharp (c#) Plugin 'OmniSharp/omnisharp-vim' @@ -49,7 +49,7 @@ filetype plugin indent on " =================================================================================== " --- Nerd Tree --------------------------------------------------------------------- -map :NERDTreeToggle % +nnoremap :NERDTreeToggle % let g:NERDTreeNodeDelimiter = "\u00a0" " -- Was seeing ^G character, and this should fix that diff --git a/zsh/alias b/zsh/alias index 3b45043..3a3f6a7 100644 --- a/zsh/alias +++ b/zsh/alias @@ -16,6 +16,8 @@ alias readable-date='date +"%A %B %d, %Y"' alias fix='vim $(git diff --name-only | uniq) -p' alias i3-config-update="$DOTWRYN/bin/i3/update-local-config" + +command -v bat >/dev/null 2>&1 && alias cat='bat --style="plain"' # --------------------------------------------------------------------- alias erg='EDIT_RIP_GREP_FILE_MATCHES'; diff --git a/zsh/plugins/fzf-tab b/zsh/plugins/fzf-tab index e8145d5..27610c0 160000 --- a/zsh/plugins/fzf-tab +++ b/zsh/plugins/fzf-tab @@ -1 +1 @@ -Subproject commit e8145d541a35d8a03df49fbbeefa50c4a0076bbf +Subproject commit 27610c03dd950dedb22010aa07d5cc01c43f9f69 diff --git a/zsh/rc b/zsh/rc index 093674d..c6ce936 100644 --- a/zsh/rc +++ b/zsh/rc @@ -38,4 +38,4 @@ for p in $EXTERNAL_PLUGINS; do [ -f $p ] && source $p; done SET_PREFERRED_EDITOR WELCOME # --------------------------------------------------------------------- -return 0 +true