diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 84a7aae0..5a57faf5 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -45,10 +45,13 @@ in {
       "kubernetes-cli"
     ];
     casks = [
+      "1password"
+      "1password-cli"
       "amethyst"
       "audacity"
       "cakebrew"
       "elgato-stream-deck"
+      "firefox"
       "font-hack-nerd-font"
       "font-inconsolata-g-for-powerline"
       "font-source-code-pro-for-powerline"
@@ -56,6 +59,7 @@ in {
       "iterm2"
       "keepingyouawake"
       "kopiaui"
+      "libreoffice"
       "logseq"
       "nextcloud"
       "obs"
@@ -67,6 +71,7 @@ in {
       "signal"
       "thunderbird"
       "vagrant"
+      "vivaldi"
       "virtualbox"
       "vlc"
       "whatsapp"
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 8d7ade12..f65845f1 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }: {
   home.stateVersion = "23.11";
   home.packages = with pkgs; [
-    _1password
-    _1password-gui
     colordiff
     dog
     dos2unix
@@ -12,7 +10,6 @@
     htop
     hub
     jq
-    libreoffice
     meld
     mtr
     nix-zsh-completions
@@ -21,7 +18,6 @@
     subversion
     tailscale
     tree
-    vivaldi
     watch
     wget
     yq
@@ -39,7 +35,6 @@
       };
     };
     eza.enable = true;
-    firefox.enable = true;
     gh.enable = true;
     git = {
       enable = true;
diff --git a/modules/nixos/configuration.nix b/modules/nixos/configuration.nix
index ec2cc641..afcdbed0 100644
--- a/modules/nixos/configuration.nix
+++ b/modules/nixos/configuration.nix
@@ -101,13 +101,18 @@ in {
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    _1password
+    _1password-gui
     dconf2nix
+    firefox
     gnomeExtensions.appindicator
     gnomeExtensions.caffeine
     gnomeExtensions.dash-to-panel
     gnomeExtensions.user-themes
+    libreoffice
     neofetch
     tilix
+    vivaldi
   ];
 
   # Some programs need SUID wrappers, can be configured further or are