refactor: clean up hm module code in devices
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-11-22 13:33:05 -05:00
parent 11adcacd6f
commit 06e62c54d4
7 changed files with 74 additions and 99 deletions

View file

@ -112,6 +112,7 @@ in {
home-manager.users = let home-manager.users = let
inherit (config.vars) mainUser; inherit (config.vars) mainUser;
mainHmCfg = config.home-manager.users.${mainUser};
default = { default = {
imports = [ imports = [
@ -136,12 +137,20 @@ in {
./home ./home
./home/trash-d ./home/trash-d
self.homeManagerModules.neovim
]; ];
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;
}; };
in { in {
root = default; root =
default
// {
programs.neovim = {
inherit (mainHmCfg.programs.neovim) enable enableIde user;
};
};
greeter = mkIf (config.services.greetd.enable) default; greeter = mkIf (config.services.greetd.enable) default;
${mainUser} = default; ${mainUser} = default;
}; };

View file

@ -19,23 +19,6 @@ in {
self.nixosModules.server self.nixosModules.server
]; ];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.firefox
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE # State Version: DO NOT CHANGE
system.stateVersion = "23.11"; system.stateVersion = "23.11";
@ -92,4 +75,16 @@ in {
}; };
services.kmscon.enable = true; services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.firefox
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
} }

View file

@ -19,22 +19,6 @@ in {
self.nixosModules.server self.nixosModules.server
]; ];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE # State Version: DO NOT CHANGE
system.stateVersion = "24.05"; system.stateVersion = "24.05";
@ -85,4 +69,14 @@ in {
}; };
services.kmscon.enable = true; services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
} }

View file

@ -18,22 +18,6 @@ in {
self.nixosModules.server self.nixosModules.server
]; ];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE # State Version: DO NOT CHANGE
system.stateVersion = "24.11"; system.stateVersion = "24.11";
@ -72,4 +56,14 @@ in {
khepri.enable = true; khepri.enable = true;
services.kmscon.enable = true; services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
} }

View file

@ -18,22 +18,6 @@ in {
self.nixosModules.server self.nixosModules.server
]; ];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE # State Version: DO NOT CHANGE
system.stateVersion = "24.05"; system.stateVersion = "24.05";
@ -72,4 +56,14 @@ in {
}; };
services.kmscon.enable = true; services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
} }

View file

@ -18,22 +18,6 @@ in {
self.nixosModules.server self.nixosModules.server
]; ];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE # State Version: DO NOT CHANGE
system.stateVersion = "24.05"; system.stateVersion = "24.05";
@ -86,4 +70,14 @@ in {
khepri.enable = true; khepri.enable = true;
services.kmscon.enable = true; services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
} }

View file

@ -22,23 +22,6 @@ in {
self.nixosModules.server self.nixosModules.server
]; ];
home-manager.users = rec {
root = {
imports = [
self.homeManagerModules.firefox
self.homeManagerModules.neovim
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
${mainUser} = root;
};
# State Version: DO NOT CHANGE # State Version: DO NOT CHANGE
system.stateVersion = "23.05"; system.stateVersion = "23.05";
@ -111,4 +94,16 @@ in {
khepri.enable = true; khepri.enable = true;
services.kmscon.enable = true; services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.firefox
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
} }