diff --git a/.gitignore b/.gitignore
index ac4c66b..806412a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
!machines/enka/discord/
!machines/enka/docker/
!machines/enka/dunst/
+!machines/enka/eww/
!machines/enka/firefox/
!machines/enka/fuzzel/
!machines/enka/git/
@@ -23,7 +24,6 @@
!machines/enka/python/
!machines/enka/steam/
!machines/enka/steck/
-!machines/enka/waybar/
!themes/
diff --git a/machines/enka/default.nix b/machines/enka/default.nix
index 919956d..b1ddc53 100644
--- a/machines/enka/default.nix
+++ b/machines/enka/default.nix
@@ -21,6 +21,7 @@
./discord
./docker
./dunst
+ ./eww
./firefox
./fuzzel
./git
@@ -37,7 +38,6 @@
./python
./steam
./steck
- ./waybar
./fonts.nix
./localisation.nix
diff --git a/machines/enka/eww/default.nix b/machines/enka/eww/default.nix
new file mode 100644
index 0000000..a148204
--- /dev/null
+++ b/machines/enka/eww/default.nix
@@ -0,0 +1,7 @@
+{ homeConfiguration, enabled, ... }:
+
+homeConfiguration "nixos" {
+ programs.eww = enabled {
+ configDir = ./.;
+ };
+}
diff --git a/machines/enka/greetd/default.nix b/machines/enka/greetd/default.nix
index ff92f45..f92a6b6 100644
--- a/machines/enka/greetd/default.nix
+++ b/machines/enka/greetd/default.nix
@@ -19,8 +19,6 @@ let
workspace = 1, default: true, gapsout: 0, gapsin: 0, border: false, decorate: false
- exec-once = systemctl --user stop waybar.service
-
exec-once = [workspace 1; fullscreen; noanim] ${pkgs.greetd.gtkgreet}/bin/gtkgreet --layer-shell --command Hyprland; ${hyprlandBin}}/bin/hyprctl dispatch exit
exec-once = ${hyprlandBin}/bin/hyprctl dispatch focuswindow gtkgreet
diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index 784ee9f..7859471 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -90,8 +90,6 @@
bind = SUPER, D, exec, discord
bind = SUPER, C, exec, hyprpicker --autocopy
- bind = SUPER, B, exec, pkill --signal SIGUSR1 waybar
-
bind = SUPER, SPACE, exec, pkill fuzzel; fuzzel
bind = SUPER, V, exec, pkill fuzzel; cliphist list | fuzzel --dmenu | cliphist decode | wl-copy
diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix
deleted file mode 100644
index 4ac685b..0000000
--- a/machines/enka/waybar/default.nix
+++ /dev/null
@@ -1,157 +0,0 @@
-{ upkgs, homeConfiguration, enabled, ... }:
-
-homeConfiguration "nixos" {
- programs.waybar = enabled {
- systemd = enabled {};
-
- settings = [{
- layer = "top";
- height = 30;
-
- margin-right = 10;
- margin-left = 10;
- margin-top = 10;
-
- modules-left = [
- "hyprland/workspaces"
- ];
-
- "hyprland/workspaces" = {
- format = "{icon}";
- format-icons.default = "";
- format-icons.active = "";
-
- persistent-workspaces."*" = 5;
- };
-
- modules-center = [
- "hyprland/window"
- ];
-
- "hyprland/window" = {
- seperate-outputs = true;
-
- rewrite."(.*) - Discord" = " $1";
- rewrite."(.*) — Mozilla Firefox" = " $1";
- rewrite."(.*) — nu" = " $1";
- };
-
- modules-right = [
- "tray"
- "pulseaudio"
- "backlight"
- "cpu"
- "memory"
- "network"
- "battery"
- "clock"
- ];
-
- pulseaudio = {
- format = "{format_source} {icon} {volume}%";
- format-bluetooth = "{format_source} {icon} {volume}%";
- format-bluetooth-muted = "{format_source} {icon}";
- format-muted = "{format_source} ";
- format-source = "";
- format-source-muted = "";
-
- format-icons.headphone = "";
- format-icons.headset = "";
- format-icons.default = [
- ""
- ""
- ""
- ];
- };
-
- backlight = {
- format = "{icon} {percent}%";
- format-icons = [
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ];
- };
-
- cpu.format = " {usage}%";
- memory.format = " {}%";
-
- network = {
- format-disconnected = "";
- format-ethernet = " {ipaddr}/{cidr}";
- format-linked = " {ifname} (No IP)";
- format-wifi = "{essid} {signalStrength}%";
- };
-
- battery = {
- format = "{icon} {capacity}%";
- format-charging = " {capacity}%";
- format-plugged = " {capacity}%";
-
- format-icons = [
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ];
-
- states.warning = 30;
- states.critical = 15;
- };
-
- clock = {
- tooltip-format = "{:%Y %B}\n{calendar}";
- };
- }];
-
- style = with upkgs.theme.withHashtag; ''
- * {
- border: none;
- border-radius: 0;
- font-family: "OpenSans";
- }
-
- #waybar {
- background: ${base00};
- color: ${base05};
- }
-
- #waybar:hover {
- border: 3px;
- border-color: ${base0A};
- }
-
- #workspace-1 {
- color: ${base08};
- }
-
- #workspace-2 {
- color: ${base09};
- }
-
- #workspace-3 {
- color: ${base0A};
- }
-
- #workspace-4 {
- color: ${base0B};
- }
-
- #workspace-5 {
- color: ${base0C};
- }
- '';
- };
-}