mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

purge and merge emacs settings. still not perfect

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration.nix
View File

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

12
home.nix
View File

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

47
modules/emacs.nix
View File

@ -1,20 +1,33 @@
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, inputs, ... }:
{ {
home.packages = [ # home.packages = [
(pkgs.emacsWithPackages { # (pkgs.emacsWithPackages {
package = pkgs.emacs29; # package = pkgs.emacs29;
# config = ~/.emacs.d/init.el; # # config = ~/.emacs.d/init.el;
extraEmacsPackages = epkgs: [ # extraEmacsPackages = epkgs: [
epkgs.dash # epkgs.dash
epkgs.compat # epkgs.compat
epkgs.marginalia # epkgs.marginalia
epkgs.page-break-lines # epkgs.page-break-lines
epkgs.rainbow-mode # epkgs.rainbow-mode
epkgs.powershell # epkgs.powershell
epkgs.diminish # epkgs.diminish
# epkgs.general # # epkgs.general
epkgs.eldoc # 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;
};}

4
modules/shell.nix
View File

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