Update emacs for non-wayland systems

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

flake.lock

@@ -3,22 +3,18 @@
     "aquamarine": {
       "inputs": {
         "hyprutils": [
-          "system-flake",
           "hyprland",
           "hyprutils"
         ],
         "hyprwayland-scanner": [
-          "system-flake",
           "hyprland",
           "hyprwayland-scanner"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -57,31 +53,9 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "system-flake",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hy3": {
       "inputs": {
         "hyprland": [
-          "system-flake",
           "hyprland"
         ]
       },
@@ -103,17 +77,14 @@
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
-          "system-flake",
           "hyprland",
           "hyprlang"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -139,14 +110,13 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
         "lastModified": 1723058230,
         "narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=",
-        "ref": "refs/heads/main",
         "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
         "revCount": 5069,
         "submodules": true,
@@ -163,13 +133,11 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "xdph",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "xdph",
           "systems"
@@ -192,17 +160,14 @@
     "hyprlang": {
       "inputs": {
         "hyprutils": [
-          "system-flake",
           "hyprland",
           "hyprutils"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -224,12 +189,10 @@
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -251,12 +214,10 @@
     "hyprwayland-scanner": {
       "inputs": {
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -276,22 +237,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1722185531,
         "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
@@ -307,7 +252,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1723637854,
         "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
@@ -326,28 +271,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "system-flake": "system-flake"
-      }
-    },
-    "system-flake": {
-      "inputs": {
-        "home-manager": "home-manager_2",
         "hy3": "hy3",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "dirtyRev": "c11d973b4b80e9093469c2d631413400af2d0122-dirty",
-        "dirtyShortRev": "c11d973-dirty",
-        "lastModified": 1724450819,
-        "narHash": "sha256-m9w2HgDUvtXegSjuIPE3whTYOPnyEZuAdIRZLMtGQBc=",
-        "type": "git",
-        "url": "file:///etc/nixos"
-      },
-      "original": {
-        "type": "git",
-        "url": "file:///etc/nixos"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -369,17 +295,14 @@
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": [
-          "system-flake",
           "hyprland",
           "hyprlang"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]

flake.nix

@@ -10,13 +10,19 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    system-flake = {
+    hyprland = {
       type = "git";
-      url = "file:///etc/nixos";
+      url = "https://github.com/hyprwm/Hyprland";
+      submodules = true;
+      rev = "9a09eac79b85c846e3a865a9078a3f8ff65a9259";
+    };
+    hy3 = {
+      url = "github:outfoxxed/hy3?ref=hl0.42.0";
+      inputs.hyprland.follows = "hyprland";
     };
   };
 
-  outputs = { nixpkgs, home-manager, ... } @inputs :
+  outputs = { nixpkgs, home-manager, hyprland, ... } @inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
@@ -27,17 +33,14 @@
         # Specify your home configuration modules here, for example,
         # the path to your home.nix.
         modules = [
-          inputs.system-flake.inputs.hyprland.homeManagerModules.default
+          hyprland.homeManagerModules.default
 
           ./home.nix
         ];
 
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
-        extraSpecialArgs = {
-          hy3 = inputs.system-flake.inputs.hy3;
-          hyprland = inputs.system-flake.inputs.hyprland;
-        };
+        extraSpecialArgs = { inherit inputs; };
       };
     };
 }

home-default.nix

@@ -51,11 +51,13 @@ 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
@@ -108,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;
@@ -185,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/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 = [ hy3.packages.x86_64-linux.hy3 ];
+    plugins = [ inputs.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 = ",preferred,3440x1440@164.90Hz,1.33333";
+  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";
+    };
+  };
+}