add fish

home/user/config.nix

@@ -23,7 +23,6 @@ in
     ".config/mako".source = "${configDir}/mako";
     ".config/scripts".source = "${configDir}/scripts";
     ".config/swaync".source = "${configDir}/swaync";
-    # ".config/uwsm".source = "${configDir}/uwsm";
     ".config/starship.toml".source = "${configDir}/starship/starship.toml";
     ".config/macchiato.toml".source = "${configDir}/starship/macchiato.toml";
     ".config/gh" = {

home/user/environment.nix

@@ -17,7 +17,7 @@
     CLUTTER_BACKEND = "wayland";
     WLR_RENDERER = "vulkan";
     XCURSOR_SIZE = "32";
-    GTK_THEME = "Catppuccin-Macchiato-Compact-Blue-Dark";
+    GTK_THEME = "Catppuccin-Macchiato-Compact-Lavender-Dark";
     XDG_CURRENT_DESKTOP = "Hyprland";
     XDG_SESSION_DESKTOP = "Hyprland";
     XDG_SESSION_TYPE = "wayland";
@@ -31,7 +31,7 @@
     XDG_DATA_DIRS = "\${XDG_DATA_DIRS}:/usr/share:/var/lib/flatpak/exports/share:\${HOME}/.local/share/flatpak/exports/share";
 
     # GPU
-    LIBVA_DRIVER_NAME  = "nvidia";
+    LIBVA_DRIVER_NAME = "nvidia";
     __GLX_VENDOR_LIBRARY_NAME = "nvidia";
   };
 }

home/user/git.nix

@@ -1,7 +1,8 @@
 let
-  userName = "danny";
+  userName = "dachxy";
   email = "Danny10132024@gmail.com";
-in {
+in
+{
   programs.git = {
     enable = true;
     userName = userName;

home/user/packages.nix

@@ -3,7 +3,7 @@
 {
   home.packages = [
     pkgs.vscode
-    pkgs.discord
+    pkgs.vesktop # discord
     pkgs.firefox
 
     # Dev stuff
@@ -25,22 +25,20 @@
     pkgs.blueberry
 
     # Gaming
-    pkgs.steam
+    # pkgs.steam
     pkgs.steam-run
-    (pkgs.lutris.override {
-      extraPkgs = pkgs: [ pkgs.wineWowPackages.stable pkgs.winetricks ];
-    })
+    # (pkgs.lutris.override {
+    #   extraPkgs = pkgs: [ pkgs.wineWowPackages.stable pkgs.winetricks ];
+    # })
 
     # Downloads
     pkgs.qbittorrent
 
     # Utils
     pkgs.viewnior
-    pkgs.catppuccin-cursors.macchiatoBlue
+    pkgs.catppuccin-cursors.macchiatoLavender
     pkgs.catppuccin-gtk
     pkgs.cava
-    # pkgs.papirus-folders
-
-    pkgs.nushell
+    pkgs.papirus-folders
   ];
 }

home/user/programs.nix

@@ -4,10 +4,9 @@
     neovim = {
       enable = true;
       withNodeJs = true;
+      withPython3 = true;
       extraLuaPackages = ps: [ ps.magick ];
       extraPackages = [ pkgs.imagemagick ];
     };
-
-    bash.enable = true;
   };
 }

home/user/shell.nix

@@ -1,22 +1,36 @@
-{ ... }:
+{ pkgs, ... }:
 {
   programs = {
-    nushell = {
+    # nushell = {
+    #   enable = true;
+    #   configFile.source = ../config/nushell/config.nu;
+    #   envFile.source = ../config/nushell/env.nu;
+    # };
+
+    fish = {
       enable = true;
-      configFile.source = ../config/nushell/config.nu;
-      envFile.source = ../config/nushell/env.nu;
+      interactiveShellInit = ''
+        set fish_greeting # Disable greeting
+      '';
+      plugins = [
+        { name = "grc"; src = pkgs.fishPlugins.grc.src; }
+        # Other plugins can be located in config file
+      ];
     };
 
-    carapace.enable = true;
-    carapace.enableNushellIntegration = true;
+    carapace = {
+      enable = true;
+      enableFishIntegration = true;
+    };
 
     starship = {
       enable = true;
+      enableFishIntegration = true;
     };
 
     zoxide = {
       enable = true;
-      enableNushellIntegration = true;
+      enableFishIntegration = true;
     };
   };
 }