4 Commits

Author SHA1 Message Date
fa07aef5a3 Pi firmware packages 2023-12-16 18:13:30 +00:00
ca37ac3837 Merge branch 'master' into rpi 2023-12-16 17:18:33 +00:00
f9cf5758e3 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/781e2a9797ecf0f146e81425c822dca69fe4a348' (2023-12-10)
  → 'github:NixOS/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12)
2023-12-14 20:02:56 +00:00
f0e0cf2772 Refactor deprecated borgmatic.settings.location 2023-12-11 23:39:09 +00:00
5 changed files with 18 additions and 11 deletions

6
flake.lock generated
View File

@@ -133,11 +133,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1702233072, "lastModified": 1702346276,
"narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -57,14 +57,12 @@
services.borgmatic = { services.borgmatic = {
enable = true; enable = true;
settings = { settings = {
location = { source_directories = [
source_directories = [ "/home/jordan/Documents"
"/home/jordan/Documents" ];
]; repositories = [
repositories = [ { label = "borgbase"; path = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo"; }
"ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo" ];
];
};
storage = { storage = {
encryption_passcommand = "cat ${config.age.secrets.odyssey_borg_passphrase.path}"; encryption_passcommand = "cat ${config.age.secrets.odyssey_borg_passphrase.path}";
ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key"; ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";

View File

@@ -13,6 +13,7 @@
apply-overlays-dtmerge.enable = true; apply-overlays-dtmerge.enable = true;
audio = false; audio = false;
fkms-3d.enable = true; fkms-3d.enable = true;
xhci.enable = true;
}; };
deviceTree = { deviceTree = {
enable = true; enable = true;
@@ -21,6 +22,10 @@
{ name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; } { name = "hifiberry-digi-pro"; dtboFile = "${pkgs.device-tree_rpi.overlays}/hifiberry-digi-pro.dtbo"; }
]; ];
}; };
firmware = with pkgs; [
firmwareLinuxNonfree
wireless-regdb
];
}; };
sound.enable = true; sound.enable = true;

View File

@@ -5,6 +5,8 @@
<nixos-hardware/raspberry-pi/4> <nixos-hardware/raspberry-pi/4>
]; ];
boot.cleanTmpDir = true;
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-label/NIXOS_SD"; device = "/dev/disk/by-label/NIXOS_SD";

View File

@@ -18,6 +18,8 @@
console.keyMap = "uk"; console.keyMap = "uk";
documentation.enable = false;
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {