diff --git a/config/nix/common/firefox.nix b/config/nix/common/firefox.nix
index 33589334..3b47f9f9 100644
--- a/config/nix/common/firefox.nix
+++ b/config/nix/common/firefox.nix
@@ -1,25 +1,57 @@
-{ device, pkgs, nur, ... }: {
+{ device, pkgs, ... }: {
   programs.firefox = {
-    enable = false;
+    enable = true;
     # enable = device.isLinux;
     profiles.default = {
-      userChrome = let
-        csshacks = pkgs.fetchFromGitHub {
-          owner = "MrOtherGuy";
-          repo = "firefox-csshacks";
-          rev = "master";
-          sha256 = "sha256-r5CKOOcRWZQzYA9M6j7m2CAulOQItCuWsTSNGOYN87w=";
-        };
-      in ''
-        @import url(${csshacks}/chrome/tabs_on_bottom.css);
-        @import url(${csshacks}/chrome/toolbars_below_content.css);
-      '';
-      # extensions = with nur.repos.rycee.firefox-addons; [
-      #   privacy-badger
-      #   ublock-origin
-      #   bitwarden
-      # ];
+      userChrome =
+        let
+          csshacks = pkgs.fetchFromGitHub {
+            owner = "MrOtherGuy";
+            repo = "firefox-csshacks";
+            rev = "master";
+            sha256 = "sha256-r5CKOOcRWZQzYA9M6j7m2CAulOQItCuWsTSNGOYN87w=";
+          };
+        in
+        ''
+          @import url(${csshacks}/chrome/toolbars_below_content.css);
+          @import url(${csshacks}/chrome/scrollable_menupopups.css);
+          @import url(${csshacks}/chrome/linux_gtk_window_control_patch.css);
+        '';
+      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        privacy-badger
+        bitwarden
+        tridactyl
+      ];
     };
     nativeMessagingHosts = [ pkgs.tridactyl-native ];
+    policies = {
+      ExtensionSettings = {
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+      };
+      DisableFirefoxStudies = true;
+      DisablePocket = true;
+      DisableTelemetry = true;
+      FeatureRecommendations = false;
+      SkipOnboarding = true;
+      Preferences = {
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = { Value = true; Status = "default"; };
+        # "browser.compactmode.show" = { Value = true; Status = "default"; };
+        "browser.urlbar.suggest.calculator" = { Value = true; Status = "default"; };
+        "extensions.quarantinedDomains.enabled" = { Value = false; Status = "default"; };
+      };
+      FirefoxHome = {
+        "Search" = true;
+        "TopSites" = false;
+        "SponsoredTopSites" = false;
+        "Highlights" = false;
+        "Pocket" = false;
+        "SponsoredPocket" = false;
+        "Snippets" = false;
+        "Locked" = false;
+      };
+    };
   };
 }
diff --git a/config/nix/common/home.nix b/config/nix/common/home.nix
index 3be37d8d..6bf3c01b 100644
--- a/config/nix/common/home.nix
+++ b/config/nix/common/home.nix
@@ -14,6 +14,8 @@ in {
   home.packages = with pkgs;
     [
       ngrok
+      kdeconnect
+      slack
       gh
       yarn
       just
diff --git a/config/nix/flake.nix b/config/nix/flake.nix
index 673d963c..eae3860b 100644
--- a/config/nix/flake.nix
+++ b/config/nix/flake.nix
@@ -57,7 +57,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-     nur.url = "github:nix-community/nur"; 
+    nur.url = "github:nix-community/nur";
 
     # { pkgs, inputs, system, ... }:
     # {
@@ -78,8 +78,16 @@
 
   };
 
-  outputs = { nixpkgs, home-manager, nix-darwin, flake-utils, anyrun, nur
-    , neovim-nightly-overlay, ... }@inputs:
+  outputs =
+    { nixpkgs
+    , home-manager
+    , nix-darwin
+    , flake-utils
+    , anyrun
+    , nur
+    , neovim-nightly-overlay
+    , ...
+    }@inputs:
     let
       config_devices = [
         {
@@ -150,21 +158,26 @@
         anyrun-overlay
         inputs.nixneovim.overlays.default
         inputs.nixneovimplugins.overlays.default
+        nur.overlay
       ];
-    in {
-      nixosConfigurations = let devices = nixos_devices;
-      in import ./nixos/device.nix {
-        inherit devices inputs nixpkgs home-manager overlays nur;
-      };
+    in
+    {
+      nixosConfigurations =
+        let devices = nixos_devices;
+        in import ./nixos/device.nix {
+          inherit devices inputs nixpkgs home-manager overlays nur;
+        };
 
-      darwinConfigurations = let devices = darwin_devices;
-      in import ./darwin/device.nix {
-        inherit devices inputs nixpkgs home-manager overlays nix-darwin;
-      };
+      darwinConfigurations =
+        let devices = darwin_devices;
+        in import ./darwin/device.nix {
+          inherit devices inputs nixpkgs home-manager overlays nix-darwin;
+        };
 
-      homeConfigurations = let devices = linux_devices;
-      in import ./linux/device.nix {
-        inherit devices inputs nixpkgs home-manager overlays;
-      };
+      homeConfigurations =
+        let devices = linux_devices;
+        in import ./linux/device.nix {
+          inherit devices inputs nixpkgs home-manager overlays;
+        };
     };
 }
diff --git a/config/nix/linux/hyprland.nix b/config/nix/linux/hyprland.nix
index b8ae76a6..48d67aad 100644
--- a/config/nix/linux/hyprland.nix
+++ b/config/nix/linux/hyprland.nix
@@ -104,14 +104,13 @@
         "QT_QPA_PLATFORM,wayland"
       ];
       exec-once = [
-        "swayosd"
-        "swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
-        "ironbar"
-        "nextcloud --background"
+        "${pkgs.swayosd}/bin/swayosd"
+        "${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
+        "${pkgs.ironbar}/bin/ironbar"
+        "${pkgs.nextcloud-client}/bin/nextcloud --background"
         "/usr/lib/polkit-kde-authentication-agent-1"
-        "/usr/local/bin/discord --enable-features=UseOzonePlatform --ozone-platform=wayland --start-minimized"
-        "/usr/lib/kdeconnectd"
-        "aa-notify -p -s 1 -w 60 -f /var/log/audit/audit.log"
+        "${pkgs.kdeconnect}/libexec/kdeconnectd"
+        # "aa-notify -p -s 1 -w 60 -f /var/log/audit/audit.log"
       ];
 
       "$mainMod" = "SUPER";
@@ -142,7 +141,7 @@
         # Screenshot
         # "$mainMod,Print, exec, grim"
         # "$mainModShift,Print, exec, grim -g "$(slurp)""
-        "$mainModShift,s, exec, watershot"
+        "$mainModShift,s, exec, ${pkgs.watershot}/bin/watershot"
 
         # Move focus with mainMod + arrow keys
         "$mainMod, left, movefocus, l"