From ba2984119e37229ee85531eec58142b525c1eaf9 Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:32:36 -0500 Subject: [PATCH] Fix alacritty theme --- .github/workflows/build.yml | 4 ++-- flake.lock | 16 ++++++++-------- home/alacritty/default.nix | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a568dfc..91798b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: substituters = https://cache.nixos.org https://devenv.cachix.org trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw= - name: Build configuration - run: nix run home-manager/release-23.11 -- build --flake ${{ github.workspace }} - timeout-minutes: 2 + run: nix run home-manager/release-24.05 -- build --flake ${{ github.workspace }} + timeout-minutes: 5 - name: Activate the configuration run: ./result/activate diff --git a/flake.lock b/flake.lock index b6d4244..94a9045 100644 --- a/flake.lock +++ b/flake.lock @@ -267,16 +267,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -550,16 +550,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1715668745, - "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", + "lastModified": 1724531977, + "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", + "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix index 2c8527c..0c366c3 100644 --- a/home/alacritty/default.nix +++ b/home/alacritty/default.nix @@ -4,7 +4,7 @@ programs.alacritty = { enable = true; settings = { - import = [ "~/.config/alacritty/theme.yml" ]; + import = [ "~/.config/alacritty/theme.toml" ]; font.normal = { family = "FiraCode Nerd Font Mono"; style = "Medium"; @@ -19,14 +19,14 @@ theme() { local style=$(/usr/bin/defaults read -g AppleInterfaceStyle 2> /dev/null || echo "Light") if [ "$style" == "Dark" ]; then - echo "${pkgs.alacritty-theme}/solarized_dark.yaml" + echo "${pkgs.alacritty-theme}/solarized_dark.toml" else - echo "${pkgs.alacritty-theme}/solarized_light.yaml" + echo "${pkgs.alacritty-theme}/solarized_light.toml" fi } mkdir -p ~/.config/alacritty - ln -sf "$(theme)" ~/.config/alacritty/theme.yml + ln -sf "$(theme)" ~/.config/alacritty/theme.toml ''; # TODO: Install dark-notify via nix @@ -36,11 +36,11 @@ let alacrittyTheme = pkgs.writeScriptBin "alacritty-theme" '' if [ "$1" == "dark" ]; then - ln -sf "${pkgs.alacritty-theme}/solarized_dark.yaml" ~/.config/alacritty/theme.yml + ln -sf "${pkgs.alacritty-theme}/solarized_dark.toml" ~/.config/alacritty/theme.toml else - ln -sf "${pkgs.alacritty-theme}/solarized_light.yaml" ~/.config/alacritty/theme.yml + ln -sf "${pkgs.alacritty-theme}/solarized_light.toml" ~/.config/alacritty/theme.toml fi - touch -h ~/.config/alacritty/alacritty.yml + touch -h ~/.config/alacritty/alacritty.toml ''; in [