diff --git a/flake.lock b/flake.lock index db5fc8f1..5fab329b 100644 --- a/flake.lock +++ b/flake.lock @@ -99,6 +99,7 @@ "chaotic": { "inputs": { "compare-to": "compare-to", + "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", @@ -107,12 +108,12 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1722771754, - "narHash": "sha256-NXE43sBXHB5kto5dSH9afFUxug7W8bBZg75UHbydX5E=", - "rev": "69263a943d93c7af4429924ef66f3f64e5555089", - "revCount": 1315, + "lastModified": 1723121942, + "narHash": "sha256-OfowhlEBPCNcaw1RaC9AuW8bc2Ee2NMngjU8dOljtoU=", + "rev": "d266429873c2a75c25eb629448d64387c7e1af22", + "revCount": 1327, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1315%2Brev-69263a943d93c7af4429924ef66f3f64e5555089/01911d53-f72d-75af-b463-5fd00a9507df/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1327%2Brev-d266429873c2a75c25eb629448d64387c7e1af22/0191321e-6860-744d-b2b8-25e37a49b607/source.tar.gz" }, "original": { "type": "tarball", @@ -197,6 +198,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1723098624, + "narHash": "sha256-TFg+lq7pHgCnsB4nRmMeTxSnZXHvzYJ2IHyEiw8zEF8=", + "owner": "nix-community", + "repo": "fenix", + "rev": "d6022ac563f2f48d8eeff89ca3589c8adc5235f6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "firefox-nightly": { "inputs": { "cachix": "cachix", @@ -208,11 +231,11 @@ ] }, "locked": { - "lastModified": 1722860994, - "narHash": "sha256-k2IT4qXy3E/mB2yPtWcj981knzLkM5pg+QhpbAB3XtE=", + "lastModified": 1723120141, + "narHash": "sha256-Fdr2l2eWB3mg3IUMvKyGSaKS3ekEcl+o+Ss3zHAayQs=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "f31f964e8c20dccda2095ff073a0afc06b34a52d", + "rev": "236cc595c1b3010be5df3b087770d2f4b51b831c", "type": "github" }, "original": { @@ -451,11 +474,11 @@ ] }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1722857853, + "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", "type": "github" }, "original": { @@ -530,11 +553,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -551,11 +574,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -626,11 +649,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722800434, - "narHash": "sha256-0lvzOT3dQWlQ+zyOAhKTxFd9BWZw380ILDNpoGdtekA=", + "lastModified": 1723110881, + "narHash": "sha256-VqQuxeai86PP/Vh1r6AqOi2pPllqBi68HVJKEk72Z0E=", "ref": "refs/heads/main", - "rev": "2b520571e897be2a0e88c8692da607b062000038", - "revCount": 5051, + "rev": "83a334f97df4389ca30cb63e50317a66a82562b9", + "revCount": 5070, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -718,6 +741,39 @@ "type": "github" } }, + "hyprlock": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1722882121, + "narHash": "sha256-gr4mN6BYKqy9JDr/ygDlMGYvEYBCMTDDDVnGNp/EYuw=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "9393a3e94d837229714e28041427709756033f5a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -777,11 +833,11 @@ ] }, "locked": { - "lastModified": 1721993749, - "narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=", + "lastModified": 1723016361, + "narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3bd059992912139d6a12e86ba418f933ec368ef2", + "rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7", "type": "github" }, "original": { @@ -874,11 +930,11 @@ ] }, "locked": { - "lastModified": 1722609272, - "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -983,11 +1039,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1046,11 +1102,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -1075,11 +1131,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722857280, - "narHash": "sha256-b5Bal3cElLrS9UtDN81ljQpOsbqBe/7CdWlTKhlswus=", + "lastModified": 1723123215, + "narHash": "sha256-PZbdO1N8zpmkFsGWk3rLUal/TnpqAXgItsIj6IUCswY=", "owner": "nix-community", "repo": "nixvim", - "rev": "5922a48008e5759acb63a12b2de8348ec512760f", + "rev": "1b135dedc4b6256faad9dae2f625e821425a60dd", "type": "github" }, "original": { @@ -1097,11 +1153,11 @@ ] }, "locked": { - "lastModified": 1722493084, - "narHash": "sha256-ktjl908zZKWcGdMyz6kX1kHSg7LFFGPYBvTi9FgQleM=", + "lastModified": 1722772237, + "narHash": "sha256-3eCYmzeLngX8eutIsTZAG8DIvT/0DWQQxiszTQz8n0s=", "owner": "NuschtOS", "repo": "search", - "rev": "3f5abffa5f28b4ac3c9212c81c5e8d2d22876071", + "rev": "aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6", "type": "github" }, "original": { @@ -1150,6 +1206,7 @@ "hm": "hm", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", + "hyprlock": "hyprlock", "lanzaboote": "lanzaboote", "microfetch": "microfetch", "nix-gaming": "nix-gaming", @@ -1158,6 +1215,23 @@ "systems": "systems_6" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1723042912, + "narHash": "sha256-Ff4nCgmlSWVOMvRVVf6gTYgmZjGw9EjIFHG0aUFg+D8=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "935883fd826c46e7e7e6de19cf24377c21f1b2ba", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 81bf6d85..e5fe260b 100644 --- a/flake.nix +++ b/flake.nix @@ -85,5 +85,14 @@ systems.follows = "systems"; }; }; + hyprlock = { + url = "github:hyprwm/hyprlock"; + inputs = { + hyprlang.follows = "hyprland/hyprlang"; + hyprutils.follows = "hyprland/hyprutils"; + nixpkgs.follows = "hyprland/nixpkgs"; + systems.follows = "hyprland/systems"; + }; + }; }; } diff --git a/home/srv/hypr/lock/default.nix b/home/srv/hypr/lock/default.nix index 2f996dfa..c94adf5b 100644 --- a/home/srv/hypr/lock/default.nix +++ b/home/srv/hypr/lock/default.nix @@ -1,67 +1,76 @@ { + pkgs, + inputs, + ... +}: { programs.hyprlock = { enable = true; + package = inputs.hyprlock.packages.${pkgs.system}.hyprlock; settings = { general = { disable_loading_bar = true; - hide_cursor = false; - no_fade_in = false; + hide_cursor = true; + no_fade_in = true; + no_fade_out = true; + ignore_empty_input = true; + immediate_render = true; }; background = [ { - color = "rgba(000000FF)"; monitor = ""; - path = "~/media/images/galaxy.png"; - blur_size = 3; - blur_passes = 2; + path = "~/media/images/dunes.png"; } ]; input-field = [ { monitor = ""; size = "200, 50"; - outline_thickness = 2; - dots_size = 0.33; - dots_spacing = 0.15; + outline_thickness = 0; + dots_size = 0.1; + dots_spacing = 0.3; dots_center = true; dots_rounding = -1; - outer_color = "rgba(3B3B3B55)"; - inner_color = "rgba(33333311)"; + outer_color = "rgba(0,0,0,0)"; + inner_color = "rgba(0,0,0,0)"; font_color = "rgba(FFFFFFFF)"; - fade_on_empty = true; - fade_timeout = 5000; + fade_on_empty = false; + fade_timeout = 0; + fail_text = ""; + fail_transition = 0; placeholder_text = ""; hide_input = false; - rounding = -1; - check_color = "rgb(204, 136, 34)"; - fail_color = "rgb(204, 34, 34)"; + rounding = 0; + check_color = "rgba(0,0,0,0)"; + fail_color = "rgba(0,0,0,0)"; + position = "0, 20"; + halign = "center"; + valign = "center"; } ]; label = [ + # date + { + monitor = ""; + text = "cmd[update:3600000] date +'%A, %B %d'"; + shadow_passes = 1; + shadow_boost = 0.5; + color = "rgba(FFFFFFFF)"; + font_size = 25; + font_family = "Input Mono Compressed"; + position = "0, 230"; + halign = "center"; + valign = "center"; + } + # clock { - # Clock monitor = ""; text = "cmd[update:1000] echo '$TIME'"; shadow_passes = 1; shadow_boost = 0.5; color = "rgba(FFFFFFFF)"; font_size = 85; - font_family = "Input Mono"; - position = "0, 300"; - halign = "center"; - valign = "center"; - } - { - # Date - monitor = ""; - text = "cmd[update:3600000] date +'%a %b %d'"; - shadow_passes = 1; - shadow_boost = 0.5; - color = "rgba(FFFFFFFF)"; - font_size = 25; font_family = "Input Mono Compressed"; - - position = "0, 230"; + position = "0, 300"; halign = "center"; valign = "center"; }