Update emacs for non-wayland systems

Even though I'm kind of giving up on nvidia+wayland emotionally right now

flake.nix

@@ -22,7 +22,7 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, hyprland, hy3, ... }:
+  outputs = { nixpkgs, home-manager, hyprland, ... } @inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
@@ -40,7 +40,7 @@
 
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
-        extraSpecialArgs = { inherit hy3; inherit hyprland; };
+        extraSpecialArgs = { inherit inputs; };
       };
     };
 }

home-default.nix

@@ -3,7 +3,6 @@
 with import <nixpkgs> {};
 let
   nextcloudTalkDesktop = pkgs.callPackage ./modules/applications/nextcloud-talk-desktop/package.nix {};
-  dodo = pkgs.callPackage ./modules/applications/networking/mailreaders/dodo/default.nix {};
 in
 {
   # Home Manager needs a bit of information about you and the paths it should
@@ -52,17 +51,18 @@ in
     pkgs.killall
     pkgs.kitty
     pkgs.less
+    pkgs.moonlight-qt
     pkgs.ncdu
     pkgs.pandoc
     pkgs.pinentry-qt
     #pkgs.pytest
     pkgs.shellcheck
+    pkgs.solaar # Logitech management software
     pkgs.tmux
     pkgs.waybar
     pkgs.wofi
     pkgs.vlc
 
-    dodo
     nextcloudTalkDesktop
   ];
 
@@ -110,6 +110,7 @@ in
     ./modules/applications/emacs/default.nix
     ./modules/games/lutris/default.nix
     ./modules/window_managers/hyprland/default.nix
+    ./modules/window_managers/i3/default.nix
   ];
 
   programs.bash.enable = true;
@@ -187,6 +188,7 @@ in
   services.kdeconnect = {
     enable = true;
     indicator = true;
+    package = pkgs.kdePackages.kdeconnect-kde;
   };
 
   services.spotifyd = {

modules/applications/emacs/default.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  emacs = pkgs.emacs29-pgtk;
+  emacs = pkgs.emacs29;
   doomSync = (let
     git = pkgs.git;
   in ''

modules/applications/networking/mailreaders/dodo/default.nix

@@ -1,41 +0,0 @@
-{ pkgs
-, lib
-, python3
-, makeWrapper
-, notmuch
-, w3m
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "dodo";
-  version = "unstable-2024-07-04";
-  format = "pyproject";
-
-  src = pkgs.fetchFromGitHub {
-    repo = pname;
-    owner = "akissinger";
-    rev = "503763c4d738af79ee0d761c47920e9a7b61855a";
-    sha256 = "sha256-Am1sFMRDlSNmVSQyuHtQj9weB90AT4d1dhnhsUlA6Zs=";
-  };
-
-  nativeBuildInputs = with python3.pkgs; [ setuptools-scm makeWrapper ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    bleach
-    pyqt6
-    pyqt6-sip
-    pyqt6-webengine
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/dodo --prefix PATH ":" \
-      ${lib.makeBinPath [ notmuch w3m ]}
-  '';
-
-  meta = with lib; {
-    description = "A graphical, hackable email client based on notmuch";
-    homepage = "https://github.com/akissinger/dodo";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ matthiasbeyer ];
-  };
-}

modules/window_managers/hyprland/default.nix

@@ -1,4 +1,4 @@
-{ hyprland, hy3, ... }:
+{ inputs, ... }:
 
 {
   imports = [
@@ -7,8 +7,7 @@
 
   wayland.windowManager.hyprland = {
     enable = true;
-    package = hyprland.packages.x86_64-linux.hyprland;
+    plugins = [ inputs.hy3.packages.x86_64-linux.hy3 ];
-    plugins = [ hy3.packages.x86_64-linux.hy3 ];
     settings = {
       "$mod" = "SUPER";
       "$terminal" = "kitty";
@@ -20,11 +19,6 @@
         "dunst"
       ];
 
-      env = [
-        "XCURSOR_SIZE,24"
-        "HYPRCURSOR_SIZE,24"
-      ];
-
       xwayland = {
         force_zero_scaling = true;
       };

modules/window_managers/hyprland/z790prors.nix

@@ -1,5 +1,16 @@
 { config, lib, pkgs, ... }:
 
 {
-  wayland.windowManager.hyprland.settings.monitor = "DP-1,3440x1440@164.90,0x0,1.33333,vrr,1,bitdepth,10";
+  wayland.windowManager.hyprland.settings.monitor = "DP-1,3440x1440@164.90,0x0,1.33333,vrr,1";
+  wayland.windowManager.hyprland.settings.env = [
+    "LIBVA_DRIVER_NAME,nvidia"
+    "XDG_SESSION_TYPE,wayland"
+    "GBM_BACKEND,nvidia-drm"
+    "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+    "NVD_BACKEND,direct"
+    "ELECTRON_OZONE_PLATFORM_HINT,auto"
+    "NIXOS_OZONE_WL,1"
+  ];
+
+  wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true;
 }

modules/window_managers/i3/default.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  xsession.windowManager.i3 = {
+    enable = true;
+    config = {
+      modifier = "Mod4";
+    };
+  };
+}