dotfiles

commit a20efb331bd2deeba0a50054354c710cee1a432c
parent 67fa2217cfc700564f3bbad61c5e1455923c6c46
Author: Matsuda Kenji <ftvda283@gmail.com>
Date:   Wed, 19 May 2021 10:29:35 +0900

resolve conflict

Diffstat:
M
.bash_profile
 | 
16
+++++++++-------
M
.bashrc
 | 
9
+--------
M
.config/X11/xinitrc
 | 
10
+++-------

3 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/.bash_profile b/.bash_profile
@@ -1,6 +1,6 @@
 # ~/.bash_profile
 
-[[ -f ~/.bashrc ]] && . ~/.bashrc
+[ -f ~/.shrc ] && . ~/.shrc
 
 # ~/ clean up:
 export XDG_CONFIG_HOME="$HOME/.config"
@@ -9,20 +9,22 @@ export XDG_CACHE_HOME="$HOME/.cache"
 [ ! -d $XDG_CACHE_HOME ] && mkdir -p $XDG_CACHE_HOME
 
 export PATH="$PATH:$HOME/.local/bin"
-export EDITOR=nvim
+export EDITOR=vi
 export TERMINAL=st
-export HISTFILE="$XDG_CACHE_HOME/bash/.bash_history"
+export HISTFILE="$XDG_CACHE_HOME/.sh_history"
 
 export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
 export XAUTHORITY="$XDG_CACHE_HOME/X11/Xauthority"
+[ ! -d $XDG_CONFIG_HOME/X11 ] && mkdir -p $XDG_CONFIG_HOME/X11
+[ ! -d $XDG_CACHE_HOME/X11 ] && mkdir -p $XDG_CACHE_HOME/X11
 #gnupg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 # less
 export LESSHISTFILE=-
 
-export BRAVE="brave --app="'https://archlinux.org'
-export SURF="surf "'https://archlinux.org'
+[ $(uname) = 'FreeBSD' ] && \
+	export CHROME="chrome --app="'https://freebsd.org' || \
+	export BRAVE="brave --app="'https://archlinux.org'
 
-#eval `/usr/local/bin/wcwidth-cjk --sh-init`
 
-[[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]] && exec startx $XINITRC
+[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec startx $XINITRC
diff --git a/.bashrc b/.bashrc
@@ -1,13 +1,6 @@
 # ~/.bashrc
 
-# to display the branch name when in a git directory
-source /usr/share/git/completion/git-prompt.sh
-source /usr/share/git/completion/git-completion.bash
-GIT_PS1_SHOWDIRTYSTATE=true
-PS1='[\u@\h \W]$(__git_ps1)\[\033[00m\]\\$ '
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
+PS1='[\u@\h \W]$ '
 
 alias ls='ls --color=auto'
 #alias brave='brave -high-dpi-support=1 -force-device-scale-factor=0.8'
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
@@ -3,8 +3,6 @@
 userresources=$XDG_CONFIG_HOME/X11/Xresources
 usermodmap=$XDG_CONFIG_HOME/X11/Xmodmap
 
-setxkbmap -layout jp
-
 if [ -f $userresources ]; then
     xrdb -merge $userresources
 fi
@@ -13,12 +11,10 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
-export DefaultIMModule='uim'
-export GTK_IM_MODULE='uim'
-export QT_IM_MODULE='uim'
 export XMODIFIERS='@im=uim'
+export GTK_IM_MODULE=uim
+export GTK3_IM_MODULE=uim
 uim-xim &
 
-unclutter --timeout 1 &
-dwmblocks &
+dwmblocks&
 exec dwm