diff --git a/flake.lock b/flake.lock index 4453dc7..f11552f 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765990358, - "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", + "lastModified": 1764325801, + "narHash": "sha256-LQ7tsrXs1wuB6KBwUctL3JlUsG/FWI2pCI6NkoO52dk=", "owner": "catppuccin", "repo": "nix", - "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", + "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de", "type": "github" }, "original": { @@ -76,22 +76,6 @@ "type": "github" } }, - "catppuccin-nix-palette": { - "locked": { - "lastModified": 1766206652, - "narHash": "sha256-pWAwRFfJx83jIqoqoHUlzsMTaCWy14JO87ot2ji+XRI=", - "ref": "main", - "rev": "4e42cc79579e082baade513ebbba9806b4fa7363", - "revCount": 1, - "type": "git", - "url": "https://git.alejandr0angul0.dev/alejandro-angulo/catppuccin-nix-palette" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://git.alejandr0angul0.dev/alejandro-angulo/catppuccin-nix-palette" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -101,11 +85,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1762286984, + "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", "type": "github" }, "original": { @@ -126,11 +110,11 @@ ] }, "locked": { - "lastModified": 1766087669, - "narHash": "sha256-1+LJXcOaeX5YCFCCCY+bh6nSQBS5fPVcudQs5/G2+P4=", + "lastModified": 1764669403, + "narHash": "sha256-aJCOp0CV/9KIR2LTwSbZZN3j9Avg7umYyaqDFPoOVhI=", "owner": "cachix", "repo": "devenv", - "rev": "c03eed645ea94da7afbee29da76436b7ce33a5cb", + "rev": "3f2d25e7af748127da0571266054575dd8fec5ab", "type": "github" }, "original": { @@ -358,11 +342,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1764788330, + "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", "type": "github" }, "original": { @@ -527,11 +511,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -660,7 +644,6 @@ "inputs": { "agenix": "agenix", "catppuccin": "catppuccin", - "catppuccin-nix-palette": "catppuccin-nix-palette", "deploy-rs": "deploy-rs", "devenv": "devenv", "home-manager": "home-manager", @@ -682,11 +665,11 @@ ] }, "locked": { - "lastModified": 1765361626, - "narHash": "sha256-kX0Dp/kYSRbQ+yd9e3lmmUWdNbipufvKfL2IzbrSpnY=", + "lastModified": 1736130495, + "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", "owner": "snowfallorg", "repo": "lib", - "rev": "c566ad8b7352c30ec3763435de7c8f1c46ebb357", + "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6a2e6e8..0e5b829 100644 --- a/flake.nix +++ b/flake.nix @@ -36,8 +36,6 @@ powerlevel10k.url = "github:romkatv/powerlevel10k/master"; powerlevel10k.flake = false; - - catppuccin-nix-palette.url = "git+https://git.alejandr0angul0.dev/alejandro-angulo/catppuccin-nix-palette?ref=main"; }; outputs = diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/fzf/default.nix index 45c500e..f11a634 100644 --- a/modules/home/programs/fzf/default.nix +++ b/modules/home/programs/fzf/default.nix @@ -2,28 +2,10 @@ config, lib, namespace, - inputs, ... }: let cfg = config.${namespace}.programs.fzf; - colors = - lib.attrsets.mapAttrs - (_: color: inputs.catppuccin-nix-palette.lib.palette.mocha.colors.${color}.hex) - { - "bg+" = "surface0"; - bg = "base"; - spinner = "rosewater"; - hl = "mauve"; - fg = "text"; - header = "mauve"; - info = "mauve"; - pointer = "mauve"; - marker = "mauve"; - "fg+" = "text"; - prompt = "mauve"; - "hl+" = "mauve"; - }; in { options.${namespace}.programs.fzf = { @@ -31,9 +13,7 @@ in }; config = lib.mkIf cfg.enable { - programs.fzf = { - inherit colors; - enable = true; - }; + catppuccin.fzf.enable = true; + programs.fzf.enable = true; }; } diff --git a/systems/x86_64-linux/git/default.nix b/systems/x86_64-linux/git/default.nix index 0d645c0..64c7678 100644 --- a/systems/x86_64-linux/git/default.nix +++ b/systems/x86_64-linux/git/default.nix @@ -21,7 +21,7 @@ in }; nix.settings.auto-optimise-store = true; - nix.gc.dates = [ "03:15" ]; + nix.gc.dates = "03:15"; nix.gc.options = "-d"; services.nginx.virtualHosts."${domain}" = {