home: refactor common files
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
		@@ -1,38 +0,0 @@
 | 
			
		||||
{ config, pkgs, inputs, lib, ... }:
 | 
			
		||||
let
 | 
			
		||||
  emacs = pkgs.emacs-git-pgtk;
 | 
			
		||||
  configFile = ./config/emacs/config.org;
 | 
			
		||||
  enable = true;
 | 
			
		||||
in
 | 
			
		||||
{
 | 
			
		||||
  nixpkgs.overlays = [ inputs.emacs-overlay.overlays.default ];
 | 
			
		||||
 | 
			
		||||
  home = {
 | 
			
		||||
    shellAliases = rec {
 | 
			
		||||
      e = "emacs";
 | 
			
		||||
      enw = e + " -nw";
 | 
			
		||||
      ec = "emacsclient";
 | 
			
		||||
      ecc = ec + " -c";
 | 
			
		||||
      ecnw = ec + " -nw";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  programs.emacs = {
 | 
			
		||||
    inherit enable;
 | 
			
		||||
    package = pkgs.emacsWithPackagesFromUsePackage {
 | 
			
		||||
      config = configFile;
 | 
			
		||||
      package = emacs;
 | 
			
		||||
      alwaysEnsure = true;
 | 
			
		||||
      alwaysTangle = true;
 | 
			
		||||
      defaultInitFile = true;
 | 
			
		||||
      extraEmacsPackages = epkgs: with epkgs; [
 | 
			
		||||
        use-package
 | 
			
		||||
        (tree-sitter-langs.withPlugins (_: tree-sitter-langs.plugins))
 | 
			
		||||
      ];
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  services.emacs = {
 | 
			
		||||
    inherit enable;
 | 
			
		||||
    defaultEditor = true;
 | 
			
		||||
  };
 | 
			
		||||
  systemd.user.services.emacs.Service.Environment = "COLORTERM=truecolor";
 | 
			
		||||
}
 | 
			
		||||
@@ -37,33 +37,6 @@
 | 
			
		||||
    dunst
 | 
			
		||||
    zenity
 | 
			
		||||
 | 
			
		||||
    # Programming and dev stuff
 | 
			
		||||
    (texlive.combine {
 | 
			
		||||
      inherit (texlive)
 | 
			
		||||
        scheme-small
 | 
			
		||||
        babel
 | 
			
		||||
        lm
 | 
			
		||||
        graphics-def
 | 
			
		||||
        url
 | 
			
		||||
        mhchem
 | 
			
		||||
        wrapfig
 | 
			
		||||
        capt-of
 | 
			
		||||
        minted
 | 
			
		||||
        fvextra
 | 
			
		||||
        xstring
 | 
			
		||||
        catchfile
 | 
			
		||||
        framed
 | 
			
		||||
        upquote
 | 
			
		||||
        pdfsync
 | 
			
		||||
        tocloft
 | 
			
		||||
        enumitem
 | 
			
		||||
        multirow
 | 
			
		||||
        adjustbox
 | 
			
		||||
        titlesec
 | 
			
		||||
        tcolorbox;
 | 
			
		||||
    })
 | 
			
		||||
    python3Packages.pygments
 | 
			
		||||
 | 
			
		||||
    # Misc
 | 
			
		||||
    anki
 | 
			
		||||
    tor-browser-bundle-bin
 | 
			
		||||
 
 | 
			
		||||
@@ -25,6 +25,7 @@
 | 
			
		||||
      enable = true;
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    password-store.enable = true;
 | 
			
		||||
    go.enable = true;
 | 
			
		||||
    foot = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user