diff --git a/flake.nix b/flake.nix index cfa3372..6f02a55 100644 --- a/flake.nix +++ b/flake.nix @@ -11,68 +11,14 @@ namespace = "marleyos"; title = "marleyOS"; }; - }; - old = - { self, ... }@inputs: - inputs.flake-parts.lib.mkFlake { inherit inputs; } { - debug = true; - - systems = [ - "x86_64-linux" + homes.modules = with inputs; [ + rose-pine.homeManagerModules.rose-pine ]; - imports = [ - inputs.nixos-unified.flakeModules.default - inputs.devenv.flakeModule - ]; - - flake = { - homeModules.marley = - { pkgs, ... }: - { - imports = - let - myHomeMods = "${self}/modules/home"; - in - [ - inputs.rose-pine.homeManagerModules.rose-pine - "${myHomeMods}/iconTheme.nix" - "${myHomeMods}/shellAbbrs.nix" - "${self}/home" - ]; - }; + outputs-builder = channels: { + formatter = channels.nixpkgs.nixfmt-rfc-style; }; - - perSystem = - { pkgs, ... }: - let - me = "marley"; - inherit (self.nixos-unified.lib) mkHomeConfiguration; - in - { - legacyPackages.homeConfigurations."${me}" = mkHomeConfiguration pkgs ( - { pkgs, ... }: - { - imports = [ - "${self}/modules/home/me.nix" - self.homeModules."${me}" - ]; - - me.name = me; - home.stateVersion = "24.05"; - } - ); - - devenv.shells.default = { - imports = [ - "${self}/shells/base.nix" - "${self}/shells/nix.nix" - ]; - }; - - formatter = pkgs.nixfmt-rfc-style; - }; }; inputs = {