kanagawa moment

This commit is contained in:
atagen 2023-05-21 16:17:52 +10:00
parent 8c093b6658
commit 707157c0fe
6 changed files with 106 additions and 36 deletions

View file

@ -58,27 +58,11 @@
"x86_64-linux"
];
in rec {
# custom packages
# packages = forAllSystems (
# system: let
# pkgs = nixpkgs.legacyPackages.${system};
# in
# import ./pkgs {inherit pkgs;}
# );
# homepkgs = forAllSystems (system:
# let pkgs = nixpkgs.legacyPackages.${system};
# in import ./homepkgs { inherit pkgs; }
# );
# any overlays or modules we use
overlays = import ./overlay.nix {inherit inputs;};
# nixosModules = import ./modules/nixos;
# homeModules = import ./modules/home;
nixosConfigurations = {
"quiver" = nixpkgs.lib.nixosSystem {
# pkgs = nixpkgs.legacyPackages.x86_64-linux;
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
@ -94,7 +78,6 @@
};
"adrift" = nixpkgs.lib.nixosSystem {
# pkgs = nixpkgs.legacyPackages.x86_64-linux;
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [

View file

@ -60,7 +60,7 @@ in {
# libsForQt5.qtstyleplugin-kvantum
gtk-engine-murrine
] ++ pkgs.rice.fonts.pkgs;
] ++ pkgs.rice.fonts.pkgs ++ pkgs.rice.icons.pkgs;
fonts.fontconfig.enable = true;
@ -323,9 +323,8 @@ in {
programs.helix = {
enable = true;
# package = inputs.helix.packages.${pkgs.hostPlatform.system}.default;
settings = {
theme = "rose_pine";
theme = "kanagawa";
editor.lsp.display-messages = true;
};
};

View file

@ -1,8 +1,8 @@
{pkgs, ...}: {
hyprland-system76-scheduler-integration = pkgs.callPackage ./hyprland-system76-scheduler-integration.nix {};
culr = pkgs.callPackage ./culr.nix {};
rose-pine-theme = pkgs.callPackage ./rose-pine-theme.nix {};
rose-pine-icons = pkgs.callPackage ./rose-pine-icons.nix {};
kanagawa-theme = pkgs.callPackage ./kanagawa-theme.nix {};
kanagawa-icons = pkgs.callPackage ./kanagawa-icons.nix {};
# gruvbox-kvantum = pkgs.callPackage ./gruvbox-kvantum.nix {};
# gruvbox-gtk-theme = pkgs.callPackage ./gruvbox-gtk-theme.nix {};
# system76-scheduler = pkgs.callPackage ./system76-scheduler.nix {};

35
pkgs/kanagawa-icons.nix Normal file
View file

@ -0,0 +1,35 @@
{
stdenv,
fetchFromGitHub,
lib,
gnome-themes-extra,
gtk-engine-murrine,
gtk_engines,
}:
stdenv.mkDerivation rec {
pname = "kanagawa-icons";
version = "unstable-2023-05-20";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Kanagawa-GKT-Theme";
rev = "7b8ece4382533491e82f9b3d5552607f67a79999";
sha256 = "sha256-Jtu04SKXk0wFRvx2Duz0YxHEWJ2sM8ZIT+dtdJqKykY=";
};
buildInputs = [
gnome-themes-extra # adwaita engine for Gtk2
gtk_engines # pixmap engine for Gtk2
];
propagatedUserEnvPkgs = [
gtk-engine-murrine # murrine engine for Gtk2
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
cp -a icons/Kanagawa $out/share/icons/Kanagawa
runHook postInstall
'';
}

35
pkgs/kanagawa-theme.nix Normal file
View file

@ -0,0 +1,35 @@
{
stdenv,
fetchFromGitHub,
lib,
gnome-themes-extra,
gtk-engine-murrine,
gtk_engines,
}:
stdenv.mkDerivation rec {
pname = "kanagawa-gtk-theme";
version = "unstable-2023-05-20";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Kanagawa-GKT-Theme";
rev = "7b8ece4382533491e82f9b3d5552607f67a79999";
sha256 = "sha256-Jtu04SKXk0wFRvx2Duz0YxHEWJ2sM8ZIT+dtdJqKykY=";
};
buildInputs = [
gnome-themes-extra # adwaita engine for Gtk2
gtk_engines # pixmap engine for Gtk2
];
propagatedUserEnvPkgs = [
gtk-engine-murrine # murrine engine for Gtk2
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a themes/Kanagawa-B $out/share/themes/Kanagawa
runHook postInstall
'';
}

View file

@ -1,11 +1,16 @@
final: prev:
with prev.lib.nix-rice; let
theme = kitty-themes.getThemeByName "rose-pine";
theme = kitty-themes.parseTheme (
builtins.fetchurl {
url = "https://github.com/rebelot/kanagawa.nvim/blob/master/extras/kanagawa.conf?raw=true";
sha256 = "1r95lkq24a2ygrjv1mkqfrksgfvnyc16xrsldw04phnsa555x51l";
}
);
in rec {
rice = {
palette =
rec {
bright =
normal =
palette.defaultPalette
// {
black = theme.color0;
@ -17,8 +22,18 @@ in rec {
cyan = theme.color6;
white = theme.color7;
};
normal =
palette.darken 15 bright;
bright =
palette.defaultPalette
// {
black = theme.color8;
red = theme.color9;
green = theme.color10;
yellow = theme.color11;
blue = theme.color12;
magenta = theme.color13;
cyan = theme.color14;
white = theme.color15;
};
util =
palette.defaultPalette
// {
@ -27,7 +42,6 @@ in rec {
fg_sel = theme.selection_foreground;
bg_sel = theme.selection_background;
cursor = theme.cursor;
cursor_text = theme.cursor_text_color;
url = theme.url_color;
};
}
@ -60,19 +74,23 @@ in rec {
monospace.package
emoji.package
meslo-lgs-nf
];
};
icons = rec {
name = "Kanagawa";
package = final.kanagawa-icons;
pkgs = with final; [
package
papirus-icon-theme
material-icons
material-design-icons
];
};
icons = {
name = "Rose-Pine";
package = final.rose-pine-icons;
};
gtk-theme = {
name = "RosePine-Main";
package = final.rose-pine-theme;
name = "Kanagawa";
package = final.kanagawa-theme;
};
@ -83,8 +101,8 @@ in rec {
bg = {
image = prev.fetchurl {
url = "https://github.com/the-argus/wallpapers/blob/main/rose/minimal_squares_rosepine.png?raw=true";
sha256 = "sha256-mZNgRDyEB5EzGucguv3vWTFaRBOEVS94bJjv7XVNW+Y=";
url = "https://upload.wikimedia.org/wikipedia/commons/0/0a/The_Great_Wave_off_Kanagawa.jpg";
sha256 = "sha256-RKhIar3wMwo/5rWG5AdQbnOP4HX+C138Q5YeNY/acgY=";
};
};
}; # /rice