bweh
1 files changed, 22 insertions(+), 29 deletions(-)
flake.nix+22-29
| ... | ... | @@ -46,6 +46,7 @@ |
| 46 | 46 | nixpkgs-stable, |
| 47 | 47 | home-manager, |
| 48 | 48 | stylix, |
| 49 | darwin, | |
| 49 | 50 | blocklist-hosts, |
| 50 | 51 | hyprland-plugins, |
| 51 | 52 | zig, |
| ... | ... | @@ -58,7 +59,6 @@ |
| 58 | 59 | inputs.zig.overlays.default |
| 59 | 60 | ]; |
| 60 | 61 | pkgs = import nixpkgs { |
| 61 | system = systemSettings.system; | |
| 62 | 62 | config = { |
| 63 | 63 | allowUnfree = true; |
| 64 | 64 | allowUnfreePredicate = _: true; |
| ... | ... | @@ -67,7 +67,6 @@ |
| 67 | 67 | }; |
| 68 | 68 | |
| 69 | 69 | pkgs-stable = import nixpkgs-stable { |
| 70 | system = systemSettings.system; | |
| 71 | 70 | config = { |
| 72 | 71 | allowUnfree = true; |
| 73 | 72 | allowUnfreePredicate = _: true; |
| ... | ... | @@ -75,36 +74,30 @@ |
| 75 | 74 | overlays = []; |
| 76 | 75 | }; |
| 77 | 76 | |
| 78 | ||
| 79 | 77 | lib = nixpkgs.lib; |
| 80 | 78 | in { |
| 81 | 79 | nixosConfigurations = { |
| 82 | 80 | nixos = lib.nixosSystem { |
| 83 | system = systemSettings.system; | |
| 84 | 81 | modules = [ |
| 85 | 82 | nixos-cosmic.nixosModules.default |
| 86 | 83 | ./configuration.nix |
| 87 | 84 | home-manager.nixosModules.home-manager |
| 88 | 85 | { |
| 89 | 86 | home-manager.useGlobalPkgs = true; |
| 90 | home-manager.useUserPackages = true; | |
| 91 | home-manager.users.nmarks = import ./hosts/desktop/home.nix; | |
| 92 | home-manager.extraSpecialArgs = { | |
| 93 | inherit pkgs-stable; | |
| 94 | inherit systemSettings; | |
| 95 | inherit userSettings; | |
| 96 | inherit stylix; | |
| 97 | inherit hyprland-plugins; | |
| 98 | inherit zls; | |
| 99 | inherit ghostty; | |
| 100 | }; | |
| 87 | home-manager.useUserPackages = true; | |
| 88 | home-manager.users.nmarks = import ./hosts/desktop/home.nix; | |
| 89 | home-manager.extraSpecialArgs = { | |
| 90 | inherit pkgs-stable; | |
| 91 | inherit stylix; | |
| 92 | inherit hyprland-plugins; | |
| 93 | inherit zls; | |
| 94 | inherit ghostty; | |
| 95 | }; | |
| 101 | 96 | } |
| 102 | 97 | ]; |
| 103 | 98 | specialArgs = { |
| 104 | 99 | inherit inputs; |
| 105 | 100 | inherit pkgs-stable; |
| 106 | inherit systemSettings; | |
| 107 | inherit userSettings; | |
| 108 | 101 | inherit stylix; |
| 109 | 102 | inherit blocklist-hosts; |
| 110 | 103 | }; |
| ... | ... | @@ -112,18 +105,18 @@ |
| 112 | 105 | }; |
| 113 | 106 | darwinSystem = darwin.lib.darwinSystem { |
| 114 | 107 | system = "aarch64-darwin"; |
| 115 | modules = [ | |
| 116 | ./hosts/laptop/configuration.nix | |
| 117 | home-manager.darwinModules.home-manager | |
| 118 | { | |
| 119 | home-manager.useGlobalPkgs = true; | |
| 120 | home-manager.useUserPackages = true; | |
| 121 | home-manager.users.nmarks = import ./hosts/laptop/home.nix; | |
| 122 | users.users.nmarks.home = "/Users/nmarks"; | |
| 123 | }; | |
| 124 | ]; | |
| 125 | specialArgs = { inherit nixpkgs; }; | |
| 126 | }; | |
| 108 | modules = [ | |
| 109 | ./hosts/laptop/configuration.nix | |
| 110 | home-manager.darwinModules.home-manager | |
| 111 | { | |
| 112 | home-manager.useGlobalPkgs = true; | |
| 113 | home-manager.useUserPackages = true; | |
| 114 | home-manager.users.nmarks = import ./hosts/laptop/home.nix; | |
| 115 | users.users.nmarks.home = "/Users/nmarks"; | |
| 116 | } | |
| 117 | ]; | |
| 118 | specialArgs = {inherit nixpkgs;}; | |
| 119 | }; | |
| 127 | 120 | # nixos = inputs.self.nixosConfigurations.nmarks; |
| 128 | 121 | # |
| 129 | 122 | # |