From bfe1d11f29b105c27406d68671f316448d642e21 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Mon, 16 May 2022 00:54:46 -0400
Subject: [PATCH] Add java to emacs

---
 doom.d/init.el   |  1 +
 modules/sway.nix | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doom.d/init.el b/doom.d/init.el
index 742525a..39ef38c 100644
--- a/doom.d/init.el
+++ b/doom.d/init.el
@@ -88,6 +88,7 @@
        (sh +fish)                ; she sells {ba,z,fi}sh shells on the C xor
        yaml             ; JSON, but readable
        (kotlin +lsp)
+       (java +lsp +meghanada)
        :email
        ;;(mu4e +org +gmail)
        ;;notmuch
diff --git a/modules/sway.nix b/modules/sway.nix
index 093e6fe..2c9605c 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -120,7 +120,11 @@
           # Use krunner (from kde) as our launcher
           menu = "albert show";
           # Use waybar, but through systemd
-          bars = [ ];
+          bars = [
+            {
+              command = "waybar";
+            }
+          ];
           # Use fira code
           fonts = {
             names = [ "Fira Code Nerd Font" ];
@@ -195,11 +199,6 @@
       programs.waybar = {
         enable = true;
         package = unstable.waybar;
-        # Enable systemd configuration
-        systemd = {
-          enable = true;
-          target = "sway-session.target";
-        };
       };
     };
 }