diff --git a/flake.lock b/flake.lock
index cbb07a0..ed1e381 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "ags": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1718921313,
+        "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
     "blobs": {
       "flake": false,
       "locked": {
@@ -1345,6 +1365,7 @@
     },
     "root": {
       "inputs": {
+        "ags": "ags",
         "catppuccin": "catppuccin",
         "crane": "crane",
         "fenix": "fenix",
diff --git a/flake.nix b/flake.nix
index 66a65bb..b68e7f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,10 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ags = {
+      url = "github:Aylur/ags";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
diff --git a/nixosConfigurations/astora/users.nix b/nixosConfigurations/astora/users.nix
index dbf0dd4..963abbe 100644
--- a/nixosConfigurations/astora/users.nix
+++ b/nixosConfigurations/astora/users.nix
@@ -29,6 +29,7 @@
     home.homeDirectory = "/home/l-nafaryus";
     imports = [
       inputs.catppuccin.homeManagerModules.catppuccin
+      inputs.ags.homeManagerModules.default
     ];
     home.packages = with pkgs; [
       #gnupg
@@ -143,9 +144,16 @@
 
     gtk = {
       enable = true;
-      cursorTheme = {
-        name = "Papirus-Dark";
-        size = 16;
+      catppuccin = {
+        enable = true;
+        accent = "green";
+        flavor = "macchiato";
+        gnomeShellTheme = true;
+        icon = {
+          enable = true;
+          accent = "green";
+          flavor = "macchiato";
+        };
       };
     };
 
@@ -254,6 +262,12 @@
           };
         };
       };
+      ags = {
+        enable = true;
+        extraPackages = with pkgs; [
+          libdbusmenu-gtk3 # for system tray
+        ];
+      };
 
       obs-studio = {
         enable = true;
@@ -548,4 +562,6 @@
 
   # Services
   services.spoofdpi.enable = true;
+
+  services.gvfs.enable = true;
 }
diff --git a/nixosConfigurations/catarina/default.nix b/nixosConfigurations/catarina/default.nix
index 425c877..000a0ea 100644
--- a/nixosConfigurations/catarina/default.nix
+++ b/nixosConfigurations/catarina/default.nix
@@ -124,6 +124,12 @@ in {
         root = "/var/www";
       };
 
+      "*.elnafo.ru" = {
+        forceSSL = true;
+        useACMEHost = "elnafo.ru";
+        globalRedirect = "elnafo.ru";
+      };
+
       "www.elnafo.ru" = {
         forceSSL = true;
         useACMEHost = "elnafo.ru";
@@ -141,6 +147,12 @@ in {
         useACMEHost = "elnafo.ru";
         locations."/".proxyPass = "http://127.0.0.1:3000";
       };
+
+      "cache.elnafo.ru" = {
+        forceSSL = true;
+        useACMEHost = "elnafo.ru";
+        locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+      };
     };
   };
 
@@ -226,6 +238,19 @@ in {
     buildMachinesFiles = [];
   };
 
+  services.nix-serve = {
+    enable = true;
+    secretKeyFile = config.sops.secrets."nix-store/cache-key".path;
+  };
+
+  users.users."nix-serve" = {
+    description = "Nix-Serve Service";
+    createHome = false;
+    group = "nix-serve";
+    isSystemUser = true;
+  };
+  users.groups."nix-serve" = {};
+
   # Packages
   environment.systemPackages = with pkgs; [
     wget
diff --git a/nixosModules/misc/bonfire/secrets/catarina.yaml b/nixosModules/misc/bonfire/secrets/catarina.yaml
index 0162e24..6d7493f 100644
--- a/nixosModules/misc/bonfire/secrets/catarina.yaml
+++ b/nixosModules/misc/bonfire/secrets/catarina.yaml
@@ -1,20 +1,22 @@
-dns: ENC[AES256_GCM,data:rz909/BAd2XUjS+wRfriTriv+Dns6eXMqpZEjdln8zkjK6GrMN5p9H4tMFOHwJz5/YRD3Eix9Z8MYsEbpQeGBAFieN7b24gucV+p1ScZYpIyWo1sNLILMGPp1LH2aw==,iv:+TJJ/jB4ScP+6kJD/XkiVy/R5aPmj25PuI1RbCyaKL8=,tag:03AAg9SV4xAdTF7tn9q26Q==,type:str]
+dns: ENC[AES256_GCM,data:KpOHrII24C6ahlJEeUlrv4tEp0tsxAhPMGSQOHJ47nqVdJMJ10s3pvOePDzJ8SmEtPz0Tgloh7/Vte2UVakvQc1ebc+5aUSK5X3ig/H8CWLk8QJ/whP4R7f349qf6w==,iv:t8/92X2GphLnWVINPdSyyRR/IdjwM4fn7/CcSCaGZ00=,tag:7AcIBWXQaptomREdPO32Cw==,type:str]
 users:
-    root: ENC[AES256_GCM,data:tCyMduL4RAyqQlPngwkQBHPTQF36Lb3k9BDtEF97vwXOrsgBFxeLO3nyKi8WbDNOQ6PshiN5gq2ATBmhhWIN5mE6ZqDBb8qraA==,iv:1EfQVZkc6L7W+CeIdQruIrieBVAtp4f06O4T0CeXO4M=,tag:h7k4OufndS0UHfNy16HS6g==,type:str]
-    l-nafaryus: ENC[AES256_GCM,data:5B4qaUe/8TBg9i47YpMkX/Pt0tcb5QYVhJc92liXf/3SzItaFIfH7ZNggJmu2vVXa/NS1C6Q35vNFX8I07fKqXc9n0IAyLuKRA==,iv:qSdBwmR7QdD4JODwVb8gc/A55GZ2ldlurXtaGDuhXSQ=,tag:N8kvy1SSq/f/AMcwsSUpMQ==,type:str]
+    root: ENC[AES256_GCM,data:6eN4qRA1KR7djxYhy4mRU+nm9KXuW3lAecU9gFf+w3nj9uWd6jlZW8zk1hzKWvmjRljjujZeAMpacq6BR//gMjI00Z6SwzS0gQ==,iv:4Pj8kYmK28a+fBu8vMNXU+lSYz/7aDIBfUtzSkIAKwI=,tag:J2SEJ/VDw2NPwZKIHQx8xQ==,type:str]
+    l-nafaryus: ENC[AES256_GCM,data:YpKH5sbKW2F6EhcXHn0be6E9tEV+DNY6puFmhrqMi4XNqL0MRfyVybIj97PQMhnb1GaJxUPLvbIbA5FFBl68crI8rtP7QTgUJA==,iv:qkxRqaoUCn7hhvEcmqxvFwOO5IP0vR6kNHMbFXhuIEg=,tag:p+ReVMvufIStvwqU0R9mNw==,type:str]
 database:
-    git: ENC[AES256_GCM,data:drfCQxPKXXtbmF4de50QXX8Kh+7gxI/W2bpKCmQVn0A=,iv:W/hAzkBj+vu5FQwzBs+L3m++Xf+cQVUFUCTVMhfus5A=,tag:2cmbYVpKHXVC8y51SfeUKA==,type:str]
+    git: ENC[AES256_GCM,data:+/MlOAtWaGGZsBUfEYQlDuey2zQ062ojQOtCSQEPwpY=,iv:9ObyynAgtE3TUUX6cpFsi3phA2X54n4jycmPnpUJWRI=,tag:EHbnV2l4ZDkgwoVJ7aJ9hw==,type:str]
 mail:
-    l-nafaryus: ENC[AES256_GCM,data:Gp/8pSPOwkdkcSZVPZrnWs+9Kk56O0r78z11tpEExREmcX4c2MPgtlYMrkqYItsG4JU/hLxXCaXK07xx,iv:LHrLnwosaYQpBVukgqOsPDmv3U/AUE0wx227Id11S6E=,tag:CB86NR1STM728R8KHXpreQ==,type:str]
-    git: ENC[AES256_GCM,data:5UF4+YdAHBzNiqRXtSc15SOg2PCN+Cz7T89o8iTuRsZ5jrdXfBl8np9rVB/uStd+Z+dhQnQ2QCT2Gfxv,iv:boncugsEKxDOLy5qLxFg5ojpb0hUYsCg5QHcJArWMfU=,tag:mjhyu4Cu0d0sD/xTbEZMtQ==,type:str]
-    kirill: ENC[AES256_GCM,data:ucG5gukNlnC+rA45RstJ/IA7oxSl+B3TWOBPGyyOG2g+VMgjqefv7bL+aHJhikL/WCUgYUXfK6d18bqu,iv:mZVL1POZK3DbFJshbPEGrOdS+iaaeg4OcBqtZ14vOo4=,tag:dIGS7cXZWTM250ufyMzP1g==,type:str]
+    l-nafaryus: ENC[AES256_GCM,data:4aeQ9V1iwGEvl3jRuqoxlU/BEripuFyxcPJi7US9uh+e9gLgB99fg/9hP5Qo3O0bhsu7WJy56sQjaW1w,iv:dfh87LBj7V25zP9Xb2nS1/jW4EVU27AmPL/RmaHt6RA=,tag:03Hkuh2ToAgvQ0+RqjB0rQ==,type:str]
+    git: ENC[AES256_GCM,data:e5p5STYmxRno6a0Lh1YxhhGf7nMep+bD8EsDkWWj3ODNixeTBM/Y6uX3EJu5JwYuHYI313zJNhCNR/8x,iv:ajukCVT9Aia/4Tq2nqnsszdHC3NqvL5FqWZK8soyM04=,tag:+GjZYCaQKdBxqnQkOvEn0w==,type:str]
+    kirill: ENC[AES256_GCM,data:bSYdsFwflv+CLkA8XoBoah6lLhD3E1Akt/wkZ8GuYf9OL+LDJjkrcQBNArjIxm3JMnPSBuauRU2Qdlpa,iv:ycmaLmFL0oVU8djI/zDypDHcapi+AFgwwMq4nLzXbvY=,tag:70NV3WL7B3Xr6FIcZt5gNQ==,type:str]
 gitea:
-    mail: ENC[AES256_GCM,data:Kn1UjRsCG9KC9SKhYUXOZ5fsvvTIcfqPMppbWxAj,iv:lKsVTZdXBr8cXzizHEcf0uFdhaqxnIDKlAr++IC14m8=,tag:EwKeSjAvI7hUlMMx9N864Q==,type:str]
+    mail: ENC[AES256_GCM,data:ET/XYFqT6GbfF2XvyET0V6axdmLioROw9G3bVqdQ,iv:OWqVEWBUA6DpabmsiGQmcIt4n8OkzCv6111iY1Z6zAU=,tag:k1/yUbEmsdLvLhy1jzQt3Q==,type:str]
 gitea-runner:
-    master-token: ENC[AES256_GCM,data:WIyXjGPl7FbrrJSNIR7kVS2Bo4od40YlY/RrgaKJ2XVYnpgIjbAP558PluclY3dLeg==,iv:doAMWY7uuNo4MYNOdMhn16pL1KgqtC+8eEbSL5QlOFQ=,tag:r/db0wNlLin5IQHzR/xL0g==,type:str]
+    master-token: ENC[AES256_GCM,data:6UmLWkzk2wAhDUdjMy3k2eivlS6FcMYBI+vIwofQY4LFVjzqmfHE0BDHPBFHsZTUUg==,iv:MPW3QFK8+25UC8QIknVB7OYJtt4ueRW4gB9UNAKXW6A=,tag:OKfzfw2EXgXLmxY1xl4Pyg==,type:str]
 papermc:
-    rcon: ENC[AES256_GCM,data:5jdkx6jpbao9,iv:arXGkrBGsfYXDU2O80QzszBmgS5H9OOPm9rvI1H4QX4=,tag:LcZhmjuj6bNqeLJViFohdw==,type:str]
-discordToken: ENC[AES256_GCM,data:qHaCz/AZWf5N2tj/utu/6eZU+id50sj7Xv4d6hU0YDcIEkrAebIO5hik+Dk1xsobuhL7YX8iuCwPDLH/lwE/beI/sbzLffsszqw=,iv:344OGivr7aFtsNMch7F/GyMhd6YC+L/r0kEybevKe08=,tag:vgbj6Kp5Vjn208kmx7Ppvg==,type:str]
+    rcon: ENC[AES256_GCM,data:SToy3Ek60SGK,iv:gLhpc7Hl/asuVsUtqE2O4X3W1g0nWGBBfhCHe/8R43A=,tag:Iq9dZ/rXIcYxg7c+vMHUMQ==,type:str]
+discordToken: ENC[AES256_GCM,data:HZUhIl/Y1toBrNF3VZS2BAnhNYuP8PxXAd+lWyH5cnwyRKnWbRL/U9SEMagvDNAf4wEfXHdHe99qW3kOIt3VwSThb7mYu0bvKZ8=,iv:ij0EzPAQMfv42uZFwH9LRUnWd+A194vzpvNNqgRqlnM=,tag:k5vrI66IJ7xo0eCzTgtVjg==,type:str]
+nix-store:
+    cache-key: ENC[AES256_GCM,data:znLobclHJkANZ2m266772Vs+WVWY7hvvzXwW1Y26MDQKDYM3UOCtCQO3+3QDlI/yNMJTkjH2e4sNg8tggVUqoUTilcAxZ65UYQyOc54Ki/wwOrasXn6R/3XlNihcnH1iXMyVMX4RypE=,iv:XFY4806eykp7Wd6o3iFUXCL065+AOswobPcu4f7vl2M=,tag:CKbOr3GMgQoCz2NnCYN7eA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -24,23 +26,23 @@ sops:
         - recipient: age1u9xr3tmwskfsrxg6gus3hmh9eakjh2h22jklfmcu33kassaraues435vvc
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdkhuV3ljWXhLSDIvMkwr
-            LzBEZGhublVkNlluSkhoeGR3SjNrNkdBSUhBClV6YlNVTURwZE1kcm1YalBha1Z1
-            QS96R1hHQXFTeGdyWVNsTVpZWnFpTGMKLS0tIDJRWjF4eS9XS29acFBpNVBDWGlU
-            S1loWHQrWGVXcitmQmF6VWdsYUkwdmMKLgSt3DdJndwL+faxDjD3BxDjPBLHtcWg
-            ZphzpRu8oMw/zMHwjoGS/l8X/KxPNyGMNBXQrK4sCh4S3S5BOeybIQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvbUlxS2V4YmlKUkRaVVdJ
+            Q3g0NC9VSU56V2QzZ0FwV21DOVpVWlpMZGpFCmxuRGtPT1MwTS9zKzZLRXNEalQ4
+            QTZ1TnlGclY5b3dlODRhWXBmWmJqeDQKLS0tIHZpZCtsZTVBUFVGY3NwTzliRlB4
+            TkV4WDJjeUthRW9nekZDc3JISlhvN0kK8AQHN7BXOuVqtMHABNTqzxGzijs2DcFI
+            FMr3TC9FXYaqWtWCiwtHM1VtogVl3GW4SSIvVTnDyrGUYCI2T5yrCQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1wyz7cfldqe9hh8qyw2qm42hkq9s7qdwqnrnv0u3s6vstv9649v0sh0z4em
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlMzNWRHdNbHk5NERXb01s
-            Lzltd21jUHE1WjB1LzU5dC9FdCtwSDQvUDJBCmlzNGpPcVZSTnViUGQ0RmxndWVO
-            aDlXRlY2V2xta0hJa0xRVmp5VGp0ZnMKLS0tIEhsYWkwVW9pSlNxc0xZRnRqRVk0
-            QzJITlJIQzVXUFZFWEljNzJmU2dZTTAK9799iq5gxCjPwBCWRzIIuOT/LDZ5Bhnv
-            CszvH6QZs+HEPDqzqcik3ewbFu/mDygmB68bJe/ccUZi4pWxemRkYg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxb1M1Mk1mdGxIb3FPTXo5
+            eXh0K2IzVEJqbnhzOFdvL1NwbHZ5bzNjUlRzCmFURHVBQnJuYVZiY1RNRndoQ2NQ
+            NjB3c0NkdnBWWUp2SC9HdVJsc1kwdVEKLS0tIEtTSE5jNVRLcmx3L2N0WUhFRVd6
+            Y2RtUklhRVBkTDcrTXlPT1BueVh0dGcKl7b3hxT11JqUb43EEJQaB29MZydiFfUp
+            ehlILpToT00MEW3JRDHw4rjtIsTj5eaPYN8Gxou/MuvVrkK6Y8OLkg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-05T17:02:03Z"
-    mac: ENC[AES256_GCM,data:nlFMfwUt2EsDHiFSrrTYJVtpYpWYcufG+ZMXEYZNhX1ozeV0zieFccBjcaojHF77bpGtER58NEqOfS8kXGltyc2Mmg810VxcRzrK5LiJA0mMlA15oo3G+EkFcqd+MhZ5OnodAdPkJN5aUafH1BEVfC1o4ebngXMp72RGuf4kEg4=,iv:P69tDcWYWkESp2ZMUVifl5PEqVmfcs4IuvpFwJuNVDU=,tag:gAxbm/LEtFB+AO9nR0tthg==,type:str]
+    lastmodified: "2024-07-12T08:17:47Z"
+    mac: ENC[AES256_GCM,data:wuTRY0nW5VBicfmMjQUgKY3tycRy9t8e4AOT8jG2Lwzj8SAw7apEK3El9DwHYwI2nPHGh46zoKro7n3whtnwxaqQbp91kZA3WpDOlg3jH0d022jDcFz6a3YBd/btcWNiqdiY441sKHwhdMwACmaUTaxy+NueSJz5F8thG7QsgNw=,iv:Ase4mwxUng1XBYTvK9uU1GS4RwVniuxOucNw1J0VrbI=,tag:+PqW5QsHg0KE/ppepXPw4Q==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/nixosModules/misc/bonfire/secrets/default.nix b/nixosModules/misc/bonfire/secrets/default.nix
index 147c438..b067e99 100644
--- a/nixosModules/misc/bonfire/secrets/default.nix
+++ b/nixosModules/misc/bonfire/secrets/default.nix
@@ -36,6 +36,12 @@
           owner = "oscuro";
           group = "oscuro";
         };
+
+        "nix-store/cache-key" = lib.mkIf config.services.nix-serve.enable {
+          owner = "nix-serve";
+          group = "nix-serve";
+          mode = "0600";
+        };
       };
     };