chore(emacs): bump emacs-overlay

Also removes the magit-file-icons input to fix conflicting versions of `compat`
gekoke · Oct 8, 2024 · 6cf50f1 · 6cf50f1
1 parent b6e510c
commit 6cf50f1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 182 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -34,8 +34,6 @@
     spicetify-nix.url = "github:Gerg-L/spicetify-nix";
     spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
 
-    magit-file-icons.url = "github:gekoke/magit-file-icons";
-
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
   };
 

diff --git a/modules/nixos/programs/emacs/default.nix b/modules/nixos/programs/emacs/default.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
   config,
   lib,
   pkgs,
@@ -36,7 +35,6 @@ in
         override = pkgs.callPackage ./overlay.nix { };
         extraEmacsPackages = epkgs: [
           epkgs.treesit-grammars.with-all-grammars
-          inputs.magit-file-icons.packages.${pkgs.system}.default
           pkgs.elementary.typst-ts-mode
           pkgs.elementary.kanagawa-theme
           pkgs.elementary.indent-bars

diff --git a/modules/nixos/programs/emacs/init.el b/modules/nixos/programs/emacs/init.el
@@ -637,7 +637,6 @@
 (setq ediff-window-setup-function 'ediff-setup-windows-plain)
 
 (use-package magit-file-icons
-  :ensure nil
   :after magit
   :config
   (magit-file-icons-mode))
@@ -812,7 +811,7 @@
                             (require 'lsp-pyright)
                             (lsp))))
 
-(use-package lsp-ruff-lsp
+(use-package lsp-ruff
   :ensure lsp-mode
   :after lsp-mode)