diff --git a/flake.lock b/flake.lock index ea9fb2f..f323eb5 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1714865296, - "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -181,45 +181,47 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems_3", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1714875275, - "narHash": "sha256-e7InWx8mw/jNGtWP1By9CZkGINHEplf9Z3P/QvgPMos=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "aaf35b9f1f0ce49080f2a0b1e7943336b1ba6057", - "type": "github" + "lastModified": 1715305136, + "narHash": "sha256-+X0H4v/goM9QAu1PSkr46AmVc5be9EV1JRkGU5TEtXw=", + "ref": "refs/heads/main", + "rev": "2ba6bb69c4b455ff6327596a63bf1785d0910d2c", + "revCount": 4655, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-protocols": { "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -287,11 +289,11 @@ ] }, "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", + "lastModified": 1715287423, + "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", + "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", "type": "github" }, "original": { @@ -364,11 +366,11 @@ ] }, "locked": { - "lastModified": 1714872254, - "narHash": "sha256-O9n7CATdL7uD+MNcxd8RhjA4Bn6yweF7uoGaJKOYcE0=", + "lastModified": 1715304061, + "narHash": "sha256-iFtaM+G51qYTBb1rroD/TBx5f2/oHjDBUIEptQJsKmo=", "owner": "infinidoge", "repo": "nix-minecraft", - "rev": "716121fd08323465a25878cba2814f7463be0095", + "rev": "6ec9f2bac00a7f5ca7133303b926d7d67a2e6167", "type": "github" }, "original": { @@ -386,11 +388,11 @@ ] }, "locked": { - "lastModified": 1714355896, - "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", + "lastModified": 1715237610, + "narHash": "sha256-/ZeWQ4mL3DfHsbTZYc80qMrL4vBfENP0RiGv2KrCrEo=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", + "rev": "61fe33f4194bbbc48c090a2e79f4eb61b47c9b75", "type": "github" }, "original": { @@ -424,11 +426,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", "type": "github" }, "original": { @@ -440,11 +442,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1715161350, + "narHash": "sha256-5ZU8DVwHO0gjw2sKoKkToYOXMJFRBpRsa17Ebm8fgj0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "c4200cb341ee794775185ecd4105fbbfb5ca73a0", "type": "github" }, "original": { @@ -456,11 +458,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714685007, - "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", + "lastModified": 1715106579, + "narHash": "sha256-gZMgKEGiK6YrwGBiccZ1gemiUwjsZ1Zv49KYOgmX2fY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", + "rev": "8be0d8a1ed4f96d99b09aa616e2afd47acc3da89", "type": "github" }, "original": { @@ -513,11 +515,11 @@ ] }, "locked": { - "lastModified": 1714875369, - "narHash": "sha256-dyyJEHKbnz2sZcz9yVxOCE/085covNljWKeTCIcBfL0=", + "lastModified": 1715221036, + "narHash": "sha256-81EKOdlmT/4hZpImRlvMVPgmCcJYZjwlWbJese/XqUw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "35cc508a9de1c971ce1dc610dec1ba75f66c6004", + "rev": "5c4bc8a0a70093a31a12509c5653c147f2310bd2", "type": "github" }, "original": { @@ -631,29 +633,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -668,11 +650,11 @@ ] }, "locked": { - "lastModified": 1714060055, - "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", + "lastModified": 1714662532, + "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", + "rev": "1f228ba2f1f254195c0b571302b37482861abee3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b9bd2e2..8c00b22 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ }; # no inputs.nixpkgs.follows so i can use cachix - hyprland.url = "github:hyprwm/Hyprland"; + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprwm-contrib = { url = "github:hyprwm/contrib"; diff --git a/home/default.nix b/home/default.nix index ff0eaaa..c48f05e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -11,8 +11,6 @@ in ./profile ./programs ./sessions - - inputs.hypridle.homeManagerModules.default ]; config = {}; options.nixfiles = { diff --git a/home/programs/hypridle.nix b/home/programs/hypridle.nix index d2ca42e..06fab83 100644 --- a/home/programs/hypridle.nix +++ b/home/programs/hypridle.nix @@ -43,45 +43,51 @@ in }; config = lib.mkMerge [ (lib.mkIf cfg.enable { - services.hypridle = let - lock = pkgs.writeShellScript "lock-once" '' - ${pkgs.procps}/bin/pgrep -x swaylock > /dev/null || "${config.programs.swaylock.package}/bin/swaylock" - ''; - in { + services.hypridle = { enable = true; - listeners = let - dpms-wrapped = pkgs.writeShellScript "dpms-wrapped" '' - exec ${cfg.commands.dpms-off} - ''; - lock-dpms = pkgs.writeShellScript "lock-dpms" '' - ${pkgs.procps}/bin/pgrep -x swaylock > /dev/null && "${dpms-wrapped}" + settings = let + lock = pkgs.writeShellScript "lock-once" '' + ${pkgs.procps}/bin/pgrep -x swaylock > /dev/null || "${config.programs.swaylock.package}/bin/swaylock" ''; + in { + listener = let + dpms-wrapped = pkgs.writeShellScript "dpms-wrapped" '' + exec ${cfg.commands.dpms-off} + ''; + lock-dpms = pkgs.writeShellScript "lock-dpms" '' + ${pkgs.procps}/bin/pgrep -x swaylock > /dev/null && "${dpms-wrapped}" + ''; - in [ - { - timeout = cfg.timeouts.dpms; - onTimeout = cfg.commands.dpms-off; - onResume = cfg.commands.dpms-on; - } - # { - # timeout = cfg.timeouts.locked-dpms; - # onTimeout = "${lock-dpms}"; - # onResume = cfg.commands.dpms-on; - # } - { - timeout = cfg.timeouts.lock; - onTimeout = "${lock}"; - } - { - timeout = cfg.timeouts.lock + cfg.timeouts.locked-dpms; - onTimeout = cfg.commands.dpms-off; - onResume = cfg.commands.dpms-on; - } - ]; + in [ + { + timeout = cfg.timeouts.dpms; + on-timeout = cfg.commands.dpms-off; + on-resume = cfg.commands.dpms-on; + } + # { + # timeout = cfg.timeouts.locked-dpms; + # on-timeout = "${lock-dpms}"; + # on-resume = cfg.commands.dpms-on; + # } + { + timeout = cfg.timeouts.lock; + on-timeout = "${lock}"; + } + { + timeout = cfg.timeouts.lock + cfg.timeouts.locked-dpms; + on-timeout = cfg.commands.dpms-off; + on-resume = cfg.commands.dpms-on; + } + ]; - lockCmd = "${lock}"; - unlockCmd = "${pkgs.procps}/bin/pkill -x -USR1 swaylock"; - beforeSleepCmd = "${config.programs.swaylock.package}"; + general = { + lock_cmd = "${lock}"; + unlock_cmd = "${pkgs.procps}/bin/pkill -x -USR1 swaylock"; + before_sleep_cmd = "${config.programs.swaylock.package}"; + ignore_dbus_inhibit = false; + # after_sleep_cmd = "echo 'Awake...'"; + }; + }; }; }) # why isn't this handled automatically??