From 922cc9afc17100c7e8844056e801895dfd903f85 Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Tue, 7 Jan 2020 01:47:53 +0800 Subject: [PATCH] update dot files --- dot/.Xdefaults | 19 +++-- dot/.Xresources | 34 +++++++++ dot/.bashrc | 26 +++++++ dot/.editorconfig | 14 ++++ dot/.eslintrc.json | 34 ++++----- dot/.gitconfig | 15 ++++ dot/.globalrc | 149 -------------------------------------- dot/.gnupg/gpg-agent.conf | 1 + dot/.jsbeautifyrc | 23 ------ dot/.tern-project | 23 ------ dot/.xprofile | 15 +++- 11 files changed, 129 insertions(+), 224 deletions(-) create mode 100644 dot/.Xresources create mode 100644 dot/.bashrc create mode 100644 dot/.editorconfig delete mode 100644 dot/.globalrc create mode 100644 dot/.gnupg/gpg-agent.conf delete mode 100644 dot/.jsbeautifyrc delete mode 100644 dot/.tern-project diff --git a/dot/.Xdefaults b/dot/.Xdefaults index 975ab39..7be68fb 100644 --- a/dot/.Xdefaults +++ b/dot/.Xdefaults @@ -1,7 +1,7 @@ URxvt.urgentOnBell: false URxvt.multichar_encoding: utf-8 URxvt.depth: 32 -URxvt.background: black +URxvt.background: [80]black URxvt.foreground: white URxvt.colorBD: yellow URxvt.colorUL: green @@ -14,15 +14,18 @@ URxvt.scrollWithBuffer: True ! lines and multi-term URxvt.saveLines: 1000000 -URxvt.font: xft:Operator Mono Book:size=14,\ +URxvt.font: xft:Sarasa Mono SC:size=14,\ +xft:Operator Mono Book:size=14,\ xft:Source Code Pro:size=14,\ +xft:Microsoft Yahei:size=14,\ xft:xos4 Terminus:size=14\, xft:Consolas:size=14,\ xft:YaHei Consolas Hybrid:size=14,\ -xft:Microsoft Yahei:size=14 -XTerm*background: black -XTerm*foreground: white -XTerm*faceName: Operator Mono:style=Book:size=14 -XTerm*faceNameDoublesize: YaHei Consolas Hybrid:size=14 -XTerm*forceBoxChars: true +! XTerm*background: white +! XTerm*foreground: black +! ! XTerm*faceName: xft:Operator Mono:style=Book:size=14 +! ! XTerm*faceNameDoublesize: xft:YaHei Consolas Hybrid:size=14 +! XTerm*faceName: xft:SaraSa Mono SC:size=14 +! XTerm*faceSize: 14 +! XTerm*forceBoxChars: true diff --git a/dot/.Xresources b/dot/.Xresources new file mode 100644 index 0000000..1e9e308 --- /dev/null +++ b/dot/.Xresources @@ -0,0 +1,34 @@ +Xcursor.theme: Adwaita +Xcursor.size: 24 + +Xft.dpi: 96 +! Xft.antialias: true +! Xft.rgba: rgb +! Xft.hinting: true +! Xft.hintstyle: hintslight +! Xft.autohint: false +! Xft.lcdfilter: lcddefault + +! xterm设置 +XTerm.termName: xterm-256color +XTerm*background: black +XTerm*foreground: white +XTerm*xftAntialias: true +XTerm*faceName: xft:SaraSa Mono SC:antialias=True:size=14 +XTerm*forceBoxChars: true + +! Alt键设置 +XTerm*metaSendsEscape: true +XTerm*eightBitInput: false + +XTerm*saveLines: 1000000 +XTerm*selectToClipboard: true +! XTerm*faceName: xft:Operator Mono:style=Book:size=14 +! XTerm*faceNameDoublesize: xft:YaHei Consolas Hybrid:size=14 +! XTerm*faceSize: 14 + +XTerm*scrollKey: true +XTerm*scrollTtyOutput: false +XTerm*buffered: true +XTerm*multiScroll: true +XTerm*fastScroll: true diff --git a/dot/.bashrc b/dot/.bashrc new file mode 100644 index 0000000..d04afdf --- /dev/null +++ b/dot/.bashrc @@ -0,0 +1,26 @@ +# /etc/skel/.bashrc +# +# This file is sourced by all *interactive* bash shells on startup, +# including some apparently interactive shells such as scp and rcp +# that can't tolerate any output. So make sure this doesn't display +# anything or bad things will happen ! + + +# Test for an interactive shell. There is no need to set anything +# past this point for scp and rcp, and it's important to refrain from +# outputting anything in those cases. +if [[ $- != *i* ]] ; then + # Shell is non-interactive. Be done now! + return +fi + + +# Put your fun stuff here. +HISTCONTROL=ignoreboth +#export PATH="~/.local/bin:/usr/lib/distcc/bin:${PATH}" + +export PATH="/usr/lib/ccache/bin${PATH:+:}$PATH" +export CCACHE_DIR="/var/cache/ccache" +export GPG_TTY=$(tty) + +# export PATH="~/.local/bin${PATH:+:}$PATH" diff --git a/dot/.editorconfig b/dot/.editorconfig new file mode 100644 index 0000000..89a7ac2 --- /dev/null +++ b/dot/.editorconfig @@ -0,0 +1,14 @@ +root = true + +[*] +charset = utf-8 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{js,ts}] +indent_style = space +indent_size = 4 + +[{package,package-lock}.json] +indent_style = space +indent_size = 2 diff --git a/dot/.eslintrc.json b/dot/.eslintrc.json index ea9508f..072905c 100644 --- a/dot/.eslintrc.json +++ b/dot/.eslintrc.json @@ -1,19 +1,19 @@ { - "env": { - "browser": true, - "node": true - }, - "extends": "airbnb", - "rules": { - "comma-dangle": [2, "never"], - "spaced-comment": "off", - "quotes": "off", - "indent": "off", - "func-names": "off", - "no-console": "off", - "no-plusplus": "off", - "no-param-reassign": "off", - "wrap-iife": ["error", "any"], - "react/jsx-filename-extension": "off" - } + "parser": "@typescript-eslint/parser", + "plugins": ["@typescript-eslint"], + "env": { + "browser": true, + "node": true + }, + "extends": [ + "airbnb-typescript" + ], + "rules": { + "comma-dangle": [2, "never"], + "no-console": "off", + "no-plusplus": "off", + "no-multi-spaces": "off", + "react/jsx-filename-extension": "off", + "@typescript-eslint/camelcase": "off" + } } diff --git a/dot/.gitconfig b/dot/.gitconfig index 6105a12..4fb2a3e 100644 --- a/dot/.gitconfig +++ b/dot/.gitconfig @@ -1,3 +1,18 @@ [user] name = Zedhugh Chen email = zedhugh@gmail.com + signingKey = 18FAC9D5FA1616E7 +[github] + user = zedhugh +[alias] + co = checkout + ci = commit + st = status + br = branch + hist = log --pretty=format:'%h %ad | %s%d [%ad]' --graph --date=short + type = cat-file -t + dump = cat-file -p +[commit] + gpgSign = true +[diff "gpg"] + textconv = gpg --no-tty --decrypt diff --git a/dot/.globalrc b/dot/.globalrc deleted file mode 100644 index 12544a8..0000000 --- a/dot/.globalrc +++ /dev/null @@ -1,149 +0,0 @@ -# -# Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003, 2010, 2011, 2013 -# Tama Communications Corporation -# -# This file is part of GNU GLOBAL. -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# * -# Configuration file for GNU GLOBAL source code tag system. -# -# Basically, GLOBAL doesn't need this file ('gtags.conf'), because it has -# default values in itsself. If you have the file as '/etc/gtags.conf' or -# "$HOME/.globalrc" in your system then GLOBAL overwrite the default values -# with the values in the file. -# -# The format is similar to termcap(5). You can specify a target with -# GTAGSLABEL environment variable. Default target is 'default'. -# -default:\ - :tc=native: -native:\ - :tc=gtags:tc=htags: -user:\ - :tc=user-custom:tc=htags: -ctags:\ - :tc=exuberant-ctags:tc=htags: -#--------------------------------------------------------------------- -# Configuration for gtags(1) -# See gtags(1). -#--------------------------------------------------------------------- -common:\ - :skip=HTML/,HTML.pub/,tags,TAGS,ID,y.tab.c,y.tab.h,gtags.files,cscope.files,cscope.out,cscope.po.out,cscope.in.out,SCCS/,RCS/,CVS/,CVSROOT/,{arch}/,autom4te.cache/,*.orig,*.rej,*.bak,*~,#*#,*.swp,*.tmp,*_flymake.*,*_flymake: -# -# Built-in parsers. -# -gtags:\ - :tc=common:\ - :tc=builtin-parser: -builtin-parser:\ - :langmap=c\:.c.h,yacc\:.y,asm\:.s.S,java\:.java,cpp\:.c++.cc.hh.cpp.cxx.hxx.hpp.C.H,php\:.php.php3.phtml: -# -# skeleton for user's custom parser. -# -user-custom|User custom plugin parser:\ - :tc=common:\ - :langmap=c\:.c.h:\ - :gtags_parser=c\:/usr/lib/gtags/user-custom.la: -# -# Plug-in parser to use Exuberant Ctags. -# -exuberant-ctags|plugin-example|setting to use Exuberant Ctags plug-in parser:\ - :tc=common:\ - :langmap=Asm\:.asm.ASM.s.S:\ - :langmap=Asp\:.asp.asa:\ - :langmap=Awk\:.awk.gawk.mawk:\ - :langmap=Basic\:.bas.bi.bb.pb:\ - :langmap=BETA\:.bet:\ - :langmap=C\:.c:\ - :langmap=C++\:.c++.cc.cp.cpp.cxx.h.h++.hh.hp.hpp.hxx.C.H:\ - :langmap=C#\:.cs:\ - :langmap=Cobol\:.cbl.cob.CBL.COB:\ - :langmap=DosBatch\:.bat.cmd:\ - :langmap=Eiffel\:.e:\ - :langmap=Erlang\:.erl.ERL.hrl.HRL:\ - :langmap=Flex\:.as.mxml:\ - :langmap=Fortran\:.f.for.ftn.f77.f90.f95.F.FOR.FTN.F77.F90.F95:\ - :langmap=HTML\:.htm.html:\ - :langmap=Java\:.java:\ - :langmap=JavaScript\:.js:\ - :langmap=Lisp\:.cl.clisp.el.l.lisp.lsp:\ - :langmap=Lua\:.lua:\ - :langmap=MatLab\:.m:\ - :langmap=OCaml\:.ml.mli:\ - :langmap=Pascal\:.p.pas:\ - :langmap=Perl\:.pl.pm.plx.perl:\ - :langmap=PHP\:.php.php3.phtml:\ - :langmap=Python\:.py.pyx.pxd.pxi.scons:\ - :langmap=REXX\:.cmd.rexx.rx:\ - :langmap=Ruby\:.rb.ruby:\ - :langmap=Scheme\:.SCM.SM.sch.scheme.scm.sm:\ - :langmap=Sh\:.sh.SH.bsh.bash.ksh.zsh:\ - :langmap=SLang\:.sl:\ - :langmap=SML\:.sml.sig:\ - :langmap=SQL\:.sql:\ - :langmap=Tcl\:.tcl.tk.wish.itcl:\ - :langmap=Tex\:.tex:\ - :langmap=Vera\:.vr.vri.vrh:\ - :langmap=Verilog\:.v:\ - :langmap=VHDL\:.vhdl.vhd:\ - :langmap=Vim\:.vim:\ - :langmap=YACC\:.y:\ - :gtags_parser=Asm\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Asp\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Awk\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Basic\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=BETA\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=C\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=C++\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=C#\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Cobol\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=DosBatch\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Eiffel\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Erlang\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Flex\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Fortran\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=HTML\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Java\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=JavaScript\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Lisp\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Lua\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=MatLab\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=OCaml\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Pascal\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Perl\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=PHP\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Python\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=REXX\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Ruby\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Scheme\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Sh\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=SLang\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=SML\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=SQL\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Tcl\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Tex\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Vera\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Verilog\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=VHDL\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=Vim\:/usr/lib/gtags/exuberant-ctags.la:\ - :gtags_parser=YACC\:/usr/lib/gtags/exuberant-ctags.la: -# -# Drupal configuration. -# -drupal|Drupal content management platform:\ - :tc=common:\ - :langmap=php\:.php.module.inc.profile.install.test: -#--------------------------------------------------------------------- -# Configuration for htags(1) -# See htags(1). -#--------------------------------------------------------------------- -htags:\ - :script_alias=/cgi-bin/:ncol#4:tabs#8:normal_suffix=html:gzipped_suffix=ghtml: diff --git a/dot/.gnupg/gpg-agent.conf b/dot/.gnupg/gpg-agent.conf new file mode 100644 index 0000000..c75a84d --- /dev/null +++ b/dot/.gnupg/gpg-agent.conf @@ -0,0 +1 @@ +allow-emacs-pinentry \ No newline at end of file diff --git a/dot/.jsbeautifyrc b/dot/.jsbeautifyrc deleted file mode 100644 index e727a29..0000000 --- a/dot/.jsbeautifyrc +++ /dev/null @@ -1,23 +0,0 @@ -{ - "indent_size": 2, - "indent_char": " ", - "eol": "\n", - "indent_level": 0, - "indent_with_tabs": false, - "preserve_newlines": true, - "max_preserve_newlines": 2, - "jslint_happy": false, - "space_after_anon_function": false, - "brace_style": "collapse", - "keep_array_indentation": false, - "keep_function_indentation": false, - "space_before_conditional": true, - "break_chained_methods": true, - "eval_code": false, - "unescape_strings": false, - "wrap_line_length": 80, - "wrap_attributes": "auto", - "wrap_attributes_indent_size": 2, - "e4x": true, - "end_with_newline": true -} diff --git a/dot/.tern-project b/dot/.tern-project deleted file mode 100644 index e14e645..0000000 --- a/dot/.tern-project +++ /dev/null @@ -1,23 +0,0 @@ -{ - "libs": [ - "ecma5", - "ecma6", - "browser", - "jquery", - "react", - "node" - ], - "plugins": { - "node": {}, - "es_modules": {}, - "doc_comment": { - "fullDocs": true, - "strong": true - } - }, - "ecmaVersion": 6, - "env": { - "browser": true, - "node": true - } -} diff --git a/dot/.xprofile b/dot/.xprofile index ca164dc..7734d84 100644 --- a/dot/.xprofile +++ b/dot/.xprofile @@ -4,10 +4,17 @@ eval "$(dbus-launch --sh-syntax --exit-with-session)" -export XMODIFIERS=@im=SCIM -export GTK_IM_MODULE="xim" -export QT_IM_MODULE="scim" -scim -d +# fcitx +export XMODIFIERS="@im=fcitx" +export GTK_IM_MODULE="fcitx" +export QT_IM_MODULE="fcitx" +fcitx -d + +# ibus +#export XMODIFIERS="@im=ibus" +#export GTK_IM_MODULE="ibus" +#export QT_IM_MODULE="ibus" +#ibus-daemon -drx # xcompmgr -c & # nm-applet &