diff --git a/flake.lock b/flake.lock index b87a42c..ca0259f 100644 --- a/flake.lock +++ b/flake.lock @@ -785,11 +785,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747980132, - "narHash": "sha256-jdQZZDMYl9JBtWupRRneP1NLDylf2KPUu8z72tJVBJI=", + "lastModified": 1748033637, + "narHash": "sha256-TetDbakvubacirX9JTzrZ8FePtT8taVv53sbqY61t38=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d5ccd8c5e6198bdac760ea65dd6c46e83a55b6f6", + "rev": "262837d8190629c4af723e35a7f2a3f49d1afb26", "type": "github" }, "original": { @@ -818,11 +818,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747977864, - "narHash": "sha256-BEXi6zHNguEsBD3TIUk/2EMOh5c4Z664UaDeUYpWDhw=", + "lastModified": 1748030931, + "narHash": "sha256-34Y9mI/IN9eWZm6v1wQS+TUw1BK9Ed5XBWe8lrVu6RE=", "owner": "YaLTeR", "repo": "niri", - "rev": "7fdb918cd04076b173a38f026dc5c27ac830b028", + "rev": "a605a3f016769ba2fd7e2147fe05c9ac3707f973", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 6e17e43..f246a85 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -91,42 +91,9 @@ in rclone = { enable = true; }; - - borgmatic = { - enable = true; - backups = { - eddie = { - location = { - patterns = [ - "R /home/emenel" - "- home/emenel/.cache" - "- home/emenel/.nix*" - "- home/emenel/.steam*" - "- home/emenel/Sync" - "- home/emenel/.BitwigStudio" - "- home/emenel/.local/share/bitwig" - ]; - repositories = [ - { - "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo"; - "label" = "eddie on borgbase"; - } - ]; - }; - retention = { - keepDaily = 3; - keepHourly = 3; - keepMonthly = 2; - }; - }; - }; - }; }; services = { - borgmatic = { - enable = true; - }; gpg-agent = { enable = true; }; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 5967e0a..21d3dfc 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -64,9 +64,9 @@ ]; }; - # registry = { - # emenel-templates.flake = inputs.emenel-templates; - # }; + # registry = { + # emenel-templates.flake = inputs.emenel-templates; + # }; channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead. }; @@ -84,42 +84,42 @@ let theme = palette.toRgbShortHex pkgs.rice.colorPalette; in - with theme; - [ - # normal.black - # normal.red - # normal.green - # normal.yellow - # normal.blue - # normal.magenta - # normal.cyan - # normal.white - # bright.black - # bright.red - # bright.green - # bright.yellow - # bright.blue - # bright.magenta - # bright.cyan - # bright.white + with theme; + [ + # normal.black + # normal.red + # normal.green + # normal.yellow + # normal.blue + # normal.magenta + # normal.cyan + # normal.white + # bright.black + # bright.red + # bright.green + # bright.yellow + # bright.blue + # bright.magenta + # bright.cyan + # bright.white - "111111" - "e06c75" - "98c379" - "e5c07b" - "61afef" - "c678dd" - "56b6c2" - "abb2bf" - "545862" - "e06c75" - "98c379" - "e5c07b" - "61afef" - "c678dd" - "56b6c2" - "c8ccd4" - ]; + "111111" + "e06c75" + "98c379" + "e5c07b" + "61afef" + "c678dd" + "56b6c2" + "abb2bf" + "545862" + "e06c75" + "98c379" + "e5c07b" + "61afef" + "c678dd" + "56b6c2" + "c8ccd4" + ]; }; environment.systemPackages = with pkgs; [ @@ -614,10 +614,36 @@ users.groups.uinput = { }; - - - - + services.borgmatic = { + enable = true; + configurations = { + eddie = { + patterns = [ + "R /home/emenel" + "- .cache" + "- .nix*" + "- .steam*" + "- Sync" + "- Mounts" + "- .BitwigStudio" + "- .local/share/bitwig" + "- .local/share/flatpak" + ]; + repositories = [ + { + "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo"; + "label" = "eddie on borgbase"; + } + ]; + keep_daily = 3; + keep_hourly = 3; + keep_monthly = 2; + # btrfs = { + # btrfs_command = "${pkgs.btrfs-progs}/bin/btrfs"; + # }; + }; + }; + }; #do not change