diff --git a/README.md b/README.md index 994a81aa..523d4fcb 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Therefore most things will not work out of the box without some changes, so be w - Modular configuration, so you can add or remove parts of the configuration - Sensible defaults, so you can get started quickly - Docs kind of -- [Catppuccin](https://github.com/catppuccin/catppuccin) everywhere, with a hint of [evergarden](https://github.com/comfysage/evergarden) +- [Catppuccin](https://github.com/catppuccin/catppuccin) everywhere. > [!NOTE] > Please read [the documentation](https://dotfiles.isabelroses.com/) diff --git a/docs/src/README.md b/docs/src/README.md index 93ee7783..9046ac9c 100644 --- a/docs/src/README.md +++ b/docs/src/README.md @@ -21,4 +21,4 @@ Therefore most things will not work out of the box without some changes, so be w - Modular configuration, so you can add or remove parts of the configuration - Sensible defaults, so you can get started quickly - Docs kind of -- [Catppuccin](https://github.com/catppuccin/catppuccin) everywhere, with a hint of [evergarden](https://github.com/comfysage/evergarden) +- [Catppuccin](https://github.com/catppuccin/catppuccin) everywhere. diff --git a/flake.lock b/flake.lock index d80f3599..49ca98ba 100644 --- a/flake.lock +++ b/flake.lock @@ -87,26 +87,6 @@ "type": "github" } }, - "evergarden": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757884928, - "narHash": "sha256-DNV2S49qKZ6ziV8mAPjN395bCWXI/qGcZkOqSthvI/8=", - "owner": "everviolet", - "repo": "nix", - "rev": "150525bd443345cc8c9a4628a68beeefb304e4f8", - "type": "github" - }, - "original": { - "owner": "everviolet", - "repo": "nix", - "type": "github" - } - }, "fht-compositor": { "inputs": { "fht-share-picker": [ @@ -202,6 +182,7 @@ "gift-wrap": { "inputs": { "nixpkgs": [ + "izvim", "nixpkgs" ] }, @@ -257,31 +238,6 @@ "type": "github" } }, - "ivy": { - "inputs": { - "gift-wrap": [ - "gift-wrap" - ], - "neovim-nightly-overlay": "neovim-nightly-overlay", - "neovim-src": "neovim-src", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1759422473, - "narHash": "sha256-iw0WHWGJbAx/LjFLZVk74EDfDPt6I59EkOgD+0WsUg4=", - "owner": "comfysage", - "repo": "ivy", - "rev": "1006fbb05a9d7376225dab280612de95ef9cfb9b", - "type": "github" - }, - "original": { - "owner": "comfysage", - "repo": "ivy", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -330,9 +286,7 @@ }, "izvim": { "inputs": { - "gift-wrap": [ - "gift-wrap" - ], + "gift-wrap": "gift-wrap", "nixpkgs": [ "nixpkgs" ] @@ -378,62 +332,6 @@ "type": "github" } }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": [ - "ivy" - ], - "flake-parts": [ - "flake-parts" - ], - "git-hooks": [ - "ivy" - ], - "hercules-ci-effects": [ - "ivy" - ], - "neovim-src": [ - "ivy", - "neovim-src" - ], - "nixpkgs": [ - "ivy", - "nixpkgs" - ], - "treefmt-nix": [ - "ivy" - ] - }, - "locked": { - "lastModified": 1759277111, - "narHash": "sha256-SDLZMha2miaChOBGBkQJlTtk2kvcB7WIVVZ2l0/9byc=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "b7b3632fab34541543373254c265da03c1d0f240", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1759281842, - "narHash": "sha256-fexPHQXI78SnB0bhiV1CgagLjNQsQk++LLb2NdEQLfI=", - "owner": "neovim", - "repo": "neovim", - "rev": "6d550f3cdbca6091042526a0153e0db18192447e", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nixos-wsl": { "inputs": { "flake-compat": [], @@ -497,15 +395,12 @@ "catppuccin": "catppuccin", "darwin": "darwin", "easy-hosts": "easy-hosts", - "evergarden": "evergarden", "fht-compositor": "fht-compositor", "fht-share-picker": "fht-share-picker", "flake-parts": "flake-parts", "flake-utils": "flake-utils", - "gift-wrap": "gift-wrap", "home-manager": "home-manager", "homebrew": "homebrew", - "ivy": "ivy", "izlix": "izlix", "izvim": "izvim", "lanzaboote": "lanzaboote", @@ -514,10 +409,8 @@ "nuscht-search": "nuscht-search", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops": "sops", - "spicetify-nix": "spicetify-nix", "systems": "systems", - "tgirlpkgs": "tgirlpkgs", - "zen-browser": "zen-browser" + "tgirlpkgs": "tgirlpkgs" } }, "rust-overlay": { @@ -586,29 +479,6 @@ "type": "github" } }, - "spicetify-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1759444170, - "narHash": "sha256-b5ShONncU4Gf39QtaL5OySC9G2o612rTE/TCwx3kMeM=", - "owner": "Gerg-L", - "repo": "spicetify-nix", - "rev": "e13267e8f3eb1664329fcb78a43b38b985f96f6f", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "spicetify-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -643,29 +513,6 @@ "repo": "pkgs", "type": "github" } - }, - "zen-browser": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1759465332, - "narHash": "sha256-F1aMvAAdJ45uIakvAoB0iVKBgvKCb2KI7h7WsSif0LA=", - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "rev": "868224641705f51399cd72cafa332fb19d793967", - "type": "github" - }, - "original": { - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5ff24e26..ca145f76 100644 --- a/flake.nix +++ b/flake.nix @@ -149,13 +149,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - evergarden = { - type = "github"; - owner = "everviolet"; - repo = "nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ### my programs tgirlpkgs = { type = "github"; @@ -168,23 +161,7 @@ type = "github"; owner = "isabelroses"; repo = "nvim"; - - inputs = { - nixpkgs.follows = "nixpkgs"; - gift-wrap.follows = "gift-wrap"; - }; - }; - - ivy = { - type = "github"; - owner = "comfysage"; - repo = "ivy"; - - inputs = { - nixpkgs.follows = "nixpkgs"; - gift-wrap.follows = "gift-wrap"; - neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts"; - }; + inputs.nixpkgs.follows = "nixpkgs"; }; nuscht-search = { @@ -198,28 +175,6 @@ }; }; - spicetify-nix = { - type = "github"; - owner = "Gerg-L"; - repo = "spicetify-nix"; - - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; - - zen-browser = { - type = "github"; - owner = "0xc000022070"; - repo = "zen-browser-flake"; - - inputs = { - nixpkgs.follows = "nixpkgs"; - home-manager.follows = "home-manager"; - }; - }; - # transative deps systems = { type = "github"; @@ -227,13 +182,6 @@ repo = "default"; }; - gift-wrap = { - type = "github"; - owner = "tgirlcloud"; - repo = "gift-wrap"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # PLEASE PLEASE PLEASE DIE OFF ALREDAY flake-utils = { type = "github"; diff --git a/home/isabel/gui/ghostty.nix b/home/isabel/gui/ghostty.nix index 228fac0c..99594f82 100644 --- a/home/isabel/gui/ghostty.nix +++ b/home/isabel/gui/ghostty.nix @@ -1,4 +1,9 @@ -{ pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: { programs.ghostty = { # FIXME: ghostty is broken on darwin @@ -7,12 +12,11 @@ settings = { command = "/run/current-system/sw/bin/fish"; - # theme = mkForce "cuddlefish"; + theme = lib.mkForce "cuddlefish"; background-opacity = 0.95; cursor-style = "bar"; window-padding-x = "4,4"; - window-decoration = toString pkgs.stdenv.hostPlatform.isDarwin; gtk-titlebar = false; window-save-state = "always"; diff --git a/home/isabel/gui/wezterm/keybinds.lua b/home/isabel/gui/wezterm/keybinds.lua index 48a5af47..b2a864fa 100644 --- a/home/isabel/gui/wezterm/keybinds.lua +++ b/home/isabel/gui/wezterm/keybinds.lua @@ -17,7 +17,6 @@ local openUrl = act.QuickSelectArgs({ local changeCtpFlavor = act.InputSelector({ title = "Change Catppuccin flavor", choices = { - { label = "Evergarden" }, { label = "Espresso" }, { label = "Mocha" }, { label = "Macchiato" }, diff --git a/home/isabel/gui/wezterm/theme.lua b/home/isabel/gui/wezterm/theme.lua index 3fbdf80e..ebe5900a 100644 --- a/home/isabel/gui/wezterm/theme.lua +++ b/home/isabel/gui/wezterm/theme.lua @@ -143,34 +143,6 @@ local colors = { mantle = "#090909", crust = "#080808", }, - evergarden = { - rosewater = "#E3A8D1", - flamingo = "#E3A8D1", - pink = "#E3A8D1", - mauve = "#D6A0D1", - red = "#E67E80", - maroon = "#E67E80", - peach = "#E69875", - yellow = "#DBBC7F", - green = "#B2C98F", - teal = "#93C9A1", - sky = "#97C9C3", - sapphire = "#9BB5CF", - blue = "#9BB5CF", - lavender = "#D6A0D1", - text = "#D9E4DC", - subtext1 = "#C9D6D0", - subtext0 = "#AEC2BE", - overlay2 = "#99ADAD", - overlay1 = "#6E8585", - overlay0 = "#5E6C70", - surface2 = "#46545B", - surface1 = "#3D494F", - surface0 = "#343E44", - base = "#252B2E", - mantle = "#1C2225", - crust = "#171C1F", - }, cuddlefish = { rosewater = "#f6edde", flamingo = "#f0a0ad", @@ -204,7 +176,6 @@ local colors = { local mappings = { -- custom flavor cuddlefish = "Catppuccin Cuddlefish", - evergarden = "Catppuccin Evergarden", espresso = "Catppuccin Espresso", -- default flavors mocha = "Catppuccin Mocha", @@ -326,7 +297,6 @@ function M.apply_to_config(c, opts) sync_flavors = { light = "latte", dark = "mocha" }, color_overrides = { cuddlefish = {}, - evergarden = {}, espresso = {}, mocha = {}, macchiato = {}, @@ -335,7 +305,6 @@ function M.apply_to_config(c, opts) }, token_overrides = { cuddlefish = {}, - evergarden = {}, espresso = {}, mocha = {}, macchiato = {}, diff --git a/modules/darwin/brew/default.nix b/modules/darwin/brew/default.nix index 5e43dc3c..7feeec4b 100644 --- a/modules/darwin/brew/default.nix +++ b/modules/darwin/brew/default.nix @@ -29,14 +29,14 @@ "homebrew/homebrew-core" = pkgs.fetchFromGitHub { owner = "homebrew"; repo = "homebrew-core"; - rev = "582ac85075ef12aaddfedf2f6bd57c7af326e2d5"; - hash = "sha256-RQUOJQVmgrpey17+EqsoHzS+0qG4v08r6ZdOzDPhp0w="; + rev = "ad2eada2b64f3f8aefd568875807bd8c03598025"; + hash = "sha256-HUqUEb7xOkxraiP28ZKsPWutqKF21mZASaX/QDS5mTU="; }; "homebrew/homebrew-cask" = pkgs.fetchFromGitHub { owner = "homebrew"; repo = "homebrew-cask"; - rev = "4d9330061d57eb9f90acb2788f652c6e69b2fd4b"; - hash = "sha256-tc6Rx8KABnJmd6/+2/fv30at/jijkOoUTiuNBVI23Ec="; + rev = "648ed5aa56f4a4bb552e1d4cfdd9d82e6d27025b"; + hash = "sha256-UjJZVqGpvQJ6AJ41ExFi02qps5A9sAmuDaJU0e+x1hU="; }; "th-ch/homebrew-youtube-music" = pkgs.fetchFromGitHub { owner = "th-ch"; diff --git a/modules/flake/lib/default.nix b/modules/flake/lib/default.nix index acf82d3a..4e44af84 100644 --- a/modules/flake/lib/default.nix +++ b/modules/flake/lib/default.nix @@ -36,19 +36,8 @@ let anyHome ; }); - - # I want to absorb the evergarden lib into the garden lib. We don't do this - # with nixpkgs lib to keep it pure as it is used else where and leads to many - # breakages - ext = lib.fixedPoints.composeManyExtensions [ - (_: _: inputs.evergarden.lib) - ]; - - # we need to extend gardenLib with the nixpkgs lib to get the full set of functions - # if we do it the otherway around we will get errors saying mkMerge and so on don't exist - finalLib = gardenLib.extend ext; in { # expose our custom lib to the flake - flake.lib = finalLib; + flake.lib = gardenLib; } diff --git a/modules/flake/packages/docs/options.nix b/modules/flake/packages/docs/options.nix index b0b9b983..87c6e731 100644 --- a/modules/flake/packages/docs/options.nix +++ b/modules/flake/packages/docs/options.nix @@ -142,14 +142,6 @@ inputs.nuscht-search.packages.${system}.mkMultiSearch { ]; urlPrefix = "https://github.com/catppuccin/nix/blob/main/"; } - # { - # name = "evergarden home-manager"; - # modules = [ - # inputs.evergarden.homeManagerModules.evergarden - # { _module.args = { inherit pkgs; }; } - # ]; - # urlPrefix = "https://github.com/everviolet/nix/blob/main/"; - # } { name = "nix-homebrew"; modules = [ diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index ba386d8f..4586d88e 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -8,7 +8,6 @@ ./catppuccin.nix ./emulation.nix ./environment - ./evergarden.nix ./extras.nix ./gaming ./hardware diff --git a/modules/nixos/evergarden.nix b/modules/nixos/evergarden.nix deleted file mode 100644 index d57716f8..00000000 --- a/modules/nixos/evergarden.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - lib, - inputs, - config, - ... -}: -{ - imports = [ - inputs.evergarden.nixosModules.evergarden - ]; - - config = { - evergarden = { - enable = lib.mkDefault (!config.catppuccin.enable); - variant = "winter"; - }; - }; -}