diff --git a/flake.lock b/flake.lock
index 8e11ae5f..5a5c873f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,45 @@
 {
   "nodes": {
+    "ags": {
+      "inputs": {
+        "astal": "astal",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1738087375,
+        "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
+    "astal": {
+      "inputs": {
+        "nixpkgs": [
+          "ags",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737670815,
+        "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=",
+        "owner": "aylur",
+        "repo": "astal",
+        "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "astal",
+        "type": "github"
+      }
+    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -235,16 +275,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739834344,
-        "narHash": "sha256-PUAcU3YlKNFYrBBHkqshO4wRfMunzhMTEIH1dyhjTtk=",
-        "owner": "NixOS",
+        "lastModified": 1737469691,
+        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f0295845e58ada369322524631821b01c0db13a7",
+        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -265,12 +305,29 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1739834344,
+        "narHash": "sha256-PUAcU3YlKNFYrBBHkqshO4wRfMunzhMTEIH1dyhjTtk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f0295845e58ada369322524631821b01c0db13a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "ags": "ags",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
diff --git a/flake.nix b/flake.nix
index 0d300e4f..aca80abc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,8 @@
         home-manager.follows = "home-manager";
       };
     };
+
+    ags.url = "github:Aylur/ags";
   };
 
   outputs = {
diff --git a/home/ags/default.nix b/home/ags/default.nix
index 9494f261..2a8dcdff 100644
--- a/home/ags/default.nix
+++ b/home/ags/default.nix
@@ -1,7 +1,7 @@
 {
-  pkgs, ags, ...
+  pkgs, ...
 }: {
-  imports = [ ags.homeManagerModules.default ];
+  # imports = [ ags.homeManagerModules.default ];
 
   home.packages = with pkgs; [
     gtksourceview
diff --git a/home/common.nix b/home/common.nix
index 59bd274f..98929e0d 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -1,4 +1,4 @@
-{
+{...}: {
   home.sessionPath = ["$HOME/.local/bin" "$HOME/.cargo/bin"];
 
   home.sessionVariables = {
diff --git a/home/default.nix b/home/default.nix
index f847e2b6..6f35d225 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,15 +1,16 @@
-{ home-manager, ... }: {
+{ home-manager, ags, sops-nix, ... } @ inputs: {
   imports = [
     home-manager.nixosModules.home-manager
   ];
 
   home-manager.users."lilith" = {
     imports = [
+      ags.homeManagerModules.default
+      sops-nix.homeManagerModules.sops
       ./ags # ToDo: get codin :3
       ./hyprland
       ./rofi.nix
       ./dunst.nix
-      ./stylix.nix
 
       ./env.nix
 
@@ -19,7 +20,6 @@
       ./direnv.nix
       ./firefox.nix
       ./fzf.nix
-      ./games
       ./git.nix
       ./gpg.nix
       ./helix.nix
@@ -33,4 +33,6 @@
     home.username = "lilith";
     home.stateVersion = "24.11";
   };
+
+  home-manager.extraSpecialArgs = { inherit inputs; };
 }
diff --git a/home/env.nix b/home/env.nix
index b860818d..e18328cd 100644
--- a/home/env.nix
+++ b/home/env.nix
@@ -1,6 +1,6 @@
-{conf, config, pkgs, ...}: {
+{ config, pkgs, ...}: {
   home = {
-    file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/${conf.user}/sync/inbox"; 
+    file.inbox.source = config.lib.file.mkOutOfStoreSymlink "/home/lilith/sync/inbox"; 
 
     shellAliases = {
       cat = "bat -p";
diff --git a/home/firefox.nix b/home/firefox.nix
index 12236845..c4616d04 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -1,5 +1,5 @@
-{ pkgs, arkenfox, ...}: {
-  imports = [arkenfox.hmModules.arkenfox];
+{ pkgs, ...}: {
+  # imports = [arkenfox.hmModules.arkenfox];
 
   programs.firefox = {
     enable = true;
@@ -85,38 +85,29 @@
       };
     };
 
-    arkenfox.enable = true;
-    arkenfox.version = "master";
+    # arkenfox.enable = true;
+    # arkenfox.version = "master";
 
-    profiles.Default.arkenfox = {
-      enable = true;
-      "0000".enable = true;
-      "0100".enable = true;
-      "0200".enable = true;
-      "0300".enable = true;
-      "0400".enable = true;
-      "0600".enable = true;
-      "0700".enable = true;
-      "0800".enable = true;
-      "0900".enable = true;
-      "1000".enable = true;
-      "1200".enable = true;
-      "1600".enable = true;
-      "1700".enable = true;
-      "2000".enable = true;
-      "2400".enable = true;
-      "2600".enable = true;
-      "2700".enable = true;
-      "2800".enable = true;
-    };
-
-    profiles.ChatGPT = {
-      name = "ChatGPT";
-      id = 1;
-      userChrome = ''
-        #TabsToolbar { visibility: collapse !important; }
-        #nav-bar { visibility: collapse !important; }
-      '';
-    };
+    # profiles.Default.arkenfox = {
+    #   enable = true;
+    #   "0000".enable = true;
+    #   "0100".enable = true;
+    #   "0200".enable = true;
+    #   "0300".enable = true;
+    #   "0400".enable = true;
+    #   "0600".enable = true;
+    #   "0700".enable = true;
+    #   "0800".enable = true;
+    #   "0900".enable = true;
+    #   "1000".enable = true;
+    #   "1200".enable = true;
+    #   "1600".enable = true;
+    #   "1700".enable = true;
+    #   "2000".enable = true;
+    #   "2400".enable = true;
+    #   "2600".enable = true;
+    #   "2700".enable = true;
+    #   "2800".enable = true;
+    # };
   };
 }
diff --git a/home/games/awakened-poe-trading/awakened-poe-trading.nix b/home/games/awakened-poe-trading/awakened-poe-trading.nix
deleted file mode 100644
index d04d8307..00000000
--- a/home/games/awakened-poe-trading/awakened-poe-trading.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs }:
-let
-  appimage = pkgs.appimageTools.wrapType2 {
-    pname = "awakened-poe-trade";
-    version = "3.24.10004";
-    src = pkgs.fetchurl {
-      url = "https://github.com/SnosMe/awakened-poe-trade/releases/download/v3.24.10004/Awakened-PoE-Trade-3.24.10004.AppImage";
-      hash = "sha256-0FSePkDZYCU32EUpyymuSIGcRXUomIOrd38QPMaFV4E=";
-    };
-    meta = {
-      homepage = "https://github.com/SnosMe/awakened-poe-trade";
-      description = "💲 🔨 Path of Exile trading app for price checking";
-      platforms =  pkgs.lib.platforms.linux;
-    };
-  };
-  desktopItem = pkgs.makeDesktopItem {
-    name = "AwakenedPoETrade";
-    exec = appimage.name;
-    icon = "${appimage}/awakened-poe-trade.png";
-    desktopName = "Awakened PoE Trade";
-    comment = appimage.meta.description;
-  };
-in
-  {
-    inherit appimage desktopItem;
-  }
diff --git a/home/games/awakened-poe-trading/default.nix b/home/games/awakened-poe-trading/default.nix
deleted file mode 100644
index a9f27d04..00000000
--- a/home/games/awakened-poe-trading/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ...}: let 
-  awakened-poe-trade = pkgs.callPackage ./awakened-poe-trade.nix;
-in {
-  home.packages = [
-    awakened-poe-trade.app
-    awakened-poe-trade.desktop
-  ];
-}
diff --git a/home/games/default.nix b/home/games/default.nix
deleted file mode 100644
index ea40ee48..00000000
--- a/home/games/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib, system-config, ...}: {
-  imports = [
-  ] ++ lib.optionals system-config.gaming.enable [
-    # ./awakened-poe-trading
-  ];
-}
diff --git a/home/helix.nix b/home/helix.nix
index 2c614493..de5bd6d2 100644
--- a/home/helix.nix
+++ b/home/helix.nix
@@ -1,11 +1,9 @@
 {
   pkgs,
-  helix,
   ...
 }: {
   programs.helix = {
     enable = true;
-    package = helix.packages.${pkgs.system}.default;
     settings = {
       editor = {
         line-number = "relative";
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 099fe3d1..8156bd92 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ system-config, lib, ...}: {
+{ lib, ...}: {
   imports = [
     ./hyprpaper.nix
     ./hyprlock.nix
@@ -176,6 +176,6 @@
     };
   };
   in {
-    hyprland = lib.recursiveUpdate hyprDefaults system-config.hyprlandOverrides;
+    hyprland = hyprDefaults;
   };
 }
diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix
index 407b8fe2..0d0b9f52 100644
--- a/home/hyprland/hyprlock.nix
+++ b/home/hyprland/hyprlock.nix
@@ -1,8 +1,8 @@
-{ config, ...}:{
+{ config, lib, ...}:{
   programs.hyprlock = {
     enable = true;
 
-    settings = {
+    settings = lib.mkForce {
       general = {
         disable_loading_bar = true;
         ignore_empty_input = true;
diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix
index a54c164d..4295de8b 100644
--- a/home/hyprland/hyprpaper.nix
+++ b/home/hyprland/hyprpaper.nix
@@ -1,7 +1,7 @@
-{ conf, ... }:
+{  ... }:
 {
   home.file.".config/hypr/wallpaper.png" = {
-    source = ../../wallpapers/${conf.wallpaper};
+    source = ../../wallpapers/default.png;
   };
 
   services.hyprpaper = let
diff --git a/home/packages.nix b/home/packages.nix
index d3d7a3b4..5cb9724f 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,5 +1,4 @@
 {
-  system-config,
   pkgs,
   lib,
   ...
@@ -19,7 +18,7 @@
       xdg-utils
       hyprshot
 
-      obsidian
+      # obsidian
       vlc
       obs-studio
       keepassxc
@@ -31,7 +30,7 @@
       htop
 
       ollama
-      zoom-us
+      # zoom-us
     ];
 
     gaming = with pkgs; [
@@ -40,5 +39,5 @@
       steamtinkerlaunch
     ];
   in
-    common ++ (lib.optionals system-config.gaming.enable gaming);
+    common; # ++ (lib.optionals system-config.gaming.enable gaming);
 }
diff --git a/home/rofi.nix b/home/rofi.nix
index 900a6c1b..f3968106 100644
--- a/home/rofi.nix
+++ b/home/rofi.nix
@@ -1,11 +1,11 @@
-{pkgs, config, stylix,...}: {
+{pkgs, config, stylix, lib, ...}: {
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
 
     theme = let 
       inherit (config.lib.formats.rasi) mkLiteral;
-    in {
+    in lib.mkForce {
       "*" = with config.lib.stylix.colors; {
         bg0 = mkLiteral "#${base00}";
         bg1 = mkLiteral "#${base01}";
diff --git a/home/sops.nix b/home/sops.nix
index 098a31d4..739401cb 100644
--- a/home/sops.nix
+++ b/home/sops.nix
@@ -1,10 +1,7 @@
 {
-  conf,
-  sops-nix,
   ...
 }: {
-  imports = [sops-nix.homeManagerModules.sops];
   sops = {
-    age.keyFile = /persist/data${conf.home}/.config/sops/age/keys.txt;
+    age.keyFile = /persist/data/home/lilith/.config/sops/age/keys.txt;
   };
 }
diff --git a/home/stylix.nix b/home/stylix.nix
deleted file mode 100644
index e27037bf..00000000
--- a/home/stylix.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{stylix, pkgs, ...}: {
-  stylix.targets.rofi.enable = false;
-
-  home.file.".icons/default".source = "${pkgs.papirus-icon-theme}/share/icons/Papirus";
-}
diff --git a/home/thunderbird.nix b/home/thunderbird.nix
index 779ba017..86a185d0 100644
--- a/home/thunderbird.nix
+++ b/home/thunderbird.nix
@@ -1,10 +1,10 @@
-{conf,...}:{
+{...}:{
   programs.thunderbird = {  
     enable = true;
     settings = {
       
     };
-    profiles.${conf.user} = {
+    profiles."lilith" = {
       isDefault = true;
     };
   };