We have made an emacs conf with profiles. And refactored lab tool to use deploy-rs
This commit is contained in:
parent
24b01ae4f0
commit
bff56e4ffc
22 changed files with 1448 additions and 176 deletions
285
modules/development/emacs.nix
Normal file
285
modules/development/emacs.nix
Normal file
|
|
@ -0,0 +1,285 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.services.emacs-profiles;
|
||||
|
||||
# Emacs package configurations for different profiles
|
||||
packageSets = {
|
||||
# Essential packages for all profiles
|
||||
essential = epkgs:
|
||||
with epkgs; [
|
||||
use-package
|
||||
diminish
|
||||
bind-key
|
||||
which-key
|
||||
exec-path-from-shell # Critical for integrating with Nix environment
|
||||
];
|
||||
|
||||
# Minimal packages for server profile
|
||||
minimal = epkgs:
|
||||
with epkgs; [
|
||||
# Basic editing
|
||||
smartparens
|
||||
expand-region
|
||||
|
||||
# Essential navigation (pure Emacs, no external deps)
|
||||
vertico
|
||||
consult
|
||||
marginalia
|
||||
orderless
|
||||
|
||||
# Basic modes for config files
|
||||
nix-mode # Essential for Nix ecosystem
|
||||
yaml-mode
|
||||
markdown-mode
|
||||
|
||||
# Org mode essentials
|
||||
org
|
||||
org-roam
|
||||
];
|
||||
|
||||
# Development packages for laptop/workstation
|
||||
development = epkgs:
|
||||
with epkgs; [
|
||||
# Advanced navigation and completion
|
||||
vertico
|
||||
consult
|
||||
marginalia
|
||||
orderless
|
||||
embark
|
||||
embark-consult
|
||||
corfu
|
||||
cape
|
||||
|
||||
# Project management
|
||||
projectile
|
||||
magit
|
||||
forge
|
||||
|
||||
# Development tools
|
||||
lsp-mode
|
||||
lsp-ui
|
||||
company
|
||||
flycheck
|
||||
yasnippet
|
||||
|
||||
# Language support
|
||||
nix-mode
|
||||
rust-mode
|
||||
python-mode
|
||||
typescript-mode
|
||||
json-mode
|
||||
yaml-mode
|
||||
markdown-mode
|
||||
|
||||
# Org mode and knowledge management
|
||||
org
|
||||
org-roam
|
||||
org-roam-ui
|
||||
org-agenda
|
||||
|
||||
# UI enhancements
|
||||
doom-themes
|
||||
doom-modeline
|
||||
all-the-icons
|
||||
rainbow-delimiters
|
||||
highlight-indent-guides
|
||||
|
||||
# Editing enhancements
|
||||
smartparens
|
||||
expand-region
|
||||
multiple-cursors
|
||||
avy
|
||||
ace-window
|
||||
|
||||
# Terminal integration
|
||||
vterm
|
||||
eshell-git-prompt
|
||||
];
|
||||
|
||||
# Full workstation packages
|
||||
workstation = epkgs:
|
||||
with epkgs; [
|
||||
# All development packages plus extras
|
||||
claude-code # AI assistance (when available)
|
||||
pdf-tools
|
||||
nov # EPUB reader
|
||||
elfeed # RSS reader
|
||||
mu4e # Email (if configured)
|
||||
dired-sidebar
|
||||
treemacs
|
||||
treemacs-projectile
|
||||
treemacs-magit
|
||||
];
|
||||
};
|
||||
|
||||
# Generate Emacs configuration based on profile
|
||||
# Uses emacs-gtk to track upstream with GTK3 support for desktop profiles
|
||||
# Uses emacs-nox for server profiles (no X11/GUI dependencies)
|
||||
emacsWithProfile = profile: let
|
||||
# Choose Emacs package based on profile
|
||||
emacsPackage =
|
||||
if profile == "server"
|
||||
then pkgs.emacs-nox # No GUI for servers
|
||||
else pkgs.emacs-gtk; # GTK3 for desktops
|
||||
|
||||
# Combine package sets based on profile
|
||||
selectedPackages = epkgs:
|
||||
(packageSets.essential epkgs)
|
||||
++ (
|
||||
if profile == "server"
|
||||
then packageSets.minimal epkgs
|
||||
else if profile == "laptop"
|
||||
then packageSets.development epkgs
|
||||
else if profile == "workstation"
|
||||
then (packageSets.development epkgs) ++ (packageSets.workstation epkgs)
|
||||
else packageSets.minimal epkgs
|
||||
);
|
||||
in
|
||||
pkgs.emacsWithPackagesFromUsePackage {
|
||||
config = builtins.readFile ../../dotfiles/geir/emacs-config/init-nix.el;
|
||||
package = emacsPackage;
|
||||
extraEmacsPackages = selectedPackages;
|
||||
|
||||
# Provide external tools that Emacs will use
|
||||
# These will be available via environment variables
|
||||
override = epkgs:
|
||||
epkgs
|
||||
// {
|
||||
# External tools for Emacs integration
|
||||
external-tools =
|
||||
[
|
||||
pkgs.ripgrep # for fast searching
|
||||
pkgs.fd # for file finding
|
||||
pkgs.sqlite # for org-roam database
|
||||
pkgs.ag # the silver searcher
|
||||
pkgs.git # version control
|
||||
pkgs.direnv # environment management
|
||||
|
||||
# Language servers (when available)
|
||||
pkgs.nixd # Nix language server
|
||||
pkgs.nodePackages.bash-language-server
|
||||
pkgs.nodePackages.yaml-language-server
|
||||
pkgs.marksman # Markdown language server
|
||||
|
||||
# Formatters
|
||||
pkgs.alejandra # Nix formatter
|
||||
pkgs.shellcheck # Shell script analysis
|
||||
pkgs.shfmt # Shell script formatter
|
||||
]
|
||||
++ lib.optionals (profile != "server") [
|
||||
# Additional tools for development profiles
|
||||
pkgs.nodejs # for various language servers
|
||||
pkgs.python3 # for Python development
|
||||
pkgs.rustup # Rust toolchain
|
||||
pkgs.go # Go language
|
||||
];
|
||||
};
|
||||
};
|
||||
in {
|
||||
options.services.emacs-profiles = {
|
||||
enable = mkEnableOption "Emacs with machine-specific profiles";
|
||||
|
||||
profile = mkOption {
|
||||
type = types.enum ["server" "laptop" "workstation"];
|
||||
default = "laptop";
|
||||
description = "Emacs profile to use based on machine type";
|
||||
};
|
||||
|
||||
enableDaemon = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Enable Emacs daemon service";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "geir";
|
||||
description = "User to run Emacs daemon for";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# Install Emacs with the selected profile
|
||||
environment.systemPackages = [
|
||||
(emacsWithProfile cfg.profile)
|
||||
];
|
||||
|
||||
# System-wide Emacs daemon (optional)
|
||||
services.emacs = mkIf cfg.enableDaemon {
|
||||
enable = true;
|
||||
package = emacsWithProfile cfg.profile;
|
||||
};
|
||||
|
||||
# Create the Emacs configuration directory structure
|
||||
environment.etc = {
|
||||
"emacs/init.el" = {
|
||||
source = ../../dotfiles/geir/emacs-config/init-nix.el;
|
||||
mode = "0644";
|
||||
};
|
||||
|
||||
# Module files
|
||||
"emacs/modules/ui.el" = {
|
||||
source = ../../dotfiles/geir/emacs-config/modules/ui.el;
|
||||
mode = "0644";
|
||||
};
|
||||
|
||||
"emacs/modules/completion.el" = {
|
||||
source = ../../dotfiles/geir/emacs-config/modules/completion.el;
|
||||
mode = "0644";
|
||||
};
|
||||
|
||||
"emacs/modules/navigation.el" = {
|
||||
source = ../../dotfiles/geir/emacs-config/modules/navigation.el;
|
||||
mode = "0644";
|
||||
};
|
||||
|
||||
"emacs/modules/development.el" = {
|
||||
source = ../../dotfiles/geir/emacs-config/modules/development.el;
|
||||
mode = "0644";
|
||||
};
|
||||
|
||||
"emacs/modules/elisp-development.el" = {
|
||||
source = ../../dotfiles/geir/emacs-config/modules/elisp-development.el;
|
||||
mode = "0644";
|
||||
};
|
||||
|
||||
"emacs/modules/claude-code.el" = mkIf (cfg.profile == "workstation") {
|
||||
source = ../../dotfiles/geir/emacs-config/modules/claude-code.el;
|
||||
mode = "0644";
|
||||
};
|
||||
};
|
||||
|
||||
# Environment variables for Nix integration
|
||||
environment.variables = {
|
||||
EMACS_PROFILE = cfg.profile;
|
||||
|
||||
# Tool paths for Emacs integration
|
||||
RG_PATH = "${pkgs.ripgrep}/bin/rg";
|
||||
FD_PATH = "${pkgs.fd}/bin/fd";
|
||||
SQLITE_PATH = "${pkgs.sqlite}/bin/sqlite3";
|
||||
AG_PATH = "${pkgs.ag}/bin/ag";
|
||||
|
||||
# Language servers
|
||||
NIL_LSP_PATH = "${pkgs.nixd}/bin/nixd";
|
||||
BASH_LSP_PATH = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
|
||||
YAML_LSP_PATH = "${pkgs.nodePackages.yaml-language-server}/bin/yaml-language-server";
|
||||
|
||||
# Formatters
|
||||
SHELLCHECK_PATH = "${pkgs.shellcheck}/bin/shellcheck";
|
||||
ALEJANDRA_PATH = "${pkgs.alejandra}/bin/alejandra";
|
||||
};
|
||||
|
||||
# Ensure the user can access the Emacs daemon
|
||||
systemd.user.services.emacs = mkIf cfg.enableDaemon {
|
||||
environment = {
|
||||
EMACS_PROFILE = cfg.profile;
|
||||
NIX_PATH = config.environment.variables.NIX_PATH or "";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -8,9 +8,7 @@
|
|||
# Editors
|
||||
zed-editor
|
||||
neovim
|
||||
emacs
|
||||
vscode
|
||||
vscodium-fhs
|
||||
|
||||
# Language servers
|
||||
nixd
|
||||
|
|
@ -35,12 +33,13 @@
|
|||
direnv
|
||||
gh
|
||||
github-copilot-cli
|
||||
deploy-rs
|
||||
# ai
|
||||
claude-code
|
||||
];
|
||||
|
||||
# System-wide Emacs daemon
|
||||
services.emacs.enable = true;
|
||||
# Note: Emacs is now configured via modules/development/emacs.nix
|
||||
# with machine-specific profiles
|
||||
|
||||
# Enable ZSH system-wide for development
|
||||
programs.zsh.enable = true;
|
||||
|
|
|
|||
|
|
@ -78,6 +78,33 @@
|
|||
User sma
|
||||
IdentityFile ~/.ssh/id_ed25519_admin
|
||||
|
||||
# Direct sma user access via Tailscale for deployments
|
||||
Host sma@sleeper-service.tail807ea.ts.net
|
||||
Hostname sleeper-service.tail807ea.ts.net
|
||||
User sma
|
||||
IdentityFile ~/.ssh/id_ed25519_admin
|
||||
|
||||
Host sma@grey-area.tail807ea.ts.net
|
||||
Hostname grey-area.tail807ea.ts.net
|
||||
User sma
|
||||
IdentityFile ~/.ssh/id_ed25519_admin
|
||||
|
||||
Host sma@reverse-proxy.tail807ea.ts.net
|
||||
Hostname reverse-proxy.tail807ea.ts.net
|
||||
User sma
|
||||
IdentityFile ~/.ssh/id_ed25519_admin
|
||||
|
||||
Host sma@little-rascal.tail807ea.ts.net
|
||||
Hostname little-rascal.tail807ea.ts.net
|
||||
User sma
|
||||
IdentityFile ~/.ssh/id_ed25519_admin
|
||||
|
||||
# Localhost sma user for local deployment from laptop
|
||||
Host sma@localhost
|
||||
Hostname localhost
|
||||
User sma
|
||||
IdentityFile ~/.ssh/id_ed25519_admin
|
||||
|
||||
# Tailscale network
|
||||
Host 100.* *.tail*
|
||||
User geir
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue