From b543fe9a7714686c7c8e2ff35895de6fa558be53 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 30 Aug 2023 23:29:31 +0200 Subject: testing broken flake --- flake.nix | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 24b84a2..71c4bc5 100644 --- a/flake.nix +++ b/flake.nix @@ -16,23 +16,26 @@ system = "x86_64-linux"; - # defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem { - defFlakeSystem = nixpkgs.lib.nixosSystem { + defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem { + # defFlakeSystem = nixpkgs.lib.nixosSystem { pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; - pkgsUnstable = import nixpkgs-unstable { + unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; }; modules = [({ ... }: { imports = [ - # baseCfg - home-manager.nixosModules.home-manager - { + baseCfg + home-manager.nixosModules.home-manager { # home-manager.useGlobalPkgs = true; home-manager.useUserpackages = true; + # home-manager.users.defin = import ./home-manager/home.nix { inherit pkgs unstable; }; + home-manager.users.defin = import ./home-manager/home.nix; + # Optionally, use home-manager.extraSpecialArgs to pass + # arguments to home.nix } ]; # Let 'nixos-version --json' know the Git revision of this flake. @@ -53,15 +56,6 @@ # Default users ./modules/user-profiles/defin.nix - home-manager.nixosModules.home-manager { - # home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.defin = import ./home-manager/home.nix; - - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } - hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} ./modules/hyprland.nix -- cgit v1.2.3