john/dendritic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved home manager modules

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/home-manager/profiles/base.nix
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

4
modules/home-manager/profiles/desktop.nix
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

4
modules/home-manager/profiles/shell-tools.nix
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

2
modules/home-manager/programs/bash.nix
View File

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

2
modules/home-manager/programs/eza.nix
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;

2
modules/home-manager/programs/files.nix
View File

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

2
modules/home-manager/programs/ghostty.nix
View File

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

2
modules/home-manager/programs/git.nix
View File

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

2
modules/home-manager/programs/onepassword.nix
View File

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

2
modules/home-manager/programs/resticprofile.nix
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 { };

4
modules/home-manager/programs/sops.nix
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;

4
modules/home-manager/programs/ssh.nix
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 {

2
modules/home-manager/programs/sublime.nix
View File

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

2
modules/home-manager/programs/vscode.nix
View File

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

2
modules/home-manager/programs/zsh.nix
View File

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

2
modules/home-manager/rebuild.nix
View File

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

2
modules/hosts/janus.nix
View File

@@ -13,7 +13,7 @@ in
inputs.self.modules.nixos.docker
];
home-manager.users."${username}" = {
imports = with inputs.self.homeModules; [
imports = with inputs.self.modules.homeManager; [
];
docker.enable = true;
ssh.matchSets = {

6
modules/hosts/john-pc-ubuntu.nix
View File

@@ -1,7 +1,7 @@
{ inputs, ... }:
{
flake.homeModules."john-pc-ubuntu" = { pkgs, config, ... }: {
imports = with inputs.self.homeModules; [
flake.modules.homeManager."john-pc-ubuntu" = { pkgs, config, ... }: {
imports = with inputs.self.modules.homeManager; [
john
desktop
docker
@@ -26,7 +26,7 @@
flake.homeConfigurations."john-pc-ubuntu" = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
modules = [
inputs.self.homeModules."john-pc-ubuntu"
inputs.self.modules.homeManager."john-pc-ubuntu"
# Include another inline module to set the options created through the jsl-home modules
({ config, ... }: {

4
modules/services/docker.nix
View File

@@ -5,14 +5,14 @@
enable = true;
};
home-manager.sharedModules = [
inputs.self.homeModules.docker
inputs.self.modules.homeManager.docker
];
# users.users.john = {
# extraGroups = [ "docker" ];
# };
};
flake.homeModules.docker = { config, lib, pkgs, ... }:
flake.modules.homeManager.docker = { config, lib, pkgs, ... }:
{
options.docker = {
enable = lib.mkEnableOption "Docker tools and utilities";

8
modules/users/john.nix
View File

@@ -11,7 +11,7 @@ in
flake.modules.nixos."${username}" = { pkgs, ... }: {
home-manager.users."${username}" = {
imports = [
inputs.self.homeModules."${username}"
inputs.self.modules.homeManager."${username}"
];
};
users.users."${username}" = {
@@ -26,7 +26,7 @@ in
programs.zsh.enable = true;
};
flake.homeModules."${username}" = {
flake.modules.homeManager."${username}" = {
home.username = "${username}";
home.homeDirectory = "/home/${username}";
home.stateVersion = "25.11";
@@ -35,7 +35,7 @@ in
programs.git.settings.user.name = "John Lancaster";
programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
imports = with inputs.self.homeModules; [
imports = with inputs.self.modules.homeManager; [
base
# docker
# resticprofile
@@ -46,7 +46,7 @@ in
flake.homeConfigurations."${username}" = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
modules = [
inputs.self.homeModules."${username}"
inputs.self.modules.homeManager."${username}"
# Include another inline module to set the options created through the jsl-home modules
{