Skip to content

Commit

Permalink
Reorganize Flake inputs
Browse files Browse the repository at this point in the history
I would prefer to follow nixpkgs-unstable for stylix, but it breaks
right now due to a mismatch in settings for a few packages. Since most
of my NixOS config is on the stable release, it's not possible to use
the master/main branch of stylix without issues like this:

danth/stylix#577
  • Loading branch information
dmarcoux committed Oct 7, 2024
1 parent 3447b7e commit 6a78509
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 83 deletions.
6 changes: 3 additions & 3 deletions UPDATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
### How to Update to a New NixOS Version

1. Update the following inputs in [flake.nix](./flake.nix) to use the new NixOS version:
- `nixpkgs.url`
- `home-manager.url`
- `nixvim.url`
- `nixpkgs`
- `home-manager`
- `stylix`

2. Update state version for NixOS and Home Manager

Expand Down
136 changes: 63 additions & 73 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,24 @@

nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

home-manager.url = "github:nix-community/home-manager/release-24.05";
# Ensure that nixpkgs and home-manager stay in sync
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
# Ensure that nixpkgs and home-manager stay in sync
inputs.nixpkgs.follows = "nixpkgs";
};

stylix.url = "github:danth/stylix";
stylix = {
# Follow the stable NixOS release
url = "github:danth/stylix/release-24.05";
# Use nixpkgs
inputs.nixpkgs.follows = "nixpkgs";
};

nixvim = {
url = "github:nix-community/nixvim/nixos-24.05";
# Ensure that nixpkgs and nixvim stay in sync
inputs.nixpkgs.follows = "nixpkgs";
# Follow the master/main branch
url = "github:nix-community/nixvim";
# Use nixpkgs-unstable
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
};

Expand Down

0 comments on commit 6a78509

Please sign in to comment.