diff --git a/configs/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix b/configs/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix index 33fbcfea..426eb437 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix @@ -17,7 +17,7 @@ in config = lib.mkIf cfg.enable { programs.emacs = { enable = true; - package = pkgs.emacs30; + package = pkgs.emacs; extraPackages = epkgs: with epkgs; [ org-noter-pdftools org-pdftools diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/fuzzy-finding.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/fuzzy-finding.nix index 0d48ecbb..a1735644 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/fuzzy-finding.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/fuzzy-finding.nix @@ -22,21 +22,11 @@ in enable = true; }; - plugins.telescope.keymaps = lib.mkMerge [ - (lib.mkIf telescopeExtensions.frecency.enable { - "fp" = { - mode = "n"; - options.desc = "List projects"; - action = helpers.mkRaw "require('telescope').extensions.project.project{}"; - }; - }) - - (lib.mkIf telescopeExtensions.live-grep-args.enable { - "fG" = { - mode = "n"; - options.desc = "Live grep (with args) for the whole project"; - action = helpers.mkRaw "require('telescope').extensions.live_grep_args.live_grep_args"; - }; - }) - ]; + keymaps = + lib.optionals telescopeExtensions.live-grep-args.enable (lib.singleton { + mode = "n"; + key = "fG"; + options.desc = "Live grep (with args) for the whole project"; + action = helpers.mkRaw "require('telescope').extensions.live_grep_args.live_grep_args"; + }); } diff --git a/configs/home-manager/foo-dogsquared/modules/programs/vs-code.nix b/configs/home-manager/foo-dogsquared/modules/programs/vs-code.nix index 200fb78b..f53dfa39 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/vs-code.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/vs-code.nix @@ -34,9 +34,6 @@ in ] ++ lib.optionals userCfg.programs.browsers.firefox.enable [ firefox-devtools.vscode-firefox-debug - ] - ++ lib.optionals userCfg.programs.browsers.edge.enable [ - #ms-edgedevtools.vscode-edge-devtools ]; userSettings = {