diff --git a/flake.lock b/flake.lock index cd5c828..8c50268 100644 --- a/flake.lock +++ b/flake.lock @@ -63,6 +63,22 @@ "type": "github" } }, + "eza": { + "locked": { + "lastModified": 1736397430, + "narHash": "sha256-l00P7P3zcx8rzYOOQMNUwBqK/yz/4Cv8G8+pYbfyQ5Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d722e8ce81cf103280ce1ff65accb3fc25cbd2ba", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d722e8ce81cf103280ce1ff65accb3fc25cbd2ba", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -248,11 +264,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", "type": "github" }, "original": { @@ -269,11 +285,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", "type": "github" }, "original": { @@ -360,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -374,6 +390,22 @@ "type": "github" } }, + "nixpkgs-borg": { + "locked": { + "lastModified": 1735547260, + "narHash": "sha256-ScKuaBbUXNqS9c6Y+N647BAQx7SvKywpu5MxBV3Y5pk=", + "owner": "cything", + "repo": "nixpkgs", + "rev": "53add6c0c30200663cd21beb06672ec2c8afc176", + "type": "github" + }, + "original": { + "owner": "cything", + "ref": "borg", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-btrbk": { "locked": { "lastModified": 1735945390, @@ -392,11 +424,11 @@ }, "nixpkgs-garage": { "locked": { - "lastModified": 1736657901, - "narHash": "sha256-KpbFF8d5cqcBF7+m5fXDcPn+ADg3kURbX49JGx18NXU=", + "lastModified": 1736656100, + "narHash": "sha256-Y/r6cOYW4UsFj55gp0FTdxDmrrccn6wXQo/zll2Yx8g=", "owner": "cything", "repo": "nixpkgs", - "rev": "616be0a7b830a10d0874d569aabd40034c9151aa", + "rev": "9a35d495d2f49eee003b57265228844bb48c933e", "type": "github" }, "original": { @@ -437,11 +469,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736715511, - "narHash": "sha256-5YAiZ3wrEJ/fzFoCwNf14xqfRTvgdcnl/+y0vye3Y6A=", + "lastModified": 1736430661, + "narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=", "owner": "nix-community", "repo": "nixvim", - "rev": "35d6c12626f9895cd5d8ccf5d19c3d00de394334", + "rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b", "type": "github" }, "original": { @@ -503,9 +535,11 @@ "root": { "inputs": { "disko": "disko", + "eza": "eza", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", + "nixpkgs-borg": "nixpkgs-borg", "nixpkgs-btrbk": "nixpkgs-btrbk", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", @@ -545,11 +579,11 @@ ] }, "locked": { - "lastModified": 1736515725, - "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6f869f7..e84606c 100644 --- a/flake.nix +++ b/flake.nix @@ -28,8 +28,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-borg.url = "github:cything/nixpkgs/borg"; # unmerged PR nixpkgs-btrbk.url = "github:cything/nixpkgs/btrbk"; # unmerged PR - nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR + eza.url = "github:nixos/nixpkgs/d722e8ce81cf103280ce1ff65accb3fc25cbd2ba"; + nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; }; nixConfig = { @@ -80,8 +82,9 @@ flake: pkgNames: _final: prev: overridePkgsFromFlake prev flake pkgNames; overlays = [ - # (overlayPkgsFromFlake inputs.eza [ - # ]) + (overlayPkgsFromFlake inputs.eza [ + "eza" + ]) ] ++ import ./overlay; pkgsFor = lib.genAttrs systems ( diff --git a/home/sway/config b/home/sway/config index 1005b61..7412fc4 100644 --- a/home/sway/config +++ b/home/sway/config @@ -125,7 +125,6 @@ for_window [app_id=mpv] inhibit_idle visible, floating enable, sticky enable for_window [app_id="LibreWolf" title="^Extension"] floating enable for_window [floating] border csd for_window [app_id="Bitwarden"] floating enable -for_window [app_id=anki title="Add"] floating enable bar { swaybar_command waybar diff --git a/modules/backup.nix b/modules/backup.nix index 7524c55..e632726 100644 --- a/modules/backup.nix +++ b/modules/backup.nix @@ -31,6 +31,13 @@ let ]; in { + imports = [ + { + disabledModules = [ "services/backup/borgbackup.nix" ]; + } + (inputs.nixpkgs-borg + "/nixos/modules/services/backup/borgbackup.nix") + ]; + options.my.backup = { enable = lib.mkEnableOption "backup"; paths = lib.mkOption {