diff --git a/flake.lock b/flake.lock
index 9d26e2a..223de46 100755
--- a/flake.lock
+++ b/flake.lock
@@ -302,22 +302,6 @@
         "type": "github"
       }
     },
-    "mpd-discord-rpc": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696275938,
-        "narHash": "sha256-hIbODswDa50BoAysXXT2HEoJJIp4d28NAQBm3DzYILg=",
-        "owner": "JakeStanger",
-        "repo": "mpd-discord-rpc",
-        "rev": "f887d05794a6dffb1cc4e143e8155d6b318e0e1a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "JakeStanger",
-        "repo": "mpd-discord-rpc",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -437,7 +421,6 @@
         "hyprland": "hyprland",
         "hyprland-contrib": "hyprland-contrib",
         "hyprpicker": "hyprpicker",
-        "mpd-discord-rpc": "mpd-discord-rpc",
         "nix-index-database": "nix-index-database",
         "nixd": "nixd",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 0b0f7af..4ade493 100755
--- a/flake.nix
+++ b/flake.nix
@@ -80,49 +80,55 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs:
-    let
-      system = "x86_64-linux";
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    ...
+  } @ inputs: let
+    system = "x86_64-linux";
 
-      pkgs = import nixpkgs {
+    pkgs = import nixpkgs {
+      inherit system;
+
+      config = {
+        allowUnfree = true;
+        allowUnsupportedSystem = true;
+      };
+
+      overlays = [
+        self.overlays.default
+        inputs.chaotic-nyx.overlays.default
+        inputs.hyprland-contrib.overlays.default
+        inputs.hyprpicker.overlays.default
+        inputs.nixd.overlays.default
+      ];
+    };
+  in {
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
+    overlays = import ./overlay.nix {inherit inputs;};
+
+    nixosConfigurations.terra =
+      nixpkgs.lib.nixosSystem
+      {
         inherit system;
-
-        config = {
-          allowUnfree = true;
-          allowUnsupportedSystem = true;
-        };
-
-        overlays = [
-          self.overlays.default
-          inputs.chaotic-nyx.overlays.default
-          inputs.hyprland-contrib.overlays.default
-          inputs.hyprpicker.overlays.default
-          inputs.nixd.overlays.default
+        inherit pkgs;
+        specialArgs = {inherit inputs;};
+        modules = [
+          ./system/configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useUserPackages = true;
+              users.manuel = import ./user/home.nix;
+              extraSpecialArgs = {inherit inputs;};
+              useGlobalPkgs = true;
+            };
+          }
+          inputs.grub2-themes.nixosModules.default
+          inputs.chaotic-nyx.nixosModules.default
+          inputs.hyprland.nixosModules.default
         ];
       };
-    in
-    {
-      overlays = (import ./overlay.nix { inherit inputs; });
-
-      nixosConfigurations.terra = nixpkgs.lib.nixosSystem
-        {
-          inherit system;
-          inherit pkgs;
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./system/configuration.nix
-            home-manager.nixosModules.home-manager {
-              home-manager = {
-                useUserPackages = true;
-                users.manuel = import ./user/home.nix;
-                extraSpecialArgs = { inherit inputs; };
-                useGlobalPkgs = true;
-              };
-            }
-            inputs.grub2-themes.nixosModules.default
-            inputs.chaotic-nyx.nixosModules.default
-            inputs.hyprland.nixosModules.default
-          ];
-        };
-    };
+  };
 }
diff --git a/overlay.nix b/overlay.nix
index 748fdfc..09317c2 100755
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,24 +1,22 @@
-{ inputs, ... }:
-{
+{inputs, ...}: {
   default = final: prev: {
-
-    gruvbox-plus-icon-pack = final.callPackage ./pkgs/gruvbox-plus-icon-pack { inherit inputs; };
+    gruvbox-plus-icon-pack = final.callPackage ./pkgs/gruvbox-plus-icon-pack {inherit inputs;};
 
     ncmpcpp = prev.ncmpcpp.override {
       visualizerSupport = true;
     };
 
     nerdfonts = prev.nerdfonts.override {
-      fonts = [ "JetBrainsMono" ];
+      fonts = ["JetBrainsMono"];
     };
 
     openmw = prev.openmw.overrideAttrs (old: {
       version = "9999";
       src = inputs.openmw-git;
 
-      buildInputs = old.buildInputs ++ [ prev.libyamlcpp prev.luajit ];
+      buildInputs = old.buildInputs ++ [prev.libyamlcpp prev.luajit];
 
-      patches = [ ];
+      patches = [];
       dontWrapQtApps = false;
     });
 
@@ -29,10 +27,10 @@
         prev.gnome.zenity
         prev.xdg-user-dirs
       ];
-      extraLibraries = prev: [ ];
+      extraLibraries = prev: [];
     };
 
-    nvim-hmts = prev.vimUtils.buildVimPluginFrom2Nix {
+    nvim-hmts = prev.vimUtils.buildVimPlugin {
       pname = "nvim-hmts";
       version = "1";
       src = inputs.nvim-hmts;
diff --git a/pkgs/gruvbox-plus-icon-pack/default.nix b/pkgs/gruvbox-plus-icon-pack/default.nix
index ba109cd..3dddb9a 100755
--- a/pkgs/gruvbox-plus-icon-pack/default.nix
+++ b/pkgs/gruvbox-plus-icon-pack/default.nix
@@ -1,14 +1,21 @@
-{ stdenvNoCC, fetchFromGitHub, inputs, gtk3, fd, gnome-icon-theme, hicolor-icon-theme }:
-
+{
+  stdenvNoCC,
+  fetchFromGitHub,
+  inputs,
+  gtk3,
+  fd,
+  gnome-icon-theme,
+  hicolor-icon-theme,
+}:
 stdenvNoCC.mkDerivation rec {
   pname = "gruvbox-plus-icon-pack";
   version = "9999";
 
-  src = inputs.gruvbox-plus-icon-pack; 
+  src = inputs.gruvbox-plus-icon-pack;
 
-  nativeBuildInputs = [ gtk3 fd ];
+  nativeBuildInputs = [gtk3 fd];
 
-  propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
+  propagatedBuildInputs = [gnome-icon-theme hicolor-icon-theme];
 
   installPhase = ''
     cd Gruvbox-Plus-Dark
diff --git a/system/configuration.nix b/system/configuration.nix
index 6cd7a6a..4aaeb72 100755
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -1,5 +1,10 @@
-{ pkgs, lib, config, inputs, ... }:
 {
+  pkgs,
+  lib,
+  config,
+  inputs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
     ./hardware
@@ -12,21 +17,19 @@
 
     kernel.sysctl."vm.max_map_count" = 16777216; #Star Citizen crash fix
 
-    #kernelPackages = pkgs.linuxPackages_latest;
-    supportedFilesystems = [ "bcachefs" ];
-    kernelModules = [ "i2c-dev" "i2c-piix4" ];
-    kernelParams =
-      [
-        "amdgpu.ppfeaturemask=0xffffffff"
-        "net.ifnames=0"
-        "amd_pstate.shared_mem=1"
-        "amd_pstate=active"
-      ];
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = ["i2c-dev" "i2c-piix4"];
+    kernelParams = [
+      "amdgpu.ppfeaturemask=0xffffffff"
+      "net.ifnames=0"
+      "amd_pstate.shared_mem=1"
+      "amd_pstate=active"
+    ];
 
     loader = {
       efi = {
         canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
+        efiSysMountPoint = "/boot/efi";
       };
 
       grub = {
@@ -76,7 +79,6 @@
     keyMap = "us-acentos";
   };
 
-  
   # Enable sound.
   sound.enable = true;
 
@@ -89,17 +91,19 @@
 
     doas = {
       enable = true;
-      extraRules = [{
-        users = [ "manuel" ];
-        keepEnv = true;
-        persist = true;
-      }];
+      extraRules = [
+        {
+          users = ["manuel"];
+          keepEnv = true;
+          persist = true;
+        }
+      ];
     };
   };
 
   users.users.manuel = {
     isNormalUser = true;
-    extraGroups = [ "audio" "games" "input" "lp" "networkmanager" "scanner" "users" "vboxusers" "video" "wheel" ];
+    extraGroups = ["audio" "games" "input" "lp" "networkmanager" "scanner" "users" "vboxusers" "video" "wheel"];
     shell = pkgs.fish;
   };
 
@@ -150,8 +154,8 @@
       warn-dirty = false
     '';
 
-      registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
-      nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+    registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
 
     gc = {
       persistent = true;
@@ -167,7 +171,6 @@
         "https://nyx.chaotic.cx"
         "https://hyprland.cachix.org"
         "https://nix-community.cachix.org"
-
       ];
 
       trusted-public-keys = [
@@ -181,4 +184,3 @@
 
   system.stateVersion = "23.05";
 }
-
diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index a759be2..93ca074 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -1,39 +1,48 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "bcache" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["nvme"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-amd"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/nvme1n1p2";
-      fsType = "bcachefs";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/cc08e6a4-46ef-4207-a2d9-195e36e06179";
+    fsType = "xfs";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/BE4D-EFA9";
-      fsType = "vfat";
-    };
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/BE4D-EFA9";
+    fsType = "vfat";
+  };
 
-  fileSystems."/mnt/hdd" =
-    { device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f";
-      fsType = "xfs";
-    };
+  fileSystems."/mnt/hdd" = {
+    device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f";
+    fsType = "xfs";
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/nvme0n1p1";
-      fsType = "bcachefs";
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/9d1be271-ca41-43cc-a334-016103bfde1a";
+    fsType = "xfs";
+  };
 
-  swapDevices = [ ];
+  swapDevices = [
+    {
+      device = "/var/swapfile";
+      size = 8 * 1024;
+    }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/system/hardware/default.nix b/system/hardware/default.nix
index 4a37c6a..8cb5d14 100644
--- a/system/hardware/default.nix
+++ b/system/hardware/default.nix
@@ -1,19 +1,16 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   hardware.opengl = {
     enable = true;
-    extraPackages = [ pkgs.libvdpau-va-gl ];
+    extraPackages = [pkgs.libvdpau-va-gl];
     driSupport32Bit = true;
   };
-  chaotic.mesa-git.enable = true; 
+  chaotic.mesa-git.enable = true;
 
   hardware.steam-hardware.enable = true;
 
   hardware.bluetooth.enable = true;
   hardware.sane = {
     enable = true;
-    extraBackends = [ pkgs.sane-airscan ];
+    extraBackends = [pkgs.sane-airscan];
   };
-
-
 }
diff --git a/system/programs/default.nix b/system/programs/default.nix
index 76e5f91..1696869 100644
--- a/system/programs/default.nix
+++ b/system/programs/default.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   programs = {
     dconf.enable = true;
     fish.enable = true;
@@ -8,5 +7,5 @@
     ssh.startAgent = true;
     steam.enable = true;
   };
-  chaotic.steam.extraCompatPackages = with pkgs; [ luxtorpeda proton-ge-custom ];
+  chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda proton-ge-custom];
 }
diff --git a/system/services/default.nix b/system/services/default.nix
index 53289d7..f2e81e3 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -1,12 +1,11 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   imports = [
     ./avahi
-      ./locate
-      ./pipewire
-      ./printing
-      ./udev
-      ./xdg-portal
+    ./locate
+    ./pipewire
+    ./printing
+    ./udev
+    ./xdg-portal
   ];
 
   services = {
diff --git a/system/services/locate/default.nix b/system/services/locate/default.nix
index 8b72693..012f9dd 100644
--- a/system/services/locate/default.nix
+++ b/system/services/locate/default.nix
@@ -1,10 +1,13 @@
-{ pkgs, lib, ... }:
 {
-    services.locate = {
-      enable = true;
-      locate = pkgs.plocate;
-      localuser = null;
-      prunePaths = lib.mkOptionDefault [ ];
-      interval = "hourly";
-    };
+  pkgs,
+  lib,
+  ...
+}: {
+  services.locate = {
+    enable = true;
+    locate = pkgs.plocate;
+    localuser = null;
+    prunePaths = lib.mkOptionDefault [];
+    interval = "hourly";
+  };
 }
diff --git a/system/services/printing/default.nix b/system/services/printing/default.nix
index 5467b58..f6c680c 100644
--- a/system/services/printing/default.nix
+++ b/system/services/printing/default.nix
@@ -1,7 +1,6 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   services.printing = {
     enable = true;
-    drivers = [ pkgs.cnijfilter2 ];
+    drivers = [pkgs.cnijfilter2];
   };
 }
diff --git a/system/services/udev/default.nix b/system/services/udev/default.nix
index ed468aa..deedb45 100644
--- a/system/services/udev/default.nix
+++ b/system/services/udev/default.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   services.udev = {
-    packages = [ pkgs.openrgb ];
+    packages = [pkgs.openrgb];
   };
 }
diff --git a/system/services/xdg-portal/default.nix b/system/services/xdg-portal/default.nix
index d9f76bd..798136d 100644
--- a/system/services/xdg-portal/default.nix
+++ b/system/services/xdg-portal/default.nix
@@ -1,9 +1,8 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   xdg.portal = {
     enable = true;
     xdgOpenUsePortal = true;
     wlr.enable = false; #conflict with XDPH if enabled
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    extraPortals = [pkgs.xdg-desktop-portal-gtk];
   };
 }
diff --git a/user/configs/beets/default.nix b/user/configs/beets/default.nix
index 9b8bde4..6c1ae6d 100755
--- a/user/configs/beets/default.nix
+++ b/user/configs/beets/default.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   programs.beets = {
     enable = true;
 
diff --git a/user/configs/cava/default.nix b/user/configs/cava/default.nix
index 5f28865..f252660 100755
--- a/user/configs/cava/default.nix
+++ b/user/configs/cava/default.nix
@@ -1,8 +1,11 @@
-{ pkgs, lib, ... }:
 {
-  home.packages = [ pkgs.cava ];
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = [pkgs.cava];
 
-  xdg.configFile."cava/config".text = lib.generators.toINI { } {
+  xdg.configFile."cava/config".text = lib.generators.toINI {} {
     general = {
       bars = "0";
       bar_width = "2";
@@ -16,4 +19,3 @@
     };
   };
 }
-
diff --git a/user/configs/dircolors.nix b/user/configs/dircolors.nix
index b8199b7..01a5fac 100755
--- a/user/configs/dircolors.nix
+++ b/user/configs/dircolors.nix
@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   programs.dircolors = {
     enable = true;
     enableFishIntegration = true;
@@ -68,7 +72,6 @@
       ".zip" = "01;31";
       ".zoo" = "01;31";
 
-
       ".anx" = "01;35";
       ".asf" = "01;35";
       ".avi" = "01;35";
@@ -155,8 +158,6 @@
       ".xls" = "38;5;109";
       ".xlsx" = "38;5;109";
       ".xml" = "38;5;109";
-
     };
-
   };
 }
diff --git a/user/configs/firefox/default.nix b/user/configs/firefox/default.nix
index 405c0f4..a86ca56 100755
--- a/user/configs/firefox/default.nix
+++ b/user/configs/firefox/default.nix
@@ -1,8 +1,7 @@
-{ ... }:
-{
+{...}: {
   programs.browserpass = {
     enable = true;
-    browsers = [ "firefox" ];
+    browsers = ["firefox"];
   };
 
   programs.firefox = {
diff --git a/user/configs/fish/default.nix b/user/configs/fish/default.nix
index 93afc04..a8b8001 100755
--- a/user/configs/fish/default.nix
+++ b/user/configs/fish/default.nix
@@ -1,11 +1,21 @@
-{ config, pkgs, inputs, ... }:
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   programs.fish = {
     enable = true;
 
     plugins = [
-      { name = "gruvbox-theme"; src = inputs.fish-plugin-gruvbox-theme; }
-      { name = "bobthefish"; src = inputs.fish-plugin-bobthefish; }
+      {
+        name = "gruvbox-theme";
+        src = inputs.fish-plugin-gruvbox-theme;
+      }
+      {
+        name = "bobthefish";
+        src = inputs.fish-plugin-bobthefish;
+      }
     ];
 
     interactiveShellInit = ''
diff --git a/user/configs/kvantum/default.nix b/user/configs/kvantum/default.nix
index e633020..fce7bf4 100755
--- a/user/configs/kvantum/default.nix
+++ b/user/configs/kvantum/default.nix
@@ -1,5 +1,8 @@
-{ pkgs, inputs, ... }:
 {
+  pkgs,
+  inputs,
+  ...
+}: {
   home.packages = [
     pkgs.libsForQt5.qtstyleplugin-kvantum
   ];
diff --git a/user/configs/mpd/default.nix b/user/configs/mpd/default.nix
index d47f0d9..8e384ab 100755
--- a/user/configs/mpd/default.nix
+++ b/user/configs/mpd/default.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   services.mpd = {
     enable = true;
     musicDirectory = "/mnt/hdd/Music";
@@ -36,7 +36,7 @@
     enable = true;
     settings = {
       id = 474605546457137157;
-      hosts = [ "localhost:6600" ];
+      hosts = ["localhost:6600"];
       format = {
         details = "$title ($album)";
         state = "by $artist";
@@ -68,8 +68,7 @@
       alternative_header_second_line_format = "$7{%t}|{%f}$0";
       progressbar_look = "─╼ ";
 
-      song_columns_list_format =
-        "(25)[5]{a:artist} (3f)[5]{n: } (50)[cyan]{t|f:title} (5)[cyan]{lr:duration}";
+      song_columns_list_format = "(25)[5]{a:artist} (3f)[5]{n: } (50)[cyan]{t|f:title} (5)[cyan]{lr:duration}";
       playlist_display_mode = "columns";
       browser_display_mode = "columns";
       search_engine_display_mode = "columns";
diff --git a/user/configs/mpv/default.nix b/user/configs/mpv/default.nix
index 0afbac1..c880f47 100755
--- a/user/configs/mpv/default.nix
+++ b/user/configs/mpv/default.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   programs.mpv = {
     enable = true;
     config = {
diff --git a/user/configs/neovim/config/lua/plugins/indent-blankline.lua b/user/configs/neovim/config/lua/plugins/ibl.lua
similarity index 70%
rename from user/configs/neovim/config/lua/plugins/indent-blankline.lua
rename to user/configs/neovim/config/lua/plugins/ibl.lua
index bbce58f..f4fb59c 100755
--- a/user/configs/neovim/config/lua/plugins/indent-blankline.lua
+++ b/user/configs/neovim/config/lua/plugins/ibl.lua
@@ -1,6 +1,6 @@
 vim.opt.list = true
 vim.opt.listchars:append "eol:↴"
 
-require("indent_blankline").setup {
+require("ibl").setup {
     show_end_of_line = true,
 }
diff --git a/user/configs/neovim/config/lua/plugins/init.lua b/user/configs/neovim/config/lua/plugins/init.lua
index 2d6c200..7f50ccb 100755
--- a/user/configs/neovim/config/lua/plugins/init.lua
+++ b/user/configs/neovim/config/lua/plugins/init.lua
@@ -5,7 +5,7 @@ require("plugins.colorizer")
 require("plugins.colorscheme")
 require("plugins.comment")
 require("plugins.dressing")
-require("plugins.indent-blankline")
+require("plugins.ibl")
 require("plugins.lspconfig")
 require("plugins.lualine")
 require("plugins.smartsplits")
diff --git a/user/configs/neovim/default.nix b/user/configs/neovim/default.nix
index a4b006e..694100f 100755
--- a/user/configs/neovim/default.nix
+++ b/user/configs/neovim/default.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   programs.neovim = {
     enable = true;
 
@@ -45,21 +44,23 @@
       lspkind-nvim
     ];
 
-    extraPackages = with pkgs; [
-      nodePackages.bash-language-server
-      clang-tools
-      lua-language-server
-      python3Packages.jedi-language-server
-      nixpkgs-fmt
-      nixd
-      rust-analyzer
-      stylua
-      nodePackages.typescript-language-server
-      nodePackages.vscode-css-languageserver-bin
-      zls
-    ] ++ [
-      pkgs.nvim-hmts
-    ];
+    extraPackages = with pkgs;
+      [
+        nodePackages.bash-language-server
+        clang-tools
+        lua-language-server
+        python3Packages.jedi-language-server
+        nixpkgs-fmt
+        nixd
+        rust-analyzer
+        stylua
+        nodePackages.typescript-language-server
+        nodePackages.vscode-css-languageserver-bin
+        zls
+      ]
+      ++ [
+        pkgs.nvim-hmts
+      ];
   };
 
   xdg.configFile.nvim = {
diff --git a/user/configs/rofi/default.nix b/user/configs/rofi/default.nix
index 3ab27d9..ccf1a74 100755
--- a/user/configs/rofi/default.nix
+++ b/user/configs/rofi/default.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
diff --git a/user/configs/tmux/default.nix b/user/configs/tmux/default.nix
index 0a27a4a..0c97ebd 100755
--- a/user/configs/tmux/default.nix
+++ b/user/configs/tmux/default.nix
@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.tmux = {
     enable = true;
   };
diff --git a/user/configs/wayland/ags/ags-config/config.js b/user/configs/wayland/ags/ags-config/config.js
index 7253ce2..fdd8a0f 100644
--- a/user/configs/wayland/ags/ags-config/config.js
+++ b/user/configs/wayland/ags/ags-config/config.js
@@ -8,16 +8,16 @@ const Workspaces = (monitor) => Box({
         if (monitor == 0) {
             box.children = [1,2,3].map(i => Button({
                 onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`),
-                onScrollUp: () => execAsync(`hyprctl dispatch workspace +1`),
-                onScrollDown: () => execAsync(`hyprctl dispatch workspace -1`),
+                onScrollDown: () => execAsync(`hyprctl dispatch workspace +1`),
+                onScrollUp: () => execAsync(`hyprctl dispatch workspace -1`),
                 child: Label({ label: `${i}` }),
                 className: Hyprland.active.workspace.id == i ? 'focused' : '',
             }));
         } else if (monitor == 1) {
             box.children = [4,5,6].map(i => Button({
                 onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`),
-                onScrollUp: () => execAsync(`hyprctl dispatch workspace +1`),
-                onScrollDown: () => execAsync(`hyprctl dispatch workspace -1`),
+                onScrollDown: () => execAsync(`hyprctl dispatch workspace +1`),
+                onScrollUp: () => execAsync(`hyprctl dispatch workspace -1`),
                 child: Label({ label: `${i}` }),
                 className: Hyprland.active.workspace.id == i ? 'focused' : '',
             }));
@@ -25,7 +25,6 @@ const Workspaces = (monitor) => Box({
     }]],
 });
 
-
 const WindowTitle = () => Label({
     connections: [[Hyprland, label => {
         label.label = Hyprland.active.client.title || '';
@@ -78,9 +77,9 @@ const Volume = () => Button({
 
 const Media = () => Button({
     className: 'media',
-    onPrimaryClick: () => Mpris.getPlayer('mpd')?.playPause(),
-    onScrollUp: () => Mpris.getPlayer('mpd')?.previous(),
-    onScrollDown: () => Mpris.getPlayer('mpd')?.next(),
+    onPrimaryClick: () => Mpris.getPlayer('')?.playPause(),
+    onScrollUp: () => Mpris.getPlayer('')?.previous(),
+    onScrollDown: () => Mpris.getPlayer('')?.next(),
 
     child: Box({
         children: [
@@ -92,7 +91,7 @@ const Media = () => Button({
                 ],
 
                 connections: [[Mpris, stack => {
-                    const mpris = Mpris.getPlayer('mpd');
+                    const mpris = Mpris.getPlayer('');
 
                     switch (mpris.playBackStatus) {
                         case "Playing":
@@ -109,7 +108,7 @@ const Media = () => Button({
 
             Label({
                 connections: [[Mpris, label => {
-                    const mpris = Mpris.getPlayer('mpd');
+                    const mpris = Mpris.getPlayer('');
                     if (!mpris || mpris.playBackStatus == "Stopped")
                         label.label = ' Stopped';
                     else 
diff --git a/user/configs/wayland/ags/ags-config/style.scss b/user/configs/wayland/ags/ags-config/style.scss
index 390410a..a4bc974 100644
--- a/user/configs/wayland/ags/ags-config/style.scss
+++ b/user/configs/wayland/ags/ags-config/style.scss
@@ -7,6 +7,8 @@ $activewsbg: rgb(102,92,84);
 
 $box-bg: rgb(80,73,69);
 
+$box-border-radius: 10px;
+
 * {
   min-height: unset;
 }
@@ -21,13 +23,13 @@ $box-bg: rgb(80,73,69);
 
 .workspaces {
   background-color: $box-bg;
-  border-radius: 10px;
+  border-radius: $box-border-radius;
   margin: 5px 0px 5px 10px;
   font-size: 0px;
 }
 
 .workspaces button {
-  border-radius: 0px;
+  border-radius: 0;
   background-color: $wsbg;
   font-size: 10px;
 }
@@ -38,30 +40,30 @@ $box-bg: rgb(80,73,69);
 }
 
 .workspaces button:first-child {
-  border-radius: 10px 0px 0px 10px;
+  border-radius: $box-border-radius 0px 0px $box-border-radius;
 }
 
 .workspaces button:last-child {
-  border-radius: 0px 10px 10px 0px;
+  border-radius: 0px $box-border-radius $box-border-radius 0px;
 }
 
 .windowTitle {
   background-color: $box-bg;
-  border-radius: 10px;
+  border-radius: $box-border-radius;
   padding: 0px 10px 0px 10px;
   margin: 5px 0px 5px 10px;
 }
 
 .volume {
   background-color: $box-bg;
-  border-radius: 10px 0px 0px 10px;
+  border-radius: $box-border-radius;
   padding: 0px 10px 0px 10px;
   margin: 5px 5px 5px 0px;
 }
 
 .media {
   background-color: $box-bg;
-  border-radius: 0px 10px 10px 0px;
+  border-radius: $box-border-radius;
   padding: 0px 10px 0px 10px;
   margin: 5px 10px 5px 0px;
 }
@@ -69,14 +71,14 @@ $box-bg: rgb(80,73,69);
 .date {
   background-color: $box-bg;
   padding: 0px 10px 0px 10px;
-  border-radius: 10px;
+  border-radius: $box-border-radius;
   margin: 5px 10px 5px 0px;
 };
 
 .tray {
   background-color: $box-bg;
   padding: 0px 10px 0px 10px;
-  border-radius: 10px;
+  border-radius: $box-border-radius;
   margin: 5px 10px 5px 0px;
 }
 
diff --git a/user/configs/wayland/ags/default.nix b/user/configs/wayland/ags/default.nix
index 6dbd8b6..70c6acb 100644
--- a/user/configs/wayland/ags/default.nix
+++ b/user/configs/wayland/ags/default.nix
@@ -1,6 +1,10 @@
-{ pkgs, lib, inputs, ...}:
 {
-  imports = [ inputs.ags.homeManagerModules.default];
+  pkgs,
+  lib,
+  inputs,
+  ...
+}: {
+  imports = [inputs.ags.homeManagerModules.default];
 
   programs.ags = {
     enable = true;
diff --git a/user/configs/wayland/foot/default.nix b/user/configs/wayland/foot/default.nix
index bdbede2..ca53198 100755
--- a/user/configs/wayland/foot/default.nix
+++ b/user/configs/wayland/foot/default.nix
@@ -1,5 +1,9 @@
-{ config, pkgs, inputs, ... }:
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   programs.foot = {
     enable = true;
     settings = {
@@ -34,4 +38,3 @@
     };
   };
 }
-
diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix
index d918949..6665faf 100755
--- a/user/configs/wayland/hyprland/default.nix
+++ b/user/configs/wayland/hyprland/default.nix
@@ -1,5 +1,9 @@
-{ config, pkgs, inputs, ... }:
-let
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: let
   leftMonitor = {
     display = "DP-2";
     res = "2560x1440";
@@ -50,10 +54,7 @@ let
 
     pass show -c "$password" 2>/dev/null
   '';
-
-in
-
-{
+in {
   imports = [
     inputs.hyprland.homeManagerModules.default
     ../ags
@@ -102,8 +103,7 @@ in
       }
 
       misc {
-          disable_hyprland_logo = true
-          disable_splash_rendering = true
+          force_default_wallpaper = 0
           vfr = true
           vrr = 2
           # enable_swallow = true
@@ -163,7 +163,7 @@ in
       bind = ${modKey}, 4, workspace, 4
       bind = ${modKey}, 5, workspace, 5
       bind = ${modKey}, 6, workspace, 6
-                                
+
       bind = ${modKey} SHIFT, 1, movetoworkspace, 1
       bind = ${modKey} SHIFT, 2, movetoworkspace, 2
       bind = ${modKey} SHIFT, 3, movetoworkspace, 3
@@ -190,7 +190,7 @@ in
       bind = , XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 10 --get-volume > ${wobsock}
       bind = , XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 10 --get-volume > ${wobsock}
 
-      bind = CTRL, Space, exec, ${pkgs.mako}/bin/makoctl dismiss
+      bind = SHIFT CTRL, Space, exec, ${pkgs.mako}/bin/makoctl dismiss
       bind = CTRL, grave, exec, ${pkgs.mako}/bin/makoctl restore
       bind = ${modKey} SHIFT, O, exec, ${killprocess}/bin/killprocess.sh
       bind = ${modKey} SHIFT, P, exec, ${passmenu}/bin/passmenu.sh
@@ -233,6 +233,5 @@ in
     Exec=swww img "%f" && echo "%f" > ~/.cache/swww/wallpaper.txt
   '';
 
-  home.packages = [ pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop ];
+  home.packages = [pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop];
 }
-
diff --git a/user/configs/wayland/mako/default.nix b/user/configs/wayland/mako/default.nix
index 9f53874..ece8d7e 100755
--- a/user/configs/wayland/mako/default.nix
+++ b/user/configs/wayland/mako/default.nix
@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.mako = {
     enable = true;
     anchor = "top-right";
@@ -18,4 +21,3 @@
     font = "JetBrainsMono Nerd Font Regular 10";
   };
 }
-
diff --git a/user/configs/wayland/wob/default.nix b/user/configs/wayland/wob/default.nix
index b434b3c..0ee049f 100755
--- a/user/configs/wayland/wob/default.nix
+++ b/user/configs/wayland/wob/default.nix
@@ -1,6 +1,5 @@
-{ lib, ... }:
-{
-  xdg.configFile."wob/wob.ini".text = lib.generators.toINIWithGlobalSection { } {
+{lib, ...}: {
+  xdg.configFile."wob/wob.ini".text = lib.generators.toINIWithGlobalSection {} {
     globalSection = {
       height = "40";
 
@@ -9,9 +8,7 @@
 
       background_color = "282828FF";
       bar_color = "665C54FF";
-
     };
-    sections = { };
+    sections = {};
   };
 }
-
diff --git a/user/configs/xdg-mime.nix b/user/configs/xdg-mime.nix
index 66b8703..9a85625 100755
--- a/user/configs/xdg-mime.nix
+++ b/user/configs/xdg-mime.nix
@@ -14,4 +14,3 @@
     };
   };
 }
-
diff --git a/user/home.nix b/user/home.nix
index 0a70ee6..c14e27f 100755
--- a/user/home.nix
+++ b/user/home.nix
@@ -1,5 +1,9 @@
-{ config, pkgs, inputs, ... }:
 {
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     ./configs/beets
     ./configs/cava
@@ -122,8 +126,8 @@
     };
 
     iconTheme = {
-     package = pkgs.gruvbox-plus-icon-pack;
-     name = "Gruvbox-Plus-Dark";
+      package = pkgs.gruvbox-plus-icon-pack;
+      name = "Gruvbox-Plus-Dark";
     };
 
     cursorTheme = {
@@ -158,7 +162,7 @@
 
     obs-studio = {
       enable = true;
-      plugins = [ pkgs.obs-studio-plugins.obs-vkcapture ];
+      plugins = [pkgs.obs-studio-plugins.obs-vkcapture];
     };
   };
 
@@ -169,7 +173,6 @@
     preset = "DT770";
   };
 
-
   xdg.userDirs = {
     enable = true;
     createDirectories = true;
@@ -180,4 +183,3 @@
 
   home.stateVersion = "23.05";
 }
-