refactor home manager configs

This commit is contained in:
Tyler Starr 2024-07-21 17:28:06 -07:00
parent 93c349d5bd
commit 827c94ee3d
12 changed files with 83 additions and 112 deletions

View File

@ -33,9 +33,10 @@
inherit system;
specialArgs = { inherit user; inherit inputs; };
modules = [
./modules
./hosts/default.nix
./hosts/kestrel/configuration.nix
./hosts/kestrel/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
@ -44,7 +45,6 @@
home-manager.users.${user} = {
imports = [
./home-modules
./hosts/kestrel/home-configuration.nix
];
};
}
@ -55,9 +55,10 @@
inherit system;
specialArgs = { inherit user; inherit inputs; };
modules = [
./modules
./hosts/default.nix
./hosts/shivan/configuration.nix
./hosts/shivan/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
@ -66,7 +67,6 @@
home-manager.users.${user} = {
imports = [
./home-modules
./hosts/shivan/home-configuration.nix
];
};
}
@ -77,9 +77,10 @@
inherit system;
specialArgs = { inherit user; inherit inputs; };
modules = [
./modules
./hosts/default.nix
./hosts/torus/configuration.nix
./hosts/torus/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
@ -88,7 +89,6 @@
home-manager.users.${user} = {
imports = [
./home-modules
./hosts/torus/home-configuration.nix
];
};
}
@ -99,9 +99,10 @@
inherit system;
specialArgs = { inherit user; inherit inputs; inherit jovian-nixos; inherit home-manager; };
modules = [
./modules
./hosts/default.nix
./hosts/bulwark/configuration.nix
./hosts/bulwark/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
@ -110,7 +111,6 @@
home-manager.users.${user} = {
imports = [
./home-modules
./hosts/bulwark/home-configuration.nix
];
};
}

View File

@ -103,6 +103,15 @@
};
};
# Home manager modules
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
# Did you read the comment?
system.stateVersion = "23.11";
}

View File

@ -1,22 +0,0 @@
{ config, pkgs, user, ... }:
{
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
# Setup git
programs.git = {
enable = true;
userName = "starr-dusT";
userEmail = "starrtyler88@gmail.com";
};
home.packages = with pkgs; [
];
# Enable home modules
#modules = {
#};
home.stateVersion = "23.11";
}

View File

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ./default ];
}

View File

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ./home-configuration.nix ];
}

View File

@ -0,0 +1,20 @@
{ config, pkgs, user, ... }:
{
home-manager.users.${user} = {
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
programs.direnv = {
enable = true;
enableBashIntegration = true;
nix-direnv.enable = true;
};
home.packages = with pkgs; [
];
# Did you read the comment?
home.stateVersion = "23.11";
};
}

View File

@ -74,7 +74,7 @@
# host secrets
age.secrets."wireguard/kestrel".file = ../../secrets/wireguard/kestrel.age;
# Enable modules
# System modules
modules = {
desktop = {
sway.enable = false;
@ -116,6 +116,15 @@
};
};
# Home manager modules
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
# Did you read the comment?
system.stateVersion = "23.11";
}

View File

@ -1,32 +0,0 @@
{ config, pkgs, user, ... }:
{
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
# Setup direnv
programs.direnv = {
enable = true;
enableBashIntegration = true;
nix-direnv.enable = true;
};
# Setup git
programs.git = {
enable = true;
userName = "starr-dusT";
userEmail = "starrtyler88@gmail.com";
};
home.packages = with pkgs; [
];
# Enable home modules
modules = {
desktop = {
kitty.enable = true;
};
};
home.stateVersion = "23.11";
}

View File

@ -108,6 +108,24 @@
};
};
# Home manager modules
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
# Home manager modules
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = true;
};
};
};
# Did you read the comment?
system.stateVersion = "23.11";
}

View File

@ -1,32 +0,0 @@
{ config, pkgs, user, ... }:
{
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
# Setup direnv
programs.direnv = {
enable = true;
enableBashIntegration = true;
nix-direnv.enable = true;
};
# Setup git
programs.git = {
enable = true;
userName = "starr-dusT";
userEmail = "starrtyler88@gmail.com";
};
home.packages = with pkgs; [
];
# Enable home modules
modules = {
desktop = {
kitty.enable = true;
};
};
home.stateVersion = "23.11";
}

View File

@ -147,6 +147,16 @@
secrets.enable = true;
};
};
# Home manager modules
home-manager.users.${user} = {
modules = {
desktop = {
kitty.enable = false;
};
};
};
# Did you read the comment?
system.stateVersion = "23.11";
}

View File

@ -1,17 +0,0 @@
{ config, pkgs, user, ... }:
{
home.username = "${user}";
home.homeDirectory = "/home/${user}";
programs.home-manager.enable = true;
home.packages = with pkgs; [
chezmoi
rbw
];
# Enable home modules
#modules = {
#};
home.stateVersion = "23.11";
}