sombrero: Update to 23.05

This commit is contained in:
Alexander Heldt
2023-10-22 15:15:39 +02:00
parent fbf38c4cf9
commit d1343c563c
3 changed files with 83 additions and 95 deletions

19
flake.lock generated
View File

@@ -266,22 +266,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs2211": {
"locked": {
"lastModified": 1688392541,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@@ -290,8 +274,7 @@
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"nh": "nh", "nh": "nh",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs2211": "nixpkgs2211"
} }
}, },
"systems": { "systems": {

View File

@@ -3,7 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixos-hardware.url = "github:nixos/nixos-hardware/master"; nixos-hardware.url = "github:nixos/nixos-hardware/master";
@@ -49,7 +48,7 @@
]; ];
}; };
sombrero = inputs.nixpkgs2211.lib.nixosSystem { sombrero = inputs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [

View File

@@ -28,7 +28,10 @@
}; };
}; };
tmpOnTmpfs = true; tmp = {
useTmpfs = true;
};
kernelPackages = pkgs.linuxPackages_rpi4; kernelPackages = pkgs.linuxPackages_rpi4;
kernelParams = [ kernelParams = [
"8250.nr_uarts=1" "8250.nr_uarts=1"
@@ -160,101 +163,104 @@
key = "/home/alex/backup/sync/hosts/sombrero/syncthing/key.pem"; key = "/home/alex/backup/sync/hosts/sombrero/syncthing/key.pem";
guiAddress = "0.0.0.0:8384"; guiAddress = "0.0.0.0:8384";
extraOptions = {
gui = {
user = "syncthing";
password = "CBLPEBrHoGPOnfdZtLibnSAaPAALXfSU";
insecureSkipHostcheck = false;
};
};
devices = { settings = {
phone.id = "NJIMX57-C2CGV76-GXMAQYV-ABWDA7Z-TS6UV2X-NVL5UPG-UFEQH4C-TKYA6QM"; extraOptions = {
bennu.id = "YXA2PVY-XNUS5HZ-4ZC6A65-O3JRY3S-P6UKE6N-FSUBOYE-JZ7UJWR-ILXMUAW"; gui = {
pinwheel.id = "AKS5L2A-NFCG5GV-3U5SSSZ-PLOX6BQ-ZL5ALXI-D7OK4KE-R2JPWRJ-B6AQJQ7"; user = "syncthing";
}; password = "CBLPEBrHoGPOnfdZtLibnSAaPAALXfSU";
insecureSkipHostcheck = false;
folders = {
"hosts" = {
path = "/home/alex/backup/sync/hosts";
devices = [ "bennu" ];
versioning = {
type = "staggered";
params = {
maxAge = "2592000"; # 30 days
};
}; };
}; };
"org" = { devices = {
path = "/home/alex/backup/sync/org"; phone.id = "NJIMX57-C2CGV76-GXMAQYV-ABWDA7Z-TS6UV2X-NVL5UPG-UFEQH4C-TKYA6QM";
devices = [ "phone" "bennu" "pinwheel" ]; bennu.id = "YXA2PVY-XNUS5HZ-4ZC6A65-O3JRY3S-P6UKE6N-FSUBOYE-JZ7UJWR-ILXMUAW";
versioning = { pinwheel.id = "AKS5L2A-NFCG5GV-3U5SSSZ-PLOX6BQ-ZL5ALXI-D7OK4KE-R2JPWRJ-B6AQJQ7";
type = "staggered";
params = {
maxAge = "2592000"; # 30 days
};
};
}; };
"phone-gps" = { folders = {
path = "/home/alex/backup/sync/gps"; "hosts" = {
devices = [ "bennu" "phone" ]; path = "/home/alex/backup/sync/hosts";
versioning = { devices = [ "bennu" ];
type = "staggered"; versioning = {
params = { type = "staggered";
maxAge = "2592000"; # 30 days params = {
maxAge = "2592000"; # 30 days
};
}; };
}; };
};
"personal" = { "org" = {
path = "/home/alex/backup/sync/personal"; path = "/home/alex/backup/sync/org";
devices = [ "bennu" "pinwheel" ]; devices = [ "phone" "bennu" "pinwheel" ];
versioning = { versioning = {
type = "staggered"; type = "staggered";
params = { params = {
maxAge = "2592000"; # 30 days maxAge = "2592000"; # 30 days
};
}; };
}; };
};
"work" = { "phone-gps" = {
path = "/home/alex/backup/sync/work"; path = "/home/alex/backup/sync/gps";
devices = [ "bennu" "pinwheel" ]; devices = [ "bennu" "phone" ];
versioning = { versioning = {
type = "staggered"; type = "staggered";
params = { params = {
maxAge = "2592000"; # 30 days maxAge = "2592000"; # 30 days
};
}; };
}; };
};
"time-tracking" = { "personal" = {
path = "/home/alex/backup/sync/time-tracking"; path = "/home/alex/backup/sync/personal";
devices = [ "phone" ]; devices = [ "bennu" "pinwheel" ];
versioning = { versioning = {
type = "staggered"; type = "staggered";
params = { params = {
maxAge = "2592000"; # 30 days maxAge = "2592000"; # 30 days
};
}; };
}; };
};
"books" = { "work" = {
path = "/home/alex/backup/books"; path = "/home/alex/backup/sync/work";
devices = [ "bennu" "pinwheel" ]; devices = [ "bennu" "pinwheel" ];
versioning = { versioning = {
type = "staggered"; type = "staggered";
params = { params = {
maxAge = "2592000"; # 30 days maxAge = "2592000"; # 30 days
};
}; };
}; };
};
"audiobooks" = { "time-tracking" = {
path = "/home/alex/media/sync/audiobooks"; path = "/home/alex/backup/sync/time-tracking";
devices = [ "phone" ]; devices = [ "phone" ];
versioning = {
type = "staggered";
params = {
maxAge = "2592000"; # 30 days
};
};
};
"books" = {
path = "/home/alex/backup/books";
devices = [ "bennu" "pinwheel" ];
versioning = {
type = "staggered";
params = {
maxAge = "2592000"; # 30 days
};
};
};
"audiobooks" = {
path = "/home/alex/media/sync/audiobooks";
devices = [ "phone" ];
};
}; };
}; };
}; };