Compare commits

...

7 commits

Author SHA1 Message Date
aa407e12b5
feat(cava): Catppuccin -> Rose Pine
Some checks are pending
CI / Format Nix files (push) Waiting to run
CI / Test Modules (push) Waiting to run
CI / Validate sources (push) Waiting to run
Release / Publish to Flake registries (push) Blocked by required conditions
Release / Make release (push) Waiting to run
Build & deploy website / Build site (push) Waiting to run
Build & deploy website / Deploy website (push) Blocked by required conditions
2024-10-19 17:45:25 -07:00
04374c0bc2
feat(btop): Catppuccin -> Rose Pine 2024-10-19 17:40:44 -07:00
3a829096c2
feat: Remove bottom
Rose Pine does not have an official bottom port.
2024-10-19 17:39:32 -07:00
035cd48f6b
fix: Remove reference to deleted aerc module 2024-10-19 17:39:31 -07:00
7d9ef4cb21
feat: Switch to Rose Pine readme 2024-10-19 17:39:31 -07:00
82e69967ed
feat(bat): Catppuccin -> Rose Pine 2024-10-19 17:39:20 -07:00
b79da5a923
feat(alacritty): Catppuccin -> Rose Pine 2024-10-19 17:38:49 -07:00
9 changed files with 124 additions and 283 deletions

View file

@ -4,13 +4,13 @@
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "catppuccin",
"owner": "rose-pine",
"repo": "alacritty"
},
"branch": "main",
"revision": "343cf8d65459ac8f6449cc98dd3648bcbd7e3766",
"url": "https://github.com/catppuccin/alacritty/archive/343cf8d65459ac8f6449cc98dd3648bcbd7e3766.tar.gz",
"hash": "1nh29kkviqp0mz0w7cjmxcp5lgmd4hg5r67fzrvgkg9wgcfidig4"
"revision": "3c3e36eb5225b0eb6f1aa989f9d9e783a5b47a83",
"url": "https://github.com/rose-pine/alacritty/archive/3c3e36eb5225b0eb6f1aa989f9d9e783a5b47a83.tar.gz",
"hash": "1b9ff2a1mmhagmajvq49p2mrb22skdcq3hx6d6pjgk2vxvhhfkrd"
},
"bat": {
"type": "Git",
@ -40,25 +40,25 @@
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "catppuccin",
"owner": "rose-pine",
"repo": "btop"
},
"branch": "main",
"revision": "21b8d5956a8b07fa52519e3267fb3a2d2e693d17",
"url": "https://github.com/catppuccin/btop/archive/21b8d5956a8b07fa52519e3267fb3a2d2e693d17.tar.gz",
"hash": "1hdh78314axpz96qvnl7dkgjd3b7sjq0l8k5h1iwir1mjz596xsi"
"revision": "6d6abdc0a8c8bcd3b056d9fe3256cfbe7e359312",
"url": "https://github.com/rose-pine/btop/archive/6d6abdc0a8c8bcd3b056d9fe3256cfbe7e359312.tar.gz",
"hash": "15s3llr9snrg30fh39a2gfzmjd8p5ki8vaggznm9jirjzdhm0a5i"
},
"cava": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "catppuccin",
"owner": "rose-pine",
"repo": "cava"
},
"branch": "main",
"revision": "0746f77974330338ee2e1e4d1ef9872eba57eb26",
"url": "https://github.com/catppuccin/cava/archive/0746f77974330338ee2e1e4d1ef9872eba57eb26.tar.gz",
"hash": "01jvxv797zvamwm82m5i1m9b92hm1bcjdr2w53wi60ws244iq174"
"revision": "f9a915563d281d4a58e6f9fe701bdb769f1bbf26",
"url": "https://github.com/rose-pine/cava/archive/f9a915563d281d4a58e6f9fe701bdb769f1bbf26.tar.gz",
"hash": "06qzrlbj2kzrbrq6ag9kha0yx3yvixsz79p7x4ib2dxl9rkxk7gf"
},
"delta": {
"type": "Git",
@ -420,6 +420,18 @@
"url": "https://github.com/catppuccin/swaylock/archive/77246bbbbf8926bdb8962cffab6616bc2b9e8a06.tar.gz",
"hash": "02nql7ry71fxlhj0vsbsxi3jrmfajxmapr9gg0mzp0k0bxwqxa00"
},
"tm-theme": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "rose-pine",
"repo": "tm-theme"
},
"branch": "main",
"revision": "c4235f9a65fd180ac0f5e4396e3a86e21a0884ec",
"url": "https://github.com/rose-pine/tm-theme/archive/c4235f9a65fd180ac0f5e4396e3a86e21a0884ec.tar.gz",
"hash": "19k0r1mrhqhlf1xfzvd1q8ihpic86f84kbmgy0m314w3w9cbqf4f"
},
"tmux": {
"type": "Git",
"repository": {

215
README.md
View file

@ -1,215 +0,0 @@
<h3 align="center">
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
Catppuccin for <a href="https://nixos.org">Nix</a>
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
</h3>
<p align="center">
<a href="https://github.com/catppuccin/nix/stargazers"><img src="https://img.shields.io/github/stars/catppuccin/nix?colorA=363a4f&colorB=b7bdf8&style=for-the-badge"></a>
<a href="https://github.com/catppuccin/nix/issues"><img src="https://img.shields.io/github/issues/catppuccin/nix?colorA=363a4f&colorB=f5a97f&style=for-the-badge"></a>
<a href="https://github.com/catppuccin/nix/contributors"><img src="https://img.shields.io/github/contributors/catppuccin/nix?colorA=363a4f&colorB=a6da95&style=for-the-badge"></a>
</p>
<p align="center">
<img src="assets/previews/preview.webp"/>
</p>
## Previews
<details>
<summary>🌻 Latte</summary>
<img src="assets/previews/latte.webp"/>
</details>
<details>
<summary>🪴 Frappé</summary>
<img src="assets/previews/frappe.webp"/>
</details>
<details>
<summary>🌺 Macchiato</summary>
<img src="assets/previews/macchiato.webp"/>
</details>
<details>
<summary>🌿 Mocha</summary>
<img src="assets/previews/mocha.webp"/>
</details>
## Usage
You will probably want to see our [Getting started guide](http://nix.catppuccin.com/getting-started/index.html), but as a TLDR:
1. Import the [NixOS](https://nixos.org) and [home-manager](https://github.com/nix-community/home-manager) modules
<details>
<summary>With Flakes</summary>
```nix
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
catppuccin.url = "github:catppuccin/nix";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { nixpkgs, catppuccin, home-manager }: {
# for nixos module home-manager installations
nixosConfigurations.pepperjacksComputer = pkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
catppuccin.nixosModules.catppuccin
# if you use home-manager
home-manager.nixosModules.home-manager
{
# if you use home-manager
home-manager.users.pepperjack = {
imports = [
./home.nix
catppuccin.homeManagerModules.catppuccin
];
};
}
];
};
# for standalone home-manager installations
homeConfigurations.pepperjack = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
modules = [
./home.nix
catppuccin.homeManagerModules.catppuccin
];
};
};
}
```
</details>
<details>
<summary>With Nix Channels</summary>
```bash
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
sudo nix-channel --add https://github.com/catppuccin/nix/archive/main.tar.gz catppuccin
sudo nix-channel --update
```
For [NixOS module installations](https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module):
```nix
{
imports = [
<catppuccin/modules/nixos>
# if you use home-manager
<home-manager/nixos>
];
# if you use home-manager
home-manager.users.pepperjack = {
imports = [
<catppuccin/modules/home-manager>
];
};
}
```
For [standalone installations](https://nix-community.github.io/home-manager/index.html#sec-install-standalone)
```nix
{
imports = [
<catppuccin/modules/home-manager>
];
home.username = "pepperjack";
programs.home-manager.enable = true;
}
```
</details>
2. Choose your desired flavor with `catppuccin.flavor`
```nix
{
catppuccin.flavor = "mocha";
}
```
3. Enable for supported programs with `catppucin.enable = true;`
```nix
{
programs.starship = {
enable = true;
catppuccin.enable = true;
};
}
```
4. Enable for all available programs you're using!
```nix
{
catppuccin.enable = true;
}
```
## 🙋 FAQ
- Q: **"How do I know what programs are supported?"**\
A: You can find programs supported through home-manager [here](https://nix.catppuccin.com/options/home-manager-options.html),
and NixOS modules [here](https://nix.catppuccin.com/options/nixos-options.html)
- Q: **"How do I set `catppuccin.enable` for everything I use?"**\
A: You can set `catppuccin.enable` [globally](https://nix.catppuccin.com/options/home-manager-options.html#catppuccinenable)
- Q: **"What versions of NixOS and home-manager are supported?"**\
A: We primarily support the `unstable` branch, but try our best to support the current stable release.
You can check if your stable release is currently supported at [status.nixos.org](https://status.nixos.org/)
- Q: **"How do I fix the error: ... during evaluation because the option 'allow-import-from-derivation' is disabled"**\
A: Some ports need to read and/or manipulate remote resources, resulting in Nix performing [IFD](https://nix.dev/manual/nix/latest/language/import-from-derivation).
<details>
<summary>Disable modules that use IFD</summary>
```nix
{
programs = {
cava.catppuccin.enable = false;
gh-dash.catppuccin.enable = false;
imv.catppuccin.enable = false;
swaylock.catppuccin.enable = false;
};
services = {
mako.catppuccin.enable = false;
};
}
```
</details>
## 💝 Thanks to
- [Stonks3141](https://github.com/Stonks3141)
- [getchoo](https://github.com/getchoo)
&nbsp;
<p align="center">
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/footers/gray0_ctp_on_line.svg?sanitize=true" />
</p>
<p align="center">
Copyright &copy; 2023-present <a href="https://github.com/catppuccin" target="_blank">Catppuccin Org</a>
</p>
<p align="center">
<a href="https://github.com/catppuccin/catppuccin/blob/main/LICENSE"><img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&logoColor=d9e0ee&colorA=363a4f&colorB=b7bdf8"/></a>
</p>

View file

@ -1,13 +1,18 @@
{ config, lib, ... }:
let
inherit (config.catppuccin) sources;
cfg = config.programs.alacritty.catppuccin;
enable = cfg.enable && config.programs.alacritty.enable;
in
{
options.programs.alacritty.catppuccin = lib.ctp.mkCatppuccinOpt { name = "alacritty"; };
config,
lib,
...
}: let
inherit (config.rose-pine) sources;
cfg = config.programs.alacritty.rose-pine;
enable = cfg.enable && config.programs.alacritty.enable;
in {
options.programs.alacritty.rose-pine = lib.rp.mkRosePineOpt {name = "alacritty";};
config = lib.mkIf enable {
programs.alacritty.settings = lib.importTOML "${sources.alacritty}/catppuccin-${cfg.flavor}.toml";
programs.alacritty.settings =
if (cfg.flavor == "main")
then lib.importTOML "${sources.alacritty}/dist/rose-pine.toml"
else lib.importTOML "${sources.alacritty}/dist/rose-pine-${cfg.flavor}.toml";
};
}

View file

@ -1,8 +1,6 @@
[
./aerc.nix
./alacritty.nix
./bat.nix
./bottom.nix
./btop.nix
./cava.nix
./cursor.nix

View file

@ -1,20 +1,25 @@
{ config, lib, ... }:
let
inherit (config.catppuccin) sources;
cfg = config.programs.bat.catppuccin;
enable = cfg.enable && config.programs.bat.enable;
themeName = "Catppuccin ${lib.ctp.mkUpper cfg.flavor}";
in
{
options.programs.bat.catppuccin = lib.ctp.mkCatppuccinOpt { name = "bat"; };
config,
lib,
...
}: let
inherit (config.rose-pine) sources;
cfg = config.programs.bat.rose-pine;
enable = cfg.enable && config.programs.bat.enable;
themeName =
if (cfg.flavor == "main")
then "rose-pine"
else "rose-pine-${cfg.flavor}";
in {
options.programs.bat.rose-pine = lib.rp.mkRosePineOpt {name = "bat";};
config = lib.mkIf enable {
programs.bat = {
config.theme = themeName;
themes.${themeName} = {
src = sources.bat;
file = "themes/${themeName}.tmTheme";
src = sources.tm-theme;
file = "dist/themes/${themeName}.tmTheme";
};
};
};

View file

@ -1,15 +0,0 @@
{ config, lib, ... }:
let
inherit (config.catppuccin) sources;
cfg = config.programs.bottom.catppuccin;
enable = cfg.enable && config.programs.bottom.enable;
in
{
options.programs.bottom.catppuccin = lib.ctp.mkCatppuccinOpt { name = "bottom"; };
config = lib.mkIf enable {
programs.bottom = {
settings = lib.importTOML "${sources.bottom}/themes/${cfg.flavor}.toml";
};
};
}

View file

@ -1,18 +1,23 @@
{ config, lib, ... }:
let
inherit (config.catppuccin) sources;
cfg = config.programs.btop.catppuccin;
{
config,
lib,
...
}: let
inherit (config.rose-pine) sources;
cfg = config.programs.btop.rose-pine;
enable = cfg.enable && config.programs.btop.enable;
themeFile = "catppuccin_${cfg.flavor}.theme";
themePath = "/themes/${themeFile}";
themeFile =
if (cfg.flavor == "main")
then "rose-pine.theme"
else "rose-pine-${cfg.flavor}.theme";
themePath = "/${themeFile}";
theme = sources.btop + themePath;
in
{
options.programs.btop.catppuccin = lib.ctp.mkCatppuccinOpt { name = "btop"; };
in {
options.programs.btop.rose-pine = lib.rp.mkRosePineOpt {name = "btop";};
config = lib.mkIf enable {
xdg.configFile."btop${themePath}".source = theme;
xdg.configFile."btop/themes${themePath}".source = theme;
programs.btop.settings.color_theme = themeFile;
};

View file

@ -1,16 +1,19 @@
{ config, lib, ... }:
let
inherit (config.catppuccin) sources;
cfg = config.programs.cava.catppuccin;
enable = cfg.enable && config.programs.cava.enable;
flavor = "${cfg.flavor}" + lib.optionalString cfg.transparent "-transparent";
in
{
options.programs.cava.catppuccin = lib.ctp.mkCatppuccinOpt { name = "cava"; } // {
transparent = lib.mkEnableOption "transparent version of flavor";
};
config,
lib,
...
}: let
inherit (config.rose-pine) sources;
cfg = config.programs.cava.rose-pine;
enable = cfg.enable && config.programs.cava.enable;
flavor =
if (cfg.flavor == "main")
then "rosepine"
else cfg.flavor;
in {
options.programs.cava.rose-pine = lib.rp.mkRosePineOpt {name = "cava";};
config.programs.cava = lib.mkIf enable {
settings = lib.ctp.fromINIRaw (sources.cava + "/themes/${flavor}.cava");
settings = lib.rp.fromINIRaw (sources.cava + "/${flavor}.cava");
};
}

43
readme.md Normal file
View file

@ -0,0 +1,43 @@
<p align="center">
<img src="https://github.com/rose-pine/rose-pine-theme/raw/main/assets/icon.png" width="80" />
<h2 align="center">Rosé Pine for Nix</h2>
</p>
<p align="center">All natural pine, faux fur and a bit of soho vibes for the classy minimalist</p>
<p align="center">
<a href="https://github.com/rose-pine/rose-pine-theme">
<img src="https://img.shields.io/badge/community-rosé%20pine-26233a?labelColor=191724&logo=data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjUwIiBoZWlnaHQ9IjIzNyIgdmlld0JveD0iMCAwIDI1MCAyMzciIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0xNjEuMjI3IDE2MS4yNTFDMTMyLjE1NCAxNjkuMDQxIDExNC45MDEgMTk4LjkyNCAxMjIuNjkxIDIyNy45OTdDMTIzLjkyNSAyMzIuNjAzIDEyOC42NTkgMjM1LjMzNiAxMzMuMjY0IDIzNC4xMDJMMTg1LjkwNyAyMTkuOTk2QzIxOS41ODUgMjEwLjk3MiAyMzkuNTcgMTc2LjM1NCAyMzAuNTQ2IDE0Mi42NzdMMTYxLjIyNyAxNjEuMjUxWiIgZmlsbD0iIzI0NjI3QiIvPgo8cGF0aCBkPSJNODguMTgzNiAxNTkuOTg4QzExNy4yNTcgMTY3Ljc3OCAxMzQuNTEgMTk3LjY2MiAxMjYuNzIgMjI2LjczNUMxMjUuNDg2IDIzMS4zNCAxMjAuNzUyIDIzNC4wNzMgMTE2LjE0NyAyMzIuODM5TDYzLjUwNDEgMjE4LjczM0MyOS44MjY0IDIwOS43MSA5Ljg0MDk0IDE3NS4wOTIgMTguODY0OSAxNDEuNDE0TDg4LjE4MzYgMTU5Ljk4OFoiIGZpbGw9IiMyNDYyN0IiLz4KPHBhdGggZD0iTTE4Ni44NjcgMTcyLjk4QzE1Mi4wMDIgMTcyLjk4IDEyMy43MzcgMjAxLjI0NSAxMjMuNzM3IDIzNi4xMTFIMTg2Ljg3QzIyMS43MzYgMjM2LjExMSAyNTAgMjA3Ljg0NiAyNTAgMTcyLjk4TDE4Ni44NjcgMTcyLjk4WiIgZmlsbD0iIzMxNzQ4RiIvPgo8cGF0aCBkPSJNNjMuMTMyNyAxNzIuOThDOTcuOTk4NCAxNzIuOTggMTI2LjI2MyAyMDEuMjQ1IDEyNi4yNjMgMjM2LjExMUg2My4xM0MyOC4yNjQyIDIzNi4xMTEgLTEuNTI0MDNlLTA2IDIwNy44NDYgMCAxNzIuOThMNjMuMTMyNyAxNzIuOThaIiBmaWxsPSIjMzE3NDhGIi8+CjxwYXRoIGQ9Ik0xNzEuNzE3IDc1LjEyNjNDMTcxLjcxNyAxMDEuMjc2IDE1MC41MTggMTIyLjQ3NSAxMjQuMzY5IDEyMi40NzVDOTguMjE4OCAxMjIuNDc1IDc3LjAyMDIgMTAxLjI3NiA3Ny4wMjAyIDc1LjEyNjNDNzcuMDIwMiA0OC45NzY0IDk4LjIxODggMjcuNzc3OCAxMjQuMzY5IDI3Ljc3NzhDMTUwLjUxOCAyNy43Nzc4IDE3MS43MTcgNDguOTc2NCAxNzEuNzE3IDc1LjEyNjNaIiBmaWxsPSIjRUJCQ0JBIi8+CjxwYXRoIGQ9Ik0xNDQuMjE3IDg2LjIzNzlDMTYxLjY0OSA1Ni4wNDMyIDE1MS4zMDMgMTcuNDMyOSAxMjEuMTA4IDBMMTA2LjA2IDI2LjA2NDRDODguNjI3IDU2LjI1OSA5OC45NzM2IDk0Ljg2OTQgMTI5LjE2OCAxMTIuMzAyTDE0NC4yMTcgODYuMjM3OVoiIGZpbGw9IiNFQkJDQkEiLz4KPHBhdGggZD0iTTEyNS4yOTkgNjAuOTc4OUMxMTYuMjc1IDI3LjMwMTIgODEuNjU3NSA3LjMxNTY3IDQ3Ljk3OTcgMTYuMzM5Nkw2NC4zMTk3IDc3LjMyMTFDNzMuMzQzNiAxMTAuOTk5IDEwNy45NjEgMTMwLjk4NCAxNDEuNjM5IDEyMS45NkwxMjUuMjk5IDYwLjk3ODlaIiBmaWxsPSIjRUJCQ0JBIi8+CjxwYXRoIGQ9Ik0xMjQuOTI2IDYwLjk3ODlDMTMzLjk1IDI3LjMwMTIgMTY4LjU2NyA3LjMxNTY3IDIwMi4yNDUgMTYuMzM5NkwxODUuOTA1IDc3LjMyMTFDMTc2Ljg4MSAxMTAuOTk5IDE0Mi4yNjMgMTMwLjk4NCAxMDguNTg2IDEyMS45NkwxMjQuOTI2IDYwLjk3ODlaIiBmaWxsPSIjRUJCQ0JBIi8+Cjwvc3ZnPgo=&style=for-the-badge" />
</a>
</p>
## Usage
## Gallery
![Rosé Pine with App](https://user-images.githubusercontent.com/1474821/166155319-06796439-95a7-4aea-910e-927c1f24518e.png)
## Thanks to
- [punkfairie](https://git.punkfairie.net/punkfairie)
## Contributing
> Prefer using [@rose-pine/build](https://github.com/rose-pine/build) when possible
Modify `template.json` using Rosé Pine variables, then build variants:
```sh
npx @rose-pine/build@latest
```
## Style guide
> Be sure to remove this section 😌
- Lowercase meta files, eg. `readme.md`
- Repo name should be the simplest version of the app name, eg. iterm instead of iTerm2
- Add a description and topics to automatically show the theme on [rosepinetheme.com/themes](https://rosepinetheme.com/themes)
- Description should read "Soho vibes for App" where "App" is the display name
- Topics should include [existing categories](https://rosepinetheme.com/themes)
- Generate and upload social image via [Rosé Pine Images](https://rose-pine-images.vercel.app)