.

4 files changed, 19 insertions, 6 deletions

diff --git a/nixos/hosts/opus/default.nix b/nixos/hosts/opus/default.nix
index 0372cb9..d1d65e0 100644
--- a/nixos/hosts/opus/default.nix
+++ b/nixos/hosts/opus/default.nix
@@ -43,6 +43,12 @@
   ];
 
   # ────────────────────────────────────────────────────────────────────────
+  # Shell composition
+  # ────────────────────────────────────────────────────────────────────────
+  # This properly installs ZSH, sets up vendor completions, and configures standard paths.
+  programs.zsh.enable = true;
+
+  # ────────────────────────────────────────────────────────────────────────
   # Desktop composition (was attrs/desktop)
   # Inline because this host is the only one using the full desktop stack.
   # ────────────────────────────────────────────────────────────────────────
@@ -60,7 +66,6 @@
   };
 
   environment.sessionVariables = {
-    SHELL = "${pkgs.fish}/bin/fish";
     XCURSOR_THEME = "Bibata-Modern-Ice";
     XCURSOR_SIZE = "20";
     CC = "clang";
@@ -80,6 +85,7 @@
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
   };
+  
   programs.throne = {
     enable = true;
     tunMode.enable = true;
diff --git a/nixos/modules/features/desktop-apps/default.nix b/nixos/modules/features/desktop-apps/default.nix
index 527a350..385af11 100644
--- a/nixos/modules/features/desktop-apps/default.nix
+++ b/nixos/modules/features/desktop-apps/default.nix
@@ -19,5 +19,7 @@
     obs-studio
     pkgs.qbittorrent
     pkgs.masterpdfeditor
+    mullvad-browser
+    librewolf
   ];
 }
diff --git a/nixos/modules/features/dev-tools/default.nix b/nixos/modules/features/dev-tools/default.nix
index ad10afd..6b20cf7 100644
--- a/nixos/modules/features/dev-tools/default.nix
+++ b/nixos/modules/features/dev-tools/default.nix
@@ -11,7 +11,7 @@
     gnumake
     nodejs
     pyright
-    python3
+    (python3.withPackages (ps: with ps; [ pip ]))
     rust-analyzer
     rustc
     lua5_4
diff --git a/nixos/modules/system/users/default.nix b/nixos/modules/system/users/default.nix
index 19c2b56..f43149d 100644
--- a/nixos/modules/system/users/default.nix
+++ b/nixos/modules/system/users/default.nix
@@ -4,7 +4,7 @@
   users.users."seraphim" = {
     isNormalUser = true;
     description = "seraphim";
-    shell = pkgs.fish;
+    shell = pkgs.zsh;
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [];
   };
@@ -20,11 +20,16 @@
     ];
   };
 
-  programs.fish = {
+  programs.zsh = {
     enable = true;
+    enableCompletion = true;
+    autosuggestions = {
+      enable = true;
+      highlightStyle = "fg=#6c7086";
+    };
     interactiveShellInit = ''
-      set -g fish_greeting ""
-      fzf --fish | source
+      source ${pkgs.fzf}/share/fzf/key-bindings.zsh
+      source ${pkgs.fzf}/share/fzf/completion.zsh
     '';
     shellAliases = {
       ls = "eza -al --icons=auto";