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