diff --git a/home/env.nix b/home/env.nix index e196dd9..f2b2551 100644 --- a/home/env.nix +++ b/home/env.nix @@ -3,6 +3,5 @@ home.sessionPath = [ "${config.xdg.configHome}/emacs/bin" "${config.home.homeDirectory}/.cargo/bin" - "${config.home.homeDirectory}/.local/bin" ]; } diff --git a/home/x/i3bar.nix b/home/x/i3bar.nix index c4b1e5a..a9c4b65 100644 --- a/home/x/i3bar.nix +++ b/home/x/i3bar.nix @@ -22,12 +22,6 @@ in settings = i3BarTheme; blocks = [ - { - block = "pomodoro"; - length = 60; - break_length = 10; - use_nag = true; - } { block = "disk_space"; path = "/"; @@ -75,12 +69,6 @@ in # TODO: use format when i3status-rust updates to v0.20 # format = "{percentage}"; } - { - block = "music"; - player = "spotify"; - buttons = ["prev" "play" "next"]; - hide_when_empty = true; - } { block = "sound"; driver = "pulseaudio"; diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index b7ab958..e31549c 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -47,14 +47,6 @@ in borg-backup = { enable = true; repo = secrets.borg-backup.boreal-repo; - # for a workstation, having backups spanning the last month should be - # enough - prune = { - keep = { - daily = 7; - weekly = 4; - }; - }; paths = [ "/home/alarsyo" ]; diff --git a/services/borg-backup.nix b/services/borg-backup.nix index 866a2af..6c4e132 100644 --- a/services/borg-backup.nix +++ b/services/borg-backup.nix @@ -14,18 +14,6 @@ in { description = "Borgbase repo info. Required."; }; - prune = mkOption { - type = types.attrs; - default = { - keep = { - daily = 7; - weekly = 4; - monthly = 6; - }; - }; - description = "pruning options for borg"; - }; - paths = mkOption { type = types.listOf types.str; default = []; @@ -69,7 +57,11 @@ in { doInit = true; compression = "auto,zstd"; startAt = "daily"; - prune = cfg.prune; + prune.keep = { + daily = 7; + weekly = 4; + monthly = 6; + }; }; }; }