From ab5b1e4d82bc1ced07048ed700aa114b49b27146 Mon Sep 17 00:00:00 2001 From: Mtende Kuyokwa Date: Mon, 15 Sep 2025 07:37:26 +0200 Subject: [PATCH 1/2] everforest dark complete --- Assets/ColorScheme/Everforest.json | 34 +++++++++++++++++ flake.nix | 60 ++++++++++-------------------- 2 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 Assets/ColorScheme/Everforest.json diff --git a/Assets/ColorScheme/Everforest.json b/Assets/ColorScheme/Everforest.json new file mode 100644 index 0000000..ff01cbe --- /dev/null +++ b/Assets/ColorScheme/Everforest.json @@ -0,0 +1,34 @@ +{ + "dark": { + "mPrimary": "#D3C6AA", + "mOnPrimary": "#232A2E", + "mSecondary": "#D3C6AA", + "mOnSecondary": "#232A2E", + "mTertiary": "#9DA9A0", + "mOnTertiary": "#232A2E", + "mError": "#E67E80", + "mOnError": "#232A2E", + "mSurface": "#232A2E", + "mOnSurface": "#859289", + "mSurfaceVariant": "#2D353B", + "mOnSurfaceVariant": "#D3C6AA", + "mOutline": "#D3C6AA", + "mShadow": "#475258" + }, + "light": { + "mPrimary": "#EAEDC8", + "mOnPrimary": "#9DA9A0", + "mSecondary": "#9DA9A0", + "mOnSecondary": "#9DA9A0", + "mTertiary": "#9DA9A0", + "mOnTertiary": "#9DA9A0", + "mError": "#9DA9A0", + "mOnError": "#9DA9A0", + "mSurface": "#D3C6AA", + "mOnSurface": "#9DA9A0", + "mSurfaceVariant": "#9DA9A0", + "mOnSurfaceVariant": "#9DA9A0", + "mOutline": "#9DA9A0", + "mShadow": "#9DA9A0" + } +} diff --git a/flake.nix b/flake.nix index cdb0de6..b2daca6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,6 @@ { - description = "Noctalia shell - a Wayland desktop shell built with Quickshell"; + description = + "Noctalia shell - a Wayland desktop shell built with Quickshell"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -11,22 +12,13 @@ }; }; - outputs = - { - self, - nixpkgs, - systems, - quickshell, - ... - }: - let - eachSystem = nixpkgs.lib.genAttrs (import systems); - in - { - formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra); + outputs = { self, nixpkgs, systems, quickshell, ... }: + let eachSystem = nixpkgs.lib.genAttrs (import systems); + in { + formatter = + eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra); - packages = eachSystem ( - system: + packages = eachSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; qs = quickshell.packages.${system}.default.override { @@ -34,8 +26,7 @@ withI3 = false; }; - runtimeDeps = - with pkgs; + runtimeDeps = with pkgs; [ bash bluez @@ -50,34 +41,21 @@ matugen networkmanager wl-clipboard - ] - ++ lib.optionals (pkgs.stdenv.hostPlatform.isx86_64) [ - gpu-screen-recorder - ]; + ] ++ lib.optionals (pkgs.stdenv.hostPlatform.isx86_64) + [ gpu-screen-recorder ]; fontconfig = pkgs.makeFontsConf { - fontDirectories = [ - pkgs.roboto - pkgs.inter-nerdfont - ]; + fontDirectories = [ pkgs.roboto pkgs.inter-nerdfont ]; }; - in - { + in { default = pkgs.stdenv.mkDerivation { pname = "noctalia-shell"; version = self.rev or self.dirtyRev or "dirty"; src = ./.; - nativeBuildInputs = [ - pkgs.gcc - pkgs.makeWrapper - pkgs.qt6.wrapQtAppsHook - ]; - buildInputs = [ - qs - pkgs.xkeyboard-config - pkgs.qt6.qtbase - ]; + nativeBuildInputs = + [ pkgs.gcc pkgs.makeWrapper pkgs.qt6.wrapQtAppsHook ]; + buildInputs = [ qs pkgs.xkeyboard_config pkgs.qt6.qtbase ]; propagatedBuildInputs = runtimeDeps; installPhase = '' @@ -91,14 +69,14 @@ ''; meta = { - description = "A sleek and minimal desktop shell thoughtfully crafted for Wayland, built with Quickshell."; + description = + "A sleek and minimal desktop shell thoughtfully crafted for Wayland, built with Quickshell."; homepage = "https://github.com/noctalia-dev/noctalia-shell"; license = pkgs.lib.licenses.mit; mainProgram = "noctalia-shell"; }; }; - } - ); + }); defaultPackage = eachSystem (system: self.packages.${system}.default); }; From 9d9bfb54e14113432dbd32da3009fa5f45ee3404 Mon Sep 17 00:00:00 2001 From: Mtende Kuyokwa Date: Mon, 15 Sep 2025 08:41:08 +0200 Subject: [PATCH 2/2] everforest light --- Assets/ColorScheme/Everforest.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ColorScheme/Everforest.json b/Assets/ColorScheme/Everforest.json index ff01cbe..618ab50 100644 --- a/Assets/ColorScheme/Everforest.json +++ b/Assets/ColorScheme/Everforest.json @@ -16,19 +16,19 @@ "mShadow": "#475258" }, "light": { - "mPrimary": "#EAEDC8", - "mOnPrimary": "#9DA9A0", - "mSecondary": "#9DA9A0", - "mOnSecondary": "#9DA9A0", - "mTertiary": "#9DA9A0", + "mPrimary": "#434F55", + "mOnPrimary": "#D3C6AA", + "mSecondary": "#232a2e", + "mOnSecondary": "#D3C6AA", + "mTertiary": "#333c43", "mOnTertiary": "#9DA9A0", - "mError": "#9DA9A0", + "mError": "#E66868", "mOnError": "#9DA9A0", - "mSurface": "#D3C6AA", - "mOnSurface": "#9DA9A0", + "mSurface": "#BEC5B2", + "mOnSurface": "#333C43", "mSurfaceVariant": "#9DA9A0", - "mOnSurfaceVariant": "#9DA9A0", - "mOutline": "#9DA9A0", - "mShadow": "#9DA9A0" + "mOnSurfaceVariant": "#232A2E", + "mOutline": "#232A2E", + "mShadow": "#ECF5ED" } }