cry/flake-ooni
1
0
Fork 0
forked from UniverseBow/flake
Code Pull requests Activity

fix nixpkgs rev for t2pkgs

Browse source
This commit is contained in:
do butterflies cry? 2026-03-27 13:44:23 +10:00
parent 80d7e8489d
commit a65c2d24a7
Signed by: cry
GPG key ID: F68745A836CA0412
8 changed files with 116 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

83
flake.lock generated
View file

@ -340,6 +340,27 @@
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1774561634,
"narHash": "sha256-3q1xsREjqdVIIwQQDZQ9y0YdBzP8gAxdwKoKnZSzJtU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7c046c63ac3b467c1d589b99d531da5b6520825a",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"hyprcursor": {
"inputs": {
"hyprlang": [
@ -980,16 +1001,17 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1774465523,
"narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
"lastModified": 1759582739,
"narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
"rev": "3441b5242af7577230a78ffb03542add264179ab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "3441b5242af7577230a78ffb03542add264179ab",
"type": "github"
}
},
@ -1024,22 +1046,6 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1773068446,
"narHash": "sha256-MCEmktH6AFJH8Pg1rBGB2Q0FhS5z5K87IsMbUU8uzHI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "70b7278e2c0acc26ad3360551bf9c15c5ccc0acd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-nixcord": {
"locked": {
"lastModified": 1773222311,
@ -1056,33 +1062,49 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"nixpkgs-t2-firmware": {
"locked": {
"lastModified": 1772773019,
"narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
"lastModified": 1759381078,
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1774273680,
"narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1772822230,
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "nixos",
"lastModified": 1774388614,
"narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
@ -1154,6 +1176,7 @@
"cerulean": "cerulean",
"grub2-themes": "grub2-themes",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"hyprland": "hyprland",
"millennium": "millennium",
"nix-flatpak": "nix-flatpak",
@ -1161,7 +1184,7 @@
"nixcord": "nixcord",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-t2-firmware": "nixpkgs-t2-firmware",
"nixpkgs-unstable": "nixpkgs-unstable",
"sddm-silent": "sddm-silent",
"systems": "systems_3",

8
flake.nix
View file

@ -4,10 +4,12 @@
inputs = {
systems.url = "github:nix-systems/default-linux";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
# WARNING: don't update the revision! it breaks the t2-firmware from nixos-hardware...
nixpkgs-t2-firmware.url = "github:NixOS/nixpkgs?rev=7df7ff7d8e00218376575f0acdcc5d66741351ee";
nixos-hardware.url = "github:NixOS/nixos-hardware";
nixos-hardware.url = "github:NixOS/nixos-hardware?rev=3441b5242af7577230a78ffb03542add264179ab";
home-manager = {
url = "github:nix-community/home-manager/release-25.11";

2
hosts/MACBOOKI9/default.nix
View file

@ -6,7 +6,7 @@
}: {
imports = [
./hardware.nix
../modules/core/t2-firmware.nix
../modules/core/t2-firmware
];
networking.hostName = "MACBOOKI9";

34
hosts/modules/core/t2-firmware.nix
View file

@ -1,34 +0,0 @@
{
inputs,
pkgs,
...
}: {
imports = [
inputs.nixos-hardware.nixosModules.apple-t2
];
nix.settings = {
trusted-substituters = [
"https://t2linux.cachix.org"
];
trusted-public-keys = [
"t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw="
];
};
apple.touchBar.enable = true;
# REF: https://github.com/NixOS/nixos-hardware/blob/master/apple/t2/default.nix
apple-t2 = {
# the macbook does not have an AMD dGPU (iGPU)
enableIGPU = false;
kernelChannel = "stable";
firmware = {
enable = true;
version = "sonoma";
};
};
};
}

57
hosts/modules/core/t2-firmware/default.nix Normal file
View file

@ -0,0 +1,57 @@
# REF: https://github.com/t2linux/nixos-t2-iso
{
inputs,
pkgs,
t2pkgs,
...
} @ args: {
imports = [
(import inputs.nixos-hardware.nixosModules.apple-t2 (args // {pkgs = t2pkgs;}))
];
nix.settings = {
trusted-substituters = [
"https://t2linux.cachix.org"
];
trusted-public-keys = [
"t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw="
];
};
# cerulean channels configuration
nixpkgs.channels.t2pkgs = {
source = inputs.nixpkgs-t2-firmware;
config = {
allowUnfree = true;
allowBroken = false;
};
overlays = [
(self: super: {
get-apple-firmware = super.callPackage ./get-apple-firmware.nix {};
})
];
};
# environment.systemPackages = with base; [
# python3
# dmg2img
# get-apple-firmware
# ];
# hardware = {
# apple.touchBar.enable = true;
# # REF: https://github.com/NixOS/nixos-hardware/blob/master/apple/t2/default.nix
# apple-t2 = {
# # the macbook does not have an AMD dGPU (iGPU)
# enableIGPU = false;
# kernelChannel = "stable";
# firmware = {
# enable = true;
# version = "sonoma";
# };
# };
# };
}

0
packages/get-apple-firmware.nix → hosts/modules/core/t2-firmware/get-apple-firmware.nix
View file

2
overlays/default.nix
View file

@ -24,8 +24,6 @@
];
};
get-apple-firmware = pkgs.callPackage ../packages/get-apple-firmware.nix {};
sddm-theme-corners = import ../packages/sddm-theme/corners.nix {
inherit pkgs;
};

3
snow.nix
View file

@ -20,9 +20,6 @@
system = "x86_64-linux";
groups = groups: [groups.desktops];
base = inputs.nixpkgs-unstable;
homeManager = inputs.home-manager-unstable;
modules = with inputs; [
grub2-themes.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak