From ca5ce3b2a61a783a4b3eaca8a8efb259359245dc Mon Sep 17 00:00:00 2001
From: ackman678 <james.ackman@gmail.com>
Date: Sun, 10 May 2020 22:22:24 -0700
Subject: [PATCH] swaying work

---
 .Xresources         | 22 +++++++++++-----------
 .bashrc             | 13 ++++++++++++-
 .config/sway/config | 10 ++++++----
 .vimrc              |  5 +++--
 .xinitrc            |  5 +++--
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/.Xresources b/.Xresources
index 1d05d9b..33c6af9 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,4 +1,4 @@
-Xft.dpi: 96
+! Xft.dpi: 96
 !HiDPI displays
 ! Xft.dpi: 144
 ! Xft.autohint: 0
@@ -12,16 +12,16 @@ URxvt.scrollBar: false
 URxvt.saveLines: 5000
 
 !DejaVu
-!URxvt.font:     xft:DejaVu Sans Mono:size=11:antialias=true
-!URxvt.boldfont: xft:DejaVu Sans Mono:bold:size=11:antialias=true
+URxvt.font:     xft:DejaVu Sans Mono:size=11:antialias=true
+URxvt.boldfont: xft:DejaVu Sans Mono:bold:size=11:antialias=true
 
-!Bitstream
-!URxvt.font:     xft:bitstream vera sans mono:size=11:antialias=true
-!URxvt.boldFont: xft:bitstream vera sans mono:bold:size=11:antialias=true
-!URxvt.letterSpace: -1
+! Bitstream
+! URxvt.font:     xft:bitstream vera sans mono:size=11:antialias=true
+! URxvt.boldFont: xft:bitstream vera sans mono:bold:size=11:antialias=true
+! URxvt.letterSpace: -1
 
-!Inconsolata
-URxvt.font: xft:Inconsolata:style=Regular:size=13
-URxvt.boldFont: xft:Inconsolata:style=Bold:size=13
-URxvt.letterSpace: -1
+! Inconsolata
+! URxvt.font: xft:Inconsolata:style=Regular:size=13
+! URxvt.boldFont: xft:Inconsolata:style=Bold:size=13
+! URxvt.letterSpace: -1
 
diff --git a/.bashrc b/.bashrc
index 4d652dd..2f2a940 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,17 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+# add from /etc/bash.bashrc defaultl with fix for alacritty window title bars
+case ${TERM} in
+  xterm*|rxvt*|Eterm|alacritty|aterm|kterm|gnome*)
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+
+    ;;
+  screen*)
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+    ;;
+esac
+
 #customize prompt see https://wiki.archlinux.org/index.php/Bash/Prompt_customization
 RED="\[$(tput setaf 1)\]"
 YELLOW="\[$(tput setaf 3)\]"
@@ -12,7 +23,7 @@ LIGHTBLUE="\[$(tput setaf 4)\]"
 BLUE="\[$(tput setaf 27)\]"
 RESET="\[$(tput sgr0)\]"
 #PS1="${BLUE}\u@\h \W>${RESET} "
-PS1="${BLUE}\W>${RESET} "
+PS1="${LIGHTBLUE}\W>${RESET} "
 
 man() {
     LESS_TERMCAP_md=$'\e[01;31m' \
diff --git a/.config/sway/config b/.config/sway/config
index 9c15949..f3e3cbd 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -16,8 +16,9 @@ set $mod Mod4
 set $alt Mod1
 
 # Your preferred terminal emulator
-set $term urxvt
-
+# set $term urxvt
+set $term alacritty
+#
 # Your preferred application launcher
 # set $menu dmenu_run
 # Note: it's recommended that you pass the final command to sway
@@ -27,8 +28,9 @@ bindsym --release $mod+z exec 'fn=$(date "+%Y-%m-%d-%H%M%S").png; grim -g "$(slu
 # bindsym --release $mod+z exec scrot '%Y-%m-%d_%H%M%S_$wx$h.png' -e '~/bin/mv2figs.sh $f'
 bindsym --release $alt+z exec 'fn=$(date "+%Y-%m-%d-%H%M%S").png; sleep 3; grim $fn; ~/bin/mv2figs.sh $fn'
 
-bindsym $mod+Shift+z exec "date --iso-8601='seconds' | tr -d '\n' | xclip -selection clipboard"
 #check out wl-clipboard for wayland xclip solution https://github.com/bugaevc/wl-clipboard
+bindsym $mod+Shift+z exec "date --iso-8601='seconds' | tr -d '\n' | wl-copy"
+# bindsym $mod+Shift+z exec "date --iso-8601='seconds' | tr -d '\n' | xclip -selection clipboard"
 
 #audio output kbd control- pulse audio
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5%
@@ -307,6 +309,6 @@ bindsym $mod+Shift+b bar mode toggle
 #exec --no-startup-id "i3-msg 'workspace 1; append_layout ~/.config/i3/workspace-1.json'"
 
 include /etc/sway/config.d/*
-exec xrdb -load ~/.Xresources
+# exec xrdb -load ~/.Xresources
 # exec mako
 exec dunst
diff --git a/.vimrc b/.vimrc
index 53b5f74..716be5d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -266,14 +266,15 @@ set mouse=n
 
 "Quick save config
 imap ;s <ESC>:update<enter>
-imap jjw <ESC>:update<enter>
+nmap ;s <ESC>:update<enter>
+" imap jjw <ESC>:update<enter>
 "<CR> vs <enter> and running code
 
 "Quick mode exit config
 " Two semicolons are easy to type. The `^ fixes the cursor position.
 imap ;; <ESC>`^
 inoremap <Tab> <Esc>`^
-" imap k <ESC>`^
+
 " Just press Space to enter insert mode while in normal mode.
 nmap <Space> i
 " On gvim and Linux console Vim, you can also use ctrl-Space.
diff --git a/.xinitrc b/.xinitrc
index 14f9d5c..ba71b64 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -33,8 +33,9 @@ fi
 
 xset r rate 400 30
 systemctl --user start check-battery.timer &
-xset +fp /usr/share/fonts/noto/
-xset +fp /usr/share/fonts/liberation/           s
+xset +fp /usr/share/fonts/
+# xset +fp /usr/share/fonts/noto/
+# xset +fp /usr/share/fonts/liberation/           s
 
 #twm &
 #xclock -geometry 50x50-1+1 &