From 0c57d97b241e372f14ed2f809536ec7ff38b3e49 Mon Sep 17 00:00:00 2001
From: Jasper Ras <jaspert.ras@gmail.com>
Date: Sat, 15 Mar 2025 09:08:42 +0100
Subject: bunch of things

---
 flake.lock                        | Bin 26332 -> 26978 bytes
 flake.nix                         |  11 +++++++++--
 modules/home-manager/hyprland.nix |   5 +++--
 modules/hyprland.nix              |   2 +-
 modules/tarrel/home-manager.nix   |   4 +++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index d3ef2e4..4392aff 100644
Binary files a/flake.lock and b/flake.lock differ
diff --git a/flake.nix b/flake.nix
index 334e988..a51cbc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,8 +9,12 @@
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
     helix.url = "github:helix-editor/helix/master";
+
     home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager-unstable.url = "github:nix-community/home-manager";
+    home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
+
     hyprland.url = "github:hyprwm/Hyprland?submodules=1&ref=v0.45.2-b";
     hy3 = {
       url = "github:outfoxxed/hy3?ref=hl0.45.0";
@@ -22,6 +26,7 @@
 
     nil.url = "github:oxalica/nil";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
 
     update-systemd-resolved.url = "github:jonathanio/update-systemd-resolved";
@@ -33,8 +38,10 @@
     agenix,
     disko,
     home-manager,
+    home-manager-unstable,
     microvm,
     nixpkgs,
+    nixpkgs-unstable,
     nixos-facter-modules,
     update-systemd-resolved,
     ...
@@ -57,7 +64,7 @@
       ];
     };
 
-    nixosConfigurations.tarrel = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.tarrel = nixpkgs-unstable.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
       modules = [
@@ -66,7 +73,7 @@
             agenix.packages."x86_64-linux".default
           ];
         }
-        home-manager.nixosModules.home-manager
+        home-manager-unstable.nixosModules.home-manager
         agenix.nixosModules.default
 
         ./modules/tarrel
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index 77bb675..8a0baaf 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ lib, pkgs, inputs, ... }:
 let
   wallpaper = ../../assets/wallpaper.jpg;
 in
@@ -24,6 +24,7 @@ in
   services.wlsunset.sunset = "17:00";
 
   wayland.windowManager.hyprland.enable = true;
+  wayland.windowManager.hyprland.package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
   wayland.windowManager.hyprland.systemd.enable = true;
   wayland.windowManager.hyprland.plugins = [
     inputs.hy3.packages.x86_64-linux.hy3
@@ -138,7 +139,7 @@ in
     preload = [ "${wallpaper}" ];
     wallpaper = [ ",${wallpaper}" ];
   };
-  services.hypridle.enable = true;
+  services.hypridle.enable = lib.mkDefault true;
   services.hypridle.settings = {
     general = {
       lock_cmd = "pidof hyprlock || hyprlock";
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 3528ec8..080cb39 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -43,7 +43,7 @@
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.hyprland}/bin/Hyprland";
+          command = "${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/Hyprland";
           user = "jras";
         };
       };
diff --git a/modules/tarrel/home-manager.nix b/modules/tarrel/home-manager.nix
index e0c7e3f..04187e9 100644
--- a/modules/tarrel/home-manager.nix
+++ b/modules/tarrel/home-manager.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ lib, pkgs, inputs, ... }:
 {
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
@@ -19,6 +19,8 @@
       userEmail = "jaspert.ras@gmail.com";
     };
 
+    services.hypridle.enable = lib.mkForce false;
+
     home.file = {
       gamestream-start = {
         text = ''
-- 
cgit v1.2.3