From 9b76aef17927c5a21ff9efb3846724e13d9fcd58 Mon Sep 17 00:00:00 2001
From: elwrcl <elwerici@icloud.com>
Date: Wed, 1 Apr 2026 18:55:00 +0300
Subject: [PATCH] add: noctalia-shell

---
 flake.lock                   | 82 ++++++++++++++++++++++++++++++++++++
 flake.nix                    |  5 +++
 machine.nix                  |  2 +-
 nixos/system/nix/default.nix |  6 +--
 4 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index db5ccc6..69408b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -276,6 +276,50 @@
         "type": "github"
       }
     },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "noctalia-qs": "noctalia-qs"
+      },
+      "locked": {
+        "lastModified": 1775039613,
+        "narHash": "sha256-5VzBe0SOXamABAbtjNF5Y7jaMbSeVtGQRhbICoJ6izo=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "7b29c11d7aaf476723af14865665cf04750f8d20",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
+    "noctalia-qs": {
+      "inputs": {
+        "nixpkgs": [
+          "noctalia",
+          "nixpkgs"
+        ],
+        "systems": "systems_2",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1774994931,
+        "narHash": "sha256-WmXA8kyqvDA226DRPrXyR6bLO9VsRr4SUAYCVH6H6Ns=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-qs",
+        "rev": "b053facf8421df220d0bf2496a543b23dee3ca85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-qs",
+        "type": "github"
+      }
+    },
     "ny": {
       "flake": false,
       "locked": {
@@ -295,6 +339,7 @@
         "helium": "helium",
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_2",
+        "noctalia": "noctalia",
         "zen-browser": "zen-browser"
       }
     },
@@ -418,6 +463,43 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "noctalia",
+          "noctalia-qs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773297127,
+        "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_3",
diff --git a/flake.nix b/flake.nix
index 8b9fe7f..6d8980a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,11 @@
       url = "github:Lyndeno/apple-fonts.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs@{ self, nixpkgs, chaotic, home-manager, ... }:
diff --git a/machine.nix b/machine.nix
index 6c4ff44..51588c5 100644
--- a/machine.nix
+++ b/machine.nix
@@ -20,6 +20,6 @@ in
   environment.systemPackages = packages.system ++ [
     inputs.helium.packages.${system}.default
     zen-browser.packages.${system}.default
-#    inputs.noctalia.packages.${system}.default
+    inputs.noctalia.packages.${system}.default
   ];
 }
diff --git a/nixos/system/nix/default.nix b/nixos/system/nix/default.nix
index 4790ebf..a050b7a 100644
--- a/nixos/system/nix/default.nix
+++ b/nixos/system/nix/default.nix
@@ -10,14 +10,12 @@
     substituters = [
       "https://cache.nixos.org"
       "https://nix-community.cachix.org"
-    #  "https://noctalia.cachix.org"
-    #  "https://quickshell.cachix.org"
+      "https://noctalia.cachix.org"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    #  "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
-    #  "quickshell.cachix.org-1:ZmizBFkDp6s3KRnFfGFtEHBblFdSVDpU2eH3b0iFkKkc="
+      "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
     ];
   };