diff --git a/flake.nix b/flake.nix index 5d91ac6..7a14e25 100644 --- a/flake.nix +++ b/flake.nix @@ -183,17 +183,12 @@ ./hosts/hl-terra1.hardware-configuration.nix ]; }; + iso = lib.makeIso { + hostName = "skygnix"; + configuration = [ + ./hosts/iso.nix + ]; + }; }; - - # Live ISO Configuration - # ------------- - packages.x86_64-linux = { - installer-iso = lib.makeIso { - hostName = "skygnix"; - configuration = [ - ./hosts/iso.nix - ]; - }; - }; }; } diff --git a/hosts/iso.nix b/hosts/iso.nix index fbe5e3a..258d368 100644 --- a/hosts/iso.nix +++ b/hosts/iso.nix @@ -7,14 +7,20 @@ # Networking networking.networkmanager.enable = true; - # SSH for remote installation - services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "yes"; + # Skyg Settings + skyg = { + user.enable = true; + nixos.common = { + ssh-server.enable = true; + }; + }; - # GUI with lightweight desktop - services.xserver.enable = true; - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.xfce.enable = true; + # SSH for remote installation + services.openssh.settings.PermitRootLogin = "yes"; + # # GUI with lightweight desktop + # services.xserver.enable = true; + # services.xserver.displayManager.lightdm.enable = true; + # services.xserver.desktopManager.xfce.enable = true; # Core system packages environment.systemPackages = with pkgs; [ @@ -32,16 +38,12 @@ wget git htop - tmux + zellij # Documentation man-pages ]; - # Disable heavy services - services.printing.enable = lib.mkForce false; - sound.enable = lib.mkForce false; - # Include documentation documentation.nixos.enable = true; } diff --git a/modules/lib.nix b/modules/lib.nix index e1a91d9..6b8905a 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -21,6 +21,13 @@ let }; } ); + osModules = [ + determinate.nixosModules.default + stylix.nixosModules.stylix + home-manager.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + specialArgs.dms.nixosModules.dank-material-shell + ]; # makeHomeManagerUsers = # { modules ? [ ] # , homeManagerVersion @@ -59,12 +66,7 @@ in unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; inherit system; - modules = [ - determinate.nixosModules.default - stylix.nixosModules.stylix - home-manager.nixosModules.default - nix-flatpak.nixosModules.nix-flatpak - specialArgs.dms.nixosModules.dank-material-shell + modules = osModules ++ [ (import ./main.nix { inherit user @@ -86,11 +88,8 @@ in unstablePkgs = nixpkgs-unstable.legacyPackages.${system}; }; inherit system; - modules = [ + modules = osModules ++ [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - determinate.nixosModules.default - stylix.nixosModules.stylix - nix-flatpak.nixosModules.nix-flatpak (import ./main.nix { inherit user