diff --git a/home-manager/base.nix b/home-manager/base.nix
index efe674e..68c5417 100644
--- a/home-manager/base.nix
+++ b/home-manager/base.nix
@@ -53,7 +53,8 @@
     vimAlias = true;
     extraConfig = ''
       syntax enable
-      set nowrap
+      set wrap
+      set spell spelllang=en_us
       set linebreak
       set number
       set relativenumber
diff --git a/home-manager/cli.nix b/home-manager/cli.nix
index 1789cce..e44e9a7 100644
--- a/home-manager/cli.nix
+++ b/home-manager/cli.nix
@@ -51,7 +51,7 @@
     };
     neovim = {
       extraConfig = ''
-                    let g:limelight_conceal_ctermfg = 'block'
+      let g:limelight_conceal_ctermfg = 'block'
       '';
       plugins = with pkgs.vimPlugins; [
         dracula-nvim
diff --git a/home-manager/dots/river/init b/home-manager/dots/river/init
index bfaa141..6555c4a 100755
--- a/home-manager/dots/river/init
+++ b/home-manager/dots/river/init
@@ -83,23 +83,23 @@ do
     tags=$((1 << ($i - 1)))
 
     # Super+[1-9] to focus tag [0-8]
-    riverctl map normal Super $i set-focused-tags $tags
+    riverctl map normal Super $i spawn "riverctl set-focused-tags $tags; notify-send 'Tag $tags focus toggle';"
 
     # Super+Shift+[1-9] to tag focused view with tag [0-8]
-    riverctl map normal Super+Shift $i set-view-tags $tags
+    riverctl map normal Super+Shift $i spawn "riverctl set-view-tags $tags; riverctl set-focused-tags $tags; notify-send 'Tag $tags swap toggle';"
 
     # Super+Control+[1-9] to toggle focus of tag [0-8]
-    riverctl map normal Super+Control $i toggle-focused-tags $tags
+    riverctl map normal Super+Control $i spawn "riverctl toggle-focused-tags $tags; notify-send 'Tag $tags focus toggle';"
 
     # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
-    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
+    riverctl map normal Super+Shift+Control $i spawn "riverctl toggle-view-tags $tags; notiy-send 'Tag $tags assignment toggle';"
 done
 
 # Super+0 to focus all tags
 # Super+Shift+0 to tag focused view with all tags
 all_tags=$(((1 << 32) - 1))
-riverctl map normal Super 0 set-focused-tags $all_tags
-riverctl map normal Super+Shift 0 set-view-tags $all_tags
+riverctl map normal Super 0 spawn "riverctl set-focused-tags $all_tags; notify-send 'All tags focus toggle';"
+riverctl map normal Super+Shift 0 spawn "riverctl set-view-tags $all_tags; notify-send 'All tags assignment toggle';"
 
 # Toggle fullscreen
 riverctl map normal None F11 toggle-fullscreen
diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
new file mode 100644
index 0000000..ab4a623
--- /dev/null
+++ b/home-manager/firefox.nix
@@ -0,0 +1,50 @@
+# Firefox home.nix
+{ config, lib, pkgs, inputs, user, ... }:
+{
+  programs = {
+    firefox = {
+      enable = true;
+      profiles.${user.name} = {
+        id = 0;
+        name = "default";
+        settings = {
+          "toolkit.telemetry.reportingpolicy.firstRun" = false;
+        };
+        bookmarks = [
+          {
+            name = "readlater";
+            url = "javascript:q=location.href;p=document.title;void(t=open('https://pinboard.in/add?later=yes&noui=yes&jump=close&url='+encodeURIComponent(q)+'&title='+encodeURIComponent(p),'Pinboard','toolbar=no,width=100,height=100'));t.blur();";
+          },
+          {
+            name = "bookmark";
+            url = "javascript:q=location.href;if(document.getSelection){d=document.getSelection();}else{d='''';};p=document.title;void(open('https://pinboard.in/add?url='+encodeURIComponent(q)+'&description='+encodeURIComponent(d)+'&title='+encodeURIComponent(p),'Pinboard','toolbar=no,width=700,height=350'));";
+          },
+          {
+            name = "subscribe";
+            url = "javascript:location.href='https://reader.miniflux.app/bookmarklet?uri='+encodeURIComponent(window.location.href)";
+          },
+          {
+            name = "untagged";
+            url = "https://pinboard.in/u:iiogama/untagged/";
+          },
+          {
+            name = "fastmail";
+            url = "https://app.fastmail.com/";
+          },
+          {
+            name = "transmission";
+            url = "http://127.0.0.1:9091/transmission/web/";
+          },
+          {
+            name = "iptorrents";
+            url = "https://iptorrents.com/peers";
+          },
+          {
+            name = "soundcloud";
+            url = "https://soundcloud.com/";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/nixos/wayland.nix b/nixos/wayland.nix
index e8b262c..6908b22 100644
--- a/nixos/wayland.nix
+++ b/nixos/wayland.nix
@@ -39,6 +39,7 @@
         swww
         tessen
         way-displays
+        wf-recorder
         wl-clipboard
         wtype
       ];