From 440084f82cd907b0d235556606905b845a2d4e58 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 14 Mar 2026 05:45:44 -0600 Subject: add comma, clean up default module definitions --- flake.nix | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index a9a8dcc..32c9b0f 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,9 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-old.url = "github:nixos/nixpkgs/nixos-25.05"; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager = { url = "github:nix-community/home-manager/release-25.11"; # The `follows` keyword in inputs is used for inheritance. @@ -201,15 +204,24 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; } + ]; + nixIndex = [ + nix-index-database.nixosModules.nix-index { + programs.nix-index-database.comma.enable = true; + } + ]; + minimalModuleConfig = minimalHomeManagerSettings ++ nixIndex ++ [ # lib.nixosSystem { # modules = [ - # ./modules/nixos/nix-common.nix - # ./modules/nixos/environment.nix - # ./modules/nixos/system-packages.nix - - # ./modules/users/defin.nix - # ./modules/users/root.nix - # ]; + ./modules/nixos/nix-common.nix + ./modules/nixos/environment.nix + ./modules/nixos/system-packages.nix + + ./modules/users/defin.nix + ./modules/users/root.nix + # nix-index-database.nixosModules.nix-index + # { programs.nix-index-database.comma.enable = true;} + # ]; # # # 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; @@ -250,7 +262,9 @@ }; zenbook = lib.nixosSystem { # Personal laptop # specialArgs = { inherit inputs; }; - modules = minimalHomeManagerSettings ++ [ ./machines/zenbook + modules = minimalModuleConfig ++ [ ./machines/zenbook + # minimalNixConfig + # nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true;} # lix-module.nixosModules.default # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; } -- cgit v1.2.3