lock: update lockfile

hyprlock: uses profile picture for hyprlock
hyprlock: fix missing profile picture and user name set to full name
2024-10-17 13:18:51 +07:00 · 2024-10-17 12:45:26 +07:00 · 2024-10-17 12:37:14 +07:00 · 2024-10-17 12:00:18 +07:00
5 changed files with 84 additions and 64 deletions
--- a/flake.lock
+++ b/flake.lock
@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727261104,
-        "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
+        "lastModified": 1728902391,
+        "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
+        "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
        "type": "github"
      },
      "original": {
@ -137,11 +137,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728092656,
-        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
+        "lastModified": 1728778939,
+        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
+        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
        "type": "github"
      },
      "original": {
@ -253,11 +253,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727532803,
-        "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
+        "lastModified": 1728669738,
+        "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
+        "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
        "type": "github"
      },
      "original": {
@ -280,11 +280,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1728347028,
-        "narHash": "sha256-585URGuPrKCqx1qQoT56AWD3am0zbb9/dZ/OOq8/Lpw=",
+        "lastModified": 1729113795,
+        "narHash": "sha256-tV6aeQZ1wvAVDi+JW+IpXH9xQjZX+ZNFsuQCfWj2zWs=",
        "ref": "refs/heads/main",
-        "rev": "0d70c442538ba0d1efc63558c859c184367c95ad",
-        "revCount": 5306,
+        "rev": "b57086aa4362117c1f1025246f618d760e44b026",
+        "revCount": 5349,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@ -327,11 +327,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727451107,
-        "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
+        "lastModified": 1728345020,
+        "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
+        "rev": "a7c183800e74f337753de186522b9017a07a8cee",
        "type": "github"
      },
      "original": {
@ -356,11 +356,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725997860,
-        "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
+        "lastModified": 1728168612,
+        "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
+        "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
        "type": "github"
      },
      "original": {
@ -381,11 +381,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727300645,
-        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
+        "lastModified": 1728941256,
+        "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
+        "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
        "type": "github"
      },
      "original": {
@ -429,11 +429,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1728347393,
-        "narHash": "sha256-yNxM7SsGOOtr7wA45sJgDLSMYyTmJAPXN7YnhHyFvkY=",
+        "lastModified": 1729058155,
+        "narHash": "sha256-m/wgI/ZWERMrADlk/c2aF/MKIchBghWQ0YUkTqhgDwU=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "b94afbd252534154fbe970699d7eef7ba8189df3",
+        "rev": "97456a48c4784f34e6c7f2f1e5fbde7a145b866a",
        "type": "github"
      },
      "original": {
@ -445,11 +445,11 @@
    "neovim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1728343329,
-        "narHash": "sha256-rxYdIoJ8fsqboSvoa/RD4ATSIPtV5bdqKvrLAkraabk=",
+        "lastModified": 1729018221,
+        "narHash": "sha256-xwFqmvrzzymfE/6NE1g/E2TOOou23Ok08bzLeftfdow=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "60e1862ccba744c4252d30f043bb077c2c657427",
+        "rev": "82b02ae2f2af439a8c678ed6b55a43121055f279",
        "type": "github"
      },
      "original": {
@ -460,11 +460,11 @@
    },
    "nix-flatpak": {
      "locked": {
-        "lastModified": 1721549352,
-        "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=",
+        "lastModified": 1729025406,
+        "narHash": "sha256-uYbDN6JikC19WfD3zg0kpOpJVZFvBhHXYo3YJo28vOs=",
        "owner": "gmodena",
        "repo": "nix-flatpak",
-        "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b",
+        "rev": "8d1193a959c7810f01610c10a055b0020390bf4e",
        "type": "github"
      },
      "original": {
@ -480,11 +480,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728263287,
-        "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
+        "lastModified": 1728790083,
+        "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
+        "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
        "type": "github"
      },
      "original": {
@ -495,11 +495,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1727348695,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
        "type": "github"
      },
      "original": {
@ -543,11 +543,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1728888510,
+        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
        "type": "github"
      },
      "original": {
@ -558,11 +558,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1728249353,
-        "narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=",
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
        "type": "github"
      },
      "original": {
@ -574,11 +574,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1728193676,
-        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
+        "lastModified": 1728909085,
+        "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
+        "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
        "type": "github"
      },
      "original": {
@ -589,11 +589,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1728350885,
-        "narHash": "sha256-8VVNU8u33wxV+PbqKlXBZ0aqgx8G1yQe/WGryYGy1Ss=",
+        "lastModified": 1729143743,
+        "narHash": "sha256-NPrOu8Cb74kZGBMkdfZ5+Ao6Tuim5mDoSrLItaPBvuM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "eceef0c591ad6579bdaf313148aac60d655af486",
+        "rev": "3733ee7b40379119a163564143d6b8684daf36c9",
        "type": "github"
      },
      "original": {
@ -613,11 +613,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1728092656,
-        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
+        "lastModified": 1728778939,
+        "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
+        "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
        "type": "github"
      },
      "original": {
@ -648,11 +648,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728268235,
-        "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
+        "lastModified": 1729132166,
+        "narHash": "sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
+        "rev": "32d889f9b9fc65cb65aa2d5db282d60ed06f348e",
        "type": "github"
      },
      "original": {
@ -725,11 +725,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727524473,
-        "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
+        "lastModified": 1728166987,
+        "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
+        "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
        "type": "github"
      },
      "original": {
--- a/home/modules/hyprland/hyprlock.nix
+++ b/home/modules/hyprland/hyprlock.nix
@ -11,9 +11,14 @@ in
    home.file.".config/hypr/hyprlock.conf".text =
      let
        blurred_image = "${config.home.homeDirectory}/.cache/wallpaper/blurred.png";
+        profilePicture = "${config.home.homeDirectory}/.cache/wallpaper/square.png";
      in
        /*hyprlang*/
      ''
+        general {
+            ignore_empty_input = true
+        }
+
        background {
            monitor =
            path = ${blurred_image}
@ -30,7 +35,7 @@ in
            outer_color = rgb(151515)
            inner_color = rgb(FFFFFF)
            font_color = rgb(10, 10, 10)
-            fade_on_empty = true
+            fade_on_empty = false
            fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
            placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
            hide_input = false
@ -64,7 +69,7 @@ in

        label {
            monitor =
-            text = $USER
+            text = ${config.profile.user.fullName}
            color = rgba(200, 200, 200, 1.0)
            font_size = 20
            font_family = Fira Semibold
@ -77,7 +82,7 @@ in

        image {
            monitor =
-            path = $HOME/.cache/wallpaper/square_wallpaper.png
+            path = ${profilePicture}
            size = 280 # lesser side if not 1:1 ratio
            rounding = -1 # negative values mean circle
            border_size = 4
--- a/home/modules/hyprland/pyprland.nix
+++ b/home/modules/hyprland/pyprland.nix
@ -7,13 +7,15 @@ let
    image_file=$1
    target="${wallpaperDir}/current"
    blur_target="${wallpaperDir}/blurred.png"
+    square_target="${wallpaperDir}/square.png"

    mkdir -p "${wallpaperDir}"
    echo "$image_file" > "${wallpaperDir}/origin.txt"
    cp "$image_file" "$target"
    swww img "$target"
    ${unstable.wallust}/bin/wallust run "$target"
-    ${pkgs.imagemagick}/bin/gm convert -resize 75% -blur 50x30 "$target" "$blur_target"
+    ${pkgs.graphicsmagick}/bin/gm convert -resize 75% -blur 50x30 "$target" "$blur_target"
+    ${pkgs.imagemagick}/bin/magick "$target" -resize 25% -gravity Center -extent 1:1 "$square_target"
  '';
 in
 {
--- a/home/modules/hyprland/wallust.nix
+++ b/home/modules/hyprland/wallust.nix
@ -7,7 +7,8 @@ let
  initWallPaperScript = pkgs.writeShellScriptBin "init-wallpaper.sh" ''
    init_wallpaper="${./wallpaper.jpeg}"
    cache_file="${wallpaperDir}/current"
-    blurred="${wallpaperDir}/blurred"
+    blurred="${wallpaperDir}/blurred.png"
+    square="${wallpaperDir}/square.png"

    mkdir -p "${wallpaperDir}"

@ -16,7 +17,11 @@ let
    fi

    if [ ! -f "$blurred" ]; then
-        ${pkgs.imagemagick}/bin/gm convert -resize 75% -blur 50x30 "$cache_file" "$blurred"
+        ${pkgs.graphicsmagick}/bin/gm convert -resize 75% -blur 50x30 "$cache_file" "$blurred"
+    fi
+
+    if [ ! -f "$square" ]; then
+        ${pkgs.imagemagick}/bin/magick "$cache_file" -resize 25% -gravity Center -extent 1:1 "$square"
    fi

    if [ ! -f "${config.home.homeDirectory}/.cache/wallust/sequences" ]; then
--- a/home/modules/hyprland/waybar.nix
+++ b/home/modules/hyprland/waybar.nix
@ -110,6 +110,14 @@ let
      tooltip = false;
    };

+    "hyprland/window" = {
+      rewrite = {
+        "(.*) - Microsoft Edge$" = "   $1";
+        "(.*) - NVIM" = "   $1";
+        "^foot$" = "    Foot";
+      };
+    };
+
    "custom/notification" = {
      tooltip = false;
      format = "{icon}";
Author	SHA1	Message	Date
Tigor Hutasuhut	5069872bcf	lock: update lockfile	2024-10-17 13:18:51 +07:00
Tigor Hutasuhut	069e17918e	hyprlock: uses profile picture for hyprlock	2024-10-17 12:45:26 +07:00
Tigor Hutasuhut	54e7758c73	hyprlock: fix missing profile picture and user name set to full name	2024-10-17 12:37:14 +07:00
Tigor Hutasuhut	78c7c4a0bc	waybar: added rewrite rule for window titles	2024-10-17 12:00:18 +07:00