switching to vivaldi

2025-03-03 06:28:08 -06:00 · 2025-03-03 06:28:08 -06:00 · 3b3d36eb03
parent 99a4d8420e
commit 3b3d36eb03
7 changed files with 206 additions and 84 deletions
--- a/flake.lock
+++ b/flake.lock
@ -133,11 +133,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1736881916,
-        "narHash": "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g=",
+        "lastModified": 1739720778,
+        "narHash": "sha256-iA/OTtsymhuCMRDC0IJE7YXuCeFJbkuMwPaj7tAVbQw=",
        "owner": "elkowar",
        "repo": "eww",
-        "rev": "593a4f4666f0bc42790d6d033e64a2b38449090f",
+        "rev": "5b4cc3e7a8055afb758421f4a114ef4032806e39",
        "type": "github"
      },
      "original": {
@ -175,11 +175,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1736899990,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
+        "lastModified": 1739223196,
+        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
+        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
        "type": "github"
      },
      "original": {
@ -237,7 +237,6 @@
      }
    },
    "flake-compat_4": {
-      "flake": false,
      "locked": {
        "lastModified": 1733328505,
        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -252,6 +251,28 @@
        "type": "github"
      }
    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
    "flake-schemas": {
      "locked": {
        "lastModified": 1721999734,
@ -352,11 +373,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735882644,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
        "type": "github"
      },
      "original": {
@ -411,11 +432,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1738448366,
-        "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
+        "lastModified": 1740699498,
+        "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
+        "rev": "b71edac7a3167026aabea82a54d08b1794088c21",
        "type": "github"
      },
      "original": {
@ -433,11 +454,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736785676,
-        "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
+        "lastModified": 1740347597,
+        "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
+        "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",
        "type": "github"
      },
      "original": {
@ -454,11 +475,11 @@
        "nixpkgs-unstable": "nixpkgs-unstable"
      },
      "locked": {
-        "lastModified": 1737481937,
-        "narHash": "sha256-FJ0ATgYWavH3ZeA0ofTEMS+22HqYN2Lqu3G6IsqbKIg=",
+        "lastModified": 1739709805,
+        "narHash": "sha256-8/OuhPELneYOtncScsPrAwmlzBNSAFotoTKd6JxU6OA=",
        "owner": "fort-nix",
        "repo": "nix-bitcoin",
-        "rev": "dc4d14e07324e43b8773e3eb5eb2a10c6b469287",
+        "rev": "bff10a66e50f6a3387b3e5acbbdf2519c624e8bc",
        "type": "github"
      },
      "original": {
@ -497,11 +518,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1738547333,
-        "narHash": "sha256-2x4UIDYMVWMN95u6yyQS3hRkn+0G9PLmVxvaxcxvVwQ=",
+        "lastModified": 1740709758,
+        "narHash": "sha256-GjeruX5MrdVwpyaUZvSiRVOQjqkHcRunlOYtX0PReV8=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
-        "rev": "3a1d7556ae4a7d4f0ad6bfe6610ef132f0d481fc",
+        "rev": "7e02381dc8a7702481c5bcbb18d2759211a80de4",
        "type": "github"
      },
      "original": {
@ -512,11 +533,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1738471961,
-        "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=",
+        "lastModified": 1740646007,
+        "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "537286c3c59b40311e5418a180b38034661d2536",
+        "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
        "type": "github"
      },
      "original": {
@ -575,11 +596,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1738435198,
-        "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
+        "lastModified": 1740463929,
+        "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
+        "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
        "type": "github"
      },
      "original": {
@ -591,11 +612,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1738435198,
-        "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
+        "lastModified": 1740603184,
+        "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
+        "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
        "type": "github"
      },
      "original": {
@ -607,11 +628,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1737370608,
-        "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
+        "lastModified": 1739451785,
+        "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "300081d0cc72df578b02d914df941b8ec62240e6",
+        "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
        "type": "github"
      },
      "original": {
@ -639,11 +660,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1737299813,
-        "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=",
+        "lastModified": 1739357830,
+        "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "107d5ef05c0b1119749e381451389eded30fb0d5",
+        "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
        "type": "github"
      },
      "original": {
@ -655,11 +676,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1738410390,
-        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+        "lastModified": 1740367490,
+        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
        "type": "github"
      },
      "original": {
@ -698,6 +719,29 @@
        "type": "indirect"
      }
    },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1740408283,
+        "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "496a4a11162bdffb9a7b258942de138873f019f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@ -708,11 +752,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736549395,
-        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
+        "lastModified": 1740569341,
+        "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
+        "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
        "type": "github"
      },
      "original": {
@ -839,18 +883,20 @@
        "nixpkgs": [
          "nixpkgs"
        ],
+        "nur": "nur",
        "systems": "systems_4",
        "tinted-foot": "tinted-foot",
        "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
        "tinted-tmux": "tinted-tmux",
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1738604441,
-        "narHash": "sha256-FgE39yKu5Tjyy0JcWyzfHEuKt4v4CVw/Qb6KE6OYBYA=",
+        "lastModified": 1740734415,
+        "narHash": "sha256-QRux8OnLOvHoMB6jRlQgfffj9y3JEGSdWclB4blGLWM=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "b7f50a56c3ccda1e6020e62b77a9f9ea80d6a656",
+        "rev": "c74352a1459ac0d350b22a3a45bbaa18ab7b7e2d",
        "type": "github"
      },
      "original": {
@ -952,14 +998,30 @@
        "type": "github"
      }
    },
+    "tinted-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1740351358,
+        "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1735737224,
-        "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
+        "lastModified": 1740272597,
+        "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
+        "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
        "type": "github"
      },
      "original": {
@ -1005,6 +1067,28 @@
        "repo": "treefmt-nix",
        "type": "github"
      }
+    },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "stylix",
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/home/home.nix
+++ b/home/home.nix
@ -45,7 +45,7 @@ in {
      enable = true;
      config = {
        common = {
-          default = [ pkgs.xdg-desktop-portal-kde ];
+          default = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
          "org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
        };
        hyprland = {
@ -53,7 +53,7 @@ in {
          "org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
        };
      };
-      extraPortals = [ pkgs.xdg-desktop-portal-kde ];
+      extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
    };
    mimeApps = {
      enable = true;
@ -71,7 +71,7 @@ in {
        "video/H265" = "mpv.desktop";
        "video/H264" = "mpv.desktop";
        "video/vnd.youtube.yt" = "mpv.desktop";
-        "inode/directory" = "com.system76.CosmicFiles.desktop";
+        "inode/directory" = "thunar.desktop";
        "image/gif" = "imv-rifle.desktop";
        "image/jpeg" = "imv-rifle.desktop";
        "image/heif" = "imv-rifle.desktop";
@ -85,17 +85,17 @@ in {
        "audio/opus" = "mpv-slow.desktop";
        "audio/x-opus" = "mpv-slow.desktop";
        "audio/x-opus+ogg" = "mpv-slow.desktop";
-        "x-scheme-handler/http" = "firefox.desktop";
-        "x-scheme-handler/https" = "firefox.desktop";
-        "text/html" = "firefox.desktop";
+        "x-scheme-handler/http" = "vivaldi.desktop";
+        "x-scheme-handler/https" = "vivaldi.desktop";
+        "text/html" = "vivaldi.desktop";
        "text/org" = "emacsclient.desktop";
        "text/md" = "emacsclient.desktop";
        "text/txt" = "emacsclient.desktop";
        "text/rs" = "emacsclient.desktop";
        "text/plain" = "emacsclient.desktop";
        "application/pdf" = "emacsclient.desktop";
-        "x-scheme-handler/about" = "firefox.desktop";
-        "x-scheme-handler/unknown" = "firefox.desktop";
+        "x-scheme-handler/about" = "vivaldi.desktop";
+        "x-scheme-handler/unknown" = "vivaldi.desktop";
        "x-scheme-handler/magnet" = "torrent.desktop";
      };
      defaultApplications = {
@ -112,7 +112,7 @@ in {
        "video/H265" = "mpv.desktop";
        "video/H264" = "mpv.desktop";
        "video/vnd.youtube.yt" = "mpv.desktop";
-        "inode/directory" = "com.system76.CosmicFiles.desktop";
+        "inode/directory" = "thunar.desktop";
        "image/gif" = "imv-rifle.desktop";
        "image/jpeg" = "imv-rifle.desktop";
        "image/heif" = "imv-rifle.desktop";
@ -124,17 +124,17 @@ in {
        "audio/flac" = "mpv-slow.desktop";
        "audio/wav" = "mpv-slow.desktop";
        "audio/opus" = "mpv-slow.desktop";
-        "x-scheme-handler/http" = "firefox.desktop";
-        "x-scheme-handler/https" = "firefox.desktop";
-        "text/html" = "firefox.desktop";
+        "x-scheme-handler/http" = "vivaldi.desktop";
+        "x-scheme-handler/https" = "vivaldi.desktop";
+        "text/html" = "vivaldi.desktop";
        "text/org" = "emacsclient.desktop";
        "text/md" = "emacsclient.desktop";
        "text/txt" = "emacsclient.desktop";
        "text/rs" = "emacsclient.desktop";
        "text/plain" = "emacsclient.desktop";
        "application/pdf" = "emacsclient.desktop";
-        "x-scheme-handler/about" = "firefox.desktop";
-        "x-scheme-handler/unknown" = "firefox.desktop";
+        "x-scheme-handler/about" = "vivaldi.desktop";
+        "x-scheme-handler/unknown" = "vivaldi.desktop";
        "x-scheme-handler/magnet" = "torrent.desktop";
      };
    };
@ -401,7 +401,7 @@ in {

    # For matrix clients that don't have e2ee
    pantalaimon = {
-      enable = true;
+      enable = false;
      settings = {
        Default = {
          LogLevel = "Debug";
@ -543,12 +543,12 @@ in {
    recursive = true;
  };

-  home.file.".mozilla/firefox/nw77o6yc.default/chrome" = {
+  home.file.".librewolf/nw77o6yc.default/chrome" = {
    source = ../.config/firefox/chrome;
    recursive = true;
  };

-  home.file.".mozilla/firefox/nw77o6yc.default/user.js" = {
+  home.file.".librewolf/nw77o6yc.default/user.js" = {
    text = ''
    // userchrome.css usercontent.css activate
    user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
@ -585,11 +585,11 @@ in {
    recursive = true;
  };

-  programs.firefox = {
+  programs.librewolf = {
    enable = true;
-    package = pkgs.firefox-wayland.override {
+    package = pkgs.librewolf-wayland.override {
      nativeMessagingHosts =
-        [ pkgs.plasma-browser-integration pkgs.tridactyl-native ];
+        [ pkgs.kdePackages.plasma-browser-integration pkgs.tridactyl-native ];
    };
    profiles.chris = {
      name = "default";
--- a/home/modules/hyprland.nix
+++ b/home/modules/hyprland.nix
@ -231,6 +231,7 @@ in
        "opaque,mpv"
        "float,pulsemixer"
        "workspace 2,ff"
+        "workspace 2,vivaldi-stable"
        "workspace 1,emacs"
        "float,btop"
        "size 70% 70%,btop"
@ -251,13 +252,13 @@ in
        "SUPER,RETURN,exec,alacritty"
        "SUPER,C,killactive,"
        "SUPERSHIFT,Q,exit,"
-        "SUPERSHIFT,D,exec,cosmic-files"
+        "SUPERSHIFT,D,exec,thunar"
        "SUPERSHIFT,F,togglefloating,"
        "SUPER,w,exec,rofi -i -show window"
        "SUPER,E,exec,/home/chris/bin/emacslof"
        "SUPER,d,exec,emacsclient -c -e '(dired-jump)'"
        "SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi | cliphist decode | wl-copy"
-        "SUPER,B,exec,/home/chris/bin/fflof"
+        "SUPER,B,exec,/home/chris/bin/vivlof"
        "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer"
        "SUPERCTRL,i,exec,alacritty --class btop -e btop"
        ",Print,exec,screenshot"
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@ -117,7 +117,7 @@ in

  xdg.portal = {
    enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-kde ];
+    extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
  };

  programs.hyprland = {
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@ -48,7 +48,7 @@
    brave
    ttyper
    audacity
-    kwallet-pam
+    kdePackages.kwallet-pam
    nm-tray
    # nyxt
    sbcl
@ -70,7 +70,7 @@
    ani-cli
    # mov-cli
    nerd-fonts.victor-mono
-    plasma-browser-integration
+    kdePackages.plasma-browser-integration
    alacritty
    libnotify
    rofi-wayland
@ -91,6 +91,8 @@
    aha
    glxinfo
    vulkan-tools
+    vivaldi
+    vivaldi-ffmpeg-codecs
    wayland-utils
    nextcloud-client
    swww
@ -99,7 +101,7 @@
    plocate
    papirus-icon-theme
    phinger-cursors
-    kde-cli-tools
+    kdePackages.kde-cli-tools
    gzip
    qrencode
    virt-manager
@ -121,11 +123,11 @@
    bluez-tools
    networkmanager_dmenu
    plasma5Packages.qt5ct
-    xdg-desktop-portal-kde
+    kdePackages.xdg-desktop-portal-kde
    lxappearance
    spotdl
    # rustdesk
-    kdenlive
+    kdePackages.kdenlive
    # davinci-resolve
    mediainfo
    libmediainfo
--- a/scripts/fflof
+++ b/scripts/fflof
@ -2,17 +2,17 @@
 export MOZ_ENABLE_WAYLAND=1
 echo $MOZ_ENABLE_WAYLAND

-# Check to see if firefox is running
-if [ $(pgrep -c firefox) -gt 0 ]; then
+# Check to see if librewolf is running
+if [ $(pgrep -c librewolf) -gt 0 ]; then
    echo "ff running"

    if [ "$XDG_SESSION_TYPE" = "x11" ]; then
        #X11
-        ffrg=$(wmctrl -lx | rg firefox | awk '{print $1}')
+        ffrg=$(wmctrl -lx | rg librewolf | awk '{print $1}')
        # echo $emacsrg

        if [ -z $ffrg ]; then
-            exec firefox
+            exec librewolf
            exit
        else
            exec wmctrl -ia $ffrg
@ -21,7 +21,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
    else
        if [ "$KDE_FULL_SESSION" = "true" ]; then
            echo "KDE"
-            exec /home/chris/bin/ww -fa firefox -c firefox
+            exec /home/chris/bin/ww -fa librewolf -c librewolf
            exit
        else
            # WAYLAND
@ -30,10 +30,10 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
            ffwin=$(echo $ffrg | sed 's/.*\: //')
            # echo $ffwin

-            exec hyprctl dispatch focuswindow "class:ff"
+            exec hyprctl dispatch focuswindow "class:lw"
            exit
        fi
    fi
 else
-    exec firefox --name "ff"
+    exec librewolf --name "lw"
 fi
--- a/scripts/vivlof
+++ b/scripts/vivlof
@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Check to see if vivaldi is running
+if [ $(pgrep -c vivaldi) -gt 0 ]; then
+    echo "vivaldi running"
+
+    if [ "$XDG_SESSION_TYPE" = "x11" ]; then
+        #X11
+        ffrg=$(wmctrl -lx | rg vivaldi | awk '{print $1}')
+
+        if [ -z $ffrg ]; then
+            exec vivaldi
+            exit
+        else
+            exec wmctrl -ia $ffrg
+            exit
+        fi
+    else
+        if [ "$KDE_FULL_SESSION" = "true" ]; then
+            echo "KDE"
+            exec /home/chris/bin/ww -fa librewolf -c librewolf
+            exit
+        else
+            # WAYLAND
+            ffrg=$(hyprctl clients | rg vivaldi-stable)
+
+            ffwin=$(echo $ffrg | sed 's/.*\: //')
+
+            exec hyprctl dispatch focuswindow "class:vivaldi-stable"
+            exit
+        fi
+    fi
+else
+    exec vivaldi
+fi