Fix Syncthing in start-haven script; General cleanup
This commit is contained in:
parent
9ab794c73d
commit
9b22d4e49f
18
flake.lock
18
flake.lock
|
@ -117,11 +117,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710532761,
|
"lastModified": 1710820906,
|
||||||
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
|
"narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
|
"rev": "022464438a85450abb23d93b91aa82e0addd71fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -174,11 +174,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710622004,
|
"lastModified": 1710783728,
|
||||||
"narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=",
|
"narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3",
|
"rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -222,11 +222,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710631334,
|
"lastModified": 1710806803,
|
||||||
"narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
|
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
|
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -4,14 +4,14 @@
|
||||||
description = "Aires' system Flake";
|
description = "Aires' system Flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# Configure nixpkgs
|
# Track base packages against Nix unstable
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
# For SecureBoot support
|
# SecureBoot support
|
||||||
lanzaboote.url = "github:nix-community/lanzaboote/v0.3.0";
|
lanzaboote.url = "github:nix-community/lanzaboote/v0.3.0";
|
||||||
|
|
||||||
# For Flatpak support
|
# Flatpak support
|
||||||
nix-flatpak.url = "github:gmodena/nix-flatpak/v0.3.0"; # Use github:gmodena/nix-flatpak/?ref=<tag> to change release version, nix-flatpak/<commit> to reference a specific commit, or remove to track main (unstable).
|
nix-flatpak.url = "github:gmodena/nix-flatpak/v0.3.0";
|
||||||
|
|
||||||
# Hardware configurations
|
# Hardware configurations
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
|
|
||||||
swapDevices = [{
|
swapDevices = [{
|
||||||
device = "/swap/swapfile";
|
device = "/swap/swapfile";
|
||||||
|
size = 16384;
|
||||||
}];
|
}];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
|
@ -30,7 +30,7 @@ if [ ! -f /dev/mapper/storage ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Starting SyncThing:"
|
echo "Starting SyncThing:"
|
||||||
systemctl --user -M aires@ start syncthing.service
|
systemctl --machine aires@.host --user start syncthing.service
|
||||||
if [ $? -eq "0" ]; then
|
if [ $? -eq "0" ]; then
|
||||||
echo "SyncThing started."
|
echo "SyncThing started."
|
||||||
else
|
else
|
||||||
|
|
|
@ -60,6 +60,7 @@
|
||||||
|
|
||||||
swapDevices = [{
|
swapDevices = [{
|
||||||
device = "/swap/swapfile";
|
device = "/swap/swapfile";
|
||||||
|
size = 16384;
|
||||||
}];
|
}];
|
||||||
|
|
||||||
# Enable AMDGPU
|
# Enable AMDGPU
|
||||||
|
|
|
@ -42,13 +42,11 @@ with lib;
|
||||||
enable = true;
|
enable = true;
|
||||||
flake = "${config.users.users.aires.home}/Development/nix-configuration";
|
flake = "${config.users.users.aires.home}/Development/nix-configuration";
|
||||||
flags = [
|
flags = [
|
||||||
"--commit-lock-file" # Create a new commit when flake.lock updates
|
|
||||||
"--update-input"
|
"--update-input"
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
"-L" # print build logs
|
"--commit-lock-file" # Create a new commit when flake.lock updates
|
||||||
];
|
];
|
||||||
dates = "02:00";
|
dates = "daily";
|
||||||
randomizedDelaySec = "45min";
|
|
||||||
allowReboot = false;
|
allowReboot = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue