diff --git a/flake.lock b/flake.lock index b18f18d..b85786c 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -132,20 +132,14 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1714640452, + "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz" } }, "nixpkgs-lib_2": { @@ -253,16 +247,16 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1713553841, - "narHash": "sha256-k0p6s7cbN3cAeOBeTpIaFWbHhma+yNisC7HwAo4aDuA=", - "ref": "refs/tags/v0.1.10", - "rev": "8164261df59f6a31cbbd72b19777b1023aa38448", - "revCount": 52, + "lastModified": 1714648678, + "narHash": "sha256-CxLSUYRk2quey0skgxa+v8mVE+pGSSPcxtK0uFq6YkQ=", + "ref": "refs/tags/v0.1.11", + "rev": "b4e667a73a0de7d83f78910d6fa3acc3b3044675", + "revCount": 53, "type": "git", "url": "https://devheroes.codes/lxsameer/noether" }, "original": { - "ref": "refs/tags/v0.1.10", + "ref": "refs/tags/v0.1.11", "type": "git", "url": "https://devheroes.codes/lxsameer/noether" } diff --git a/flake.nix b/flake.nix index bf1d69e..4eb217d 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ description = "FG42 - Emacs Editor for advance users"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e"; - inputs.noether.url = "git+https://devheroes.codes/lxsameer/noether?ref=refs/tags/v0.1.10"; + inputs.noether.url = "git+https://devheroes.codes/lxsameer/noether?ref=refs/tags/v0.1.11"; inputs.emacs-overlay.url = "github:nix-community/emacs-overlay/0f7f3b39157419f3035a2dad39fbaf8a4ba0448d"; inputs.flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/lisp/fg42/modeline/units.el b/lisp/fg42/modeline/units.el index 7900167..8932c61 100644 --- a/lisp/fg42/modeline/units.el +++ b/lisp/fg42/modeline/units.el @@ -26,7 +26,7 @@ (require 'noether) (require 'noether-units) -(require 'projectile) +(require 'project) (require 'nerd-icons) diff --git a/lisp/fg42/modeline/views.el b/lisp/fg42/modeline/views.el index 7662162..686e5ad 100644 --- a/lisp/fg42/modeline/views.el +++ b/lisp/fg42/modeline/views.el @@ -62,7 +62,7 @@ (buffer-name-unit :label (format "%s " (nerd-icons-codicon "nf-cod-layers")) :len 20) - (projectile-project-unit + (project-unit :label (format "%s " (nerd-icons-octicon "nf-oct-project")) :len 20) (git-branch-unit @@ -94,7 +94,7 @@ Appears on the center of the current window." (buffer-name-unit :label (format "%s " (nerd-icons-codicon "nf-cod-layers")) :len 30) - + (time-unit :label (format "%s " (nerd-icons-mdicon "nf-md-clock_time_three"))))) diff --git a/nix/modules/editor/default.nix b/nix/modules/editor/default.nix index 818ee9c..47f2b82 100644 --- a/nix/modules/editor/default.nix +++ b/nix/modules/editor/default.nix @@ -26,9 +26,9 @@ let deps = (with pkgs.emacsPackages; [ origami - which-key - projectile - projectile-ripgrep + #which-key + # projectile + #projectile-ripgrep pkg-info expand-region direnv @@ -49,6 +49,8 @@ let tempel tempel-collection beacon + hydra + rg ]); drv = makeFG42Drv { diff --git a/nix/modules/editor/lisp/fg42/editor.el b/nix/modules/editor/lisp/fg42/editor.el index a03e3c0..da35e5a 100644 --- a/nix/modules/editor/lisp/fg42/editor.el +++ b/nix/modules/editor/lisp/fg42/editor.el @@ -50,37 +50,37 @@ (global-origami-mode t)) -(use! which-key - "which-key is a minor mode for Emacs that displays the key bindings following -your currently entered incomplete command (a prefix) in a popup. For example, -after enabling the minor mode if you enter ~C-x~ and wait for the default of -1 second the minibuffer will expand with all of the available key bindings -that follow ~C-x~ (or as many as space allows given your settings). -This includes prefixes like ~C-x 8~ which are shown in a different face." - :config - (which-key-setup-side-window-bottom) - (which-key-mode)) +;; (use! which-key +;; "which-key is a minor mode for Emacs that displays the key bindings following +;; your currently entered incomplete command (a prefix) in a popup. For example, +;; after enabling the minor mode if you enter ~C-x~ and wait for the default of +;; 1 second the minibuffer will expand with all of the available key bindings +;; that follow ~C-x~ (or as many as space allows given your settings). +;; This includes prefixes like ~C-x 8~ which are shown in a different face." +;; :config +;; (which-key-setup-side-window-bottom) +;; (which-key-mode)) -(use! projectile - "Projectile is a project interaction library for Emacs. Its goal is to provide -a nice set of features operating on a project level without introducing -external dependencies." - :hook (emacs-startup . projectile-mode) - :config - ;; We don't want the auto discovery on startup - (setq projectile-auto-discover nil) - (setq projectile-enable-caching t) +;; (use! projectile +;; "Projectile is a project interaction library for Emacs. Its goal is to provide +;; a nice set of features operating on a project level without introducing +;; external dependencies." +;; :hook (emacs-startup . projectile-mode) +;; :config +;; ;; We don't want the auto discovery on startup +;; (setq projectile-auto-discover nil) +;; (setq projectile-enable-caching t) - :bind (:map projectile-mode-map - ("s-p" . projectile-command-map) - ("C-c p" . projectile-command-map))) +;; :bind (:map projectile-mode-map +;; ("s-p" . projectile-command-map) +;; ("C-c p" . projectile-command-map))) -(use! projectile-ripgrep - "Use ripgrep with projectile" - :after projectile) - +(use! rg + "A ripgrep based search utility." + :commands rg-menu + :bind ("C-c s" . rg-menu)) (use! pkg-info "`pkg-info' integration.") @@ -220,6 +220,19 @@ of the Emacs Tempo library." "A collection of tempel templates.") +(use! hydra + "Once you summon the Hydra through the prefixed binding (the +body+ any one head), all heads can be called in succession with only a +short extension." + :init + (require 'hydra) + :hook (emacs-startup . hydra-add-imenu) + :config + (defhydra hydra-zoom (global-map "") + "zoom" + ("g" text-scale-increase "in") + ("l" text-scale-decrease "out"))) + (use! beacon "Never lose sight of your curser." :hook (emacs-startup . beacon-mode)) diff --git a/nix/modules/minibuffer-vertico/lisp/fg42/minibuffer-vertico.el b/nix/modules/minibuffer-vertico/lisp/fg42/minibuffer-vertico.el index 0f088ff..3010f51 100644 --- a/nix/modules/minibuffer-vertico/lisp/fg42/minibuffer-vertico.el +++ b/nix/modules/minibuffer-vertico/lisp/fg42/minibuffer-vertico.el @@ -181,8 +181,8 @@ match all of the components in any order." ;; Configure the narrowing key. ;; Both < and C-+ work reasonably well. (setq consult-narrow-key "<") ;; "C-+" - (autoload 'projectile-project-root "projectile") - (setq consult-project-function (lambda (_) (projectile-project-root))) + (setq consult-project-function (lambda (_) (when (project-current) + (project-root (project-current))))) ;; Optionally make narrowing help available in the minibuffer. ;; You may want to use `embark-prefix-help-command' or which-key instead. diff --git a/nix/modules/noether/lisp/fg42/modeline/units.el b/nix/modules/noether/lisp/fg42/modeline/units.el index 6708bb6..0838824 100644 --- a/nix/modules/noether/lisp/fg42/modeline/units.el +++ b/nix/modules/noether/lisp/fg42/modeline/units.el @@ -27,13 +27,13 @@ (require 'noether) (require 'noether-units) -(require 'projectile) +(require 'project) (with-config "graphics" (require 'nerd-icons) - + (defvar fg42/-mode-icon) - + (defun fg42/-update-mode-icon () "Set the current buffer name to the watched var." (setq fg42/-mode-icon major-mode)) diff --git a/nix/modules/noether/lisp/fg42/modeline/views.el b/nix/modules/noether/lisp/fg42/modeline/views.el index 0344e68..d9d8344 100644 --- a/nix/modules/noether/lisp/fg42/modeline/views.el +++ b/nix/modules/noether/lisp/fg42/modeline/views.el @@ -67,7 +67,7 @@ (buffer-name-unit :label (format "%s " (nerd-icons-codicon "nf-cod-layers")) :len 20) - (projectile-project-unit + (project-unit :label (format "%s " (nerd-icons-octicon "nf-oct-project")) :len 20) (git-branch-unit @@ -81,7 +81,7 @@ (buffer-name-unit :label "B: " :len 20) - (projectile-project-unit + (project-unit :label "P: " :len 20) (git-branch-unit diff --git a/nix/modules/noether/lisp/fg42/noether.el b/nix/modules/noether/lisp/fg42/noether.el index 96fc064..2533d73 100644 --- a/nix/modules/noether/lisp/fg42/noether.el +++ b/nix/modules/noether/lisp/fg42/noether.el @@ -53,7 +53,6 @@ "Smart mode line is a pretty simple yet fantastic alternative to Emacs modeline." :if (display-graphic-p) - ;;:after projectile :commands noether-global-mode :hook (emacs-startup . noether-global-mode) :config