diff options
| -rwxr-xr-x | desktop/.xsession | 3 | ||||
| -rw-r--r-- | emacs/.config/chemacs/profiles.el | 2 | ||||
| -rw-r--r-- | emacs/.config/doom/config.el | 2 | ||||
| -rw-r--r-- | emacs/.config/doom/init.el | 4 | ||||
| -rw-r--r-- | emacs/.config/doom/packages.el | 2 | ||||
| -rwxr-xr-x | setup.sh | 4 |
6 files changed, 10 insertions, 7 deletions
diff --git a/desktop/.xsession b/desktop/.xsession index 2c29ecf..0dee0b7 100755 --- a/desktop/.xsession +++ b/desktop/.xsession @@ -31,12 +31,13 @@ conky | dzen2 -dock -geometry 800x24-950+0 -expand left -fn "WenQuanYi Micro Hei trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 100 --widthtype pixel --transparent true --height 24 --tint 0x252526 --alpha 0 & # xbindkeys +xinput --set-prop "pointer:Ploopy Corporation Trackball Nano" 'libinput Accel Speed' -0.9 { while true; do xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 87 = Pointer_Button1' xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 88 = Pointer_Button3' xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 89 = Pointer_Button2' - xinput --set-prop "pointer:Ploopy Corporation Trackball Nano" 'libinput Accel Speed' -0.9 + xkbset exp 65535 && xkbset m && xmodmap -e 'keycode 89 = Pointer_Button4' sleep 300 done } & diff --git a/emacs/.config/chemacs/profiles.el b/emacs/.config/chemacs/profiles.el index d134391..70636f9 100644 --- a/emacs/.config/chemacs/profiles.el +++ b/emacs/.config/chemacs/profiles.el @@ -1,6 +1,4 @@ (("default" . ((user-emacs-directory . "~/build/doom-emacs") (env . (("DOOMDIR" . "~/.config/doom"))))) - ("doom-staging" . ((user-emacs-directory . "~/build/doom-emacs-staging") - (env . (("DOOMDIR" . "~/.config/doom"))))) ("kj" . ((user-emacs-directory . "~/.config/emacs-kj"))) ) diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el index 34e66b5..25a762a 100644 --- a/emacs/.config/doom/config.el +++ b/emacs/.config/doom/config.el @@ -360,6 +360,6 @@ (evil-embrace-enable-evil-surround-integration) (setq evil-embrace-show-help-p t)) -(let ((local-config "~/.doom.d/config.local.el")) +(let ((local-config "~/.config/doom/config.local.el")) (when (file-exists-p local-config) (load-file local-config))) diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el index 7d37eae..ff2768b 100644 --- a/emacs/.config/doom/init.el +++ b/emacs/.config/doom/init.el @@ -13,7 +13,7 @@ ;; ;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its ;; directory (for easy access to its source code). -(let ((local-config "~/.doom.d/init.local.el")) +(let ((local-config "~/.config/doom/init.local.el")) (when (file-exists-p local-config) (load-file local-config))) @@ -124,7 +124,7 @@ ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses ;;erlang ; an elegant language for a more civilized age - (ess +lsp) ; emacs speaks statistics + ;;(ess +lsp) ; emacs speaks statistics ;;faust ; dsp, but you get to keep your soul ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el index eb942d3..136308b 100644 --- a/emacs/.config/doom/packages.el +++ b/emacs/.config/doom/packages.el @@ -54,6 +54,6 @@ ; (package! org-appear) ; (package! org-super-agenda) -(let ((local-config "~/.doom.d/packages.local.el")) +(let ((local-config "~/.config/doom/packages.local.el")) (when (file-exists-p local-config) (load-file local-config))) @@ -29,6 +29,10 @@ if [[ $# -ge 1 && $1 == "fast" ]]; then exit fi +if [[ ! -e ~/.config/emacs ]]; then + git clone https://github.com/plexus/chemacs2.git ~/.config/emacs +fi + doom_path=~/build/doom-emacs if which emacs >/dev/null && [[ ! -e $doom_path ]]; then git clone https://github.com/plexus/chemacs2.git ~/.config/emacs |