moved home manager modules

This commit is contained in:
John Lancaster
2026-03-10 22:39:30 -05:00
parent 6c01156ffe
commit 5ee73c1f44
20 changed files with 31 additions and 31 deletions

View File

@@ -1,8 +1,8 @@
{ inputs, pkgs, ... }:
{
flake.homeModules.base = { pkgs, ... }:
flake.modules.homeManager.base = { pkgs, ... }:
{
imports = with inputs.self.homeModules; [
imports = with inputs.self.modules.homeManager; [
rebuild
git
shell-tools

View File

@@ -1,9 +1,9 @@
# This module is for programs with GUIs that run in a desktop environment
{ inputs, ... }:
{
flake.homeModules.desktop =
flake.modules.homeManager.desktop =
{
imports = with inputs.self.homeModules; [
imports = with inputs.self.modules.homeManager; [
onepassword
ghostty
sublime

View File

@@ -1,14 +1,14 @@
# This module provides all the shell options
{ inputs, lib, ... }:
{
flake.homeModules.shell-tools = { config, pkgs, ... }: {
flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
options.shell.program = lib.mkOption {
type = lib.types.enum [ "bash" "zsh" ];
default = "zsh";
description = "Which interactive shell configuration to enable.";
};
imports = with inputs.self.homeModules; [
imports = with inputs.self.modules.homeManager; [
bash
zsh

View File

@@ -1,5 +1,5 @@
{
flake.homeModules.bash = { pkgs, ... }:
flake.modules.homeManager.bash = { pkgs, ... }:
{
programs.bash = {
enable = true;

View File

@@ -1,6 +1,6 @@
{ inputs, pkgs, lib, ... }:
{
flake.homeModules.eza = { pkgs, lib, ... }: {
flake.modules.homeManager.eza = { pkgs, lib, ... }: {
programs.eza = {
enable = true;
package = pkgs.eza;

View File

@@ -1,5 +1,5 @@
{
flake.homeModules.files = { pkgs, ... }:
flake.modules.homeManager.files = { pkgs, ... }:
{
programs.lf.enable = true;
programs.lf.cmdKeybindings = {

View File

@@ -7,7 +7,7 @@
};
};
flake.homeModules.ghostty = { config, pkgs, lib, ... }:
flake.modules.homeManager.ghostty = { config, pkgs, lib, ... }:
{
home.sessionVariables = {
TERMINAL = "ghostty";

View File

@@ -1,5 +1,5 @@
{
flake.homeModules.git = { config, lib, ... }:
flake.modules.homeManager.git = { config, lib, ... }:
{
programs.git = {
enable = true;

View File

@@ -1,5 +1,5 @@
{
flake.homeModules.onepassword = {
flake.modules.homeManager.onepassword = {
# TODO: Port `_1password = true` behavior into an explicit Home Manager module.
};
}

View File

@@ -29,7 +29,7 @@
};
};
flake.homeModules.resticprofile = { config, lib, pkgs, ... }:
flake.modules.homeManager.resticprofile = { config, lib, pkgs, ... }:
let
cfg = config.programs.resticprofile;
yamlFormat = pkgs.formats.yaml { };

View File

@@ -11,8 +11,8 @@ in
};
# Define the homeModules that are used by flake-parts
# https://flake.parts/options/home-manager.html#opt-flake.homeModules
flake.homeModules.sops = { inputs, config, pkgs, lib, ... }:
# https://flake.parts/options/home-manager.html#opt-flake.modules.homeManager
flake.modules.homeManager.sops = { inputs, config, pkgs, lib, ... }:
let
sopsBin = lib.getExe pkgs.sops;
sopsConfigPath = ../../../.sops.yaml;

View File

@@ -11,12 +11,12 @@ in
settings.KbdInteractiveAuthentication = false;
};
home-manager.sharedModules = with inputs.self.homeModules; [
home-manager.sharedModules = with inputs.self.modules.homeManager; [
ssh
];
};
flake.homeModules.ssh = { pkgs, config, lib, ... }:
flake.modules.homeManager.ssh = { pkgs, config, lib, ... }:
{
options.ssh = {
IdentityFile = lib.mkOption {

View File

@@ -1,6 +1,6 @@
{ inputs, pkgs, ... }:
{
flake.homeModules.sublime = { pkgs, lib, ... }: {
flake.modules.homeManager.sublime = { pkgs, lib, ... }: {
home.packages = with pkgs; [
sublime4
];

View File

@@ -1,5 +1,5 @@
{
flake.homeModules.vscode = { pkgs, ... }:
flake.modules.homeManager.vscode = { pkgs, ... }:
{
programs.vscode = {
enable = true;

View File

@@ -1,5 +1,5 @@
{
flake.homeModules.zsh = { pkgs, config, ... }:
flake.modules.homeManager.zsh = { pkgs, config, ... }:
{
programs.zsh = {
enable = true;

View File

@@ -1,6 +1,6 @@
{ inputs, ... }:
{
flake.homeModules.rebuild =
flake.modules.homeManager.rebuild =
{ pkgs, lib, config, ... }:
{
options = {