fixed hyprlock and updated hyprpicker

3 files changed, 199 insertions, 18 deletions

diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock
index 8e3e4ed..ae044f1 100644
--- a/home-config/nix-home-manager/flake.lock
+++ b/home-config/nix-home-manager/flake.lock
@@ -153,6 +153,35 @@
         "type": "github"
       }
     },
+    "hyprgraphics_2": {
+      "inputs": {
+        "hyprutils": [
+          "hyprlock",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprlock",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprlock",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734906236,
+        "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
     "hyprland": {
       "inputs": {
         "aquamarine": "aquamarine",
@@ -268,26 +297,81 @@
         "type": "github"
       }
     },
-    "hyprpicker-git": {
+    "hyprlang_2": {
+      "inputs": {
+        "hyprutils": [
+          "hyprlock",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprlock",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprlock",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735393019,
+        "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprlock": {
       "inputs": {
+        "hyprgraphics": "hyprgraphics_2",
+        "hyprlang": "hyprlang_2",
         "hyprutils": "hyprutils_3",
         "hyprwayland-scanner": "hyprwayland-scanner_3",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1727705155,
-        "narHash": "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc=",
+        "lastModified": 1735497496,
+        "narHash": "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=",
+        "owner": "hyprwm",
+        "repo": "hyprlock",
+        "rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "ref": "v0.6.1",
+        "repo": "hyprlock",
+        "type": "github"
+      }
+    },
+    "hyprpicker-git": {
+      "inputs": {
+        "hyprutils": "hyprutils_4",
+        "hyprwayland-scanner": "hyprwayland-scanner_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1737129788,
+        "narHash": "sha256-CWmzXhsdk+c1d7Ub7TXQ2BVYla1HSJ9jbgOilbVl1so=",
         "owner": "hyprwm",
         "repo": "hyprpicker",
-        "rev": "116cec14a552191a9ad69ca96252ca12ecfa9826",
+        "rev": "0b044884d9298bb5fac164101eb880b499d8a5df",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.4.1",
+        "ref": "v0.4.2",
         "repo": "hyprpicker",
         "type": "github"
       }
@@ -346,6 +430,25 @@
     },
     "hyprutils_3": {
       "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1736164519,
+        "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "3c895da64b0eb19870142196fa48c07090b441c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprutils_4": {
+      "inputs": {
         "nixpkgs": [
           "hyprpicker-git",
           "nixpkgs"
@@ -424,6 +527,31 @@
     "hyprwayland-scanner_3": {
       "inputs": {
         "nixpkgs": [
+          "hyprlock",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprlock",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735493474,
+        "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner_4": {
+      "inputs": {
+        "nixpkgs": [
           "hyprpicker-git",
           "nixpkgs"
         ],
@@ -486,6 +614,22 @@
     },
     "nixpkgs_2": {
       "locked": {
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
         "lastModified": 1736012469,
         "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "nixos",
@@ -527,9 +671,10 @@
       "inputs": {
         "home-manager": "home-manager",
         "hyprland": "hyprland",
+        "hyprlock": "hyprlock",
         "hyprpicker-git": "hyprpicker-git",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "wpaperd": "wpaperd"
       }
     },
@@ -614,13 +759,43 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "wpaperd": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay",
-        "systems": "systems_4"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1731514601,
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index af0af94..9dd2bec 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -8,8 +8,12 @@
       url = "github:nix-community/home-manager/fc52a210b60f2f52c74eac41a8647c1573d2071d";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    hyprlock = {
+      url = "github:hyprwm/hyprlock/v0.6.1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     hyprpicker-git = {
-      url = "github:hyprwm/hyprpicker/v0.4.1";
+      url = "github:hyprwm/hyprpicker/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland = {
@@ -28,12 +32,11 @@
     #mozff.url = "github:mozilla/nixpkgs-mozilla";
   };
 
-  outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, wpaperd, ... }@inputs:
+  outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, wpaperd, hyprlock, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
       overlays = [
-        hyprpicker-git.overlays.default
         nixgl.overlay
         #mozff.overlays.firefox
       ];
@@ -51,6 +54,8 @@
               inherit hyprland;
               inherit nixgl;
               inherit wpaperd;
+              inherit hyprlock;
+              inherit hyprpicker-git;
             };
           }
         ];
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index 4c889c9..70fb4b1 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, hyprland, nixgl, wpaperd, ... }:
+{ config, pkgs, hyprland, nixgl, hyprpicker-git, wpaperd, hyprlock, ... }:
     let
         lock-false = {
             Value = false;
@@ -383,7 +383,7 @@
     waypaper
     gdu
     spotify-player
-    hyprpicker
+    #hyprpicker
     xwayland
     xdg-desktop-portal
     xdg-desktop-portal-gtk
@@ -399,17 +399,18 @@
     starship
 
     # Wrapped programs for some env variables
-    # (pkgs.writeScriptBin "hyprlock" ''
-    #   #! ${pkgs.bash}/bin/bash
-    #   export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD"
-    #   exec ${pkgs.hyprlock}/bin/hyprlock "$@"
-    # '')
+    (pkgs.writeScriptBin "hyprlock" ''
+      #! ${pkgs.bash}/bin/bash
+      export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD"
+      exec ${hyprlock.packages.${pkgs.system}.hyprlock}/bin/hyprlock "$@"
+    '')
 
     # Flakes specific things defined in flake.nix
     hyprland.packages.${pkgs.system}.default
     hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
     nixgl.packages.${pkgs.system}.nixGLIntel
     wpaperd.packages.${pkgs.system}.wpaperd
+    hyprpicker-git.packages.${pkgs.system}.hyprpicker
 
     # Fonts!
     noto-fonts