From 6d1e0348b1d411bfc2f0b39bcc4b5e9178898af5 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Wed, 20 Apr 2022 10:54:40 +0200
Subject: [PATCH] Disable gtk

---
 eww-bar/.config/eww-bar/eww.scss                | 1 +
 nixpkgs/.config/nixpkgs/modules/desktop.nix     | 4 ++--
 nixpkgs/.config/nixpkgs/modules/desktop/gtk.nix | 3 ++-
 nvim/.config/nvim/fnl/dots/plugins.fnl          | 7 +++++--
 nvim/.config/nvim/fnl/dots/plugins/lsp.fnl      | 5 ++++-
 xmonad/.xmonad/lib/Config.hs                    | 2 ++
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/eww-bar/.config/eww-bar/eww.scss b/eww-bar/.config/eww-bar/eww.scss
index 29be4c1..aceec39 100644
--- a/eww-bar/.config/eww-bar/eww.scss
+++ b/eww-bar/.config/eww-bar/eww.scss
@@ -5,6 +5,7 @@
 window {
   background: #282828;
   color: #ebdbb2;
+  font-size: 14px;
 
   & > * {
     margin: 3px;
diff --git a/nixpkgs/.config/nixpkgs/modules/desktop.nix b/nixpkgs/.config/nixpkgs/modules/desktop.nix
index 46e40a1..193a0d0 100644
--- a/nixpkgs/.config/nixpkgs/modules/desktop.nix
+++ b/nixpkgs/.config/nixpkgs/modules/desktop.nix
@@ -39,7 +39,7 @@ in
 
 
     elkowar.desktop = {
-      gtk.enable = true;
+      gtk.enable = false;
     };
 
     elkowar.programs = {
@@ -106,7 +106,7 @@ in
       "Xft.antialias" = "1";
       "Xft.hinting" = "true";
       "Xft.hintstyle" = "hintslight";
-      "Xft.dpi" = "110";
+      "Xft.dpi" = "96";
       "Xft.rgba" = "rgb";
       "Xft.lcdfilter" = "lcddefault";
 
diff --git a/nixpkgs/.config/nixpkgs/modules/desktop/gtk.nix b/nixpkgs/.config/nixpkgs/modules/desktop/gtk.nix
index 52cfb52..d6a1081 100644
--- a/nixpkgs/.config/nixpkgs/modules/desktop/gtk.nix
+++ b/nixpkgs/.config/nixpkgs/modules/desktop/gtk.nix
@@ -10,7 +10,8 @@ in
   config = lib.mkIf cfg.enable {
     gtk = {
       enable = true;
-      theme.name = "elkowars_phocus";
+      #theme.name = "elkowars_phocus";
+      theme.name = "gruvbox-phocus";
       iconTheme.name = "oomox-materia-dark";
       #iconTheme.name = "Numix";
       #font.name = "Terminus (TTF) 12";
diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl
index 3315753..db7430b 100644
--- a/nvim/.config/nvim/fnl/dots/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins.fnl
@@ -121,8 +121,11 @@
   :ray-x/lsp_signature.nvim {:events [:BufEnter]}
   :weilbith/nvim-code-action-menu {}
   
-  :folke/lsp-trouble.nvim {:opt false :config #(require "dots.plugins.trouble")
-                           :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
+  ;:folke/trouble.nvim {:opt false}
+  :elkowar/trouble.nvim {:branch "fix_error_on_nil_window"
+                         :opt false
+                         :config #(require "dots.plugins.trouble")
+                         :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
   
   :simrat39/symbols-outline.nvim {:opt false :config #(require "dots.plugins.symbols-outline")}
   
diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
index 07abbbc..79f6d09 100644
--- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
+++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl
@@ -115,7 +115,10 @@
                              :autoSetHints false}
                      :dap {:adapter (rust-tools-dap.get_codelldb_adapter codelldb-path liblldb-path)}
                      :server {:on_attach on_attach
-                              :capabilities default-capabilities}}))
+                              :capabilities default-capabilities
+                              :settings {:rust-analyzer {:cargo {:loadOutDirsFromCheck true}
+                                                         :procMacro {:enable true}}}}}))
+                              
                               ;:cmd ["/home/leon/coding/prs/rust-analyzer/target/release/rust-analyzer"]}}))
 
 (let [sumneko_root_path (.. vim.env.HOME "/.local/share/lua-language-server")
diff --git a/xmonad/.xmonad/lib/Config.hs b/xmonad/.xmonad/lib/Config.hs
index 9529e1a..f4e06c3 100644
--- a/xmonad/.xmonad/lib/Config.hs
+++ b/xmonad/.xmonad/lib/Config.hs
@@ -264,6 +264,8 @@ myStartupHook = do
   spawnOnce "mailnag"
   spawn "flashfocus"
   spawnOnce "dunst"
+  -- This supposedly fixes slow startup of gtk applications???
+  spawn "dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY"
   for_ ["led1", "led2"] $ \led -> safeSpawn "sudo" ["liquidctl", "set", led, "color", "fixed", "00ffff"]
   setGtkFrameExtents