summaryrefslogtreecommitdiff
path: root/.config/emacs/modules
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs/modules')
-rw-r--r--.config/emacs/modules/bd--chat.el2
-rw-r--r--.config/emacs/modules/bd--exwm.el22
-rw-r--r--.config/emacs/modules/bd--modeline.el8
-rw-r--r--.config/emacs/modules/bd--tabs.el20
-rw-r--r--.config/emacs/modules/bd--themes.el8
-rw-r--r--.config/emacs/modules/bd--utility.el10
6 files changed, 25 insertions, 45 deletions
diff --git a/.config/emacs/modules/bd--chat.el b/.config/emacs/modules/bd--chat.el
index 62ab2bb..0649605 100644
--- a/.config/emacs/modules/bd--chat.el
+++ b/.config/emacs/modules/bd--chat.el
@@ -60,7 +60,7 @@ channel, which is issuing the PART command."
(use-package gptel
:bind (("C-c g" . gptel-menu)
- ("C-c C-k" . (lambda () (interactive) (gptel "*evka*") (switch-to-buffer "*evka*"))))
+ ("C-c k" . (lambda () (interactive) (gptel "*evka*") (switch-to-buffer "*evka*"))))
:config
(defvar bd/llama-cpp-buffer-name "*llama-cpp-proc*")
(defvar bd/llama-cpp-reasoning-buffer-name "*llama-cpp-reasoning*")
diff --git a/.config/emacs/modules/bd--exwm.el b/.config/emacs/modules/bd--exwm.el
index 6ab7c10..6542241 100644
--- a/.config/emacs/modules/bd--exwm.el
+++ b/.config/emacs/modules/bd--exwm.el
@@ -9,7 +9,7 @@
(require 'exwm-randr)
(setopt exwm-randr-workspace-monitor-plist '(0 "HDMI-1" 1 "eDP-1")
- exwm-workspace-number 2)
+ exwm-workspace-number 10)
(add-hook 'exwm-randr-screen-change-hook
(lambda ()
(start-process-shell-command
@@ -97,7 +97,9 @@ that buffer."
(use-package exwm-outer-gaps
:defer 1
:config
- (exwm-outer-gaps-mode 1))
+ (setopt exwm-outer-gaps-mode 1
+ exwm-outer-gaps-width 10)
+ (exwm-outer-gaps-apply))
(use-package server
:defer 1
@@ -108,21 +110,5 @@ that buffer."
(setopt tab-bar-select-tab-modifiers '(super))
-(defvar new-mode-line nil)
-(defun set-new-mode-line ()
- (setq new-mode-line
- (replace-regexp-in-string
- "%" "%%"
- (format "[%s] [%s]"
- (shell-command-to-string "/home/bdunahu/.local/bin/mail-string 2>/dev/null")
- (shell-command-to-string "/home/bdunahu/.local/bin/t1-string 2>/dev/null")))))
-
-(defvar-local bd/external-mode-line
- '(:eval (when new-mode-line
- new-mode-line)))
-
-(run-with-timer t 30 #'set-new-mode-line)
-(add-to-list 'global-mode-string bd/external-mode-line)
-
(provide 'bd--exwm)
;;; bd--exwm.el ends here
diff --git a/.config/emacs/modules/bd--modeline.el b/.config/emacs/modules/bd--modeline.el
index 7fc4892..2b38459 100644
--- a/.config/emacs/modules/bd--modeline.el
+++ b/.config/emacs/modules/bd--modeline.el
@@ -39,6 +39,11 @@
'help-echo "mouse-1: Project menu"
'local-map project-mode-line-map))))))
+(defvar-local bd/global-mode-string
+ '(:eval (when (mode-line-window-selected-p)
+ global-mode-string))
+ "Displays the global mode string only on the current window.")
+
(column-number-mode 1)
(setopt mode-line-position-column-line-format '("%l:%c")
mode-line-percent-position nil)
@@ -63,6 +68,7 @@
(dolist (construct '(bd/buffer-identification-mode-line
bd/project-mode-line
bd/vc-mode-line
+ bd/global-mode-string
bd/line-position
bd/modeline-window-dedicated))
(put construct 'risky-local-variable t))
@@ -84,6 +90,8 @@
mode-line-mule-info
mode-line-modified
mode-line-front-space
+ bd/global-mode-string
+ mode-line-front-space
))
diff --git a/.config/emacs/modules/bd--tabs.el b/.config/emacs/modules/bd--tabs.el
index 3ab660e..320acae 100644
--- a/.config/emacs/modules/bd--tabs.el
+++ b/.config/emacs/modules/bd--tabs.el
@@ -3,21 +3,6 @@
;;; Code:
-(use-package time
- :demand t
- :init
- (display-time)
- :config
- (setopt display-time-format " [%m/%d %H:%M] "
- display-time-default-load-average nil))
-
-(use-package battery
- :demand t
- :init
- (display-battery-mode)
- :config
- (setopt battery-update-interval 90))
-
(use-package tab-bar
:demand t
:config
@@ -40,15 +25,14 @@
(tab-bar-mode)
(tab-bar-history-mode)
(setopt tab-bar-tab-name-function #'bd/tab-bar-name-function
- tab-bar-show t
+ tab-bar-show nil
tab-bar-select-restore-windows nil
;; remove useless gui elements
tab-bar-format
'(tab-bar-format-tabs
- tab-bar-format-align-right
- tab-bar-format-global)
+ tab-bar-format-align-right)
tab-bar-close-button-show nil
tab-bar-auto-width-max nil
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index 0771f22..f4ef567 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -36,13 +36,13 @@ and some other minor face changes."
(fg-active fg-main)
(fg-mode-line-active "#ed8dff")
(bg-mode-line-active "#442c50")
- (fg-mode-line-inactive "#a3bc0a")
- (bg-mode-line-inactive "#191d01")
+ (fg-mode-line-inactive "#606060") ;; secondary
+ (bg-mode-line-inactive "#232323") ;; secondary
(border-mode-line-active nil)
(border-mode-line-inactive nil)
(bg-tab-bar bg-main)
(bg-tab-current "#5f4057")
- (bg-tab-other "#282e03")
+ (bg-tab-other "#434343") ;; secondary
(fg-heading-0 "#b2ebf2")
(fg-heading-1 "#98fb98")
@@ -67,7 +67,7 @@ and some other minor face changes."
(cursor "#c41ea1")
(fg-prose-verbatim "#af9fff")
- (bg-prose-block-contents "#252b02")
+ (bg-prose-block-contents "#323232") ;; secondary
(fg-prose-block-delimiter "#c6b7ad")
(bg-prose-block-delimiter bg-prose-block-contents)
diff --git a/.config/emacs/modules/bd--utility.el b/.config/emacs/modules/bd--utility.el
index d48ff02..33e2285 100644
--- a/.config/emacs/modules/bd--utility.el
+++ b/.config/emacs/modules/bd--utility.el
@@ -99,10 +99,12 @@ TODO default folder"
'(eww-mode)))
(defun bd/buffer-exwm-p (buf)
- "Return non-nil if BUF is an `exwm-mode' buffer."
- (member
- (buffer-local-value 'major-mode (get-buffer buf))
- '(exwm-mode)))
+ "Return non-nil if BUF is an `exwm-mode' buffer and is in the current workspace."
+ (and (member
+ (buffer-local-value 'major-mode (get-buffer buf))
+ '(exwm-mode))
+ (eq (exwm-workspace--position exwm-workspace--current)
+ (alist-get 'exwm--desktop (buffer-local-variables (get-buffer buf))))))
(defun bd/buffer-scratch-p (buf)
"Return non-nil if BUF is a scratch buffer."