From b811bc4ea3b1e7dd8a1374b995ece713f803ea77 Mon Sep 17 00:00:00 2001 From: Hunter Halloran Date: Wed, 17 Dec 2025 16:18:38 -0500 Subject: [PATCH] resolve more comments --- templates/user/README.md | 5 +- templates/user/home.nix | 100 --------------------------------------- 2 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 templates/user/home.nix diff --git a/templates/user/README.md b/templates/user/README.md index a731b9d..bd1934e 100644 --- a/templates/user/README.md +++ b/templates/user/README.md @@ -189,8 +189,7 @@ This file contains system-level NixOS configuration. Only needed for: External user modules: - Receive the same flake inputs as nixos-systems -- Can set user options via user.nix (description, shell, extraGroups, etc.) -- Can use all home-manager options via home.nix +- Can set user options via user.nix (description, shell, home-manager, etc.) - Optionally provide system-level configuration (nixos.nix) - System zsh theme applied if `useZshTheme = true` (default) - System nvim config applied if `useNvimPlugins = true` (default) @@ -198,7 +197,7 @@ External user modules: ## Development Workflow -1. Create your user config repository with `user.nix`, `home.nix`, and/or `nixos.nix` +1. Create your user config repository with `user.nix` and/or `nixos.nix` 2. Set user options in user.nix OR in the main users.nix 3. Test locally: `external = /path/to/local/repo;` 4. Build: `nix build .#nixosConfigurations.hostname.config.system.build.toplevel` diff --git a/templates/user/home.nix b/templates/user/home.nix deleted file mode 100644 index 375a9c8..0000000 --- a/templates/user/home.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ inputs, ... }: - -# ============================================================================ -# User Home Manager Configuration Template (Optional) -# ============================================================================ -# This file provides home-manager configuration for a user. -# It will be imported into the NixOS system's home-manager configuration. -# -# This file is optional - if not present, no home-manager configuration -# will be loaded from this external module. -# -# Usage in users.nix: -# myusername = { -# # Set user options here OR in the external module's user.nix -# description = "My Name"; -# shell = pkgs.zsh; -# extraGroups = [ "wheel" "networkmanager" ]; -# -# external = builtins.fetchGit { -# url = "https://github.com/username/dotfiles"; -# rev = "commit-hash"; -# }; -# }; -# -# Or use user.nix in your external module to set user options. -# -# This module receives the same `inputs` flake inputs as the main -# nixos-systems configuration (nixpkgs, home-manager, etc.). - -{ - config, - lib, - pkgs, - osConfig, # Access to the OS-level config - ... -}: - -{ - # ========== Home Manager Configuration ========== - - # User identity (required) - home.username = lib.mkDefault config.home.username; # Set by system - home.homeDirectory = lib.mkDefault config.home.homeDirectory; # Set by system - home.stateVersion = lib.mkDefault "25.11"; - - # ========== Packages ========== - home.packages = with pkgs; [ - # Add your preferred packages here - # htop - # ripgrep - # fd - # bat - ]; - - # ========== Programs ========== - - # Git configuration - programs.git = { - enable = true; - userName = "Your Name"; - userEmail = "your.email@example.com"; - extraConfig = { - init.defaultBranch = "main"; - }; - }; - - # Zsh configuration - programs.zsh = { - enable = true; - # System theme is applied automatically if useZshTheme = true in users.nix - # Add your custom zsh config here - }; - - # Neovim configuration - # programs.neovim = { - # enable = true; - # # System nvim config is applied automatically if useNvimPlugins = true - # # Add your custom neovim config here - # }; - - # ========== Shell Environment ========== - - home.sessionVariables = { - EDITOR = "vim"; - # Add your custom environment variables - }; - - # ========== Dotfiles ========== - - # You can manage dotfiles with home.file - # home.file.".bashrc".source = ./dotfiles/bashrc; - # home.file.".vimrc".source = ./dotfiles/vimrc; - - # Or use programs.* options for better integration - - # ========== XDG Configuration ========== - - xdg.enable = true; - # xdg.configFile."app/config.conf".source = ./config/app.conf; -}