From ec62701a296ed8f58ac6895b9f7f7be087335b07 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sun, 5 May 2024 19:55:38 +0200 Subject: [PATCH] Update --- flake.lock | 131 +++++++------------------------ flake.nix | 13 +-- modules/home/de/hypridlelock.nix | 33 ++++---- users/seb/@inspiron.nix | 8 +- users/seb/@north.nix | 2 +- 5 files changed, 54 insertions(+), 133 deletions(-) diff --git a/flake.lock b/flake.lock index 9c6dc09..f26b32b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714405407, - "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", + "lastModified": 1714612856, + "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", "owner": "nix-community", "repo": "disko", - "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", "type": "github" }, "original": { @@ -38,7 +38,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1714900398, + "narHash": "sha256-H7XYHpjk1G6dkA3AnbYrKtaTFjcCE7ul6nUVlVQxtsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "fdaaf543bad047639ef0b356ea2e6caec2f1215c", "type": "github" }, "original": { @@ -74,32 +74,10 @@ "type": "github" } }, - "hypridle": { - "inputs": { - "hyprlang": "hyprlang", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1713472482, - "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", - "owner": "hyprwm", - "repo": "Hypridle", - "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hypridle", - "type": "github" - } - }, "hyprlang": { "inputs": { "nixpkgs": [ - "hypridle", + "hyprlock", "nixpkgs" ], "systems": "systems" @@ -118,42 +96,20 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprlock": { "inputs": { - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_2" }, "locked": { - "lastModified": 1713978374, - "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=", + "lastModified": 1714843107, + "narHash": "sha256-89WxndRGO3CGuWE5XCaHKnsV3IKBRdOWqScp6o8enT4=", "owner": "hyprwm", "repo": "Hyprlock", - "rev": "415262065fff0a04b229cd00165f346a86a0a73a", + "rev": "c87af3aa1f6e6bd06cffaabcc400bd45e26d565a", "type": "github" }, "original": { @@ -169,11 +125,11 @@ ] }, "locked": { - "lastModified": 1714273701, - "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", + "lastModified": 1714878592, + "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "941c4973c824509e0356be455d89613611f76c8a", + "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", "type": "github" }, "original": { @@ -191,11 +147,11 @@ ] }, "locked": { - "lastModified": 1714526701, - "narHash": "sha256-SO5QvTx6gEbEDqRJVzQGhwftmJICJM+h0cvql9z4kTg=", + "lastModified": 1714872267, + "narHash": "sha256-G04hUZnX7rrJ5a9A2OqrKZ1x25svs2xpGDrP2ExExUg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "24c85bf514f34dc679f0cfd35c66065975cb635e", + "rev": "7d48b70548c01495e9d434db3a89f61600ca4aca", "type": "github" }, "original": { @@ -206,11 +162,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714763106, + "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d", "type": "github" }, "original": { @@ -222,11 +178,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713638189, - "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", + "lastModified": 1714858427, + "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74574c38577914733b4f7a775dd77d24245081dd", + "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "type": "github" }, "original": { @@ -240,7 +196,6 @@ "inputs": { "disko": "disko", "home-manager": "home-manager", - "hypridle": "hypridle", "hyprlock": "hyprlock", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", @@ -256,11 +211,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1714878026, + "narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "10dc39496d5b027912038bde8d68c836576ad0bc", "type": "github" }, "original": { @@ -300,36 +255,6 @@ } }, "systems_3": { - "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_4": { - "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_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index b1705fa..80b0b8c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,13 +12,13 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database = { - url = "github:Mic92/nix-index-database"; + sops-nix = { + url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - sops-nix = { - url = "github:Mic92/sops-nix"; + nix-index-database = { + url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -31,11 +31,6 @@ url = "github:hyprwm/Hyprlock"; inputs.nixpkgs.follows = "nixpkgs"; }; - - hypridle = { - url = "github:hyprwm/Hypridle"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = {nixpkgs, ...} @ inputs: let diff --git a/modules/home/de/hypridlelock.nix b/modules/home/de/hypridlelock.nix index eb796e1..c977c56 100644 --- a/modules/home/de/hypridlelock.nix +++ b/modules/home/de/hypridlelock.nix @@ -4,10 +4,7 @@ lib, ... }: { - imports = [ - inputs.hyprlock.homeManagerModules.hyprlock - inputs.hypridle.homeManagerModules.hypridle - ]; + imports = [inputs.hyprlock.homeManagerModules.hyprlock]; options.myConfig.de.hypridlelock.enable = lib.mkEnableOption ""; @@ -24,21 +21,25 @@ ]; }; - services.hypridle = let - hyprlockExe = "${lib.getExe config.programs.hyprlock.package}"; - in { + services.hypridle = { enable = true; - lockCmd = "pidof ${hyprlockExe} || ${hyprlockExe}"; - beforeSleepCmd = "loginctl lock-session"; - afterSleepCmd = "hyprctl dispatch dpms on"; + settings = { + general = { + lock_cmd = let + hyprlockExe = "${lib.getExe config.programs.hyprlock.package}"; + in "pidof ${hyprlockExe} || ${hyprlockExe}"; + before_sleep_cmd = "loginctl lock-session"; + after_sleep_cmd = "hyprctl dispatch dpms on"; + }; - listeners = [ - { - timeout = 600; - onTimeout = "loginctl lock-session"; - } - ]; + listener = [ + { + timeout = 600; + on-timeout = "loginctl lock-session"; + } + ]; + }; }; }; } diff --git a/users/seb/@inspiron.nix b/users/seb/@inspiron.nix index fbcdcfc..dc2e812 100644 --- a/users/seb/@inspiron.nix +++ b/users/seb/@inspiron.nix @@ -10,15 +10,15 @@ wayland.windowManager.hyprland.settings.monitor = "eDP-1,1920x1080@60,0x0,1"; - services.hypridle.listeners = [ + services.hypridle.settings.listener = [ { timeout = 300; - onTimeout = "${lib.getExe pkgs.brightnessctl} -s && ${lib.getExe pkgs.brightnessctl} -e set 10%"; - onResume = "${lib.getExe pkgs.brightnessctl} -r"; + on-timeout = "${lib.getExe pkgs.brightnessctl} -s && ${lib.getExe pkgs.brightnessctl} -e set 10%"; + on-resume = "${lib.getExe pkgs.brightnessctl} -r"; } { timeout = 1200; - onTimeout = "systemctl suspend"; + on-timeout = "systemctl suspend"; } ]; }; diff --git a/users/seb/@north.nix b/users/seb/@north.nix index dd4b288..45602f0 100644 --- a/users/seb/@north.nix +++ b/users/seb/@north.nix @@ -24,6 +24,6 @@ ''; }; - services.hypridle.beforeSleepCmd = lib.mkForce ""; + services.hypridle.settings.general.before_sleep_cmd = lib.mkForce ""; }; }