diff options
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | modules/emacs/README.org | 36 | ||||
| -rw-r--r-- | modules/emacs/emacs.nix | 2 | ||||
| -rw-r--r-- | users/leonardo.nix | 4 |
4 files changed, 44 insertions, 40 deletions
@@ -56,11 +56,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716916086, - "narHash": "sha256-n/uf+jsjrXDUuDE6npM2hFfmPRfoYmEcpcoUuPstwi8=", + "lastModified": 1718183320, + "narHash": "sha256-L0b6hyf9EWeWKhmUwTQvbLtBtLBblyYJ3llOTsLIr0s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b6c62d8135f943ea1e2733aa644cbd146afe2d62", + "rev": "7aa1c14402a09fc043110d6477aa5cc90e60e409", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1716813977, - "narHash": "sha256-8fabA8OY1n2OcJFbbE03+bMydVANSBrNGo8hkzhXxxU=", + "lastModified": 1717963159, + "narHash": "sha256-IkplGeSrZUdzxAOdXtOTecvyAiVSzGO45/xjDeof6QE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "8171c0578feb835ce66d49edba7429f46b7ac3f6", + "rev": "16e2c33e3c817208811e389fc716d6c4aabf7923", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1716908526, - "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "373ead20606efa9181cd15ba19a5deac7ead1492", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -178,11 +178,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1718265846, + "narHash": "sha256-h4MnTID6ciFxtTvtl+ibXMKaG6iLMezCtUvKIfFG7r0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "d75003136c0fc94ee60e51806c2801ff572d06a6", "type": "github" }, "original": { @@ -193,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1718060059, + "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { diff --git a/modules/emacs/README.org b/modules/emacs/README.org index 4b9c6dd..92044b2 100644 --- a/modules/emacs/README.org +++ b/modules/emacs/README.org @@ -23,6 +23,8 @@ You can also use it as a ~nixosModule~, in order to add additional packages like (setq ring-bell-function 'ignore) (setq-default indent-tabs-mode nil) + +(setq window-combination-resize t) #+end_src ** Theme and font @@ -49,6 +51,13 @@ You can also use it as a ~nixosModule~, in order to add additional packages like #+end_src * Utility +** Searching +#+begin_src emacs-lisp :tangle yes +(use-package rg) + +(setq isearch-lazy-count t) +(setq isearch-lazy-highlight t) +#+end_src ** Age encryption Configuration to automagically open age files, and to encrypt them correctly to all my machines. #+begin_src emacs-lisp :tangle yes @@ -75,11 +84,9 @@ Configuration to automagically open age files, and to encrypt them correctly to ** All the Icons Works through nixosModules. #+begin_src emacs-lisp :tangle yes -(use-package all-the-icons - :if (display-graphic-p)) +(use-package all-the-icons) (use-package all-the-icons-completion - :if (display-graphic-p) :after all-the-icons :hook (marginalia-mode . all-the-icons-completion-mode)) #+end_src @@ -110,20 +117,17 @@ To interact with gitlab and github. ** Vertico, Orderless, Marginalia Pretty minibuffer support #+begin_src emacs-lisp :tangle yes - (use-package vertico - :config (vertico-mode)) - - (use-package orderless - :custom - (completion-styles '(orderless basic)) - (completion-category-defaults nil) - (completion-category-overrides '((file (styles basic partial-completion))))) +(use-package vertico + :config (vertico-mode)) - (use-package marginalia - :config (marginalia-mode)) +(use-package orderless + :custom + (completion-styles '(orderless basic)) + (completion-category-defaults nil) + (completion-category-overrides '((file (styles basic partial-completion))))) - (use-package ctrlf - :config (ctrlf-mode +1)) +(use-package marginalia + :config (marginalia-mode)) #+end_src ** Projects #+begin_src emacs-lisp :tangle yes @@ -217,7 +221,7 @@ Add support for ansi escape codes in compilation :custom (compilation-environment '("TERM=xterm-256color"))) (defun my/advice-compilation-filter (f proc string) (funcall f proc (xterm-color-filter string))) -(advice-add 'compilation-filter :around #'my/advice-compilation-filter) +(add-hook 'compilation-filter-hook #'my/advice-compilation-filter) #+end_src ** Pdf reader diff --git a/modules/emacs/emacs.nix b/modules/emacs/emacs.nix index a4e1722..bb0626b 100644 --- a/modules/emacs/emacs.nix +++ b/modules/emacs/emacs.nix @@ -7,8 +7,8 @@ let pylsp-mypy ]))) nil - rust-analyzer parallel + ripgrep ]; org-tangle-elisp-blocks = (pkgs.callPackage ./org.nix {inherit pkgs; from-elisp = inputs.from-elisp;}).org-tangle ({ language, flags } : let is-elisp = (language == "emacs-lisp") || (language == "elisp"); diff --git a/users/leonardo.nix b/users/leonardo.nix index 10d9602..5d85267 100644 --- a/users/leonardo.nix +++ b/users/leonardo.nix @@ -56,8 +56,8 @@ in PS1="> " ;; xterm*|rxvt*|eterm*|screen*) - PS1="\033[1;95m\[[\h]\]\033[0m \033[0;32m\[\w\]\033[0m :: " - PS1=$PS1'\[$(vterm_prompt_end)\]' + PS1="\033[1;95m[\h]\033[0m \033[0;32m\w\033[0m :: " + PS1=$PS1'$(vterm_prompt_end)' ;; *) PS1="> " |