From 019332ff943ec62afaab2b4fbc152f9364e87d21 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 6 Feb 2025 19:14:19 -0700 Subject: more cleanup of old code --- flake.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index f5ed4f2..74668c5 100644 --- a/flake.nix +++ b/flake.nix @@ -138,7 +138,7 @@ }; - outputs = inputs@{ ... }: with inputs; + outputs = inputs@{ self, ... }: with inputs; # packages.aarch64-linux = { # # packages.x86_64-linux = { # aarch64-installer = nixos-generators.nixosGenerate { @@ -152,14 +152,14 @@ # }; # }; let - # inherit (self) outputs; + inherit (self) outputs; lib = nixpkgs.lib //home-manager.lib; - # systems = [ "x86_64-linux" "aarch64-linux" ]; + systems = [ "x86_64-linux" "aarch64-linux" ]; # forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system}); - # pkgsFor = lib.genAttrs systems (system: import nixpkgs { - # inherit system; - # config.allowUnfreee = true; - # }); + pkgsFor = lib.genAttrs systems (system: import nixpkgs { + inherit system; + config.allowUnfreee = true; + }); minimalConfigSettings = [ # From github:MasterofNull/nixos config home-manager.nixosModules.home-manager { @@ -167,6 +167,11 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; } + { + # # Let 'nixos-version --json' know the Git revision of this flake. (for containers?) + # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + # nix.registry.nixpkgs.flake = nixpkgs; + } ]; in { inherit lib; @@ -199,15 +204,11 @@ modules = minimalConfigSettings ++ [ ./machines/zenbook lix-module.nixosModules.default - # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/home.nix; } - # # Let 'nixos-version --json' know the Git revision of this flake. - # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; - # nix.registry.nixpkgs.flake = nixpkgs; ]; }; -- cgit v1.2.3