From e61a8f1d65dac86f23527ad3431371d33a36bf8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Thu, 29 Feb 2024 10:17:13 +0100
Subject: [PATCH] Update and add hyperpapr

---
 flake.lock                   | 6 +++---
 home/default.nix             | 6 +++---
 home/hyprland/hyprland.nix   | 2 +-
 home/hyprland/hyprpaper.conf | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index db6e3a8..ebe0edc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708984720,
-        "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
+        "lastModified": 1709150264,
+        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
+        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index 5165218..cc6b4a3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,10 +1,10 @@
-{ inputs, self, user, ... }: {
+{ pkgs, inputs, self, user, ... }: {
   imports = [ inputs.home-manager.nixosModules.home-manager ];
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    extraSpecialArgs = { inherit inputs user; };
-    users.${user} = {
+    extraSpecialArgs = { inherit pkgs inputs user; };
+    users.${user} = { pkgs, ... }: {
       imports = [
         ./editor/neovim
         ./programs/firefox
diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix
index 7e372c8..38941b7 100644
--- a/home/hyprland/hyprland.nix
+++ b/home/hyprland/hyprland.nix
@@ -1,7 +1,7 @@
 { inputs, pkgs, lib, config, ... }: {
   options.hyprland.enable = lib.mkEnableOption "Hyprland";
   config = {
-    home.packages = with pkgs; [ swww wl-clipboard cliphist hyprpaper ];
+    home.packages = with pkgs; [ swww wl-clipboard cliphist hyprpaper hyprlock ];
 
     wayland.windowManager.hyprland = {
       enable = true;
diff --git a/home/hyprland/hyprpaper.conf b/home/hyprland/hyprpaper.conf
index da82015..77dc0e3 100644
--- a/home/hyprland/hyprpaper.conf
+++ b/home/hyprland/hyprpaper.conf
@@ -1,2 +1,3 @@
-preload = ~/pics/wallpaper/1.jpg
-wallpaper = eDP-1,~/pics/wallpaper/1.jpg
+preload = ~/pics/wallpapers/1.jpg
+wallpaper = eDP-1,~/pics/wallpapers/1.jpg
+splash = false