purge and merge emacs settings. still not perfect

This commit is contained in:
Miranda Marquez 2024-09-22 16:27:52 -08:00
parent 6e03352e5a
commit 261135724c
5 changed files with 39 additions and 33 deletions

View File

@ -102,7 +102,6 @@
pkgs.fprintd
wget
vim
emacs29-pgtk
sg3_utils
nfs-utils
fontconfig

View File

@ -6,15 +6,14 @@ with lib.hm.gvariant;
./modules/dconf.nix
./modules/shell.nix
./modules/firefox.nix
# ./modules/emacs.nix
# ./modules/sway.nix
./modules/emacs.nix
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "mir";
home.homeDirectory = "/home/mir";
home.packages = [
pkgs.emacs-all-the-icons-fonts
pkgs.btop
pkgs.killall
pkgs.gdb
@ -56,11 +55,7 @@ with lib.hm.gvariant;
enable = true;
# version = "23.11";
};
# environment.variables = rec {
# EDITOR = "emacs -nw";
# };
home.sessionVariables = {
EDITOR = "emacs";
TERMINAL = "kitty";
TERM_PROGRAM = "kitty";
BROWSER = "firefox";
@ -92,11 +87,6 @@ with lib.hm.gvariant;
# programs.gdb = {
# enable = true;
# };
# home.file.".emacs.d" = {
# source = inputs.emacs-config;
# recursive = true;
# };
programs.gpg = {
enable = true;

View File

@ -1,20 +1,33 @@
{ lib, config, pkgs, inputs, ... }:
{
home.packages = [
(pkgs.emacsWithPackages {
package = pkgs.emacs29;
# config = ~/.emacs.d/init.el;
extraEmacsPackages = epkgs: [
epkgs.dash
epkgs.compat
epkgs.marginalia
epkgs.page-break-lines
epkgs.rainbow-mode
epkgs.powershell
epkgs.diminish
# epkgs.general
epkgs.eldoc
];
}
)];
# home.packages = [
# (pkgs.emacsWithPackages {
# package = pkgs.emacs29;
# # config = ~/.emacs.d/init.el;
# extraEmacsPackages = epkgs: [
# epkgs.dash
# epkgs.compat
# epkgs.marginalia
# epkgs.page-break-lines
# epkgs.rainbow-mode
# epkgs.powershell
# epkgs.diminish
# # epkgs.general
# epkgs.eldoc
# ];
# }
#)];
programs.emacs = {
enable = true;
package = pkgs.emacs29-pgtk.override {
# inherit (pkgs) imagemagickBig;
withImageMagick = true;
};
# package = (pkgs.emacsWithPackages.override {
# imagemagick = pkgs.imagemagickBig;
# withImagemagick = true;
# };
# }
# );
};
}

8
modules/gui/niri.nix Normal file
View File

@ -0,0 +1,8 @@
{ config, lib, pkgs, nixos-unstable, inputs, ... }:
{
programs.niri = {
enable = true;
# wrapperFeatures.gtk = true;
};}

View File

@ -6,9 +6,6 @@
# ls = "eza";
# tree = "eza -T";
# };
# initExtra = ''
# export EDITOR=emacs\ -nw
# '';
# };
programs.zsh = {
enable = true;
@ -19,7 +16,6 @@
ip = "ip -c";
};
initExtraFirst = ''
export EDITOR=emacs\ -nw
[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
source "$EAT_SHELL_INTEGRATION_DIR/zsh"
source ~/.p10k.zsh