summaryrefslogtreecommitdiff
path: root/emacs/inits
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/inits')
-rw-r--r--emacs/inits/00-exwm.el47
-rw-r--r--emacs/inits/07-tinymenu.el48
-rw-r--r--emacs/inits/11-selectrum.el6
-rw-r--r--emacs/inits/14-movement.el24
-rw-r--r--emacs/inits/24-latex.el7
5 files changed, 58 insertions, 74 deletions
diff --git a/emacs/inits/00-exwm.el b/emacs/inits/00-exwm.el
index c05c2dd..7ad3deb 100644
--- a/emacs/inits/00-exwm.el
+++ b/emacs/inits/00-exwm.el
@@ -1,18 +1,4 @@
-;; Time-stamp: <2020-03-24 10:11:51 (tslil@bison)>
-
-(defun adjust-volume (mixer adjust)
- (let ((tail " | tail -n 1")
- (sed (concat " | sed 's/.*\\[\\([0-9]*.\\)\\] "
- "\\[.*dB\\] \\[\\(.*\\)\\]$/"
- mixer
- " \\1 \\2/'")))
- (shell-command
- (concat
- (cond ((string-equal "+" adjust) (concat "amixer set " mixer " 2%+"))
- ((string-equal "-" adjust) (concat "amixer set " mixer " 2%-"))
- (t (concat "amixer set " mixer " toggle")))
- tail
- sed))))
+;; Time-stamp: <2020-04-01 22:13:15 (tslil@bison)>
(defun banish-rat ()
(interactive)
@@ -112,37 +98,6 @@
(interactive (list (read-shell-command "$ ")))
(start-process-shell-command command nil command)))
- ;; Volume
- (exwm-input-set-key (kbd "<XF86AudioRaiseVolume>")
- (lambda ()
- (interactive)
- (adjust-volume "Master" "+")))
-
- (exwm-input-set-key (kbd "<XF86AudioLowerVolume>")
- (lambda ()
- (interactive)
- (adjust-volume "Master" "-")))
-
- (exwm-input-set-key (kbd "<XF86Launch1>")
- (lambda ()
- (interactive)
- (adjust-volume "Master" "toggle")))
-
- (exwm-input-set-key (kbd "S-<XF86AudioRaiseVolume>")
- (lambda ()
- (interactive)
- (adjust-volume "Headphone" "+")))
-
- (exwm-input-set-key (kbd "S-<XF86AudioLowerVolume>")
- (lambda ()
- (interactive)
- (adjust-volume "Headphone" "-")))
-
- (exwm-input-set-key (kbd "S-<XF86Launch1>")
- (lambda ()
- (interactive)
- (adjust-volume "Headphone" "toggle")))
-
;; -------------------------------------------------------------------
;; RandR
diff --git a/emacs/inits/07-tinymenu.el b/emacs/inits/07-tinymenu.el
new file mode 100644
index 0000000..ac521c7
--- /dev/null
+++ b/emacs/inits/07-tinymenu.el
@@ -0,0 +1,48 @@
+;; Time-stamp: <2020-03-28 13:33:17 (tslil@bison)>
+
+(use-package tiny-menu
+ :ensure t)
+
+;; (eval-after-load "tiny-menu"
+;; (progn
+;; (defun hexl-input-smart ()
+;; (hexl-insert-char (0xc-string-to-number (read-string "Input: ")) 1))
+
+;; (setq tiny-menu-forever t
+;; tiny-menu-items '(("hexl-menu"
+;; ("hexl"
+;; ((?i "Insert" hexl-input-smart)
+;; (?b "Byte" hexl-forward-char)
+;; (?e "bytE" hexl-backward-char)
+;; (?s "Short" hexl-forward-short)
+;; (?t "shorT" hexl-backward-short))))
+;; ))))
+
+;; (add-hook 'hexl-mode-hook
+;; (lambda ()
+;; (require '0xc)
+;; (require 'tiny-menu)
+;; (define-key hexl-mode-map (kbd "M-l")
+;; (lambda () (interactive) (tiny-menu "hexl-menu")))))
+
+
+(use-package pulseaudio-control
+ :ensure t
+ :bind ("C-x /" . (lambda () (interactive) (tiny-menu "pulseaudio-control-menu")))
+ :config
+ (defun pulseaudio-control-tinymenu-header ()
+ (let ((words (split-string (pulseaudio-control--get-current-volume)))
+ (mute (if (string-equal "yes" (cadr (split-string (pulseaudio-control--get-current-mute))))
+ "[mute]" "")))
+ (concat "PulseAudio " mute "(" (nth 4 words) " / " (nth 11 words) ")")))
+ (add-to-list 'tiny-menu-items
+ '("pulseaudio-control-menu"
+ (pulseaudio-control-tinymenu-header
+ ((?+ "Vol+" pulseaudio-control-increase-volume "pulseaudio-control-menu")
+ (?- "Vol-" pulseaudio-control-decrease-volume "pulseaudio-control-menu")
+ (?? "Vol?" pulseaudio-control-display-volume)
+ (?m "Mute" pulseaudio-control-toggle-current-sink-mute)
+ (?e "Mute sink" pulseaudio-control-toggle-sink-mute-by-name)
+ (?d "Use @DEF" pulseaudio-control-toggle-use-of-default-sink "pulseaudio-control-menu")
+ (?n "Sink" pulseaudio-control-select-sink-by-name "pulseaudio-control-menu")
+ (?p "Vol%" pulseaudio-control-set-volume))))))
diff --git a/emacs/inits/11-selectrum.el b/emacs/inits/11-selectrum.el
index c8c9470..d7aaab2 100644
--- a/emacs/inits/11-selectrum.el
+++ b/emacs/inits/11-selectrum.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2020-03-04 21:49:27 (tslil@bison)>
+;; Time-stamp: <2020-03-31 09:11:15 (tslil@bison)>
(use-package deadgrep
:ensure t
@@ -27,11 +27,11 @@
selectrum-count-style 'matches)
(selectrum-mode +1))
+(quelpa '(selectrum-prescient :fetcher git :url "https://github.com/raxod502/prescient.git"))
+
(use-package prescient
:ensure t)
-(quelpa '(selectrum-prescient :fetcher git :url "https://github.com/raxod502/prescient.git"))
-
(use-package selectrum-prescient
:ensure t
:config
diff --git a/emacs/inits/14-movement.el b/emacs/inits/14-movement.el
index 0e5b1b7..b9318a5 100644
--- a/emacs/inits/14-movement.el
+++ b/emacs/inits/14-movement.el
@@ -1,26 +1,4 @@
-;; Time-stamp: <2020-01-18 20:07:14 (tslil@bison)>
-
-;; (eval-after-load "tiny-menu"
-;; (progn
-;; (defun hexl-input-smart ()
-;; (hexl-insert-char (0xc-string-to-number (read-string "Input: ")) 1))
-
-;; (setq tiny-menu-forever t
-;; tiny-menu-items '(("hexl-menu"
-;; ("hexl"
-;; ((?i "Insert" hexl-input-smart)
-;; (?b "Byte" hexl-forward-char)
-;; (?e "bytE" hexl-backward-char)
-;; (?s "Short" hexl-forward-short)
-;; (?t "shorT" hexl-backward-short))))
-;; ))))
-
-;; (add-hook 'hexl-mode-hook
-;; (lambda ()
-;; (require '0xc)
-;; (require 'tiny-menu)
-;; (define-key hexl-mode-map (kbd "M-l")
-;; (lambda () (interactive) (tiny-menu "hexl-menu")))))
+;; Time-stamp: <2020-03-28 13:02:05 (tslil@bison)>
;; -------------------------------------------------------------------
;; Repeated key presses for region, deletion, and movement
diff --git a/emacs/inits/24-latex.el b/emacs/inits/24-latex.el
index f71041b..aa195fc 100644
--- a/emacs/inits/24-latex.el
+++ b/emacs/inits/24-latex.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2020-03-24 10:05:16 (tslil@bison)>
+;; Time-stamp: <2020-03-27 15:27:06 (tslil@bison)>
(defvar latex-template-dir (expand-file-name "~/academic/typeset/latex-templates"))
(defun prompt-latex-file-template ()
@@ -46,7 +46,10 @@ populated from the directory *latex-template-dir*"
(require 'company-auctex)
(electric-pair-local-mode -1)
(flyspell-mode)
- (turn-on-auto-fill)
+ ;; (turn-on-auto-fill)
+ (display-line-numbers-mode)
+ (auto-fill-mode -1)
+ (visual-line-mode)
(cdlatex-mode t)
(company-auctex-init)
(siege-mode 1)