From e8cabbd2017ff773d3fd77a72d78b66ec6d2fe5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= Date: Thu, 30 Aug 2018 10:54:35 +0200 Subject: [PATCH] Minor changes after switching to the proper intel video driver --- bash/.bashrc | 10 +++++++--- i3/.i3/scripts/work-layout.sh | 4 ++-- i3/.i3/scripts/work-monitors.sh | 2 +- i3/.i3/workspaces/ws01.sh | 2 +- neovim/.config/nvim/init.vim | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index f5a10ed..391bdf9 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -140,6 +140,7 @@ ex () #Bash Completion for OC source ~/.oc_completion.sh +source ~/.alias_completion.sh #Git Config GIT_PROMPT_ONLY_IN_REPO=1 @@ -159,19 +160,22 @@ setxkbmap -option ctrl:nocaps powerline-daemon -q POWERLINE_BASH_CONTINUATION=1 POWERLINE_BASH_SELECT=1 -. /usr/lib/python3.6/site-packages/powerline/bindings/bash/powerline.sh +. /usr/lib/python3.7/site-packages/powerline/bindings/bash/powerline.sh #Disable some CTRL for VIM commands bind -r '\C-s' stty -ixon +stty -echoctl #Paths export M2_HOME=/home/jfm/Tools/apache-maven -export PATH=$PATH:$M2_HOME/bin +export PATH=$PATH:$M2_HOME/bin:/home/jfm/Tools/openshift-origin-client/ export GIT_EDITOR=vim #Aliases -alias oc="/home/jfm/Tools/openshift-origin-client/oc" +#alias oc="/home/jfm/Tools/openshift-origin-client/oc" +alias ocdev="oc -n onboarding-dev" +alias octst="oc -n onboarding-test" alias code="cd /home/jfm/Customers/TDC/Code/Onboarding" alias dotfiles="cd /home/jfm/Repositories/dotfiles" alias tdc="cd /home/jfm/Customers/TDC" diff --git a/i3/.i3/scripts/work-layout.sh b/i3/.i3/scripts/work-layout.sh index 4f93e16..8b13577 100755 --- a/i3/.i3/scripts/work-layout.sh +++ b/i3/.i3/scripts/work-layout.sh @@ -4,8 +4,8 @@ ENV_FILE="/home/jfm/.i3/env" /bin/cat <$ENV_FILE export LAPTOP="eDP-1" -export PRIMARY="DP-1-2" -export SECONDARY="DP-1-3" +export PRIMARY="DP1-2" +export SECONDARY="DP1-3" export LDPI_PROFILE="default" export HDPI_PROFILE="laptop" diff --git a/i3/.i3/scripts/work-monitors.sh b/i3/.i3/scripts/work-monitors.sh index c877f2c..f1ed4ae 100755 --- a/i3/.i3/scripts/work-monitors.sh +++ b/i3/.i3/scripts/work-monitors.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output eDP-1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP-1-2 --primary --mode 1920x1080 --pos 2560x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output DP-1-3 --mode 1680x1050 --pos 4480x0 --rotate normal --output DP-2 --off --output DP-1-1 --off +xrandr --output eDP-1 --mode 2560x1440 --pos 0x0 --rotate normal --output DP1-2 --primary --mode 1920x1080 --pos 2560x0 --rotate normal --output HDMI-2 --off --output HDMI-1 --off --output DP-1 --off --output DP1-3 --mode 1680x1050 --pos 4480x0 --rotate normal --output DP-2 --off --output DP-1-1 --off diff --git a/i3/.i3/workspaces/ws01.sh b/i3/.i3/workspaces/ws01.sh index 6a7b5cd..1684531 100755 --- a/i3/.i3/workspaces/ws01.sh +++ b/i3/.i3/workspaces/ws01.sh @@ -2,5 +2,5 @@ . ~/.i3/env i3-msg "workspace 1:Comms; append_layout ~/.i3/layouts/workspace1-comms.json" -i3-msg "workspace 1:Comms; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" +i3-msg "workspace 1:Comms; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" i3-msg "workspace 1:Comms; move workspace to output $LAPTOP" diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index c067153..935be47 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -3,6 +3,7 @@ filetype indent on set encoding=utf-8 set clipboard=unnamed +set clipboard+=unnamedplus set smartindent set shiftwidth=2 set tabstop=2