mirror of
https://github.com/Moe1369/nixos-config.git
synced 2024-10-18 16:24:08 +02:00
Compare commits
2 Commits
36e452dada
...
007669d23d
Author | SHA1 | Date | |
---|---|---|---|
|
007669d23d | ||
c9123dfd05 |
@ -11,5 +11,5 @@ Mirrored on [gitea.chrayed.de](https://gitea.chrayed.de/moe1369/nixos-config)
|
|||||||
- [ ] ssh key deployment with [agenix](https://github.com/ryantm/agenix)
|
- [ ] ssh key deployment with [agenix](https://github.com/ryantm/agenix)
|
||||||
- [x] alternative way to declare .nix files instead of dumping them into configuration.nix -> now uses groups in flake.nix
|
- [x] alternative way to declare .nix files instead of dumping them into configuration.nix -> now uses groups in flake.nix
|
||||||
- [x] Multi Host functionality for homelab
|
- [x] Multi Host functionality for homelab
|
||||||
- [X] OCI container for common services
|
- [ ] OCI container for common services
|
||||||
- [X] Fix Home-Manager issues with immutable .config files during rebuild -> files kglobalshortcutsrc and kwinrc can't be overwritten because of plasma-manager
|
- [ ] Fix Home-Manager issues with immutable .config files during rebuild -> files kglobalshortcutsrc and kwinrc can't be overwritten because of plasma-manager
|
||||||
|
30
flake.nix
30
flake.nix
@ -30,7 +30,8 @@
|
|||||||
];
|
];
|
||||||
externalUserModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
externalUserModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||||
# System Module groups
|
# System Module groups
|
||||||
baseSystemModules = [
|
baseSystemModules = hostName:[
|
||||||
|
./hosts/${hostName}
|
||||||
./modules/system/apps-shell
|
./modules/system/apps-shell
|
||||||
./modules/system/boot
|
./modules/system/boot
|
||||||
./modules/system/devices
|
./modules/system/devices
|
||||||
@ -44,18 +45,20 @@
|
|||||||
./modules/system/upgrades
|
./modules/system/upgrades
|
||||||
./modules/system/users
|
./modules/system/users
|
||||||
];
|
];
|
||||||
desktopSystemModules = [
|
desktopSystemModules = hostName:[
|
||||||
./modules/system/ai
|
./modules/system/ai
|
||||||
./modules/system/apps-misc
|
./modules/system/apps-misc
|
||||||
./modules/system/browser
|
./modules/system/browser
|
||||||
./modules/system/flatpak
|
./modules/system/flatpak
|
||||||
./modules/system/plasma
|
./modules/system/plasma
|
||||||
|
./modules/system/syncthing-${hostName}
|
||||||
];
|
];
|
||||||
displaySystemModules = [
|
displaySystemModules = [
|
||||||
./modules/system/sddm
|
./modules/system/sddm
|
||||||
];
|
];
|
||||||
gamingSystemModules = [
|
gamingSystemModules = hostName:[
|
||||||
./modules/system/controller
|
./modules/system/controller
|
||||||
|
./modules/system/jovian-${hostName}
|
||||||
./modules/system/lact
|
./modules/system/lact
|
||||||
./modules/system/retrodeck
|
./modules/system/retrodeck
|
||||||
./modules/system/steam
|
./modules/system/steam
|
||||||
@ -87,10 +90,7 @@
|
|||||||
in
|
in
|
||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
specialArgs = {inherit user; inherit hostName; inherit system;};
|
specialArgs = {inherit user; inherit hostName; inherit system;};
|
||||||
modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ displaySystemModules ++ gamingSystemModules ++ [
|
modules = externalSystemModules ++ (baseSystemModules hostName) ++ (desktopSystemModules hostName) ++ displaySystemModules ++ (gamingSystemModules hostName) ++ [
|
||||||
./hosts/${hostName}
|
|
||||||
./modules/system/jovian-${hostName}
|
|
||||||
./modules/system/syncthing-${hostName}
|
|
||||||
{
|
{
|
||||||
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
|
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
|
||||||
];
|
];
|
||||||
@ -106,12 +106,9 @@
|
|||||||
in
|
in
|
||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
specialArgs = {inherit user; inherit hostName; inherit system;};
|
specialArgs = {inherit user; inherit hostName; inherit system;};
|
||||||
modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
|
modules = externalSystemModules ++ (baseSystemModules hostName) ++ (desktopSystemModules hostName) ++ (gamingSystemModules hostName) ++ [
|
||||||
./hosts/${hostName}
|
|
||||||
./modules/system/jovian-${hostName}
|
|
||||||
./modules/system/syncthing-${hostName}
|
|
||||||
{
|
{
|
||||||
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
|
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingSystemModules ++ [
|
||||||
];
|
];
|
||||||
home-manager.extraSpecialArgs = { inherit user; inherit hostName;};
|
home-manager.extraSpecialArgs = { inherit user; inherit hostName;};
|
||||||
home-manager.sharedModules = externalUserModules;
|
home-manager.sharedModules = externalUserModules;
|
||||||
@ -125,10 +122,7 @@
|
|||||||
in
|
in
|
||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
specialArgs = {inherit user; inherit hostName; inherit system;};
|
specialArgs = {inherit user; inherit hostName; inherit system;};
|
||||||
modules = externalSystemModules ++ baseSystemModules ++ desktopSystemModules ++ gamingSystemModules ++ [
|
modules = externalSystemModules ++ (baseSystemModules hostName) ++ (desktopSystemModules hostName) ++ (gamingSystemModules hostName) ++ [
|
||||||
./hosts/${hostName}
|
|
||||||
./modules/system/jovian-${hostName}
|
|
||||||
./modules/system/syncthing-${hostName}
|
|
||||||
{
|
{
|
||||||
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
|
home-manager.users.${user}.imports = baseUserModules ++ desktopUserModules ++ gamingUserModules ++ [
|
||||||
];
|
];
|
||||||
@ -144,9 +138,7 @@
|
|||||||
in
|
in
|
||||||
lib.nixosSystem {
|
lib.nixosSystem {
|
||||||
specialArgs = {inherit user; inherit hostName; inherit system;};
|
specialArgs = {inherit user; inherit hostName; inherit system;};
|
||||||
modules = externalSystemModules ++ baseSystemModules ++ serverSystemModules ++ [
|
modules = externalSystemModules ++ (baseSystemModules hostName) ++ serverSystemModules ++ [
|
||||||
./hosts/${hostName}
|
|
||||||
./modules/system/syncthing-${hostName}
|
|
||||||
{
|
{
|
||||||
home-manager.users.${user}.imports = baseUserModules ++ serverUserModules ++ [
|
home-manager.users.${user}.imports = baseUserModules ++ serverUserModules ++ [
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user