diff --git a/configuration.bak.nix b/configuration.bak.nix
deleted file mode 100644
index 4d8cba4..0000000
--- a/configuration.bak.nix
+++ /dev/null
@@ -1,169 +0,0 @@
-{ config, pkgs, lib, inputs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      inputs.home-manager.nixosModules.default
-    ];
-
-  nix.settings.experimental-features = [ "nix-command" "flakes"];
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  virtualisation.virtualbox.guest.enable = true;
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "intl";
-  };
-
-  # Configure console keymap
-  console.keyMap = "us-acentos";
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.alex = {
-    isNormalUser = true;
-    description = "alex";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
-  };
-
-  home-manager = {
-    # also pass inputs to home-manager modules
-    extraSpecialArgs = {inherit inputs;};
-    users = {
-      "username" = import ./home.nix;
-    };
-  };
-
-  # Install firefox.
-  programs.firefox.enable = true;
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-
-  # basics
-  vim 
-  wget
-  fish
-
-  # terminal
-  lf
-  ranger
-
-  # display manager
-  ly
-  wayland
-  sway
-  
-  # basic desktop
-  rofi
-  waybar
-  mako
-  nwg-displays
-
-  # rofi related
-  rofi-bluetooth
-  networkmanager_dmenu
-
-  # basic apps
-  alacritty
-
-
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.05"; # Did you read the comment?
-
-}
diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix
index e48ed88..c7b5d5a 100644
--- a/home-manager/waybar.nix
+++ b/home-manager/waybar.nix
@@ -1,12 +1,10 @@
 { config, lib, pkgs, ... }:
 {
   home.packages = with pkgs; [
-    waybar
   ];
   programs.waybar = {
     enable = true;
-    settings = {
-	  mainBar = {
+    settings = [{
         layer = "top";
         position = "top";
         "modules-left" = [
@@ -28,11 +26,11 @@
           "battery"
           "clock"
         ];
-  
+
         margin = null;
         spacing = 15;
         reload_style_on_change = true;
-  
+
         "clock" = {
           format = "{:%a %d.%m.%y | Week: %U | %T}";
           interval = 1;
@@ -43,30 +41,30 @@
           format-calendar-weeks = "<span color='#aeaeae'><b>W{:%V}</b></span>";
           format-calendar-weekdays = "<span color='#aeaeae'><b>{}</b></span>";
         };
-  
+
         "disk" = {
           interval = 30;
           format = " {percentage_used}% {free:2} free";
           path = "/";
         };
-  
+
         "memory" = {
           format = " {percentage}% {used:.1f}/{total:.1f} S: {swapUsed:.1f}/{swapTotal:.1f}";
         };
-  
+
         "custom/cpu_linux" = {
           exec = "~/.config/waybar/scripts/cpu_linux.sh";
           "return-type" = "json";
           interval = 2;
           format = ": {text}%";
         };
-  
+
         "custom/nvidia" = {
           exec = "nvidia-smi --query-gpu=utilization.gpu,temperature.gpu --format=csv,nounits,noheader | sed 's/\\([0-9]\\+\\), \\([0-9]\\+\\)/\\1% @ \\2°C/g'";
           format = "  {}";
           interval = 4;
         };
-  
+
         "temperature" = {
           format = " {temperatureC}°C";
           hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon7/temp1_input";
@@ -75,12 +73,12 @@
           critical-threshold = 80;
           on-click = "psensor";
         };
-  
+
         "tray" = {
           icon-size = 14;
           spacing = 5;
         };
-  
+
         "idle_inhibitor" = {
           format = "<span font='12'>{icon}</span>";
           format-icons = {
@@ -88,7 +86,7 @@
             deactivated = "󰅶";
           };
         };
-  
+
         "bluetooth" = {
           format-on = "󰂰";
           format-off = "";
@@ -101,7 +99,7 @@
           tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
           on-click = "rofi-bluetooth";
         };
-  
+
         "pulseaudio" = {
           format = "{volume}% {icon}";
           format-bluetooth = "󰂰";
@@ -124,7 +122,7 @@
           on-scroll-up = "pactl set-sink-volume @DEFAULT_SINK@ +5%";
           on-scroll-down = "pactl set-sink-volume @DEFAULT_SINK@ -5%";
         };
-  
+
         "pulseaudio#mic" = {
           format = "{format_source}";
           format-source = "";
@@ -134,17 +132,17 @@
           on-scroll-down = "pactl set-source-volume 1 -1%";
           on-scroll-up = "pactl set-source-volume 1 +1%";
         };
-  
+
         "group/audio" = {
           orientation = "horizontal";
           modules = [ "pulseaudio" "pulseaudio#mic" ];
         };
-  
+
         "group/networking" = {
           orientation = "horizontal";
           modules = [ "network" "network#speed" ];
         };
-  
+
         network = {
           format-wifi = "  {essid}";
           format-ethernet = "󰈀";
@@ -155,7 +153,7 @@
           tooltip-format-disconnected = "Not Connected";
           on-click = "networkmanager_dmenu";
         };
-  
+
         "network#speed" = {
           format = "󰁅 {bandwidthDownBits:20} 󰁝 {bandwidthUpBits:20}";
           interval = 1;
@@ -166,7 +164,7 @@
           tooltip-format-disconnected = "Not Connected";
           on-click = "networkmanager_dmenu";
         };
-  
+
         "battery" = {
           interval = 4;
           states = {
@@ -184,7 +182,6 @@
             "󰪢" "󰪣" "󰪤" "󰪥"
           ];
         };
-      };
-    };
+      }];
   };
 }
diff --git a/modules/sway.nix b/modules/sway.nix
index d0d7259..84af617 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -7,6 +7,7 @@
     sway
     swaylock
     swayidle
+    waybar
 
 	nwg-displays