From 6f9977ea698a174fc8d7d62702cc05e9189f0845 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Thu, 7 Sep 2023 03:24:09 -0700
Subject: [PATCH] Various uncommitted changes

---
 modules/core/default.nix       | 3 +++
 modules/emacs/default.nix      | 3 ++-
 modules/hyprland/default.nix   | 1 +
 modules/hyprland/hyprland.conf | 2 ++
 modules/hyprland/session.sh    | 2 +-
 modules/system.nix             | 5 ++++-
 modules/user/dev-support.nix   | 1 +
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/core/default.nix b/modules/core/default.nix
index 7ff9cb7..ad7951b 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -29,18 +29,21 @@
     # this binds the nixpkgs registry to the one in `flake.nix`.
     registry = {
       nixpkgs.flake = inputs.nixpkgs;
+      stable.flake = inputs.stable;
     };
 
     # the nix path is used to discover channels for the old nix commands.
     # this binds the nix path to the channels following `flake.nix` declared below.
     nixPath = [
       "nixpkgs=/etc/nix/inputs/nixpkgs"
+      "stable=/etc/nix/inputs/stable"
     ];
   };
 
   # add entries for `nixPath` above.
   environment.etc = {
     "nix/inputs/nixpkgs".source = inputs.nixpkgs.outPath;
+    "nix/inputs/stable".source = inputs.stable.outPath;
   };
 
   # allow processes to request scheduling priority
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 4e841a8..7f38352 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -41,7 +41,7 @@
 
   custom-emacs =
     with newpkgs;
-    ((emacsPackagesFor (emacs-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [
+    ((emacsPackagesFor (emacs29-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [
       avy
       better-jumper
       company
@@ -56,6 +56,7 @@
       flycheck
       frames-only-mode
       fussy
+      groovy-mode
       just-mode
       kotlin-mode
       lsp-mode
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 79b7aa4..ba0f635 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -2,6 +2,7 @@
   inherit (inputs) hyprland hyprpaper hyprland-hy3;
 
   wrapper = pkgs.writeShellScriptBin "hyprland" ''
+    ${impurity.link ./session.sh}
     ${config.hyprland-session.prerun}
     ${hyprland.packages.${system}.default}/bin/Hyprland $@
   '';
diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf
index 0852ca4..a2be32d 100644
--- a/modules/hyprland/hyprland.conf
+++ b/modules/hyprland/hyprland.conf
@@ -1,3 +1,5 @@
+exec = systemctl start --user emacs.service && emacsclient -e "(setenv \"HYPRLAND_INSTANCE_SIGNATURE\" \"$HYPRLAND_INSTANCE_SIGNATURE\")"
+
 general {
     gaps_in = 3
     gaps_out = 5
diff --git a/modules/hyprland/session.sh b/modules/hyprland/session.sh
index a048c6f..377765a 100644
--- a/modules/hyprland/session.sh
+++ b/modules/hyprland/session.sh
@@ -34,4 +34,4 @@ dbus-update-activation-environment --systemd MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE
 # QT_PLUGIN_PATH=<qt5ct>/lib/qt-ver/plugins + breeze will correctly set the theme.
 # HOWEVER it won't find thumbnailers. For now the easiest way to deal with this, though definitely not
 # the right one, is to just throw $PATH into dbus.
-@dbusenv@ --systemd PATH
+dbus-update-activation-environment --systemd PATH
diff --git a/modules/system.nix b/modules/system.nix
index 0fa237b..78240e8 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ lib, pkgs, config, ... }: {
   imports = [
     ./core
     ./theme
@@ -43,4 +43,7 @@
 
   # removable disks in file manager
   services.udisks2.enable = true;
+
+  programs.adb.enable = true;
+  users.users.${config.main-user}.extraGroups = [ "adbusers" ];
 }
diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix
index f191b39..bccdef8 100644
--- a/modules/user/dev-support.nix
+++ b/modules/user/dev-support.nix
@@ -3,6 +3,7 @@
     rust-analyzer
     clang-tools_16
     jdt-language-server
+    kotlin-language-server
 
     bear
     gdb