From ddf5bcaeee96f51befd33073fba0410c85773d08 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Sun, 6 Jul 2025 19:37:15 -0500 Subject: [PATCH] updated module example --- README.md | 68 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index db18adf..0d757b2 100644 --- a/README.md +++ b/README.md @@ -40,42 +40,52 @@ nhmu ```nix { - description = "Home Manager configuration of john"; + description = "John's system flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + jsl-home = { + url = "git+https://gitea.john-stream.com/john/jsl-home?ref=dev"; inputs.nixpkgs.follows = "nixpkgs"; }; - john-home-config = { - url = "path:/home/john/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; }; - outputs = - { nixpkgs, ... }@inputs: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - homeManagerConfiguration = inputs.home-manager.lib.homeManagerConfiguration; - jslDefault = inputs.john-home-config.homeManagerModules.default; - userName = "john"; - in - { - homeConfigurations."${userName}" = homeManagerConfiguration { - inherit pkgs; - modules = [ - jslDefault { - user = "${userName}"; - # Add any additional configuration here - } - ./home.nix - # Add other home manager modules here - ]; + outputs = { self, nixpkgs, ... }@inputs: + let + system = "x86_64-linux"; + nixosSystem = nixpkgs.lib.nixosSystem; + hostName = "john-p14s"; + in + { + nixosConfigurations.${hostName} = nixosSystem { + specialArgs = + { + inherit inputs; + inherit system; }; + modules = [ + ./hardware-configuration.nix + ./configuration.nix + inputs.jsl-home.nixosModules.default + { + stateVersion = "24.05"; + user = "john"; + root = true; + ssh = true; + profile = "personal"; + enableShell = true; + _1password = true; + docker = true; + graphical = true; + steam = true; + extraImports = [ + ./home-manager/john.nix + ./home-manager/gnome.nix + ./home-manager/ssh.nix + ]; + } + ]; }; + }; } ```