diff --git a/dev/flake.lock b/dev/flake.lock index 8c8fe67..9f3b5ea 100644 --- a/dev/flake.lock +++ b/dev/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1726592409, - "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix index 2b5f9f4..175e0f4 100644 --- a/modules/home-manager/fish.nix +++ b/modules/home-manager/fish.nix @@ -2,18 +2,16 @@ config, lib, ... -}: -let +}: let inherit (config.rose-pine) sources; cfg = config.programs.fish.rose-pine; enable = cfg.enable && config.programs.fish.enable; - themeName = lib.strings.trim "Rosé Pine ${lib.rp.mkUpper (lib.rp.getFlavor cfg.flavor)}"; + themeName = lib.trim "Rosé Pine ${lib.rp.mkUpper (lib.rp.getFlavor cfg.flavor)}"; themePath = "/themes/${themeName}.theme"; -in -{ - options.programs.fish.rose-pine = lib.rp.mkRosePineOpt { name = "fish"; }; +in { + options.programs.fish.rose-pine = lib.rp.mkRosePineOpt {name = "fish";}; config = lib.mkIf enable { xdg.configFile."fish${themePath}".source = "${sources.fish}${themePath}";