diff --git a/hosts/home/configuration.nix b/hosts/home/configuration.nix
index 32f627b..8cb9053 100644
--- a/hosts/home/configuration.nix
+++ b/hosts/home/configuration.nix
@@ -98,6 +98,7 @@
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.yoru = {
+    shell = pkgs.fish;
     isNormalUser = true;
     description = "Yoru";
     extraGroups = [ "networkmanager" "wheel" ];
@@ -122,21 +123,42 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    fish
     wget
+    unzip
   	helix
+
   	firefox
     kitty
-    rofi
+    # rofi
     wofi
     dolphin
     waybar
-    git
     skypeforlinux
-    unzip
     steam
+    discord  # here because somehow the 'allowUnfree' is not recognized in home.nix
+    pavucontrol
+    
+    docker
+    docker-compose
+    git
+  ];
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-emoji
+    fira-code
+
+    nerd-fonts.fira-code
+    nerd-fonts.hack
+    nerd-fonts.droid-sans-mono
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.fantasque-sans-mono
   ];
 
   programs.steam.enable = true;
+  programs.fish.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
diff --git a/hosts/home/home.nix b/hosts/home/home.nix
index 712c59b..b7c0e6e 100644
--- a/hosts/home/home.nix
+++ b/hosts/home/home.nix
@@ -24,7 +24,7 @@
     # pkgs.hello
     pkgs.helix
     pkgs.firefox
-    pkgs.zsh
+    # pkgs.zsh
     pkgs.bottles
     pkgs.neofetch
     # pkgs.steam
@@ -88,5 +88,127 @@
       background_blur = 5;
     };
   };
-  # programs.waybar.enable = true;
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = false;
+      target = "graphical-session.target";
+    };
+    style = ''
+      * {
+        font-family: 'Fira Code', 'Symbols Nerd Font Mono', 'JetBrainsMono Nerd Font';
+      }
+      window#waybar {
+        background: transparent;
+      }
+    '';
+    settings = [{
+      "layer" = "top";
+      "position" = "top";
+      modules-left = [
+        "hyprland/workspaces"
+        "custom/media"
+      ];
+      modules-center = [
+        "hyprland/window"
+      ];
+      modules-right = [
+        "mpd"
+        "idle_inhibitor"
+        "pulseaudio"
+        "network"
+        "power-profiles-daemon"
+        "cpu"
+        "memory"
+        "temperature"
+        # "backlight"
+        "keyboard-state"
+        "clock"
+        "tray"
+        "custom/power"
+      ];
+      "hyprland/workspaces" = {
+        "format" = "{icon}";
+        "on-scroll-up" = "hyprctl dispatch workspace e+1";
+        "on-scroll-down" = "hyprctl dispatch workspace e-1";
+      };
+      "idle_inhibitor" = {
+          "format" = "{icon}";
+          "format-icons" = {
+              "activated" = "";
+              "deactivated" = "";
+          };
+      };
+      "tray" = {
+          "spacing" = 10;
+      };
+      "cpu" = {
+          "format" = "{usage}% ";
+          "tooltip" = false;
+      };
+      "memory" = {
+          "format" = "{}% ";
+      };
+      "temperature" = {
+          # // "thermal-zone" = 2;
+          # // "hwmon-path" = "/sys/class/hwmon/hwmon2/temp1_input";
+          "critical-threshold" = 80;
+          # // "format-critical" = "{temperatureC}°C {icon}";
+          "format" = "{temperatureC}°C {icon}";
+          "format-icons" = ["" "" ""];
+      }; 
+      "network" = {
+          # // "interface" = "wlp2*"; // (Optional) To force the use of this interface
+          "format-wifi" = "{essid} ({signalStrength}%) ";
+          "format-ethernet" = "{ipaddr}/{cidr} ";
+          "tooltip-format" = "{ifname} via {gwaddr} ";
+          "format-linked" = "{ifname} (No IP) ";
+          "format-disconnected" = "Disconnected ⚠";
+          "format-alt" = "{ifname}: {ipaddr}/{cidr}";
+      };
+      "pulseaudio" = {
+          # // "scroll-step" = 1; // %, can be a float
+          "format" = "{volume}% {icon} {format_source}";
+          "format-bluetooth" = "{volume}% {icon} {format_source}";
+          "format-bluetooth-muted" = " {icon} {format_source}";
+          "format-muted" = " {format_source}";
+          "format-source" = "{volume}% ";
+          "format-source-muted" = "";
+          "format-icons" = {
+              "headphone" = "";
+              "hands-free" = "";
+              "headset" = "";
+              "phone" = "";
+              "portable" = "";
+              "car" = "";
+              "default" = ["" "" ""];
+          };
+          "on-click" = "pavucontrol";
+      };
+      "custom/media" = {
+          "format" = "{icon} {text}";
+          "return-type" = "json";
+          "max-length" = 40;
+          "format-icons" = {
+              "spotify" = "";
+              "default" = "🎜";
+          };
+          "escape" = true;
+          "exec" = "$HOME/.config/waybar/mediaplayer.py 2> /dev/null"; # // Script in resources folder
+          # // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+      };
+      "custom/power" = {
+        "format" = "⏻ ";
+        "tooltip" = false;
+    		"menu" = "on-click";
+    		"menu-file" = "$HOME/.config/waybar/power_menu.xml"; # // Menu file in resources folder
+    		"menu-actions" = {
+    			"shutdown" = "shutdown";
+    			"reboot" = "reboot";
+    			"suspend" = "systemctl suspend";
+    			"hibernate" = "systemctl hibernate";
+    		};
+      };
+    }];
+  };
 }