adding yazi, refactor emacs package config, more

This commit is contained in:
Matt Nish-Lapidus 2025-01-31 23:40:31 -05:00
parent fe95c5af51
commit 29f9ba670f
6 changed files with 208 additions and 115 deletions

View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, inputs, outputs, ... }:
{ config, pkgs, inputs, outputs, ... }:
{
nixpkgs = {
@ -6,6 +6,10 @@
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
(import (builtins.fetchTarball {
url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
sha256 = "0cfz3178ija6s37pa5rdfmqpcqj38gchn1y9q4iln2jrqh8v600i";
}))
];
config = {
@ -86,9 +90,7 @@
# SDL2.dev
protonplus
ispell
aspell
aspellDicts.en
aspellDicts.en-computers
(aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ]))
texlive.combined.scheme-full
appimage-run
libappimage
@ -238,7 +240,7 @@
vorta
stirling-pdf
trash-cli
ripdrag
wineWowPackages.stagingFull
winetricks
@ -319,7 +321,6 @@
alsa-tools
clapper
ardour
parinfer-rust-emacs
dockfmt
impala
unstable.playerctl
@ -474,7 +475,18 @@
yazi = {
enable = true;
enableFishIntegration = true;
package = pkgs.unstable.yazi;
package = inputs.yazi.packages.x86_64-linux.default;
keymap = {
manager.prepend_keymap = [
{
on = "<C-d>";
run = ''shell 'ripdrag "$@" -x 2>/dev/null &' --confirm'';
}
];
};
settings = {
};
};
fish = {
enable = true;
@ -499,6 +511,9 @@
}
];
};
zoxide = {
enable = true;
};
starship = {
enable = true;
};
@ -507,29 +522,24 @@
msmtp.enable = true;
emacs = {
enable = true;
package = (pkgs.emacs29-pgtk.override {
withGTK3 = true;
# withPGTK = true;
withXwidgets = true;
withNativeCompilation = true;
withTreeSitter = true;
withImageMagick = true;
});
extraPackages = epkgs: [
epkgs.mu4e
epkgs.vterm
epkgs.sly
epkgs.sly-quicklisp
epkgs.geiser-racket
epkgs.editorconfig
epkgs.shfmt
epkgs.nixpkgs-fmt
epkgs.nixfmt
epkgs.parinfer-rust-mode
epkgs.tree-sitter-langs
# epkgs.gpastel
epkgs.pdf-tools
];
package = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (
epkgs: [
epkgs.vterm
epkgs.mu4e
epkgs.sly
epkgs.sly-quicklisp
epkgs.geiser-racket
epkgs.editorconfig
epkgs.shfmt
epkgs.nixpkgs-fmt
epkgs.nixfmt
epkgs.parinfer-rust-mode
epkgs.tree-sitter-langs
epkgs.treesit-grammars.with-all-grammars
epkgs.pretty-sha-path
epkgs.pdf-tools
]
));
};
ripgrep = {
enable = true;
@ -609,10 +619,7 @@
swaylock = {
enable = true;
settings = {
font-size = 24;
indicator-idle-visible = true;
indicator-radius = 200;
color="1e1e1e";
color="000000";
bs-hl-color="f5e0dc";
caps-lock-bs-hl-color="f5e0dc";
caps-lock-key-hl-color="a6e3a1";
@ -738,14 +745,24 @@
emacs = {
enable = true;
defaultEditor = true;
package = (pkgs.emacs29-pgtk.override {
withGTK3 = true;
# withPGTK = true;
withXwidgets = true;
withNativeCompilation = true;
withTreeSitter = true;
withImageMagick = true;
});
package = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (
epkgs: [
epkgs.vterm
epkgs.mu4e
epkgs.sly
epkgs.sly-quicklisp
epkgs.geiser-racket
epkgs.editorconfig
epkgs.shfmt
epkgs.nixpkgs-fmt
epkgs.nixfmt
epkgs.parinfer-rust-mode
epkgs.tree-sitter-langs
epkgs.treesit-grammars.with-all-grammars
epkgs.pretty-sha-path
epkgs.pdf-tools
]
));
socketActivation.enable = true;
client = {
enable = true;