Skip to content

Commit

Permalink
NixOS: use nixpkgs-flake to pin nixpkgs (NixOS/nix#7075)
Browse files Browse the repository at this point in the history
  • Loading branch information
delan committed Dec 23, 2024
1 parent bb15bfe commit 9f01b5d
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 174 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

6 changes: 3 additions & 3 deletions nix/nixos/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
uranus/configuration.nix
hm2211.nixosModules.home-manager
{
home-manager.users.delan = import ../nixpkgs/home.nix;
home-manager.users.delan = import ./home.nix;

# use same nixpkgs as system, which has allowUnfree
home-manager.useGlobalPkgs = true;
Expand All @@ -96,7 +96,7 @@
nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen2
hm2405.nixosModules.home-manager
{
home-manager.users.delan = import ../nixpkgs/home.nix;
home-manager.users.delan = import ./home.nix;

# use same nixpkgs as system, which has allowUnfree
home-manager.useGlobalPkgs = true;
Expand All @@ -114,7 +114,7 @@
jupiter/configuration.nix
hm.nixosModules.home-manager
{
home-manager.users.delan = import ../nixpkgs/home.nix;
home-manager.users.delan = import ./home.nix;

# use same nixpkgs as system, which has allowUnfree
home-manager.useGlobalPkgs = true;
Expand Down
File renamed without changes.
8 changes: 0 additions & 8 deletions nix/nixos/lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@
experimental-features = nix-command flakes
'';

# pin nixpkgs flakeref to match our nixos config, to avoid constantly fetching unstable packages
# https://discourse.nixos.org/t/how-to-pin-nix-registry-nixpkgs-to-release-channel/14883/7
# TODO unwrap path in NixOS 22.11
nix.registry.nixpkgs.to = { type = "path"; path = "${pkgs.path}"; };

# pin nixpkgs channel to nixpkgs flakeref
nix.nixPath = ["nixpkgs=flake:nixpkgs"];

console.keyMap = "us";
i18n.defaultLocale = "en_AU.UTF-8";
time.timeZone = "Australia/Perth";
Expand Down
84 changes: 0 additions & 84 deletions nix/nixpkgs/osu.nix

This file was deleted.

1 change: 0 additions & 1 deletion nix/overlays/nixpkgs-mozilla
Submodule nixpkgs-mozilla deleted from db89c8
36 changes: 0 additions & 36 deletions nix/packages/adc902fc0fa11bbe/default.nix

This file was deleted.

39 changes: 0 additions & 39 deletions nix/packages/nmcli-rofi/default.nix

This file was deleted.

0 comments on commit 9f01b5d

Please sign in to comment.