diff --git a/core/packages.nix b/core/packages.nix index 6b463e2..5084032 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -25,11 +25,6 @@ udiskie ntfs3g xfsprogs -<<<<<<< HEAD - - ## compositor - waybar - swww ## terminal kitty @@ -40,17 +35,6 @@ cmatrix peaclock - ## tools - file - fd - bc - gcc - zip - tldr - wget - curl -======= - ## tools fd bc @@ -60,7 +44,6 @@ curl file zip ->>>>>>> origin/core-merge unzip gnupg blueman diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index a01e81f..8fb388e 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -38,6 +38,8 @@ wayland-utils wayland-protocols meson + waybar + swww ]; }