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

Reshuffling stuff

Browse Source
This commit is contained in:
Henro Veijer
2026-03-18 18:57:36 +00:00
parent 5774e064dc
commit b8383c4125
2 changed files with 136 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+68 -77
View File
@@ -1261,100 +1261,91 @@ 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
environment.systemPackages = with pkgs; [ options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config";
# Add system-wide packages here, if any
];
# Home Manager Configuration for the user 'henrov' config = lib.mkIf (config.mySystem.system.emacs.enable or false) {
home-manager.users.henrov = { # System packages (optioneel)
programs.emacs = { environment.systemPackages = with pkgs; [
enable = true; # Voeg systeem-brede packages toe als je wilt
package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; ];
# Group related packages for clarity and easier maintenance # Home Manager configuratie
extraPackages = epkgs: with epkgs; [ home-manager.users.henrov = {
# Tree-sitter and language support programs.emacs = {
manualPackages.treesit-grammars.with-all-grammars enable = true;
rust-mode package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
rustic
nix-mode
hcl-mode
# UI/UX and navigation extraPackages = epkgs: with epkgs; [
nerd-icons # Tree-sitter and language support
doom-modeline manualPackages.treesit-grammars.with-all-grammars
diminish rust-mode
eldoc rustic
eldoc-box nix-mode
pulsar hcl-mode
which-key
avy
consult
vertico
marginalia
crux
shell-pop
# Completion and snippets # UI/UX and navigation
nerd-icons-corfu nerd-icons
corfu doom-modeline
cape diminish
orderless eldoc
yasnippet eldoc-box
yasnippet-snippets pulsar
which-key
avy
consult
vertico
marginalia
crux
shell-pop
# Utilities and tools # Completion and snippets
rg nerd-icons-corfu
exec-path-from-shell corfu
eat cape
f orderless
gptel yasnippet
nixpkgs-fmt yasnippet-snippets
envrc
# Theming # Utilities and tools
catppuccin-theme rg
exec-path-from-shell
eat
f
gptel
nixpkgs-fmt
envrc
# Git # Theming
magit catppuccin-theme
# Editing and workflow # Git
expreg magit
vundo
puni
# Error and side panel support # Editing and workflow
sideline expreg
sideline-flymake vundo
sideline-eglot puni
];
};
# Home Manager session variables # Error and side panel support
home.sessionVariables = { sideline
EDITOR = "emacs"; sideline-flymake
XDG_SCREENSHOTS_DIR = "~/screenshots"; sideline-eglot
}; ];
/*
# 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; home.sessionVariables = {
target = ".emacs.d/init.el"; EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots";
}; };
}; };
*/
}; };
} }
#+END_SRC #+END_SRC
** =generated/modules/apps/emacs/early-init.el= ** =generated/modules/apps/emacs/early-init.el=
Droidnix/generated/modules/apps/emacs/emacs.nix
+68 -76
View File
@@ -1,93 +1,85 @@
{ pkgs, ... }: { lib, ... }:
flake.nixosModules.emacs = { config, pkgs, lib, ... }:
{ {
# NixOS Configuration # Optie om de module aan/uit te zetten
environment.systemPackages = with pkgs; [ options.mySystem.system.emacs.enable = lib.mkEnableOption "Enable Emacs config";
# Add system-wide packages here, if any
];
# Home Manager Configuration for the user 'henrov' config = lib.mkIf (config.mySystem.system.emacs.enable or false) {
home-manager.users.henrov = { # System packages (optioneel)
programs.emacs = { environment.systemPackages = with pkgs; [
enable = true; # Voeg systeem-brede packages toe als je wilt
package = pkgs.emacs-pgtk.override { withTreeSitter = true; }; ];
# Group related packages for clarity and easier maintenance # Home Manager configuratie
extraPackages = epkgs: with epkgs; [ home-manager.users.henrov = {
# Tree-sitter and language support programs.emacs = {
manualPackages.treesit-grammars.with-all-grammars enable = true;
rust-mode package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
rustic
nix-mode
hcl-mode
# UI/UX and navigation extraPackages = epkgs: with epkgs; [
nerd-icons # Tree-sitter and language support
doom-modeline manualPackages.treesit-grammars.with-all-grammars
diminish rust-mode
eldoc rustic
eldoc-box nix-mode
pulsar hcl-mode
which-key
avy
consult
vertico
marginalia
crux
shell-pop
# Completion and snippets # UI/UX and navigation
nerd-icons-corfu nerd-icons
corfu doom-modeline
cape diminish
orderless eldoc
yasnippet eldoc-box
yasnippet-snippets pulsar
which-key
avy
consult
vertico
marginalia
crux
shell-pop
# Utilities and tools # Completion and snippets
rg nerd-icons-corfu
exec-path-from-shell corfu
eat cape
f orderless
gptel yasnippet
nixpkgs-fmt yasnippet-snippets
envrc
# Theming # Utilities and tools
catppuccin-theme rg
exec-path-from-shell
eat
f
gptel
nixpkgs-fmt
envrc
# Git # Theming
magit catppuccin-theme
# Editing and workflow # Git
expreg magit
vundo
puni
# Error and side panel support # Editing and workflow
sideline expreg
sideline-flymake vundo
sideline-eglot puni
];
};
# Home Manager session variables # Error and side panel support
home.sessionVariables = { sideline
EDITOR = "emacs"; sideline-flymake
XDG_SCREENSHOTS_DIR = "~/screenshots"; sideline-eglot
}; ];
/*
# 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; home.sessionVariables = {
target = ".emacs.d/init.el"; EDITOR = "emacs";
XDG_SCREENSHOTS_DIR = "~/screenshots";
}; };
}; };
*/
}; };
} }