From 8995f6265f71943c3a5db7a1f912658be89a8cb7 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 27 Apr 2024 18:58:23 +0200 Subject: [PATCH] add rpi5 --- flake.lock | 63 ++++++++++++++++++++++++++++++++--------- flake.nix | 7 ++++- systems.nix | 1 + systems/pi5/default.nix | 55 +++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 14 deletions(-) create mode 100644 systems/pi5/default.nix diff --git a/flake.lock b/flake.lock index 2872243..91c0faf 100644 --- a/flake.lock +++ b/flake.lock @@ -37,6 +37,20 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -80,11 +94,11 @@ ] }, "locked": { - "lastModified": 1714042918, - "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -158,11 +172,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713864415, - "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "type": "github" }, "original": { @@ -214,15 +228,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714122681, - "narHash": "sha256-9T6J9a39eFJ/a5WZ7il/GsutGWeLKFMcbAI8pamKstg=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6cefed103cc8146acf4ca7ecddc481874a167d44", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -235,14 +250,36 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "rpi_5": "rpi_5", "snm": "snm", "srvos": "srvos" } }, + "rpi_5": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704485878, + "narHash": "sha256-i7UH31IZyil99EUB5qnQJAiszFkea1B1yZf5pQEDIYg=", + "owner": "vriska", + "repo": "nix-rpi5", + "rev": "ac9942532e1dc2f825ad2aa3a6d31bfbd3b42eed", + "type": "gitlab" + }, + "original": { + "owner": "vriska", + "repo": "nix-rpi5", + "type": "gitlab" + } + }, "snm": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -269,11 +306,11 @@ ] }, "locked": { - "lastModified": 1714006362, - "narHash": "sha256-Wp7eWCLmDHI+sfAergoKluNWPyeAyG8ePfeXsUGJZ6c=", + "lastModified": 1714143163, + "narHash": "sha256-WMAziIBkwX//WUGxH49ZSm0yaPS6/PvNWUMMut8unm0=", "owner": "nix-community", "repo": "srvos", - "rev": "a1bbd4ab45c065bb2583f6344f9f72663c683fcb", + "rev": "71a8e8ab6e4763714d20c22f42ba8860369a1508", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 685f217..92d00f0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,12 @@ description = "jopejoe1 NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + rpi_5 = { + url = "gitlab:vriska/nix-rpi5"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Outputs nixos-generators = { diff --git a/systems.nix b/systems.nix index 98e2d23..e1526e2 100644 --- a/systems.nix +++ b/systems.nix @@ -43,5 +43,6 @@ in { pi400 = mkSystem "aarch64-unknown-linux-gnu" "pi400"; pi4 = mkSystem "aarch64-unknown-linux-gnu" "pi4"; + pi5 = mkSystem "aarch64-unknown-linux-gnu" "pi5"; pi4-2 = mkSystem "aarch64-unknown-linux-gnu" "pi4-2"; } diff --git a/systems/pi5/default.nix b/systems/pi5/default.nix new file mode 100644 index 0000000..f1c3aad --- /dev/null +++ b/systems/pi5/default.nix @@ -0,0 +1,55 @@ +{ + modulesPath, + lib, + pkgs, + self, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = false; + }; + kernelPackages = self.rpi_5.legacyPackages.aarch64-linux.linux_rpi5; + kernelModules = [ ]; + initrd = { + availableKernelModules = [ "usbhid" "usb_storage" ]; + kernelModules = [ ]; + }; + }; + + + networking = { + useDHCP = lib.mkDefault true; + wireless.iwd = { + enable = true; + settings.General.EnableNetworkConfiguration = true; + }; + firewall.enable = false; + }; + + environment.systemPackages = with pkgs; [ + vim + curl + git + ]; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/1c06cdf2-126c-41dc-b8bd-b441856d5e98"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/DAE3-FBD2"; + fsType = "vfat"; + }; + }; + + powerManagement.cpuFreqGovernor = "ondemand"; +}