diff --git a/flake.lock b/flake.lock index d487243..35bbe84 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1745362344, - "narHash": "sha256-R4d7j2urn/W+K9crKJaxJvZOsVX5v7uCAymaDBq97SE=", + "lastModified": 1745380081, + "narHash": "sha256-bUy25YkdRfdWPxSyx22igWi6g3rd3HXKFg+yL4dfBPY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b99e3e46b86aefc01f229e0a29d0c03c1079aaed", + "rev": "1d0e13904bd8c444ab1595f686ede5eff377e881", "type": "github" }, "original": { @@ -20,6 +20,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745120797, + "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1745234285, @@ -39,6 +59,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index e6442c1..8cca1df 100644 --- a/flake.nix +++ b/flake.nix @@ -3,20 +3,30 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home-manager, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, nix-index-database, ... }@inputs: { nixosConfigurations.rainix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ ./configuration.nix home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.rainy = import ./home.nix; - } ]; + modules = [ + ./configuration.nix + nix-index-database.nixosModules.nix-index + { + programs.nix-index-database.comma.enable = true; + } + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.rainy = import ./home.nix; + } + ]; }; }; } diff --git a/home.nix b/home.nix index b775901..23b0fba 100644 --- a/home.nix +++ b/home.nix @@ -25,6 +25,7 @@ pkgs.fastfetch pkgs.upscayl pkgs.heroic + #pkgs.comma ]; home.stateVersion = "25.05"; diff --git a/modules/fish.nix b/modules/fish.nix index fcaf2bf..64f76db 100644 --- a/modules/fish.nix +++ b/modules/fish.nix @@ -4,7 +4,7 @@ programs.fish = { enable = true; shellAliases = { - nxr = "cd ~/nix-config && nix flake update && sudo nixos-rebuild switch --upgrade --flake .#"; + nxr = "cd ~/nix-config && sudo nix flake update && sudo nixos-rebuild switch --upgrade --flake .#"; nxe = "nano /home/rainy/nix-config/configuration.nix"; nxh = "nano /home/rainy/nix-config/home.nix"; };