From c7a3d1d0b1790ca0b52ba8d7b4c02089a8489378 Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Mon, 1 Jul 2024 04:11:39 -0400
Subject: [PATCH] x11 for display manger

---
 flake.lock                                    |  6 ++--
 home-manager/_mixins/console/neovim/init.lua  | 11 +++++-
 home-manager/_mixins/desktop/alacritty.nix    |  2 +-
 home-manager/_mixins/desktop/gnome-shell.nix  |  4 +++
 .../_mixins/users/gburd/hosts/floki.nix       | 35 ++++++++++---------
 nixos/_mixins/desktop/gnome.nix               |  2 +-
 6 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 home-manager/_mixins/desktop/gnome-shell.nix

diff --git a/flake.lock b/flake.lock
index 08a9e46..ff531a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1081,11 +1081,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1718437845,
-        "narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
+        "lastModified": 1719145550,
+        "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
+        "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/_mixins/console/neovim/init.lua b/home-manager/_mixins/console/neovim/init.lua
index a911e4c..d8d05ae 100644
--- a/home-manager/_mixins/console/neovim/init.lua
+++ b/home-manager/_mixins/console/neovim/init.lua
@@ -255,6 +255,7 @@ require('lazy').setup({
 
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
+      'simrat39/rust-tools.nvim',
     },
   },
 
@@ -673,7 +674,15 @@ require('lazy').setup({
       --    :Mason
       --
       --  You can press `g?` for help in this menu.
-      require('mason').setup()
+      require('mason').setup({
+          ui = {
+              icons = {
+                  package_installed = "",
+                  package_pending = "",
+                  package_uninstalled = "",
+              },
+          }
+      })
 
       -- You can add other tools here that you want Mason to install
       -- for you, so that they are available from within Neovim.
diff --git a/home-manager/_mixins/desktop/alacritty.nix b/home-manager/_mixins/desktop/alacritty.nix
index 9795f2f..c9c63e3 100644
--- a/home-manager/_mixins/desktop/alacritty.nix
+++ b/home-manager/_mixins/desktop/alacritty.nix
@@ -1,4 +1,4 @@
 { pkgs, ... }:
 {
-  home.packages = [ pkgs.alacritty ];
+  home.packages = [ pkgs.alacritty pkgs.alacritty-theme pkgs.gnomeExtensions.toggle-alacritty ];
 }
diff --git a/home-manager/_mixins/desktop/gnome-shell.nix b/home-manager/_mixins/desktop/gnome-shell.nix
new file mode 100644
index 0000000..329ecdc
--- /dev/null
+++ b/home-manager/_mixins/desktop/gnome-shell.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.gnome-shell ];
+}
diff --git a/home-manager/_mixins/users/gburd/hosts/floki.nix b/home-manager/_mixins/users/gburd/hosts/floki.nix
index a7f4750..e6234d5 100644
--- a/home-manager/_mixins/users/gburd/hosts/floki.nix
+++ b/home-manager/_mixins/users/gburd/hosts/floki.nix
@@ -71,33 +71,36 @@ with lib.hm.gvariant;
       # TODO: Move some of these into ../../../desktop/<app>.nix files
       _1password
       _1password-gui
-      cfssl
-      gnumake
-      cmake
       autoconf
-      libtool
-      m4
-      perl
-      pkg-config
-      python3
+      cfssl
+      cmake
+      dig
+      elixir
+      emacs
+      erlang
+      file
       gcc
       gdb
-      dig
-      emacs
-      file
+      gnumake
       htop
+      libtool
+      lsof
+      luajitPackages.luarocks
+      m4
       openssl
+      perl
+      pkg-config
       plocate
+      python3
+      rebar3
       ripgrep
       tig
       tree
-      lsof
+      tree-sitter
+      unstable.element-desktop
       unstable.flyctl
       unstable.minio-client
-      unstable.element-desktop
-      erlang
-      rebar3
-      elixir
+      xclip
     ];
 
     # http://rski.github.io/2021/09/05/nix-debugging.html
diff --git a/nixos/_mixins/desktop/gnome.nix b/nixos/_mixins/desktop/gnome.nix
index 24e62e7..ecf6199 100644
--- a/nixos/_mixins/desktop/gnome.nix
+++ b/nixos/_mixins/desktop/gnome.nix
@@ -14,7 +14,7 @@
   services.xserver.displayManager.gdm.enable = true;
 
   # TODO: Disable Wayland (issues with Electron app rendering)?
-  services.xserver.displayManager.gdm.wayland = true;
+  services.xserver.displayManager.gdm.wayland = false;
 
   # Enable udev rules
   services.udev.packages = with pkgs.unstable; [ gnome.gnome-settings-daemon ];