From d6700df95507de66cbddc0986c3172549dd26b1e Mon Sep 17 00:00:00 2001 From: "Mohamed C." Date: Sat, 10 Aug 2024 19:39:20 +0200 Subject: [PATCH] use default.nix --- flake.nix | 84 +------------------ hosts/computer-mo/default.nix | 0 .../sys.pkg-customization.nix | 0 .../{system-packages => }/sys.pkg-desktop.nix | 0 .../{system-packages => }/sys.pkg-dev.nix | 0 .../{system-packages => }/sys.pkg-firefox.nix | 0 .../{system-packages => }/sys.pkg-gaming.nix | 0 .../sys.pkg-hardware.nix | 0 .../{system-packages => }/sys.pkg-media.nix | 0 .../{system-packages => }/sys.pkg-misc.nix | 0 .../{system-packages => }/sys.pkg-steam.nix | 0 .../{system-packages => }/sys.pkg-system.nix | 0 .../{system-settings => }/sys.set-boot.nix | 0 .../sys.set-controller.nix | 0 .../{system-settings => }/sys.set-desktop.nix | 0 .../sys.set-filesystems.nix | 0 .../sys.set-hardware.nix | 0 .../sys.set-hostname.nix | 0 .../{system-settings => }/sys.set-steam.nix | 0 .../{system-settings => }/sys.set-systemd.nix | 0 .../{system-settings => }/sys.set-users.nix | 0 .../{user-packages => }/usr.pkg-desktop.nix | 0 .../usr.set-customization.nix | 0 .../{user-settings => }/usr.set-desktop.nix | 0 .../{user-settings => }/usr.set-dotfiles.nix | 0 25 files changed, 2 insertions(+), 82 deletions(-) create mode 100644 hosts/computer-mo/default.nix rename hosts/computer-mo/{system-packages => }/sys.pkg-customization.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-desktop.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-dev.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-firefox.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-gaming.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-hardware.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-media.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-misc.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-steam.nix (100%) rename hosts/computer-mo/{system-packages => }/sys.pkg-system.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-boot.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-controller.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-desktop.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-filesystems.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-hardware.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-hostname.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-steam.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-systemd.nix (100%) rename hosts/computer-mo/{system-settings => }/sys.set-users.nix (100%) rename hosts/computer-mo/{user-packages => }/usr.pkg-desktop.nix (100%) rename hosts/computer-mo/{user-settings => }/usr.set-customization.nix (100%) rename hosts/computer-mo/{user-settings => }/usr.set-desktop.nix (100%) rename hosts/computer-mo/{user-settings => }/usr.set-dotfiles.nix (100%) diff --git a/flake.nix b/flake.nix index 3afbb10..0550d2e 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ ${host-computer} = lib.nixosSystem { specialArgs = {inherit user-computer host-computer;}; modules = [ - ./hosts/${host-computer}/system-imports.nix + ./hosts/${host-computer} ./global/system-imports.nix jovian.nixosModules.jovian home-manager.nixosModules.home-manager @@ -46,7 +46,7 @@ home-manager.backupFileExtension = "backup"; home-manager.extraSpecialArgs = {inherit pkgs;}; home-manager.users.${user-computer}.imports = [ - ./hosts/${host-computer}/user-imports.nix + ./hosts/${host-computer} ./global/user-imports.nix ]; home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager]; @@ -54,85 +54,5 @@ ]; }; }; - - - nixosConfigurations = { - ${host-server} = lib.nixosSystem { - specialArgs = {inherit user-server host-server;}; - modules = [ - ./hosts/${host-server}/system-imports.nix - ./global/system-imports.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = {inherit pkgs;}; - home-manager.users.${user-server}.imports = [ - ./hosts/${user-server}/user-imports.nix - ./global/user-imports.nix - ]; - } - ]; - }; - }; - - nixosConfigurations = { - ${host-konsole} = lib.nixosSystem { - specialArgs = {inherit user-konsole host-konsole;}; - modules = [ - ./hosts/${host-konsole}/system-imports.nix - ./global/system-imports.nix - jovian.nixosModules.jovian - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = {inherit pkgs;}; - home-manager.users.${user-konsole}.imports = [ - ./hosts/${user-konsole}/user-imports.nix - ./global/user-imports.nix - ]; - home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager]; - } - ]; - }; - }; - - nixosConfigurations = { - ${host-steamdeck} = lib.nixosSystem { - specialArgs = {inherit user-steamdeck host-steamdeck;}; - modules = [ - ./hosts/${host-steamdeck}/system-imports.nix - ./global/system-imports.nix - jovian.nixosModules.jovian - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = {inherit pkgs;}; - home-manager.users.${user-steamdeck}.imports = [ - ./hosts/${user-steamdeck}/user-imports.nix - ./global/user-imports.nix - ]; - home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager]; - } - ]; - }; - }; - - - - - - - - - - - - }; } diff --git a/hosts/computer-mo/default.nix b/hosts/computer-mo/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/computer-mo/system-packages/sys.pkg-customization.nix b/hosts/computer-mo/sys.pkg-customization.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-customization.nix rename to hosts/computer-mo/sys.pkg-customization.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-desktop.nix b/hosts/computer-mo/sys.pkg-desktop.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-desktop.nix rename to hosts/computer-mo/sys.pkg-desktop.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-dev.nix b/hosts/computer-mo/sys.pkg-dev.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-dev.nix rename to hosts/computer-mo/sys.pkg-dev.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-firefox.nix b/hosts/computer-mo/sys.pkg-firefox.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-firefox.nix rename to hosts/computer-mo/sys.pkg-firefox.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-gaming.nix b/hosts/computer-mo/sys.pkg-gaming.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-gaming.nix rename to hosts/computer-mo/sys.pkg-gaming.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-hardware.nix b/hosts/computer-mo/sys.pkg-hardware.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-hardware.nix rename to hosts/computer-mo/sys.pkg-hardware.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-media.nix b/hosts/computer-mo/sys.pkg-media.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-media.nix rename to hosts/computer-mo/sys.pkg-media.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-misc.nix b/hosts/computer-mo/sys.pkg-misc.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-misc.nix rename to hosts/computer-mo/sys.pkg-misc.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-steam.nix b/hosts/computer-mo/sys.pkg-steam.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-steam.nix rename to hosts/computer-mo/sys.pkg-steam.nix diff --git a/hosts/computer-mo/system-packages/sys.pkg-system.nix b/hosts/computer-mo/sys.pkg-system.nix similarity index 100% rename from hosts/computer-mo/system-packages/sys.pkg-system.nix rename to hosts/computer-mo/sys.pkg-system.nix diff --git a/hosts/computer-mo/system-settings/sys.set-boot.nix b/hosts/computer-mo/sys.set-boot.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-boot.nix rename to hosts/computer-mo/sys.set-boot.nix diff --git a/hosts/computer-mo/system-settings/sys.set-controller.nix b/hosts/computer-mo/sys.set-controller.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-controller.nix rename to hosts/computer-mo/sys.set-controller.nix diff --git a/hosts/computer-mo/system-settings/sys.set-desktop.nix b/hosts/computer-mo/sys.set-desktop.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-desktop.nix rename to hosts/computer-mo/sys.set-desktop.nix diff --git a/hosts/computer-mo/system-settings/sys.set-filesystems.nix b/hosts/computer-mo/sys.set-filesystems.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-filesystems.nix rename to hosts/computer-mo/sys.set-filesystems.nix diff --git a/hosts/computer-mo/system-settings/sys.set-hardware.nix b/hosts/computer-mo/sys.set-hardware.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-hardware.nix rename to hosts/computer-mo/sys.set-hardware.nix diff --git a/hosts/computer-mo/system-settings/sys.set-hostname.nix b/hosts/computer-mo/sys.set-hostname.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-hostname.nix rename to hosts/computer-mo/sys.set-hostname.nix diff --git a/hosts/computer-mo/system-settings/sys.set-steam.nix b/hosts/computer-mo/sys.set-steam.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-steam.nix rename to hosts/computer-mo/sys.set-steam.nix diff --git a/hosts/computer-mo/system-settings/sys.set-systemd.nix b/hosts/computer-mo/sys.set-systemd.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-systemd.nix rename to hosts/computer-mo/sys.set-systemd.nix diff --git a/hosts/computer-mo/system-settings/sys.set-users.nix b/hosts/computer-mo/sys.set-users.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-users.nix rename to hosts/computer-mo/sys.set-users.nix diff --git a/hosts/computer-mo/user-packages/usr.pkg-desktop.nix b/hosts/computer-mo/usr.pkg-desktop.nix similarity index 100% rename from hosts/computer-mo/user-packages/usr.pkg-desktop.nix rename to hosts/computer-mo/usr.pkg-desktop.nix diff --git a/hosts/computer-mo/user-settings/usr.set-customization.nix b/hosts/computer-mo/usr.set-customization.nix similarity index 100% rename from hosts/computer-mo/user-settings/usr.set-customization.nix rename to hosts/computer-mo/usr.set-customization.nix diff --git a/hosts/computer-mo/user-settings/usr.set-desktop.nix b/hosts/computer-mo/usr.set-desktop.nix similarity index 100% rename from hosts/computer-mo/user-settings/usr.set-desktop.nix rename to hosts/computer-mo/usr.set-desktop.nix diff --git a/hosts/computer-mo/user-settings/usr.set-dotfiles.nix b/hosts/computer-mo/usr.set-dotfiles.nix similarity index 100% rename from hosts/computer-mo/user-settings/usr.set-dotfiles.nix rename to hosts/computer-mo/usr.set-dotfiles.nix