This commit is contained in:
mjallen
2025-05-12 15:39:36 +00:00
parent af365fd1e8
commit 42a2e79889
5 changed files with 154 additions and 73 deletions

View File

@@ -5,52 +5,54 @@
{ config, lib, pkgs, ... }:
let
user = "matt";
password = config.sops.secrets."jallen-nas/admin_password".path;
kernelBundle = pkgs.linuxAndFirmware.v6_6_31;
password = config.sops.secrets."desktop/matt_password".path;
# kernelBundle = pkgs.linuxAndFirmware.v6_6_31;
in
{
imports = [
./boot.nix
./impermanence.nix
./hardware-configuration.nix
./networking.nix
./sops.nix
../default.nix
];
programs.zsh.enable = true;
# Enable nix flakes and nix-command tools
nix = {
settings = {
substituters = [
"https://nixos-raspberrypi.cachix.org"
];
trusted-public-keys = [
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
];
};
};
# nix = {
# settings = {
# substituters = [
# "https://nixos-raspberrypi.cachix.org"
# ];
# trusted-public-keys = [
# "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
# ];
# };
# };
# Configure nixpkgs
nixpkgs = {
overlays = lib.mkAfter [
(self: super: {
# This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
# nixpkgs = {
# overlays = lib.mkAfter [
# (self: super: {
# # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
# enableRedistributableFirmware is enabled
# I know no easier way to override this package
inherit (kernelBundle) raspberrypiWirelessFirmware;
# inherit (kernelBundle) raspberrypiWirelessFirmware;
# Some derivations want to use it as an input,
# e.g. raspberrypi-dtbs, omxplayer, sd-image-* modules
inherit (kernelBundle) raspberrypifw;
})
];
};
# inherit (kernelBundle) raspberrypifw;
# })
# ];
# };
system.nixos.tags = let
cfg = config.boot.loader.raspberryPi;
in [
"raspberry-pi-${cfg.variant}"
cfg.bootloader
config.boot.kernelPackages.kernel.version
];
# system.nixos.tags = let
# cfg = config.boot.loader.raspberryPi;
# in [
# "raspberry-pi-${cfg.variant}"
# cfg.bootloader
# config.boot.kernelPackages.kernel.version
# ];
systemd.services.btattach = {
before = [ "bluetooth.service" ];
@@ -75,7 +77,8 @@ in
mutableUsers = false;
users."${user}" = {
isNormalUser = true;
hashedPasswordFile = password;
initialPassword = "BogieDudie1";
# hashedPasswordFile = password;
extraGroups = [
"wheel"
"docker"