diff --git a/flake.lock b/flake.lock
index a99510a..ff8317a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,7 +85,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -206,6 +206,49 @@
         "type": "github"
       }
     },
+    "nysh": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "quickshell": "quickshell",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1724637070,
+        "narHash": "sha256-Ibulm02yNpTJmN4j4YDLga9gxyxXXkr3thax9wLXopk=",
+        "owner": "nydragon",
+        "repo": "nysh",
+        "rev": "9b5e41b07250aba2073741a6e1746b75978bbc7d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nydragon",
+        "repo": "nysh",
+        "type": "github"
+      }
+    },
+    "quickshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nysh",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724598086,
+        "narHash": "sha256-RwLvR0p1vnGDFz9qXz6QLaFPQ751doKLG1ROWZh6zcA=",
+        "owner": "Nydragon",
+        "repo": "quickshell",
+        "rev": "7aa93ccf9ddb383e54a742cccba27cff37a43c8c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Nydragon",
+        "repo": "quickshell",
+        "type": "github"
+      }
+    },
     "rofi-obsidian": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -236,6 +279,7 @@
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
+        "nysh": "nysh",
         "rofi-obsidian": "rofi-obsidian"
       }
     },
@@ -286,6 +330,39 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 62698b5..8bc7862 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,11 @@
       url = "github:nydragon/rofi-obsidian";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nysh = {
+      url = "github:nydragon/nysh";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 67d10a4..4cbcecc 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -126,6 +126,7 @@
           { command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; }
           { command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
           { command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
+          { command = "${pkgs.nysh}/bin/nysh"; }
           {
             command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";
             always = true;
diff --git a/home/swaync/config.nix b/home/swaync/config.nix
index 8223d62..9647c50 100644
--- a/home/swaync/config.nix
+++ b/home/swaync/config.nix
@@ -29,50 +29,6 @@
   timeout-low = 5;
   transition-time = 200;
   widget-config = {
-    #"buttons-grid" = {
-    #actions = [
-    #{
-    #command = "systemctl poweroff";
-    #label = "󰐥";
-    #}
-    #{
-    #command = "systemctl reboot";
-    #label = "󰜉";
-    #}
-    #{
-    #command = "swaylock";
-    #label = "󰌾";
-    #}
-    #{
-    #command = "swaymsg exit";
-    #label = "󰍃";
-    #}
-    #{
-    #command = "systemctl suspend";
-    #label = "󰏥";
-    #}
-    #{
-    #command = "pactl set-sink-mute @DEFAULT_SINK@ toggle";
-    #label = "󰕾";
-    #}
-    #{
-    #command = "pactl set-source-mute @DEFAULT_SOURCE@ toggle";
-    #label = "󰍬";
-    #}
-    #{
-    #command = "nmtui";
-    #label = "󰖩";
-    #}
-    #{
-    #command = "blueman-manager";
-    #label = "󰂯";
-    #}
-    #{
-    #command = "kooha";
-    #label = "";
-    #}
-    #];
-    #};
     backlight = {
       label = "󰃟";
     };
diff --git a/home/terminal/neovim/default.nix b/home/terminal/neovim/default.nix
index 5150143..1976cc7 100644
--- a/home/terminal/neovim/default.nix
+++ b/home/terminal/neovim/default.nix
@@ -8,6 +8,8 @@
     withPython3 = false;
     withRuby = false;
     extraPackages = with pkgs; [
+      lua
+
       # Language Servers
       rust-analyzer
       nixd
@@ -18,6 +20,8 @@
       typescript
       nodePackages_latest.typescript-language-server
 
+      kdePackages.qtdeclarative # QML formatter
+
       # Formatter
       python311Packages.black # Python formatter
       clang-tools
diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix
index 2511bd1..6c33432 100644
--- a/modules/nix/overlays.nix
+++ b/modules/nix/overlays.nix
@@ -35,5 +35,7 @@
     (final: prev: {
       rofi-obsidian = inputs.rofi-obsidian.outputs.packages.${prev.pkgs.system}.rofi-obsidian;
     })
+
+    (final: prev: { nysh = inputs.nysh.defaultPackage.${prev.pkgs.system}; })
   ];
 }