Skip to content

Commit

Permalink
refactor: re-align on 24.11 from master to avoid 25.05 rc
Browse files Browse the repository at this point in the history
  • Loading branch information
tcarrio committed Nov 21, 2024
1 parent 20d7ed2 commit bb3c420
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 104 deletions.
2 changes: 1 addition & 1 deletion darwin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
# Add overlays your own flake exports (from overlays and pkgs dir):
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
outputs.overlays.unstable-packages
outputs.overlays.trunk-packages
];
};
Expand Down
101 changes: 12 additions & 89 deletions flake.lock

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

10 changes: 3 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
# You can access packages and modules from different nixpkgs revs at the
# same time. See 'stable-packages' overlay in 'overlays/default.nix'.
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
# same time. See 'unstable-packages' overlay in 'overlays/default.nix'.
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-trunk.url = "github:nixos/nixpkgs/master";

agenix.url = "github:ryantm/agenix";
Expand All @@ -18,7 +18,7 @@

# Chaotic's Nyx provides many additional packages like NordVPN
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
chaotic.inputs.nixpkgs.follows = "nixpkgs";
chaotic.inputs.nixpkgs.follows = "nixpkgs-unstable";

nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
nix-formatter-pack.inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -39,10 +39,6 @@
nixos-generators.url = "github:tcarrio/nixos-generators";
nixos-generators.inputs.nixpkgs.follows = "nixpkgs";

# COSMIC DE
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs";

# Zen Browser
zen-browser.url = "github:MarceColl/zen-browser-flake";
zen-browser.inputs.nixpkgs.follows = "nixpkgs";
Expand Down
2 changes: 1 addition & 1 deletion home-manager/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ in
# Add overlays your own flake exports (from overlays and pkgs dir):
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
outputs.overlays.unstable-packages

# You can also add overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
Expand Down
2 changes: 1 addition & 1 deletion nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ in
# Add overlays your own flake exports (from overlays and pkgs dir):
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
outputs.overlays.unstable-packages
outputs.overlays.trunk-packages

# You can also add overlays exported from other flakes:
Expand Down
4 changes: 2 additions & 2 deletions nixos/mixins/hardware/gtx-1080ti.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ in

hardware = {
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.stable;
package = config.boot.kernelPackages.nvidiaPackages.beta;

modesetting.enable = true;

Expand All @@ -43,5 +43,5 @@ in
pulseaudio.support32Bit = true;
};

virtualisation.docker.enableNvidia = true;
virtualisation.docker.enableNvidia = config.oxc.virtualisation.enable;
}
6 changes: 3 additions & 3 deletions overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@


# When applied, the stable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.stable'
stable-packages = final: _prev: {
stable = import inputs.nixpkgs-stable {
# be accessible through 'pkgs.unstable'
unstable-packages = final: _prev: {
stable = import inputs.nixpkgs-unstable {
inherit (final) system;
config.allowUnfree = true;
};
Expand Down

0 comments on commit bb3c420

Please sign in to comment.