moe1369/nixos-config
1
0
Fork 0
mirror of https://github.com/Moe1369/nixos-config.git synced 2024-10-18 16:24:08 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: moe1369:36e452dada3c9f9bea33d5b490813171d58b88e9
Branches Tags
moe1369:main
...
compare: moe1369:007669d23d1a1cbb8aa46186e5f359fb640eaca7
Branches Tags
moe1369:main

2 Commits
36e452dada ... 007669d23d

Author SHA1 Message Date
Flake Bot
007669d23d Bump flake.lock
Some checks are pending
Flake.lock / build (push) Waiting to run
Details 
Signed-off-by: Flake Bot <41898282+github-actions[bot]@users.noreply.github.com>
 2024-09-07 22:02:01 +00:00
Mohamed C.
c9123dfd05 hostname function in group 2024-09-08 00:00:11 +02:00
2 changed files with 20 additions and 28 deletions
Show Stats Expand all files Collapse all files

18
flake.lock
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725180166, "lastModified": 1725694918,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,11 +177,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1725634671,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -200,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725575977, "lastModified": 1725727445,
"narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", "narHash": "sha256-f5TrY73wfL4kvRmEtZXpzgCuxVFlNqMUNY6QSX16IPA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", "rev": "1b9c8200d6438c98c427536abbc5b6fd6a5250c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

30
flake.nix
View File

@ -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 ++ [
]; ];