Reshuffling stuff
This commit is contained in:
+10
-19
@@ -1261,21 +1261,26 @@ This sets up the zsh terminal
|
|||||||
** =generated/modules/apps/emacs/emacs.nix=
|
** =generated/modules/apps/emacs/emacs.nix=
|
||||||
This sets up the emacs terminal
|
This sets up the emacs terminal
|
||||||
#+BEGIN_SRC nix :tangle generated/modules/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
|
#+BEGIN_SRC nix :tangle generated/modules/apps/emacs/emacs.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
{ pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
|
flake.nixosModules.emacs = { config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# NixOS Configuration
|
# Optie om de module aan/uit te zetten
|
||||||
|
options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config";
|
||||||
|
|
||||||
|
config = lib.mkIf (config.mySystem.system.emacs.enable or false) {
|
||||||
|
# System packages (optioneel)
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Add system-wide packages here, if any
|
# Voeg systeem-brede packages toe als je wilt
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager Configuration for the user 'henrov'
|
# Home Manager configuratie
|
||||||
home-manager.users.henrov = {
|
home-manager.users.henrov = {
|
||||||
programs.emacs = {
|
programs.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
||||||
|
|
||||||
# Group related packages for clarity and easier maintenance
|
|
||||||
extraPackages = epkgs: with epkgs; [
|
extraPackages = epkgs: with epkgs; [
|
||||||
# Tree-sitter and language support
|
# Tree-sitter and language support
|
||||||
manualPackages.treesit-grammars.with-all-grammars
|
manualPackages.treesit-grammars.with-all-grammars
|
||||||
@@ -1334,27 +1339,13 @@ This sets up the emacs terminal
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Home Manager session variables
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "emacs";
|
EDITOR = "emacs";
|
||||||
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
||||||
};
|
};
|
||||||
/*
|
|
||||||
# Home Manager file management
|
|
||||||
home.file = {
|
|
||||||
"emacs/early-init.el" = {
|
|
||||||
source = ./early-init.el;
|
|
||||||
target = ".emacs.d/early-init.el";
|
|
||||||
};
|
};
|
||||||
"emacs/init.el" = {
|
|
||||||
source = ./init.el;
|
|
||||||
target = ".emacs.d/init.el";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** =generated/modules/apps/emacs/early-init.el=
|
** =generated/modules/apps/emacs/early-init.el=
|
||||||
|
|||||||
@@ -1,18 +1,23 @@
|
|||||||
{ pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
|
flake.nixosModules.emacs = { config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# NixOS Configuration
|
# Optie om de module aan/uit te zetten
|
||||||
|
options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config";
|
||||||
|
|
||||||
|
config = lib.mkIf (config.mySystem.system.emacs.enable or false) {
|
||||||
|
# System packages (optioneel)
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Add system-wide packages here, if any
|
# Voeg systeem-brede packages toe als je wilt
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager Configuration for the user 'henrov'
|
# Home Manager configuratie
|
||||||
home-manager.users.henrov = {
|
home-manager.users.henrov = {
|
||||||
programs.emacs = {
|
programs.emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
|
||||||
|
|
||||||
# Group related packages for clarity and easier maintenance
|
|
||||||
extraPackages = epkgs: with epkgs; [
|
extraPackages = epkgs: with epkgs; [
|
||||||
# Tree-sitter and language support
|
# Tree-sitter and language support
|
||||||
manualPackages.treesit-grammars.with-all-grammars
|
manualPackages.treesit-grammars.with-all-grammars
|
||||||
@@ -71,23 +76,10 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Home Manager session variables
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "emacs";
|
EDITOR = "emacs";
|
||||||
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
XDG_SCREENSHOTS_DIR = "~/screenshots";
|
||||||
};
|
};
|
||||||
/*
|
|
||||||
# Home Manager file management
|
|
||||||
home.file = {
|
|
||||||
"emacs/early-init.el" = {
|
|
||||||
source = ./early-init.el;
|
|
||||||
target = ".emacs.d/early-init.el";
|
|
||||||
};
|
};
|
||||||
"emacs/init.el" = {
|
|
||||||
source = ./init.el;
|
|
||||||
target = ".emacs.d/init.el";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user