add fish

system/modules/fonts.nix

@@ -6,15 +6,20 @@
     jetbrains-mono
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
+    noto-fonts-emoji
 
     (nerdfonts.override { fonts = [ "CascadiaCode" ]; })
   ];
 
+  fonts.fontDir.enable = true;
+
   fonts.fontconfig = {
+    enable = true;
     defaultFonts = {
       serif = [ "CaskaydiaCove Nerd Font" "Noto Sans CJK" ];
       sansSerif = [ "CaskaydiaCove Nerd Font" "Noto Sans CJK" ];
       monospace = [ "CaskaydiaCove Nerd Font Mono" ];
     };
+    cache32Bit = true;
   };
 }

system/modules/gaming.nix

@@ -3,10 +3,11 @@
 {
   nix = {
     settings = {
-     		warn-dirty = false;
-		experimental-features = [ "nix-command" "flakes" ];
-		auto-optimise-store = true;
-		substituters = ["https://nix-gaming.cachix.org"];
-		trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];    };
+      warn-dirty = false;
+      experimental-features = [ "nix-command" "flakes" ];
+      auto-optimise-store = true;
+      substituters = [ "https://nix-gaming.cachix.org" ];
+      trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ];
+    };
   };
 }

system/modules/hardware.nix

@@ -1,17 +1,30 @@
 { config, pkgs, nixpkgs, ... }:
 
 {
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = [ "nvidia" ];
 
   nixpkgs.config.packageOverrides = pkgs: {
-    intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; } ;
+    intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
   };
 
 
   hardware = {
     steam-hardware.enable = true;
-    bluetooth.enable = true;
-    graphics = { 
+
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings.General = {
+        experimental = true;
+        Privacy = "device";
+        JustWorksRepairing = "always";
+        Class = "0x000100";
+        FastConnectable = true;
+      };
+    };
+    xpadneo.enable = true;
+
+    graphics = {
       enable = true;
       enable32Bit = true;
       extraPackages = with pkgs; [
@@ -40,4 +53,12 @@
       nvidiaBusId = "PCI:1:0:0";
     };
   };
+
+  # Enable bluetooth
+  boot = {
+    extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
+    extraModprobeConfig = ''
+      options bluetooth disable_ertm=Y
+    '';
+  };
 }

system/modules/hyprland.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   programs.hyprland = { enable = true; };

system/modules/nixsettings.nix

@@ -4,11 +4,12 @@
   documentation.nixos.enable = false;
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-	"steam"
-	"steam-original"
-	"steam-unwrapped"
-	"steam-run"
+    "steam"
+    "steam-original"
+    "steam-unwrapped"
+    "steam-run"
   ];
+  nixpkgs.config.rcomSupport = true;
 
 
   nix = {

system/modules/packages.nix

@@ -61,6 +61,12 @@
     xdg-desktop-portal-wlr
 
     # Shell 
+    fishPlugins.done
+    fishPlugins.fzf-fish
+    fishPlugins.forgit
+    fishPlugins.hydro
+    fishPlugins.grc
+    grc # Colorize
     zoxide # Dir jumper
     starship # Shell theme
     carapace # Autocomplete

system/modules/programs.nix

@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   xdg.portal = {
@@ -16,8 +16,6 @@
       remotePlay.openFirewall = true;
       dedicatedServer.openFirewall = true;
       localNetworkGameTransfers.openFirewall = true;
-      fontPackages = with pkgs; [ wqy_zenhei noto-fonts-cjk-sans noto-fonts-cjk-serif ];
-      extraPackages = with pkgs; [ wqy_zenhei noto-fonts-cjk-sans noto-fonts-cjk-serif ];
     };
 
     hyprland = {
@@ -86,6 +84,24 @@
 
     zsh.enable = true;
     mtr.enable = true;
+    fish.enable = true;
+    nix-index = {
+      enable = true;
+      enableFishIntegration = true;
+      enableBashIntegration = false;
+      enableZshIntegration = false;
+    };
+
+    # Set fish as default shell but not login shell
+    bash = {
+      interactiveShellInit = ''
+        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+        then
+          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+        fi
+      '';
+    };
   };
 
 }

system/modules/services.nix

@@ -12,14 +12,17 @@
   services = {
     dbus.enable = true;
     picom.enable = true;
-    openssh = { 
-      enable = true; 
+
+    blueman.enable = true;
+
+    openssh = {
+      enable = true;
       ports = [ 22 ];
       settings = {
         PasswordAuthentication = false;
-	AllowUsers = [ "danny" ];
-	UseDns = true;
-	PermitRootLogin =  "no";
+        AllowUsers = [ "danny" ];
+        UseDns = true;
+        PermitRootLogin = "no";
       };
     };
 

system/modules/users.nix

@@ -3,7 +3,7 @@
 {
   users.users.danny = {
     isNormalUser = true;
-    shell = pkgs.nushell;
+    shell = pkgs.bash; # Actually fish 
     extraGroups = [ "wheel" "input" "networkmanager" "docker" ];
   };
 }

system/modules/virtualization.nix

@@ -15,6 +15,8 @@
 
     libvirtd = {
       enable = true;
+      qemu.swtpm.enable = true;
+      qemu.ovmf.enable = true;
     };
 
     spiceUSBRedirection.enable = true;