pouya-abbassi
/
FG42
forked from FG42/FG42
1
0
Fork 0
Code Pull Requests Activity

Remove projectile to replace it with project.el

This commit is contained in:
Sameer Rahmani 2024-05-02 12:48:10 +01:00
parent b4162580da
commit 5ebb68c2ef
Signed by: lxsameer
GPG Key ID: 8741FACBF412FFA5
10 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flake.lock
View File

@ -47,11 +47,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1714641030,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,20 +132,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "lastModified": 1714640452,
"lastModified": 1711703276, "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
}, },
"original": { "original": {
"dir": "lib", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
@ -253,16 +247,16 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1713553841, "lastModified": 1714648678,
"narHash": "sha256-k0p6s7cbN3cAeOBeTpIaFWbHhma+yNisC7HwAo4aDuA=", "narHash": "sha256-CxLSUYRk2quey0skgxa+v8mVE+pGSSPcxtK0uFq6YkQ=",
"ref": "refs/tags/v0.1.10", "ref": "refs/tags/v0.1.11",
"rev": "8164261df59f6a31cbbd72b19777b1023aa38448", "rev": "b4e667a73a0de7d83f78910d6fa3acc3b3044675",
"revCount": 52, "revCount": 53,
"type": "git", "type": "git",
"url": "https://devheroes.codes/lxsameer/noether" "url": "https://devheroes.codes/lxsameer/noether"
}, },
"original": { "original": {
"ref": "refs/tags/v0.1.10", "ref": "refs/tags/v0.1.11",
"type": "git", "type": "git",
"url": "https://devheroes.codes/lxsameer/noether" "url": "https://devheroes.codes/lxsameer/noether"
} }

2
flake.nix
View File

@ -17,7 +17,7 @@
description = "FG42 - Emacs Editor for advance users"; description = "FG42 - Emacs Editor for advance users";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e"; 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.emacs-overlay.url = "github:nix-community/emacs-overlay/0f7f3b39157419f3035a2dad39fbaf8a4ba0448d";
inputs.flake-parts.url = "github:hercules-ci/flake-parts"; inputs.flake-parts.url = "github:hercules-ci/flake-parts";

2
lisp/fg42/modeline/units.el
View File

@ -26,7 +26,7 @@
(require 'noether) (require 'noether)
(require 'noether-units) (require 'noether-units)
(require 'projectile) (require 'project)
(require 'nerd-icons) (require 'nerd-icons)

4
lisp/fg42/modeline/views.el
View File

@ -62,7 +62,7 @@
(buffer-name-unit (buffer-name-unit
:label (format "%s " (nerd-icons-codicon "nf-cod-layers")) :label (format "%s " (nerd-icons-codicon "nf-cod-layers"))
:len 20) :len 20)
(projectile-project-unit (project-unit
:label (format "%s " (nerd-icons-octicon "nf-oct-project")) :label (format "%s " (nerd-icons-octicon "nf-oct-project"))
:len 20) :len 20)
(git-branch-unit (git-branch-unit
@ -94,7 +94,7 @@ Appears on the center of the current window."
(buffer-name-unit (buffer-name-unit
:label (format "%s " (nerd-icons-codicon "nf-cod-layers")) :label (format "%s " (nerd-icons-codicon "nf-cod-layers"))
:len 30) :len 30)
(time-unit :label (format "%s " (nerd-icons-mdicon "nf-md-clock_time_three"))))) (time-unit :label (format "%s " (nerd-icons-mdicon "nf-md-clock_time_three")))))

8
nix/modules/editor/default.nix
View File

@ -26,9 +26,9 @@ let
deps = deps =
(with pkgs.emacsPackages; [ (with pkgs.emacsPackages; [
origami origami
which-key #which-key
projectile # projectile
projectile-ripgrep #projectile-ripgrep
pkg-info pkg-info
expand-region expand-region
direnv direnv
@ -49,6 +49,8 @@ let
tempel tempel
tempel-collection tempel-collection
beacon beacon
hydra
rg
]); ]);
drv = makeFG42Drv { drv = makeFG42Drv {

65
nix/modules/editor/lisp/fg42/editor.el
View File

@ -50,37 +50,37 @@
(global-origami-mode t)) (global-origami-mode t))
(use! which-key ;; (use! which-key
"which-key is a minor mode for Emacs that displays the key bindings following ;; "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, ;; 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 ;; 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 ;; 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). ;; 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." ;; This includes prefixes like ~C-x 8~ which are shown in a different face."
:config ;; :config
(which-key-setup-side-window-bottom) ;; (which-key-setup-side-window-bottom)
(which-key-mode)) ;; (which-key-mode))
(use! projectile ;; (use! projectile
"Projectile is a project interaction library for Emacs. Its goal is to provide ;; "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 ;; a nice set of features operating on a project level without introducing
external dependencies." ;; external dependencies."
:hook (emacs-startup . projectile-mode) ;; :hook (emacs-startup . projectile-mode)
:config ;; :config
;; We don't want the auto discovery on startup ;; ;; We don't want the auto discovery on startup
(setq projectile-auto-discover nil) ;; (setq projectile-auto-discover nil)
(setq projectile-enable-caching t) ;; (setq projectile-enable-caching t)
:bind (:map projectile-mode-map ;; :bind (:map projectile-mode-map
("s-p" . projectile-command-map) ;; ("s-p" . projectile-command-map)
("C-c p" . projectile-command-map))) ;; ("C-c p" . projectile-command-map)))
(use! projectile-ripgrep (use! rg
"Use ripgrep with projectile" "A ripgrep based search utility."
:after projectile) :commands rg-menu
:bind ("C-c s" . rg-menu))
(use! pkg-info (use! pkg-info
"`pkg-info' integration.") "`pkg-info' integration.")
@ -220,6 +220,19 @@ of the Emacs Tempo library."
"A collection of tempel templates.") "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 "<f2>")
"zoom"
("g" text-scale-increase "in")
("l" text-scale-decrease "out")))
(use! beacon (use! beacon
"Never lose sight of your curser." "Never lose sight of your curser."
:hook (emacs-startup . beacon-mode)) :hook (emacs-startup . beacon-mode))

4
nix/modules/minibuffer-vertico/lisp/fg42/minibuffer-vertico.el
View File

@ -181,8 +181,8 @@ match all of the components in any order."
;; Configure the narrowing key. ;; Configure the narrowing key.
;; Both < and C-+ work reasonably well. ;; Both < and C-+ work reasonably well.
(setq consult-narrow-key "<") ;; "C-+" (setq consult-narrow-key "<") ;; "C-+"
(autoload 'projectile-project-root "projectile") (setq consult-project-function (lambda (_) (when (project-current)
(setq consult-project-function (lambda (_) (projectile-project-root))) (project-root (project-current)))))
;; Optionally make narrowing help available in the minibuffer. ;; Optionally make narrowing help available in the minibuffer.
;; You may want to use `embark-prefix-help-command' or which-key instead. ;; You may want to use `embark-prefix-help-command' or which-key instead.

6
nix/modules/noether/lisp/fg42/modeline/units.el
View File

@ -27,13 +27,13 @@
(require 'noether) (require 'noether)
(require 'noether-units) (require 'noether-units)
(require 'projectile) (require 'project)
(with-config "graphics" (with-config "graphics"
(require 'nerd-icons) (require 'nerd-icons)
(defvar fg42/-mode-icon) (defvar fg42/-mode-icon)
(defun fg42/-update-mode-icon () (defun fg42/-update-mode-icon ()
"Set the current buffer name to the watched var." "Set the current buffer name to the watched var."
(setq fg42/-mode-icon major-mode)) (setq fg42/-mode-icon major-mode))

4
nix/modules/noether/lisp/fg42/modeline/views.el
View File

@ -67,7 +67,7 @@
(buffer-name-unit (buffer-name-unit
:label (format "%s " (nerd-icons-codicon "nf-cod-layers")) :label (format "%s " (nerd-icons-codicon "nf-cod-layers"))
:len 20) :len 20)
(projectile-project-unit (project-unit
:label (format "%s " (nerd-icons-octicon "nf-oct-project")) :label (format "%s " (nerd-icons-octicon "nf-oct-project"))
:len 20) :len 20)
(git-branch-unit (git-branch-unit
@ -81,7 +81,7 @@
(buffer-name-unit (buffer-name-unit
:label "B: " :label "B: "
:len 20) :len 20)
(projectile-project-unit (project-unit
:label "P: " :label "P: "
:len 20) :len 20)
(git-branch-unit (git-branch-unit

1
nix/modules/noether/lisp/fg42/noether.el
View File

@ -53,7 +53,6 @@
"Smart mode line is a pretty simple yet fantastic alternative "Smart mode line is a pretty simple yet fantastic alternative
to Emacs modeline." to Emacs modeline."
:if (display-graphic-p) :if (display-graphic-p)
;;:after projectile
:commands noether-global-mode :commands noether-global-mode
:hook (emacs-startup . noether-global-mode) :hook (emacs-startup . noether-global-mode)
:config :config