use home-manager shorthand module

This commit is contained in:
Primrose 2025-05-18 16:07:47 +02:00
parent d76c538e02
commit a2811e91b4
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
2 changed files with 63 additions and 53 deletions

View file

@ -3,14 +3,23 @@ let
sources = import ../sources.nix;
hostname = "tungsten";
username = "leana";
system = "x86_64-linux";
in
{
config,
lib,
...
}: {
}: let
inherit (lib.modules) mkAliasOptionModule;
in {
imports = [
#
# Shorthands
#
(mkAliasOptionModule ["me"] ["users" "users" username])
(mkAliasOptionModule ["hm"] ["home-manager" "users" username])
#
# hostname
#
@ -93,57 +102,58 @@ in
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [{home.stateVersion = lib.mkDefault config.system.stateVersion;}];
users.leana.imports = [
#
# hostname
#
{_module.args = {inherit hostname;};}
#
# home modules
#
./tungsten/home/programs.nix
./tungsten/home/misc.nix
./tungsten/home/firefox.nix
./tungsten/home/xmobar.nix
# Language server packages, etc
./tungsten/home/dev.nix
../homeModules/common/btop
../homeModules/common/cmus
../homeModules/common/fcitx5
../homeModules/common/fish
../homeModules/common/ranger
../homeModules/common/starship
../homeModules/common/tmux
../homeModules/common/vim
../homeModules/common/wired
../homeModules/common/atuin.nix
../homeModules/common/battery-notify.nix
../homeModules/common/direnv.nix
../homeModules/common/feh.nix
../homeModules/common/firefox.nix
../homeModules/common/fzf.nix
../homeModules/common/git.nix
../homeModules/common/gpg.nix
../homeModules/common/kitty.nix
../homeModules/common/leana.nix
../homeModules/common/locale.nix
../homeModules/common/neovim.nix
../homeModules/common/packages.nix
../homeModules/common/password-store.nix
../homeModules/common/sioyek.nix
../homeModules/common/user-nixconf.nix
#
# Extern modules
#
(sources.agenix + "/modules/age-home.nix")
((import sources.wired-notify).homeManagerModules.default)
];
};
hm.imports = [
#
# hostname
#
{_module.args = {inherit hostname;};}
#
# home modules
#
./tungsten/home/programs.nix
./tungsten/home/misc.nix
./tungsten/home/firefox.nix
./tungsten/home/xmobar.nix
# Language server packages, etc
./tungsten/home/dev.nix
../homeModules/common/btop
../homeModules/common/cmus
../homeModules/common/fcitx5
../homeModules/common/fish
../homeModules/common/ranger
../homeModules/common/starship
../homeModules/common/tmux
../homeModules/common/vim
../homeModules/common/wired
../homeModules/common/atuin.nix
../homeModules/common/battery-notify.nix
../homeModules/common/direnv.nix
../homeModules/common/feh.nix
../homeModules/common/firefox.nix
../homeModules/common/fzf.nix
../homeModules/common/git.nix
../homeModules/common/gpg.nix
../homeModules/common/kitty.nix
../homeModules/common/leana.nix
../homeModules/common/locale.nix
../homeModules/common/neovim.nix
../homeModules/common/packages.nix
../homeModules/common/password-store.nix
../homeModules/common/sioyek.nix
../homeModules/common/user-nixconf.nix
#
# Extern modules
#
(sources.agenix + "/modules/age-home.nix")
((import sources.wired-notify).homeManagerModules.default)
];
}
#
@ -166,7 +176,7 @@ in
two_pwd.file = "${../secrets/two_pwd.age}";
};
home-manager.users.leana = {
hm = {
age.secrets = {
sshconfig = {
file = "${../secrets/sshconfig.age}";