Skip to content

Commit

Permalink
change moromormo
Browse files Browse the repository at this point in the history
  • Loading branch information
tsu-nera committed Dec 10, 2016
1 parent 823e3ff commit 4738258
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 43 deletions.
1 change: 1 addition & 0 deletions .emacs.d/etc/dict/README.org
@@ -1 +1,2 @@
* �����t�@�C���u����
- [[http://openlab.ring.gr.jp/skk/wiki/wiki.cgi?page=SKK%BC%AD%BD%F1#p7][SKK ���� - SKK ���� Wiki]]
2 changes: 2 additions & 0 deletions .emacs.d/inits/03_display.org
Expand Up @@ -49,6 +49,8 @@
(remove-hook 'text-mode-hook 'turn-on-auto-fill)
#+end_src

入力テスト。入力に問題なし

** Popwin
バッファのポップアップ表示. Popup Manager for Emacs.
- [[https://github.com/m2ym/popwin-el][m2ym/popwin-el]]
Expand Down
7 changes: 5 additions & 2 deletions .emacs.d/inits/20_text.org
Expand Up @@ -682,6 +682,7 @@

#+begin_src emacs-lisp
(use-package skk-autoloads
:disabled t
:bind (("C-x C-j" . skk-mode) ("C-x j" . skk-mode))
:init
(global-unset-key "\C-xj")
Expand Down Expand Up @@ -1036,6 +1037,8 @@ google-ime-skk &
echo "lang en_US" >> ~/.aspell.conf
#+end_src



#+begin_src emacs-lisp
(use-package ispell
:config
Expand Down Expand Up @@ -1065,6 +1068,7 @@ google-ime-skk &

#+begin_src emacs-lisp
(use-package flyspell
:disabled t
:if linux-p
:bind (("C-c <f8>" . flyspell-mode)
("C-c <f9>" . ispell-word)
Expand Down Expand Up @@ -1102,8 +1106,7 @@ google-ime-skk &

#+begin_src emacs-lisp
(use-package flyspell-lazy
;; エラーしている.
:disabled t
:disabled t
:config
(flyspell-lazy-mode 1))
#+end_src
Expand Down
37 changes: 25 additions & 12 deletions .emacs.d/inits/31_python.org
Expand Up @@ -21,18 +21,31 @@
(setq py-install-directory "~/.emacs.d/el-get/repo/python-mode"))
(if windows-p
(setq py-install-directory "C:\cygwin64\home\tsu-nera\dotfiles\.emacs.d\el-get\repo\python-mode"))
(use-package python-mode
:mode "\\.py$"
:interpreter "python"
:init
(add-hook 'python-mode-hook
'(lambda ()
(setq indent-tabs-mode nil)
(setq indent-level 4)
(setq python-indent 4)
(setq tab-width 4)
(setq imenu-create-index-function 'python-imenu-create-index)
)))
(add-to-list 'load-path py-install-directory)
(require 'python-mode)
(add-hook 'python-mode-hook
'(lambda ()
(setq indent-tabs-mode nil)
(setq indent-level 4)
(setq python-indent 4)
(setq tab-width 4)
(setq imenu-create-index-function 'python-imenu-create-index)
))

;; use-package が動かない。
;; (use-package python-mode)
;; (use-package python-mode
;; :mode "\\.py$"
;; :interpreter "python"
;; :init
;; (add-hook 'python-mode-hook
;; '(lambda ()
;; (setq indent-tabs-mode nil)
;; (setq indent-level 4)
;; (setq python-indent 4)
;; (setq tab-width 4)
;; (setq imenu-create-index-function 'python-imenu-create-index)
;; )))
#+end_src

* 補完
Expand Down
5 changes: 2 additions & 3 deletions .emacs.d/inits/60_utility.org
Expand Up @@ -1135,13 +1135,12 @@ sudo pacman -S ghostscript

#+begin_src emacs-lisp
(use-package fcitx
:disabled t
:if linux-p
:config
(fcitx-aggressive-setup)
(fcitx-default-setup)
;; (fcitx-aggressive-setup)
(fcitx-prefix-keys-setup)
(fcitx-prefix-keys-turn-on))

#+end_src

** emoji-cheat-sheet-plus
Expand Down
8 changes: 5 additions & 3 deletions .emacs.d/inits/90_color.org
Expand Up @@ -194,6 +194,8 @@

起動時に 有効にならないな...

動作すると

#+begin_src emacs-lisp
(use-package auto-highlight-symbol
:init
Expand Down Expand Up @@ -338,10 +340,10 @@ sudo apt-get install fonts-ricty-diminished

#+begin_src emacs-lisp
(when linux-p
(add-to-list 'default-frame-alist '(font . "Ricty Diminished-13.5")))
;; (add-to-list 'default-frame-alist '(font . "Ricty Diminished-13.5")))
;; (add-to-list 'default-frame-alist '(font . "Ricty-13")))
(add-to-list 'default-frame-alist '(font . "Ricty Bold 13")))

;; (add-to-list 'default-frame-alist '(font . "Ricty-13")))
;; (add-to-list 'default-frame-alist '(font . "Ricty Bold 13")))
;;(when windows-p
;; (add-to-list 'default-frame-alist '(font . "Ricty Diminished-13.5")))
;; (add-to-list 'default-frame-alist '(font . "Ricty Diminished-13.5"))
Expand Down
33 changes: 15 additions & 18 deletions .profile → .profile_ubuntu 100755 → 100644
Expand Up @@ -21,30 +21,27 @@ if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi

if [ -d "$HOME/script" ] ; then
PATH="$HOME/script/sh:$PATH"
PATH="$HOME/script/ruby:$PATH"
fi

# Touch Padデフォルト無効
xinput --set-prop "SynPS/2 Synaptics TouchPad" "Device Enabled" 0 &

# 背景の設定
feh --bg-scale ~/Pictures/wallpaper/moonlight.png &

# tmux
tmux-session restore
tmux a

# trayer タスクトレイ
trayer --edge top --align right --SetDockType true --SetPartialStrut false --expand true --width 10 --transparent true --tint 0x000000 --height 14 &

# ネットワーク
nm-applet &

# サウンド
cinnamon-sound-applet &
volumeicon &

# バッテリ
cbatticon &

# Dropbox
~/.dropbox-dist/dropboxd &~/.dropbox-dist/dropboxd &

# TouchPad Default Off
xinput --set-prop "SynPS/2 Synaptics TouchPad" "Device Enabled" 0

# skk server
google-ime-skk &
# emacs
# https://wiki.archlinuxjp.org/index.php/Fcitx#Emacs 文字コードしていしないと変換してくれない。
# LC_CTYPE=ja_JP.UTF-8 emacs --daemon &

# wall paper
feh --bg-scale ~/Dropbox/Photos/ubuntu.jpg &
5 changes: 3 additions & 2 deletions .xmobarrc
Expand Up @@ -16,5 +16,6 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
]
, sepChar = "%"
, alignSep = "}{"
, template = "%cpu% | %memory% | %battery% }{ <fc=#ee9a00>%date%</fc> %orgClock%clock</fc> %orgShow%"
}
-- , template = "%cpu% | %memory% | %battery% }{ <fc=#ee9a00>%date%</fc> %orgClock%clock</fc> %orgShow%"
, template = "%cpu% | %memory% | %battery% }{ <fc=#ee9a00>%date%</fc> "
}
8 changes: 8 additions & 0 deletions .zshenv_ubuntu
@@ -0,0 +1,8 @@
# Power Off
alias fault='sudo shutdown -P now'

# LANG
export LANG=ja_JP.UTF-8

# 画面lock
alias lock='gnome-screensaver-command -l'
6 changes: 3 additions & 3 deletions .zshrc
Expand Up @@ -231,6 +231,7 @@ fi
if [ -d ${HOME}/script ] ; then
export PATH="${HOME}/script/sh:${PATH}"
export PATH="${HOME}/script/ruby:${PATH}"
export PATH="${HOME}/script/scala:${PATH}"
fi

# z ディレクトリ移動を簡単に
Expand Down Expand Up @@ -360,9 +361,8 @@ if [ "$EMACS" ];then
else
alias m='emacsclient -nw'
alias kill_emacs="emacsclient -e \"(kill-emacs)\""
alias boot_emacs="emacs --daemon"
alias boot_my_world="emacs --daemon"
alias reboot_emacs="emacsclient -e \"(kill-emacs)\";emacs --daemon"
alias boot_emacs="LC_CTYPE=ja_JP.UTF-8 emacs --daemon"
alias reboot_emacs="kill_emacs;boot_emacs"

export EDITOR="emacsclient -nw"
export VISUAL="emacsclient -nw"
Expand Down

0 comments on commit 4738258

Please sign in to comment.