From b5da18c992e1782e44ddfe5d10304b55cef33b00 Mon Sep 17 00:00:00 2001
From: Gabriella Bere <contact@gabbie.blue>
Date: Fri, 20 Dec 2024 17:57:37 +0000
Subject: [PATCH] fixed hyprlock and updated stablepkgs to 24.11 for some
 reason im having issues with startup, where i have to switch TTY and then
 wait ages for waybar to show up. on the first tty i dont have keybinds to
 start programs, but on the second tty i dont have my wallpaper set properly

---
 flake.lock                | 8 ++++----
 flake.nix                 | 6 +++---
 home-manager/hyprlock.nix | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 546a7e8..dbb50b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -820,16 +820,16 @@
     },
     "stablepkgs": {
       "locked": {
-        "lastModified": 1734529975,
-        "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
+        "lastModified": 1734323986,
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 8893e2a..3bf849d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,9 @@
   description = "main system and home configuration flake";
 
   inputs = {
-    # NixOS official package source, using the nixos-24.05 branch as stable and nixos-unstable as default
+    # NixOS official package source, using the nixos-24.11 branch as stable and nixos-unstable as default
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    stablepkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    stablepkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
 
     # Home manager using nixos-unstable
     home-manager = {
@@ -100,7 +100,7 @@
         modules = [
           ./home-manager/home.nix
           #        ./home-manager/librewolf.nix
-          inputs.flatpaks.homeManagerModules.default
+          inputs.flatpaks.homeManagerModules.declarative-flatpak
           inputs.nixvim.homeManagerModules.default
           inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
         ];
diff --git a/home-manager/hyprlock.nix b/home-manager/hyprlock.nix
index 7803cfb..f25c29a 100644
--- a/home-manager/hyprlock.nix
+++ b/home-manager/hyprlock.nix
@@ -1,4 +1,4 @@
-{pkgs, ... }: {
+{pkgs, lib, ... }: {
   programs.hyprlock = {
     enable = true;
     settings = {
@@ -9,7 +9,7 @@
         no_fade_in = false;
       };
 
-      background = [
+      background = lib.mkForce [
         {
           path = "screenshot";
           blur_passes = 3;
@@ -17,7 +17,7 @@
         }
       ];
 
-      input-field = [
+      input-field = lib.mkForce [
         {
           size = "200, 50";
           position = "0, -80";