From 946496a44167289e924d925aacb2102e33862fe6 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 10 Nov 2020 17:57:47 +0100 Subject: Add local Rust, Ruby, and Node bin directories to PATH --- bash/.bashrc | 12 ++++++++++++ bspwm/.config/bspwm/bspwmrc | 12 ++++++++++-- emacs/.emacs.d/init.el | 47 ++++++++++++++++++++++++++++++++------------- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index b432b6b..9b72937 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -120,6 +120,18 @@ man() { man "$@" } +if [ -d "$HOME/.cargo/bin" ] ; then + PATH="$HOME/.cargo/bin:$PATH" +fi + +if [ -d "$HOME/.gem/ruby/2.6.0/bin" ] ; then + PATH="$HOME/.gem/ruby/2.6.0/bin:$PATH" +fi + +if [ -d "$HOME/.local/lib/node_modules/bin" ] ; then + PATH="$HOME/.local/lib/node_modules/bin:$PATH" +fi + # set PATH so it includes user's private bin if it exists if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$HOME/.local/bin:$PATH" diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 3550cfa..9e105b3 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -26,7 +26,15 @@ xmodmap ~/.Xmodmap sxhkd & # Show panel when mouse is on top edge -xdotool behave_screen_edge --delay 1000 top search --name "Top Expanded Edge Panel" windowmap exec bspc config top_padding $PANEL_PAD > /dev/null & +# xdotool behave_screen_edge --delay 1000 top search --name "xfce4-panel" windowmap windowraise exec bspc config top_padding $PANEL_PAD > /dev/null & + +# Show panel when mouse is on top edge +xdotool behave_screen_edge --delay 1000 top exec \ + xfconf-query -c xfce4-panel -p /panels/panel-0/autohide-behavior -s 0 + +# Hide panel when mouse is on bottom edge +# xdotool behave_screen_edge --delay 1000 bottom search --name "xfce4-panel" windowunmap exec bspc config top_padding 0 > /dev/null & # Hide panel when mouse is on bottom edge -xdotool behave_screen_edge --delay 1000 bottom search --name "Top Expanded Edge Panel" windowunmap exec bspc config top_padding 0 > /dev/null & +xdotool behave_screen_edge --delay 1000 bottom exec \ + xfconf-query -c xfce4-panel -p /panels/panel-0/autohide-behavior -s 2 diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 8d86538..d76b7e6 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -15,7 +15,7 @@ (scroll-bar-mode (quote right)))) (setq-default - gc-cons-threshold 10000000 + gc-cons-threshold 100000000 backup-by-copying t backup-directory-alist `((".*" . ,temporary-file-directory)) auto-save-file-name-transforms `((".*" ,temporary-file-directory t)) @@ -33,15 +33,13 @@ (package-refresh-contents) (package-install 'use-package))) -(require 'use-package) - (setq use-package-always-ensure t) (use-package clang-format :commands (c-mode c++-mode)) (use-package counsel :after (ivy) :config (counsel-mode)) (use-package counsel-gtags :commands ggtags-mode) (use-package counsel-projectile :after (counsel projectile)) (use-package diminish) -(use-package dired-rainbow :after (dired+)) +(use-package dired-rainbow) (use-package flyspell :commands flyspell-mode) (use-package flyspell-correct-ivy :after (flyspell ivy) :commands flyspell-mode) (use-package ggtags :commands ggtags-mode) @@ -54,11 +52,13 @@ (use-package smart-tabs-mode :commands (c-mode c++-mode)) (use-package spaceline) (use-package swiper :commands swiper) -(use-package ttl-mode :commands ttl-mode) +;; (use-package ttl-mode :commands ttl-mode) (use-package tramp) (require 'spaceline-config) +(require 'turtle-mode) + ;;; Basic editor configuration (defalias 'yes-or-no-p 'y-or-n-p) @@ -140,7 +140,7 @@ '(erc-mode-line-format "%t") '(erc-modules (quote - (autojoin button completion irccontrols list match menu move-to-prompt netsplit networks noncommands readonly ring stamp track))) + (autojoin button completion irccontrols list log match menu move-to-prompt netsplit networks noncommands readonly ring stamp track))) '(erc-prompt ">") '(erc-stamp-mode t) '(erc-timestamp-format "%H:%M ") @@ -153,6 +153,7 @@ '(fill-column 79) '(font-lock-maximum-decoration t) '(frame-background-mode (quote dark)) + '(frame-inhibit-implied-resize t) '(fringe-mode (quote (nil . 0)) nil (fringe)) '(gc-cons-threshold 10000000) '(global-diff-hl-mode t) @@ -160,6 +161,7 @@ "find . -type f -not -name \"*.svn-base\" -print0 | xargs -0 grep -I -n -s -F ") '(indicate-empty-lines t) '(inhibit-startup-screen t) + '(initial-major-mode (quote fundamental-mode)) '(ivy-magic-tilde nil) '(jabber-account-list (quote @@ -210,7 +212,7 @@ '(ns-use-srgb-colorspace nil) '(package-selected-packages (quote - (apache-mode auctex clang-format cmake-mode counsel-gtags counsel-projectile diff-hl diminish dired-rainbow dockerfile-mode flyspell-correct-ivy ggtags git-gutter-fringe glsl-mode ivy jinja2-mode json-mode llvm-mode magit markdown-mode meson-mode n3-mode pdf-tools pkgbuild-mode projectile rainbow-delimiters rust-mode smart-tabs-mode spaceline swift-mode ttl-mode use-package yaml-mode))) + (cython-mode groovy-mode jenkins qml-mode ninja-mode bison-mode csv-mode apache-mode auctex clang-format cmake-mode counsel-gtags counsel-projectile diff-hl diminish dired-rainbow dockerfile-mode flyspell-correct-ivy ggtags git-gutter-fringe glsl-mode ivy jinja2-mode json-mode llvm-mode magit markdown-mode meson-mode n3-mode pdf-tools pkgbuild-mode projectile rainbow-delimiters rust-mode smart-tabs-mode spaceline swift-mode ttl-mode use-package yaml-mode))) '(pdf-view-midnight-colors (quote ("#C3D1D1" . "#141414"))) '(powerline-default-separator (quote arrow-fade)) '(projectile-completion-system (quote ivy)) @@ -233,6 +235,7 @@ '(speedbar-use-images nil) '(split-window-preferred-function (quote split-window-horizontally)) '(tool-bar-mode nil) + '(ttl-electric-punctuation t) '(version-control t) '(visible-bell nil) '(winner-mode t)) @@ -252,7 +255,10 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - ) + '(default ((t (:inherit nil :stipple nil :background "#141414" :foreground "#C3D1D1" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 180 :width normal :foundry "PfEd" :family "DejaVu Sans Mono")))) + '(font-lock-keyword-face ((t (:foreground "#839496" :weight normal)))) + '(font-lock-preprocessor-face ((t (:foreground "#586E75")))) + '(font-lock-string-face ((t (:foreground "#CB4B16"))))) ;;; Windows @@ -261,7 +267,7 @@ (cond ((and (string-match "compilation" (buffer-name buffer)) (string-match "finished" string)) (bury-buffer "*compilation*") - (winner-undo) + ;; (winner-undo) (message "Build successful.")) (t (message "Compilation exited abnormally: %s" string)))) @@ -419,7 +425,21 @@ (lambda () (setq tab-width 4) (setq indent-tabs-mode nil) - (setq show-trailing-whitespace))) + (setq show-trailing-whitespace t))) + +;; Turtle + +(add-hook 'turtle-mode-hook + (lambda () + (setq tab-width 4) + (setq indent-tabs-mode t) + (setq show-trailing-whitespace t))) + +;; Dired + +(add-hook 'dired-mode-hook + (lambda () + (dired-hide-details-mode))) ;; IRC @@ -460,15 +480,16 @@ (add-to-list 'auto-mode-alist '("\\.ipp" . c++-mode)) (add-to-list 'auto-mode-alist '("\\.pl\\'" . prolog-mode)) -(add-to-list 'auto-mode-alist '("\\.n3" . ttl-mode)) -(add-to-list 'auto-mode-alist '("\\.ttl" . ttl-mode)) -(add-to-list 'auto-mode-alist '("\\.owl" . ttl-mode)) +(add-to-list 'auto-mode-alist '("\\.n3" . turtle-mode)) +(add-to-list 'auto-mode-alist '("\\.ttl" . turtle-mode)) +(add-to-list 'auto-mode-alist '("\\.owl" . turtle-mode)) (add-to-list 'auto-mode-alist '("\\.ll" . llvm-mode)) (add-to-list 'auto-mode-alist '("\\.md" . markdown-mode)) (add-to-list 'auto-mode-alist '("\\.pdf" . pdf-view-mode)) (add-to-list 'auto-mode-alist '("\\.gyp" . python-mode)) (add-to-list 'auto-mode-alist '("\\.gypi" . python-mode)) (add-to-list 'auto-mode-alist '("\\.jsonld" . json-mode)) +(add-to-list 'auto-mode-alist '("\\.jsonld" . json-mode)) (add-to-list 'auto-mode-alist '("\\.tesc" . glsl-mode)) (add-to-list 'auto-mode-alist '("\\.tese" . glsl-mode)) -- cgit v1.2.1