decoupled home-manager

This commit is contained in:
ari committed 2024-03-03 16:50:02 -05:00
1 parent c8045e86e0
commit 766ead72fb
3 files changed
+12 -57

No files matched your search

+10 -6
View File
@@ -1,6 +1,7 @@
{ {
systemStateVersion ? "23.11", systemStateVersion ? "23.11",
homeMangerVersion ? "23.11", homeMangerVersion ? "23.11",
enableHomeManager ? true,
hostName, hostName,
user, user,
enableSSHServer ? false, enableSSHServer ? false,
@@ -12,8 +13,7 @@ let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${homeMangerVersion}.tar.gz"; home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-${homeMangerVersion}.tar.gz";
in in
{ {
imports = imports = [
[
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
(import ./modules/os/nix.nix { (import ./modules/os/nix.nix {
systemStateVersion = systemStateVersion; systemStateVersion = systemStateVersion;
@@ -29,16 +29,20 @@ in
user = user; user = user;
enableSSHServer = enableSSHServer; enableSSHServer = enableSSHServer;
}) })
(import "${home-manager}/nixos")
./modules/os/services.nix ./modules/os/services.nix
./modules/docker/core.nix ./modules/docker/core.nix
(import ./modules/user.nix { (import ./modules/user.nix {
user = user; user = user;
homeMangerVersion = homeMangerVersion;
}) })
(import ./modules/rootUser.nix { (import ./modules/rootUser.nix {
hostName = hostName; hostName = hostName;
homeMangerVersion = homeMangerVersion;
}) })
]; ] ++ (if enableHomeManager then [
(import "${home-manager}/nixos")
(import ./modules/home-manager-config.nix {
homeMangerVersion = homeMangerVersion;
hostName = hostName;
user = user;
})
] else []);
} }
+1 -14
View File
@@ -1,18 +1,5 @@
{ hostName, homeMangerVersion }: { hostName }:
{ pkgs, ... }: { pkgs, ... }:
{ {
users.users.root.shell = pkgs.zsh; users.users.root.shell = pkgs.zsh;
home-manager.users.root = {
home.stateVersion = homeMangerVersion;
programs.git = {
enable = true;
userName = "root";
userEmail = "root@${hostName}";
};
programs.zsh = {
enable = true;
enableAutosuggestions = true;
};
programs.zsh.oh-my-zsh.enable = true;
};
} }
+1 -37
View File
@@ -1,4 +1,4 @@
{ user, homeMangerVersion }: { user }:
{ pkgs, ... }: { pkgs, ... }:
{ {
users.users.${user.name} = { users.users.${user.name} = {
@@ -19,40 +19,4 @@
nixd nixd
]; ];
}; };
home-manager.users.${user.name} = {
home = {
stateVersion = homeMangerVersion;
shellAliases = {
cat = "bat";
};
packages = [
(pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
];
};
programs = {
bat.enable = true;
direnv.enable = true;
lsd = {
enable = true;
enableAliases = true;
};
git = {
enable = true;
userName = user.fullName;
userEmail = user.email;
};
zsh = {
enable = true;
enableAutosuggestions = true;
};
zsh.oh-my-zsh = {
enable = true;
plugins = [
"git"
"sudo"
];
theme = "robbyrussell";
};
};
};
} }