diff --git a/modules/holocron/smb/default.nix b/modules/holocron/smb/default.nix index 5589f8d..f6b9f75 100644 --- a/modules/holocron/smb/default.nix +++ b/modules/holocron/smb/default.nix @@ -19,8 +19,10 @@ let timemachine = { browseable = true; "path" = "/holocron/archives/timemachine"; + #"valid users" = "blake"; "public" = "no"; "writeable" = "yes"; + #"force user" = "blake"; "fruit:aapl" = "yes"; "fruit:time machine" = "yes"; "vfs objects" = "catia fruit streams_xattr"; diff --git a/modules/system/backups/default.nix b/modules/system/backups/default.nix index d4c8ce4..79ff0f2 100644 --- a/modules/system/backups/default.nix +++ b/modules/system/backups/default.nix @@ -240,7 +240,7 @@ in { description = "daily borg backup timer"; wantedBy = ["timers.target"]; timerConfig = { - OnCalendar = "*-*-* *:01:00"; # every hour, at :01 (one min after db dump) + OnCalendar = "*-*-* *:00:00"; # every hour, at :01 (one min after db dump) Persistent = true; }; }; @@ -251,7 +251,7 @@ in { enable = true; location = "/var/backup/mysql"; user = "root"; - calendar = "*-*-* *:00:00"; + calendar = "*-*-* *:59:00"; compressionAlg = "zstd"; databases = config.services.mysql.ensureDatabases; # set to all databases defined in esure databases }; diff --git a/users/blake/default.nix b/users/blake/default.nix index bf46b95..bcd2dc3 100644 --- a/users/blake/default.nix +++ b/users/blake/default.nix @@ -31,7 +31,7 @@ useUserPackages = true; useGlobalPkgs = true; users = { - "blake" = import ./home.nix; + "blake" = import ./dots/bundles/nixos.nix; }; }; diff --git a/users/blake/dots/bundles/darwin.nix b/users/blake/dots/bundles/darwin.nix new file mode 100644 index 0000000..7de1d6c --- /dev/null +++ b/users/blake/dots/bundles/darwin.nix @@ -0,0 +1,11 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: + +{ + +} diff --git a/users/blake/dots/bundles/nixos.nix b/users/blake/dots/bundles/nixos.nix new file mode 100644 index 0000000..56b6995 --- /dev/null +++ b/users/blake/dots/bundles/nixos.nix @@ -0,0 +1,17 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: + +{ + imports = [ + ../../home.nix + ]; + + home.packages = with pkgs; [ + htop + ]; +} diff --git a/users/blake/home.nix b/users/blake/home.nix index 68f271d..2d2e9b6 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -3,6 +3,7 @@ lib, pkgs, inputs, + system, ... }: let