Skip to content

Commit

Permalink
Update all config to new pc
Browse files Browse the repository at this point in the history
  • Loading branch information
cnsworder committed Nov 27, 2015
1 parent a694152 commit 2635150
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
2 changes: 1 addition & 1 deletion conky.conf → conkyrc
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ ${color lightblue} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
${color lightblue} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
$hr
${color}
${image ~/Image/d.png -p 50,-10 -s 286x149}
#${image ~/Image/d.png -p 50,-10 -s 286x149}
6 changes: 3 additions & 3 deletions emacs.el
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,18 @@
'(company-c-headers-path-system
(quote
("/usr/include/" "/usr/local/include/" "/usr/include/c++/4.9.2/" "." ".." "../..")))
'(custom-enabled-themes (quote (molokai)))
'(custom-enabled-themes (quote (monokai)))
'(custom-safe-themes
(quote
("0e121ff9bef6937edad8dfcff7d88ac9219b5b4f1570fd1702e546a80dba0832" default)))
("196cc00960232cfc7e74f4e95a94a5977cb16fd28ba7282195338f68c84058ec" default)))
'(ede-project-directories
(quote
("/home/cnsworder/workspace/haoop" "/home/cnsworder/workspace" "/home/cnsworder")))
'(pyim-dicts
(quote
((:name "py" :file "/home/cnsworder/.emacs.d/pyim-bigdict.txt" :coding utf-8-unix)))))

(set-default-font "文泉驿等宽正黑-10")
(set-default-font "Source Code Pro-10")

(custom-set-faces
;; custom-set-faces was added by Custom.
Expand Down
5 changes: 3 additions & 2 deletions i3/config
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ bindsym $mod+r mode "resize"
#popup_during_fullscreen smart

#锁屏
bindsym $mod+c exec i3lock -i ~/.i3/theme.png
bindsym $mod+c exec i3lock -i ~/.i3/xj.jpg

#默认边框
new_window 1pixel
Expand All @@ -190,7 +190,7 @@ bindsym $mod+n move scratchpad
bindsym $mod+m scratchpad show

#自动启动应用
exec_always feh --bg-scale ~/.i3/theme.png
exec_always feh --bg-scale ~/.config/i3/xj.jpg
exec_always synapse
exec_always fcitx
exec_always conky
Expand Down Expand Up @@ -226,6 +226,7 @@ client.urgent #2f343a #900000 #ffffff #900000

# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
exec lxqt-notificationd
exec lxqt-panel

#bar {
Expand Down
Binary file added i3/xj.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 12 additions & 2 deletions profile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# cnsworder profile
#

DIR=$(cd "$(dirname $0)" && pwd)

#IM envrionment
export GTK_IM_MODULE=fcitx
export QT_IM_MODULE=fcitx
Expand All @@ -17,11 +19,19 @@ if [[ "$TERM" == "linux" ]]; then
fi

if [[ "${DISPLAY}" != "" ]]; then
xhost +
xhost + &> /dev/null
fi


#export XDG_CURRENT_DESKTOP=KDE
export QT_QPA_PLATFORMTHEME="qt5ct"

source alias.conf
source ${DIR}/alias.conf

if [ ! -d /tmp/chrome ]; then
mkdir /tmp/chrome
if [ -d ~/.cache/chromium ]; then
rm -rf ~/.cache/chromium
fi
ln -s /tmp/chrome ~/.cache/chromium
fi

0 comments on commit 2635150

Please sign in to comment.