punkfairie/rose-pine-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: punkfairie:f89d1c0f4143f5d31d6ac18e5fa5bef42fe64b4c
Branches Tags
punkfairie:main
...
compare: punkfairie:558c12035e8c7ec81c07701e2d20ffe37dff84e8
Branches Tags
punkfairie:main

7 commits
f89d1c0f41 ... 558c12035e

Author SHA1 Message Date
punkfairie
558c12035e
fix(sddm): Move pkg derv to it's own file
Some checks failed
Release / Publish to Flake registries (push) Has been cancelled
Details
CI / Format Nix files (push) Has been cancelled
Details
CI / Test Modules (push) Has been cancelled
Details
CI / Validate sources (push) Has been cancelled
Details
Release / Make release (push) Has been cancelled
Details
Build & deploy website / Build site (push) Has been cancelled
Details
Build & deploy website / Deploy website (push) Has been cancelled
Details 
Nix was complaining that it wasn't a valid package so moved to it's own
file and called with callPackage()
 2024-10-20 18:37:56 -07:00
punkfairie
fa9adc6173
fix(cava): Put palette under the color section 2024-10-20 17:55:15 -07:00
punkfairie
190737eca1
fix(palette): Move JSON palette to it's own repo 
Nix was complaining that paths weren't absolute so I just made the JSON
file its own repo so I can import it with npins.
 2024-10-20 17:53:31 -07:00
punkfairie
d08549c4e5
fix(swaylock): Fix source name 2024-10-20 17:47:36 -07:00
punkfairie
db4872dc1a
fix(cava): Fix theme name 2024-10-20 17:42:59 -07:00
punkfairie
77ac6d6589
fix(rio): Incorrect source specified 2024-10-20 17:42:30 -07:00
punkfairie
a49c020fc8
fix(tests): Remove unthemed modules from tests 2024-10-20 17:36:53 -07:00
13 changed files with 87 additions and 557 deletions
Show stats Expand all files Collapse all files

425
.sources/palette.json
View file

@ -1,425 +0,0 @@
{
"main": {
"name": "",
"dark": true,
"colors": {
"base": {
"name": "Base",
"hex": "#191724",
"rgb": {
"r": 25,
"g": 23,
"b": 36
}
},
"surface": {
"name": "Surface",
"hex": "#1f1d2e",
"rgb": {
"r": 31,
"g": 29,
"b": 36
}
},
"overlay": {
"name": "Overlay",
"hex": "#26233a",
"rgb": {
"r": 38,
"g": 35,
"b": 58
}
},
"muted": {
"name": "Muted",
"hex": "#6e6a86",
"rgb": {
"r": 110,
"g": 106,
"b": 134
}
},
"subtle": {
"name": "Subtle",
"hex": "#908caa",
"rgb": {
"r": 144,
"g": 140,
"b": 170
}
},
"text": {
"name": "Text",
"hex": "#e0def4",
"rgb": {
"r": 224,
"g": 222,
"b": 244
}
},
"love": {
"name": "Love",
"hex": "#eb6f92",
"rgb": {
"r": 235,
"g": 111,
"b": 146
}
},
"gold": {
"name": "Gold",
"hex": "#f6c177",
"rgb": {
"r": 246,
"g": 193,
"b": 119
}
},
"rose": {
"name": "Rose",
"hex": "#ebbcba",
"rgb": {
"r": 235,
"g": 188,
"b": 186
}
},
"pine": {
"name": "Pine",
"hex": "#31748f",
"rgb": {
"r": 49,
"g": 116,
"b": 143
}
},
"foam": {
"name": "Foam",
"hex": "#9ccfd8",
"rgb": {
"r": 156,
"g": 207,
"b": 216
}
},
"iris": {
"name": "Iris",
"hex": "#c4a7e7",
"rgb": {
"r": 196,
"g": 167,
"b": 231
}
},
"highlight-low": {
"name": "Highlight Low",
"hex": "#21202e",
"rgb": {
"r": 33,
"g": 32,
"b": 46
}
},
"highlight-med": {
"name": "Highlight Med",
"hex": "#403d52",
"rgb": {
"r": 64,
"g": 61,
"b": 82
}
},
"highlight-high": {
"name": "Highlight High",
"hex": "#524f67",
"rgb": {
"r": 82,
"g": 79,
"b": 103
}
}
}
},
"moon": {
"name": "Moon",
"dark": true,
"colors": {
"base": {
"name": "Base",
"hex": "#232136",
"rgb": {
"r": 35,
"g": 33,
"b": 54
}
},
"surface": {
"name": "Surface",
"hex": "#2a273f",
"rgb": {
"r": 42,
"g": 39,
"b": 63
}
},
"overlay": {
"name": "Overlay",
"hex": "#26233a",
"rgb": {
"r": 57,
"g": 53,
"b": 82
}
},
"muted": {
"name": "Muted",
"hex": "#6e6a86",
"rgb": {
"r": 110,
"g": 106,
"b": 134
}
},
"subtle": {
"name": "Subtle",
"hex": "#908caa",
"rgb": {
"r": 144,
"g": 140,
"b": 170
}
},
"text": {
"name": "Text",
"hex": "#e0def4",
"rgb": {
"r": 224,
"g": 222,
"b": 244
}
},
"love": {
"name": "Love",
"hex": "#eb6f92",
"rgb": {
"r": 235,
"g": 111,
"b": 146
}
},
"gold": {
"name": "Gold",
"hex": "#f6c177",
"rgb": {
"r": 246,
"g": 193,
"b": 119
}
},
"rose": {
"name": "Rose",
"hex": "#ea9a97",
"rgb": {
"r": 234,
"g": 154,
"b": 151
}
},
"pine": {
"name": "Pine",
"hex": "#3e8fb0",
"rgb": {
"r": 62,
"g": 143,
"b": 176
}
},
"foam": {
"name": "Foam",
"hex": "#9ccfd8",
"rgb": {
"r": 156,
"g": 207,
"b": 216
}
},
"iris": {
"name": "Iris",
"hex": "#c4a7e7",
"rgb": {
"r": 196,
"g": 167,
"b": 231
}
},
"highlight-low": {
"name": "Highlight Low",
"hex": "#2a283e",
"rgb": {
"r": 42,
"g": 40,
"b": 62
}
},
"highlight-med": {
"name": "Highlight Med",
"hex": "#44415a",
"rgb": {
"r": 58,
"g": 65,
"b": 90
}
},
"highlight-high": {
"name": "Highlight High",
"hex": "#56526e",
"rgb": {
"r": 86,
"g": 82,
"b": 110
}
}
}
},
"dawn": {
"name": "Dawn",
"dark": false,
"colors": {
"base": {
"name": "Base",
"hex": "#faf4ed",
"rgb": {
"r": 250,
"g": 244,
"b": 237
}
},
"surface": {
"name": "Surface",
"hex": "#fffaf3",
"rgb": {
"r": 255,
"g": 250,
"b": 243
}
},
"overlay": {
"name": "Overlay",
"hex": "#f2e9e1",
"rgb": {
"r": 242,
"g": 233,
"b": 222
}
},
"muted": {
"name": "Muted",
"hex": "#9893a5",
"rgb": {
"r": 152,
"g": 147,
"b": 165
}
},
"subtle": {
"name": "Subtle",
"hex": "#797593",
"rgb": {
"r": 121,
"g": 117,
"b": 147
}
},
"text": {
"name": "Text",
"hex": "#575279",
"rgb": {
"r": 87,
"g": 82,
"b": 121
}
},
"love": {
"name": "Love",
"hex": "#b4637a",
"rgb": {
"r": 180,
"g": 99,
"b": 122
}
},
"gold": {
"name": "Gold",
"hex": "#ea9d34",
"rgb": {
"r": 234,
"g": 157,
"b": 52
}
},
"rose": {
"name": "Rose",
"hex": "#d7827e",
"rgb": {
"r": 215,
"g": 130,
"b": 126
}
},
"pine": {
"name": "Pine",
"hex": "#286983",
"rgb": {
"r": 40,
"g": 105,
"b": 131
}
},
"foam": {
"name": "Foam",
"hex": "#56949f",
"rgb": {
"r": 86,
"g": 148,
"b": 159
}
},
"iris": {
"name": "Iris",
"hex": "#907aa9",
"rgb": {
"r": 144,
"g": 122,
"b": 169
}
},
"highlight-low": {
"name": "Highlight Low",
"hex": "#f4ede8",
"rgb": {
"r": 244,
"g": 237,
"b": 232
}
},
"highlight-med": {
"name": "Highlight Med",
"hex": "#dfdad9",
"rgb": {
"r": 223,
"g": 218,
"b": 217
}
},
"highlight-high": {
"name": "Highlight High",
"hex": "#cecacd",
"rgb": {
"r": 206,
"g": 202,
"b": 205
}
}
}
}
}

35
.sources/sources.json
View file

@ -240,18 +240,6 @@
"url": "https://github.com/rose-pine/polybar/archive/2c94fbc4997915c1c877cecc9aaf5b63797f74a4.tar.gz", "url": "https://github.com/rose-pine/polybar/archive/2c94fbc4997915c1c877cecc9aaf5b63797f74a4.tar.gz",
"hash": "10b09fypcp8bj92wwkc95w4nwk4rxh0an3v2hdp551f8lc7qz75j" "hash": "10b09fypcp8bj92wwkc95w4nwk4rxh0an3v2hdp551f8lc7qz75j"
}, },
"rio": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "catppuccin",
"repo": "rio"
},
"branch": "main",
"revision": "6d93b3385a0f2ae586edc30aa64601d40ea382d5",
"url": "https://github.com/catppuccin/rio/archive/6d93b3385a0f2ae586edc30aa64601d40ea382d5.tar.gz",
"hash": "171pb62q1rzpr802yb93sj30vq3b3kiqlac8nva08rgjb94z5ipi"
},
"rio-terminal": { "rio-terminal": {
"type": "Git", "type": "Git",
"repository": { "repository": {
@ -288,6 +276,17 @@
"url": "https://github.com/d2718nis/rose-pine-dunst/archive/496499eaed38a07ce4f79ec91baaf6e1e4c28bc5.tar.gz", "url": "https://github.com/d2718nis/rose-pine-dunst/archive/496499eaed38a07ce4f79ec91baaf6e1e4c28bc5.tar.gz",
"hash": "0x7cqbcn7zygab9xbmbarz06wxkj3wxxffwmka33ljhm8gk3x0ay" "hash": "0x7cqbcn7zygab9xbmbarz06wxkj3wxxffwmka33ljhm8gk3x0ay"
}, },
"rose-pine-palette": {
"type": "Git",
"repository": {
"type": "Git",
"url": "https://git.punkfairie.net/punkfairie/rose-pine-palette.git"
},
"branch": "main",
"revision": "7248b41a76dfc807694bc5bb4bec0edc16d23cd9",
"url": null,
"hash": "1x72ivyp8963wfrjp84nbh5phwkhd5fyd1jl0b5vasvrzjpp0vvj"
},
"rose-pine-swaylock": { "rose-pine-swaylock": {
"type": "Git", "type": "Git",
"repository": { "repository": {
@ -336,18 +335,6 @@
"url": "https://github.com/catppuccin/sway/archive/5f9da99a43336583c7d5ebddf78d7b615911e5ea.tar.gz", "url": "https://github.com/catppuccin/sway/archive/5f9da99a43336583c7d5ebddf78d7b615911e5ea.tar.gz",
"hash": "0n3fpb9pkmis932jv5b1gz045xyhw9cqybild20hsv45lr3r5f1q" "hash": "0n3fpb9pkmis932jv5b1gz045xyhw9cqybild20hsv45lr3r5f1q"
}, },
"swaylock": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "catppuccin",
"repo": "swaylock"
},
"branch": "main",
"revision": "77246bbbbf8926bdb8962cffab6616bc2b9e8a06",
"url": "https://github.com/catppuccin/swaylock/archive/77246bbbbf8926bdb8962cffab6616bc2b9e8a06.tar.gz",
"hash": "02nql7ry71fxlhj0vsbsxi3jrmfajxmapr9gg0mzp0k0bxwqxa00"
},
"tm-theme": { "tm-theme": {
"type": "Git", "type": "Git",
"repository": { "repository": {

2
modules/home-manager/cava.nix
View file

@ -14,6 +14,6 @@ in {
options.programs.cava.rose-pine = lib.rp.mkRosePineOpt {name = "cava";}; options.programs.cava.rose-pine = lib.rp.mkRosePineOpt {name = "cava";};
config.programs.cava = lib.mkIf enable { config.programs.cava = lib.mkIf enable {
settings = lib.rp.fromINIRaw (sources.cava + "/${flavor}.cava"); settings.color = lib.rp.fromINIRaw (sources.cava + "/${flavor}");
}; };
} }

3
modules/home-manager/fzf.nix
View file

@ -3,9 +3,10 @@
lib, lib,
... ...
}: let }: let
inherit (config.rose-pine) sources;
cfg = config.programs.fzf.rose-pine; cfg = config.programs.fzf.rose-pine;
enable = cfg.enable && config.programs.fzf.enable; enable = cfg.enable && config.programs.fzf.enable;
palette = (lib.importJSON "../../.sources/palette.json").${cfg.flavor}.colors; palette = (lib.importJSON "${sources.rose-pine-palette}/palette.json").${cfg.flavor}.colors;
in { in {
options.programs.fzf.rose-pine = options.programs.fzf.rose-pine =
lib.rp.mkRosePineOpt {name = "fzf";}; lib.rp.mkRosePineOpt {name = "fzf";};

2
modules/home-manager/rio.nix
View file

@ -16,6 +16,6 @@ in {
options.programs.rio.rose-pine = lib.rp.mkRosePineOpt {name = "rio";}; options.programs.rio.rose-pine = lib.rp.mkRosePineOpt {name = "rio";};
config = lib.mkIf enable { config = lib.mkIf enable {
programs.rio.settings = lib.importTOML "${sources.rio}/${themeName}.toml"; programs.rio.settings = lib.importTOML "${sources.rio-terminal}/${themeName}.toml";
}; };
} }

2
modules/home-manager/swaylock.nix
View file

@ -46,6 +46,6 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.swaylock.settings = lib.rp.fromINI (sources.swaylock + "/${themeName}"); programs.swaylock.settings = lib.rp.fromINI (sources.rose-pine-swaylock + "/${themeName}");
}; };
} }

4
modules/nixos/console.nix
View file

@ -3,10 +3,12 @@
lib, lib,
... ...
}: let }: let
inherit (config.rose-pine) sources;
cfg = config.console.rose-pine; cfg = config.console.rose-pine;
enable = cfg.enable && config.console.enable; enable = cfg.enable && config.console.enable;
palette = (lib.importJSON "../../.sources/palette.json").${cfg.flavor}.colors; palette = (lib.importJSON "${sources.rose-pine-palette}/palette.json").${cfg.flavor}.colors;
in { in {
options.console.rose-pine = lib.rp.mkRosePineOpt {name = "console";}; options.console.rose-pine = lib.rp.mkRosePineOpt {name = "console";};

21
modules/nixos/sddm-rose-pine-pkg.nix Normal file
View file

@ -0,0 +1,21 @@
{
stdenvNoCC,
libsForQt5,
sources,
}:
stdenvNoCC.mkDerivation {
pname = "sddm-rose-pine-theme";
version = "1.2";
dontBuild = true;
propagatedUserEnvPkgs = [
libsForQt5.qt5.qtgraphicaleffects
];
src = sources.sddm-rose-pine;
installPhase = ''
mkdir -p $out/share/sddm/themes
cp -aR $src $out/share/sddm/themes/rose-pine
'';
}

24
modules/nixos/sddm.nix
View file

@ -1,6 +1,7 @@
{ {
lib, lib,
config, config,
pkgs,
... ...
}: let }: let
inherit (config.rose-pine) sources; inherit (config.rose-pine) sources;
@ -13,28 +14,7 @@ in {
services.displayManager.sddm.theme = "rose-pine"; services.displayManager.sddm.theme = "rose-pine";
environment.systemPackages = [ environment.systemPackages = [
( (pkgs.callPackage ./sddm-rose-pine-pkg.nix {inherit sources;})
{
stdenvNoCC,
libsForQt5,
}:
stdenvNoCC.mkDerivation {
pname = "sddm-rose-pine-theme";
version = "1.2";
dontBuild = true;
propagatedUserEnvPkgs = [
libsForQt5.qt5.qtgraphicaleffects
];
src = sources.sddm;
installPhase = ''
mkdir -p $out/share/sddm/themes
cp -aR $src $out/share/sddm/themes/rose-pine
'';
}
)
]; ];
}; };
} }

9
tests/darwin.nix
View file

@ -18,15 +18,9 @@
programs = { programs = {
cava.enable = lib.mkForce false; # NOTE: this may actually work on darwin, but the package is currently not supported cava.enable = lib.mkForce false; # NOTE: this may actually work on darwin, but the package is currently not supported
foot.enable = lib.mkForce false; foot.enable = lib.mkForce false;
fuzzel.enable = lib.mkForce false;
hyprlock.enable = lib.mkForce false;
imv.enable = lib.mkForce false;
mpv.enable = lib.mkForce false; # NOTE: same as cava, but `mpv` fails to build currently
obs-studio.enable = lib.mkForce false;
rio.enable = lib.mkForce false; # marked as broken rio.enable = lib.mkForce false; # marked as broken
rofi.enable = lib.mkForce false; rofi.enable = lib.mkForce false;
swaylock.enable = lib.mkForce false; swaylock.enable = lib.mkForce false;
tofi.enable = lib.mkForce false;
waybar.enable = lib.mkForce false; waybar.enable = lib.mkForce false;
}; };
@ -44,4 +38,5 @@
}; };
} }
]; ];
}).activationPackage })
.activationPackage

6
tests/default.nix
View file

@ -6,11 +6,11 @@
home-manager-stable, home-manager-stable,
}: }:
lib.optionalAttrs nixpkgs.stdenv.isLinux { lib.optionalAttrs nixpkgs.stdenv.isLinux {
nixos-test-unstable = nixpkgs.callPackage ./nixos.nix { inherit home-manager; }; nixos-test-unstable = nixpkgs.callPackage ./nixos.nix {inherit home-manager;};
nixos-test-stable = nixpkgs-stable.callPackage ./nixos.nix { home-manager = home-manager-stable; }; nixos-test-stable = nixpkgs-stable.callPackage ./nixos.nix {home-manager = home-manager-stable;};
} }
// lib.optionalAttrs nixpkgs.stdenv.isDarwin { // lib.optionalAttrs nixpkgs.stdenv.isDarwin {
darwin-test-unstable = nixpkgs.callPackage ./darwin.nix { inherit home-manager; }; darwin-test-unstable = nixpkgs.callPackage ./darwin.nix {inherit home-manager;};
darwin-test-stable = nixpkgs-stable.callPackage ./darwin.nix { darwin-test-stable = nixpkgs-stable.callPackage ./darwin.nix {
home-manager = home-manager-stable; home-manager = home-manager-stable;
}; };

34
tests/home.nix
View file

@ -16,59 +16,25 @@
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enabled = "fcitx5";
programs = { programs = {
aerc.enable = true;
alacritty.enable = true; alacritty.enable = true;
bat.enable = true; bat.enable = true;
bottom.enable = true;
btop.enable = true; btop.enable = true;
cava.enable = true; cava.enable = true;
fish.enable = true; fish.enable = true;
foot.enable = true; foot.enable = true;
freetube.enable = true;
fuzzel.enable = true;
fzf.enable = true; fzf.enable = true;
gh-dash.enable = true;
git = {
enable = true;
delta.enable = true;
};
gitui.enable = true;
# this is enabled by default already, but still
# listing explicitly so we know it's tested
glamour.rose-pine.enable = true;
helix.enable = true; helix.enable = true;
hyprlock.enable = true;
imv.enable = true;
k9s.enable = true; k9s.enable = true;
kitty.enable = true; kitty.enable = true;
lazygit.enable = true;
micro.enable = true;
mpv.enable = true;
neovim.enable = true; neovim.enable = true;
newsboat.enable = true;
rio.enable = true; rio.enable = true;
rofi.enable = true; rofi.enable = true;
skim.enable = true;
spotify-player.enable = true;
starship.enable = true; starship.enable = true;
swaylock.enable = true; swaylock.enable = true;
tmux.enable = true; tmux.enable = true;
tofi.enable = true;
obs-studio.enable = true;
waybar.enable = true; waybar.enable = true;
yazi.enable = true;
zathura.enable = true; zathura.enable = true;
zellij.enable = true; zellij.enable = true;
zsh = {
enable = true;
syntaxHighlighting.enable = true;
};
};
qt = {
enable = true;
platformTheme.name = "kvantum";
style.name = "kvantum";
}; };
services = { services = {

77
tests/nixos.nix
View file

@ -1,46 +1,49 @@
{ testers, home-manager }: {
testers,
home-manager,
}:
testers.runNixOSTest { testers.runNixOSTest {
name = "module-test"; name = "module-test";
nodes.machine = nodes.machine = {
{ lib, pkgs, ... }: lib,
{ pkgs,
imports = [ ...
home-manager.nixosModules.default }: {
../modules/nixos imports = [
./common.nix home-manager.nixosModules.default
]; ../modules/nixos
./common.nix
];
boot = { boot = {
loader.grub.enable = true; loader.grub.enable = true;
plymouth.enable = true;
};
services = {
displayManager.sddm = {
enable = true;
package = pkgs.kdePackages.sddm; # our module/the upstream port requires the qt6 version
};
xserver.enable = true; # required for sddm
};
console.enable = true;
users.users.test = {
isNormalUser = true;
home = "/home/test";
};
virtualisation = {
memorySize = 4096;
writableStore = true;
};
home-manager.users.test = {
imports = [ ./home.nix ];
};
}; };
services = {
displayManager.sddm = {
enable = true;
};
xserver.enable = true; # required for sddm
};
console.enable = true;
users.users.test = {
isNormalUser = true;
home = "/home/test";
};
virtualisation = {
memorySize = 4096;
writableStore = true;
};
home-manager.users.test = {
imports = [./home.nix];
};
};
testScript = _: '' testScript = _: ''
machine.start() machine.start()
machine.wait_for_unit("home-manager-test.service") machine.wait_for_unit("home-manager-test.service")