diff --git a/flake.lock b/flake.lock
index 4aada094..b4cdc677 100644
--- a/flake.lock
+++ b/flake.lock
@@ -465,11 +465,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1752875735,
-        "narHash": "sha256-ie+Qr1L2LXdWOMPjaU+Iw1w9lsrh57QgQ+BVN+hSjec=",
+        "lastModified": 1752932551,
+        "narHash": "sha256-cYzB7hcW9ptgFddFYYxtWh8Lj6hJ3CDPWIQkoj1A/rM=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "39f4cf3d19d49eecdb03cf963ec5818fd83d2fe7",
+        "rev": "88b317dba370db16f8ae755abcefe9bc63471d99",
         "type": "github"
       },
       "original": {
@@ -789,11 +789,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1752921521,
-        "narHash": "sha256-i8dyBuUgm2cOtH0YvFH+SpbCW0fABL52wV7Mn2u+8aM=",
+        "lastModified": 1752936500,
+        "narHash": "sha256-StLLgYbL3U2iDezMbfr/QjUtd2a0Mb+pScDSQxFElTg=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "d84699d8e5e984422da37595ee41fc0d8d93fef5",
+        "rev": "91d8a629ebfffaa46290331a74a54e249dec64fe",
         "type": "github"
       },
       "original": {
@@ -1490,11 +1490,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1752888521,
-        "narHash": "sha256-ddjJCgiNwA4AleqxxKr6ZSQjGGpHLFpMQyNQ7wAJADA=",
+        "lastModified": 1752939527,
+        "narHash": "sha256-rN8EU6DjUxa4Q1T6xxfpEqSWJH97gGAaGQGUkXgwhuo=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "b89ed914055ce246493eaf8cc33553ad25b9a64f",
+        "rev": "0c9b4d0d80bb0f9b0a99cd1717344e705f7ca6b2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 31a8bc19..490a8e70 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,8 +79,6 @@
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
     # Miscellaneous
-    ghostty.url = "github:ghostty-org/ghostty";
-
     helix-flake.url = "github:helix-editor/helix";
 
     nvf.url = "github:notashelf/nvf";
@@ -93,11 +91,6 @@
       };
     };
 
-    astal = {
-      url = "github:aylur/astal";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     anyrun.url = "github:anyrun-org/anyrun";
     microfetch.url = "github:NotAShelf/microfetch";
     agenix.url = "github:ryantm/agenix";
@@ -113,11 +106,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    wezterm = {
-      url = "github:wez/wezterm/main?dir=nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     ags = {
       url = "github:Aylur/ags";
     };
diff --git a/modules/home/programs/fish/default.nix b/modules/home/programs/fish/default.nix
index 41563194..03c6ea89 100644
--- a/modules/home/programs/fish/default.nix
+++ b/modules/home/programs/fish/default.nix
@@ -39,8 +39,8 @@ in {
         nixconfig = "cd /home/$USER/.nix-config/";
         homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}mod.nix";
         hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}mod.nix";
-        nixoptions = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/options.nix";
-        nopt = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/options.nix";
+        nixsettings = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
+        nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
         nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
         nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
         tree = "${getExe eza} --tree --icons=always";
diff --git a/modules/home/programs/ghostty/default.nix b/modules/home/programs/ghostty/default.nix
index 58060c6e..db67f17f 100644
--- a/modules/home/programs/ghostty/default.nix
+++ b/modules/home/programs/ghostty/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   osConfig,
+  pkgs,
   ...
 }: let
   inherit (lib) mkIf mkEnableOption mkMerge getExe;
@@ -15,6 +16,7 @@ in {
     {
       programs.ghostty = {
         enable = true;
+        package = pkgs.ghostty-bin;
         enableBashIntegration = config.programs.bash.enable;
         enableFishIntegration = config.programs.fish.enable;
         enableZshIntegration = config.programs.zsh.enable;