9f7c2640b5
✅ Completed Tasks: - Task 6: Successfully tested deploy-rs on all machines (grey-area, reverse-proxy, congenital-optimist) - Task 7: Added deploy-rs status monitoring to lab tool 🔧 Infrastructure Improvements: - Added sma user to local machine for consistent SSH access - Created shared shell-aliases.nix module to eliminate conflicts - Enhanced lab status command with deploy-rs deployment info - Added generation tracking, build dates, and uptime monitoring 🚀 Deploy-rs Status: - All 4 machines successfully tested with both dry-run and actual deployments - Automatic rollback protection working correctly - Health checks and magic rollback functioning properly - Tailscale connectivity verified across all nodes 📊 New Status Features: - lab status --deploy-rs: Shows deployment details - lab status -v: Verbose SSH connection info - lab status -vd: Combined verbose + deploy-rs info - Real-time generation and system closure information The hybrid deployment approach is now fully operational with modern safety features while maintaining legacy compatibility.
177 lines
4.4 KiB
Nix
177 lines
4.4 KiB
Nix
# Primary User Configuration - geir
|
|
# Main user account for development and desktop use
|
|
{
|
|
config,
|
|
pkgs,
|
|
...
|
|
}: let
|
|
# Import custom packages from the flake
|
|
homeLabPackages = import ../../packages {inherit pkgs;};
|
|
in {
|
|
imports = [
|
|
./media-group.nix
|
|
];
|
|
|
|
users.users.geir = {
|
|
description = "Geir Okkenhaug Jerstad - Primary User";
|
|
isNormalUser = true;
|
|
|
|
# User groups for development and desktop use
|
|
extraGroups = [
|
|
"wheel" # sudo access
|
|
"networkmanager" # network management
|
|
"libvirt" # virtualization
|
|
"incus-admin" # container management
|
|
"podman" # container runtime
|
|
"audio" # audio devices
|
|
"video" # video devices
|
|
"render" # GPU access
|
|
"media" # shared media access for NFS shares
|
|
];
|
|
|
|
shell = pkgs.zsh;
|
|
|
|
# SSH access with development keys
|
|
openssh.authorizedKeys.keys = [
|
|
# Current key (keep for continuity during transition)
|
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHeOvTHIw+hZOAiWkIrz9t11UeGwxAMx7jN/1IIdgq7O geokkjer@gmail.com"
|
|
# New development key
|
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHukJK0Kc1YexvzF8PdqaqWNZdVffGoM6ePPMecrU6dM geir@geokkjer.eu-dev"
|
|
];
|
|
|
|
# User-specific packages
|
|
packages = with pkgs; [
|
|
# Home lab management tools
|
|
homeLabPackages.lab
|
|
|
|
# Terminal applications & system monitoring
|
|
kitty
|
|
terminator
|
|
starship
|
|
ghostty
|
|
|
|
# Essential system tools (moved duplicates to base.nix)
|
|
mc
|
|
|
|
# Browsers & Communication
|
|
firefox
|
|
chromium
|
|
vesktop
|
|
vivaldi
|
|
vivaldi-ffmpeg-codecs
|
|
|
|
# Shell Enhancement & Fun
|
|
nerdfetch
|
|
neo-cowsay
|
|
fortune
|
|
clolcat
|
|
|
|
# Audio & System Control
|
|
ncpamixer
|
|
pavucontrol
|
|
|
|
# Productivity
|
|
koodo-reader
|
|
|
|
# Development & System Management
|
|
neovim
|
|
vscode
|
|
git-credential-manager
|
|
nodejs
|
|
virt-manager
|
|
|
|
# Creative Tools (optional - remove if not needed)
|
|
gimp
|
|
obs-studio
|
|
inkscape
|
|
|
|
# AI Tools
|
|
opencode # AI code assistant
|
|
|
|
# Container tools
|
|
podman-compose
|
|
podman-desktop
|
|
|
|
# Media
|
|
celluloid
|
|
ytmdesktop
|
|
|
|
# Emacs Integration
|
|
emacsPackages.vterm
|
|
# Gaming
|
|
steam
|
|
# Desktop integration (moved from system)
|
|
dbus
|
|
wayland
|
|
xwayland
|
|
xwayland-satellite
|
|
xdg-utils
|
|
];
|
|
};
|
|
|
|
# User-specific services and configurations
|
|
|
|
# Enable automatic login for primary user (optional, can be disabled for security)
|
|
# services.xserver.displayManager.autoLogin = {
|
|
# enable = true;
|
|
# user = "geir";
|
|
# };
|
|
|
|
# User-specific environment variables
|
|
environment.sessionVariables = {
|
|
# Development preferences
|
|
EDITOR = "emacs";
|
|
BROWSER = "firefox";
|
|
TERMINAL = "kitty";
|
|
|
|
# Git configuration
|
|
GIT_EDITOR = "nano";
|
|
};
|
|
|
|
# Comprehensive zsh configuration for geir
|
|
programs.zsh = {
|
|
enable = true;
|
|
|
|
# Shell aliases (user-specific only, common ones in shell-aliases.nix)
|
|
shellAliases = {
|
|
# Development workflow - geir specific
|
|
"home-lab" = "z /home/geir/Home-lab";
|
|
"configs" = "z /home/geir/Home-lab/user_configs/geir";
|
|
"emacs-config" = "emacs /home/geir/Home-lab/user_configs/geir/emacs.org";
|
|
|
|
# Flake-specific rebuilds (geir has access to local flake directory)
|
|
"rebuild-local" = "sudo nixos-rebuild switch --flake /home/geir/Home-lab";
|
|
"rebuild-local-test" = "sudo nixos-rebuild test --flake /home/geir/Home-lab";
|
|
|
|
# Git shortcuts for multi-remote workflow
|
|
"git-status-all" = "git status && echo '--- Checking origin ---' && git log origin/main..HEAD --oneline && echo '--- Checking github ---' && git log github/main..HEAD --oneline";
|
|
};
|
|
|
|
# History configuration
|
|
histSize = 10000;
|
|
histFile = "$HOME/.histfile";
|
|
|
|
# Shell options
|
|
setOptions = ["autocd" "extendedglob"];
|
|
|
|
# Interactive shell initialization
|
|
interactiveShellInit = ''
|
|
# Emacs-style keybindings
|
|
bindkey -e
|
|
|
|
# Disable annoying shell options
|
|
unsetopt beep nomatch
|
|
|
|
# Completion configuration
|
|
zstyle ':completion:*' completer _expand _complete _ignored
|
|
zstyle ':completion:*' matcher-list ""
|
|
autoload -Uz compinit
|
|
compinit
|
|
|
|
# Initialize shell enhancements
|
|
eval "$(starship init zsh)"
|
|
eval "$(direnv hook zsh)"
|
|
eval "$(zoxide init zsh)"
|
|
'';
|
|
};
|
|
}
|