From 5e6ff689e0dcffbf012b5224219c027b0e109acf Mon Sep 17 00:00:00 2001 From: Leonardo Santiago Date: Sat, 31 May 2025 16:03:59 -0300 Subject: fix: fix `.envrc` --- flake.lock | 12 ++++++------ modules/emacs/README.org | 7 +++++-- modules/gnome/default.nix | 12 +++++------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3cf9dbf..fcc1d6c 100644 --- a/flake.lock +++ b/flake.lock @@ -483,11 +483,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -712,11 +712,11 @@ ] }, "locked": { - "lastModified": 1746725877, - "narHash": "sha256-0YQx51XJyV43yjdv2+RHoO+C8wgI5V9L1DGVGr1+8hY=", + "lastModified": 1748574694, + "narHash": "sha256-VZFWDs3sBj9tXJsSAVJplzfzGYya7HVdOrzyMH/zPPo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1965b827dc7f89e48744ec52e41dce920485ea85", + "rev": "52cda0df1e094cbd8b0699d1cb6386beaffb4863", "type": "github" }, "original": { diff --git a/modules/emacs/README.org b/modules/emacs/README.org index 54c1345..1e41cd4 100644 --- a/modules/emacs/README.org +++ b/modules/emacs/README.org @@ -120,7 +120,6 @@ Configuration to automagically open age files, and to encrypt them correctly to (nerd-icons-completion-mode)) (use-package nerd-icons-dired - :hook (dired-mode . nerd-icons-dired-mode) :diminish nerd-icons-dired :custom (dired-listing-switches "-alh")) @@ -130,7 +129,11 @@ Configuration to automagically open age files, and to encrypt them correctly to To integrate with nix shells. #+begin_src emacs-lisp :tangle yes (use-package envrc - :config (envrc-global-mode)) + :config + (envrc-global-mode) + ;; HACK: add emacs' `exec-path` back to `PATH` in order to keep + ;; envrc from deleting special entries added into emacs' `exec-path` on reload + (setenv "PATH" (mapconcat 'identity (cons (getenv "PATH") exec-path) ":"))) #+end_src ** Magit Configurations for magit diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index fe25ccf..469121a 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -55,14 +55,12 @@ hitori # sudoku game atomix # puzzle game ]; - services.xserver = { - displayManager.gdm = { - enable = true; - wayland = true; - }; - desktopManager.gnome.enable = true; - excludePackages = [ pkgs.xterm ]; + services.displayManager.gdm = { + enable = true; + wayland = true; }; + services.desktopManager.gnome.enable = true; + services.xserver.excludePackages = [ pkgs.xterm ]; services.udev.packages = [ pkgs.gnome-settings-daemon ]; services.gnome = { gnome-browser-connector.enable = true; -- cgit v1.2.3