fix
This commit is contained in:
parent
b04652173d
commit
d31c49ed15
@ -3,9 +3,6 @@ let
|
|||||||
nodeAddress = "192.168.0.5";
|
nodeAddress = "192.168.0.5";
|
||||||
upstream-dns = "100.64.0.1";
|
upstream-dns = "100.64.0.1";
|
||||||
in {
|
in {
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /srv/blocky-tailscale 0755 root root -"
|
|
||||||
];
|
|
||||||
systemd.services.gen-headscale-key = {
|
systemd.services.gen-headscale-key = {
|
||||||
before = [ "container@blocky.service" ];
|
before = [ "container@blocky.service" ];
|
||||||
requiredBy = [ "container@blocky.service" ];
|
requiredBy = [ "container@blocky.service" ];
|
||||||
|
@ -55,41 +55,41 @@ in {
|
|||||||
};
|
};
|
||||||
persist.state.directories = [ "/var/lib/mc-statech" ];
|
persist.state.directories = [ "/var/lib/mc-statech" ];
|
||||||
|
|
||||||
secrets.restic-mc-pass.services = [ "restic-backups-mc-servers.service" ];
|
# secrets.restic-mc-pass.services = [ "restic-backups-mc-servers.service" ];
|
||||||
secrets.restic-mc-repo.services = [ "restic-backups-mc-servers.service" ];
|
# secrets.restic-mc-repo.services = [ "restic-backups-mc-servers.service" ];
|
||||||
services.restic.backups.mc-servers = {
|
# services.restic.backups.mc-servers = {
|
||||||
initialize = true;
|
# initialize = true;
|
||||||
passwordFile = config.secrets.restic-mc-pass.decrypted;
|
# passwordFile = config.secrets.restic-mc-pass.decrypted;
|
||||||
repositoryFile = config.secrets.restic-mc-repo.decrypted;
|
# repositoryFile = config.secrets.restic-mc-repo.decrypted;
|
||||||
paths = [ "/var/lib/mc-statech" ];
|
# paths = [ "/var/lib/mc-statech" ];
|
||||||
exclude = [ "/var/lib/mc-statech/backups" ];
|
# exclude = [ "/var/lib/mc-statech/backups" ];
|
||||||
environmentFile = "${pkgs.writeText "restic.env" ''
|
# environmentFile = "${pkgs.writeText "restic.env" ''
|
||||||
GOMAXPROCS=1
|
# GOMAXPROCS=1
|
||||||
MCRCON_PORT=25566
|
# MCRCON_PORT=25566
|
||||||
MCRCON_PASS=whatisloveohbabydonthurtmedonthurtmenomore
|
# MCRCON_PASS=whatisloveohbabydonthurtmedonthurtmenomore
|
||||||
''}";
|
# ''}";
|
||||||
extraBackupArgs = [ "--no-scan" ];
|
# extraBackupArgs = [ "--no-scan" ];
|
||||||
backupPrepareCommand = ''
|
# backupPrepareCommand = ''
|
||||||
if ! systemctl is-active --quiet mc-statech.service; then
|
# if ! systemctl is-active --quiet mc-statech.service; then
|
||||||
echo "Minecraft server is not active. Skipping restic backup."
|
# echo "Minecraft server is not active. Skipping restic backup."
|
||||||
exit 1
|
# exit 1
|
||||||
fi
|
# fi
|
||||||
${pkgs.mcrcon}/bin/mcrcon "say Restic backup is started!" save-off "save-all"
|
# ${pkgs.mcrcon}/bin/mcrcon "say Restic backup is started!" save-off "save-all"
|
||||||
sleep 3
|
# sleep 3
|
||||||
'';
|
# '';
|
||||||
backupCleanupCommand = ''
|
# backupCleanupCommand = ''
|
||||||
systemctl is-active --quiet mc-statech.service && ${pkgs.mcrcon}/bin/mcrcon "say Restic backup is done!" save-on
|
# systemctl is-active --quiet mc-statech.service && ${pkgs.mcrcon}/bin/mcrcon "say Restic backup is done!" save-on
|
||||||
'';
|
# '';
|
||||||
timerConfig = {
|
# timerConfig = {
|
||||||
OnCalendar = "*:0/15";
|
# OnCalendar = "*:0/15";
|
||||||
};
|
# };
|
||||||
pruneOpts = [
|
# pruneOpts = [
|
||||||
"--keep-last 12"
|
# "--keep-last 12"
|
||||||
"--keep-hourly 12"
|
# "--keep-hourly 12"
|
||||||
"--keep-daily 5"
|
# "--keep-daily 5"
|
||||||
"--keep-weekly 2"
|
# "--keep-weekly 2"
|
||||||
"--keep-monthly 0"
|
# "--keep-monthly 0"
|
||||||
"--keep-yearly 0"
|
# "--keep-yearly 0"
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
}
|
}
|
||||||
|
@ -26,23 +26,23 @@ in with config.deviceSpecific; with lib; {
|
|||||||
imports = [ inputs.hyprland.nixosModules.default ];
|
imports = [ inputs.hyprland.nixosModules.default ];
|
||||||
|
|
||||||
programs.ydotool.enable = true;
|
programs.ydotool.enable = true;
|
||||||
services.udiskie.enable = !isServer;
|
|
||||||
services.gammastep = {
|
|
||||||
enable = !isServer;
|
|
||||||
latitude = config.location.latitude;
|
|
||||||
longitude = config.location.longitude;
|
|
||||||
temperature.day = 6500;
|
|
||||||
temperature.night = 3000;
|
|
||||||
};
|
|
||||||
systemd.user.services.gammastep = {
|
|
||||||
Install.WantedBy = lib.mkForce [];
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.hyprland.enable = true;
|
programs.hyprland.enable = true;
|
||||||
home-manager.users.${config.mainuser} = {
|
home-manager.users.${config.mainuser} = {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.hyprland.homeManagerModules.default
|
inputs.hyprland.homeManagerModules.default
|
||||||
];
|
];
|
||||||
|
services.udiskie.enable = !isServer;
|
||||||
|
services.gammastep = {
|
||||||
|
enable = !isServer;
|
||||||
|
latitude = config.location.latitude;
|
||||||
|
longitude = config.location.longitude;
|
||||||
|
temperature.day = 6500;
|
||||||
|
temperature.night = 3000;
|
||||||
|
};
|
||||||
|
systemd.user.services.gammastep = {
|
||||||
|
Install.WantedBy = lib.mkForce [];
|
||||||
|
};
|
||||||
|
|
||||||
home.packages = [ pkgs.wl-clipboard hyprpaper-pkg ];
|
home.packages = [ pkgs.wl-clipboard hyprpaper-pkg ];
|
||||||
home.file.".config/hypr/hyprpaper.conf".text = ''
|
home.file.".config/hypr/hyprpaper.conf".text = ''
|
||||||
preload = ${/. + ../../../misc/wallpaper.png}
|
preload = ${/. + ../../../misc/wallpaper.png}
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
imports = with inputs.self.customProfiles; [
|
imports = with inputs.self.customProfiles; [
|
||||||
./base.nix
|
./base.nix
|
||||||
inputs.base16.hmModule
|
inputs.base16.hmModule
|
||||||
inputs.self.customProfiles.seadrive
|
|
||||||
|
|
||||||
applications-setup
|
applications-setup
|
||||||
hardware
|
hardware
|
||||||
@ -19,7 +18,6 @@
|
|||||||
kitty
|
kitty
|
||||||
mangohud
|
mangohud
|
||||||
mpv
|
mpv
|
||||||
# ncmpcpp
|
|
||||||
packages
|
packages
|
||||||
rclone
|
rclone
|
||||||
rofi
|
rofi
|
||||||
@ -45,6 +43,7 @@
|
|||||||
hyprland
|
hyprland
|
||||||
waybar
|
waybar
|
||||||
xdg
|
xdg
|
||||||
|
vpn
|
||||||
|
|
||||||
vscode-server
|
vscode-server
|
||||||
];
|
];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user