ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

remove framework-16 module

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-20 18:34:35 -04:00 committed by Alice Huston
parent 547bd07ed0
commit 4dd11b6f9a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.lock generated
View File

@ -276,6 +276,7 @@
"type": "github" "type": "github"
} }
}, },
<<<<<<< Updated upstream
"nixos-hardware-fw16": { "nixos-hardware-fw16": {
"locked": { "locked": {
"lastModified": 1713209644, "lastModified": 1713209644,
@ -292,6 +293,8 @@
"url": "https://github.com/jkoking/nixos-hardware" "url": "https://github.com/jkoking/nixos-hardware"
} }
}, },
=======
>>>>>>> Stashed changes
"nixos-modules": { "nixos-modules": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -408,7 +411,6 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-pre-commit": "nix-pre-commit", "nix-pre-commit": "nix-pre-commit",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-hardware-fw16": "nixos-hardware-fw16",
"nixos-modules": "nixos-modules", "nixos-modules": "nixos-modules",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",

4
flake.nix
View File

@ -96,10 +96,6 @@
url = "github:NixOS/nixos-hardware"; url = "github:NixOS/nixos-hardware";
}; };
nixos-hardware-fw16 = {
url = "git+https://github.com/jkoking/nixos-hardware?ref=add-framework-16";
};
attic = { attic = {
url = "github:zhaofengli/attic"; url = "github:zhaofengli/attic";
inputs = { inputs = {

2
users/alice/systems/artemision/default.nix
View File

@ -4,7 +4,7 @@
home = true; home = true;
sops = true; sops = true;
modules = [ modules = [
inputs.nixos-hardware-fw16.nixosModules.framework-16-7040-amd inputs.nixos-hardware.nixosModules.framework-16-7040-amd
#({ pkgs, ... }: { #({ pkgs, ... }: {
# nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ]; # nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
# environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { # environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {