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

switch to fw16 branch, flake update

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-10 19:19:47 -04:00 committed by Alice Huston
parent 036e5302f6
commit 1ad2bf21b7
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.lock generated
View File

@ -256,6 +256,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware-fw16": {
"locked": {
"lastModified": 1711646850,
"narHash": "sha256-obXZfJVIPJl7wfO1WrcHqcIGLm7mSsQ4MjcUu9PqIPM=",
"ref": "add-framework-16",
"rev": "cf73a64b8cb9f0a4c86b53a645a8d35f1b7bc246",
"revCount": 1603,
"type": "git",
"url": "https://github.com/jkoking/nixos-hardware"
},
"original": {
"ref": "add-framework-16",
"type": "git",
"url": "https://github.com/jkoking/nixos-hardware"
}
},
"nixos-modules": { "nixos-modules": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -371,6 +387,7 @@
"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

@ -99,6 +99,10 @@
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 = {

12
users/alice/systems/artemision/configuration.nix
View File

@ -52,13 +52,13 @@
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
services.fwupd.package = # services.fwupd.package =
(import (builtins.fetchTarball { # (import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz"; # url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk"; # sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
}) { inherit (pkgs) system; }).fwupd; # }) { inherit (pkgs) system; }).fwupd;
services.fprintd.enable = false; services.fprintd.enable = true;
services.spotifyd = { services.spotifyd = {
enable = true; enable = true;

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.nixosModules.framework-13-7040-amd inputs.nixos-hardware-fw16.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 {