Merge pull request #282 from Mtendekuyokwa19/everforest

Everforest

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": "#434F55",
+        "mOnPrimary": "#D3C6AA",
+        "mSecondary": "#232a2e",
+        "mOnSecondary": "#D3C6AA",
+        "mTertiary": "#333c43",
+        "mOnTertiary": "#9DA9A0",
+        "mError": "#E66868",
+        "mOnError": "#9DA9A0",
+        "mSurface": "#BEC5B2",
+        "mOnSurface": "#333C43",
+        "mSurfaceVariant": "#9DA9A0",
+        "mOnSurfaceVariant": "#232A2E",
+        "mOutline": "#232A2E",
+        "mShadow": "#ECF5ED"
+    }
+}

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 =
+  outputs = { self, nixpkgs, systems, quickshell, ... }:
-    {
+    let eachSystem = nixpkgs.lib.genAttrs (import systems);
-      self,
+    in {
-      nixpkgs,
+      formatter =
-      systems,
+        eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra);
-      quickshell,
-      ...
-    }:
-    let
-      eachSystem = nixpkgs.lib.genAttrs (import systems);
-    in
-    {
-      formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra);
 
-      packages = eachSystem (
+      packages = eachSystem (system:
-        system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
           qs = quickshell.packages.${system}.default.override {
@@ -34,8 +26,7 @@
             withI3 = false;
           };
 
-          runtimeDeps =
+          runtimeDeps = with pkgs;
-            with pkgs;
             [
               bash
               bluez
@@ -50,34 +41,21 @@
               matugen
               networkmanager
               wl-clipboard
-            ]
+            ] ++ lib.optionals (pkgs.stdenv.hostPlatform.isx86_64)
-            ++ lib.optionals (pkgs.stdenv.hostPlatform.isx86_64) [
+            [ gpu-screen-recorder ];
-              gpu-screen-recorder
-            ];
 
           fontconfig = pkgs.makeFontsConf {
-            fontDirectories = [
+            fontDirectories = [ pkgs.roboto pkgs.inter-nerdfont ];
-              pkgs.roboto
-              pkgs.inter-nerdfont
-            ];
           };
-        in
+        in {
-        {
           default = pkgs.stdenv.mkDerivation {
             pname = "noctalia-shell";
             version = self.rev or self.dirtyRev or "dirty";
             src = ./.;
 
-            nativeBuildInputs = [
+            nativeBuildInputs =
-              pkgs.gcc
+              [ pkgs.gcc pkgs.makeWrapper pkgs.qt6.wrapQtAppsHook ];
-              pkgs.makeWrapper
+            buildInputs = [ qs pkgs.xkeyboard_config pkgs.qt6.qtbase ];
-              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);
     };