Remove the dependency to projectile

This commit is contained in:
Sameer Rahmani 2024-05-02 12:17:58 +01:00
parent 71b8d8e278
commit 67b5894a0f
Signed by: lxsameer
GPG Key ID: 8741FACBF412FFA5
6 changed files with 41 additions and 21 deletions

View File

@ -57,7 +57,7 @@ can be defined using the =noether-defview= macro like:
'display '(raise -0.1))))
(buffer-name-unit)
(mode-name-unit)
(projectile-project-unit)))
(project-unit)))
#+END_SRC
* Unit

View File

@ -53,14 +53,13 @@
noether = pkgs.emacsPackages.trivialBuild {
pname = "noether";
version = "0.1.10";
version = "0.1.11";
buildInputs = [ pkgs.emacsPackages.posframe ];
src = ./.;
};
emacsPkgs = (pkgs.emacsPackagesFor emacs).withPackages (epkgs: [
epkgs.projectile
epkgs.posframe
noether
]);

View File

@ -30,9 +30,7 @@
(defvar buffer-name-unit)
(defvar time-unit)
(defvar date-unit)
(defvar mode-name-unit)
(defvar projectile-project-unit)
(declare-function projectile-project-name "projectile-project-name" ()))
(defvar mode-name-unit))
;; ============================================================================
;; line number indicator
@ -165,29 +163,30 @@ Emacs knowing."
;; ============================================================================
;; Projectile, Project Name
;; Project Name
;; ============================================================================
(defvar noether--project nil)
(defun noether--set-project ()
"Set the current project for the current buffer."
(let ((p (projectile-project-name)))
(when p
(setq noether--project p))))
(let ((p (project-current)))
(setq noether--project
(if p (project-name p)
nil))))
(defun noether--format-project (_ v _ _)
"Just return the current project V."
v)
(or v "-"))
(noether-defunit projectile-project-unit
(noether-defunit project-unit
"Show the current project name for the current buffer"
:label "P:"
:len 30
:init (lambda ()
(if (and (featurep 'projectile) (boundp 'projectile-mode))
(add-hook 'noether-on-buffer-change-hook #'noether--set-project)
(warn "Can't find feature `projectile'")))
(when (not (boundp 'project))
(require 'project))
(add-hook 'noether-on-buffer-change-hook #'noether--set-project))
:deinit (lambda ()
(remove-hook 'noether-on-buffer-change-hook #'noether--set-project))

View File

@ -46,7 +46,7 @@
;; (line-unit :label "")
(buffer-name-unit :label "B: ")
(mode-name-unit :label "M: ")
(projectile-project-unit :label "P: ")
(project-unit :label "P: ")
(git-branch-unit :label "Br: ")))

View File

@ -24,7 +24,6 @@
;;; Change Log:
;;; Code:
(setq debug-on-error t)
(require 'projectile)
(require 'all-the-icons)
(require 'noether-units)
(require 'noether-views)
@ -54,7 +53,7 @@
'display '(raise -0.1))))
(buffer-name-unit)
(mode-name-unit)
(projectile-project-unit)))
(project-unit)))
(defface noether-active-modeline
'((((background light))
@ -88,7 +87,6 @@
(default-value 'face-remapping-alist) face-remaps))))
(projectile-global-mode t)
(noether-global-mode t)

View File

@ -33,14 +33,16 @@
(require 'noether)
(require 'noether-units)
(require 'noether-views)
(load-theme 'tsdh-dark)
(defun noether--bottom-right (info)
(cons -1 -1))
(defun noether-autohide-on-echo (_)
(message "here")
(minibuffer-prompt))
(noether-defview mode-line
"A simple and minimalist mode-line like status bar"
:managed? t
@ -67,7 +69,29 @@
(date-unit)))
(setq noether-views (list mode-line))
(noether-defview minibuffer-ex
"A simple and minimalist mode-line like status bar"
:managed? t
:buffer "*modeline*"
:binding (kbd "C-c 2")
:frame
(list
:poshandler #'posframe-poshandler-frame-center
:border-width 1
:timeout 5
;; :hidehandler #'noether-autohide-on-echo
:border-color "#bd93f9")
:units
(list
(line-unit :label "")
(buffer-name-unit :label "B: ")
(mode-name-unit :label "M: ")
(time-unit)
(project-unit)
(date-unit)))
(setq noether-views (list minibuffer-ex))
(noether-global-mode t)