emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trying to get swayidle/lock working properly

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-07-03 11:43:56 -04:00
parent 727c106bdc
commit 0a990d8308
7 changed files with 71 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

79
flake.lock generated
View file

@ -137,11 +137,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1751508915, "lastModified": 1751533870,
"narHash": "sha256-mVnjzM1VGLNrIEC8ghaQVoat68kXh4/AzBE4QPi29QI=", "narHash": "sha256-QrYtdbXjFjawI89+jQt9ASoUwGy8UAae/yLLFO9JxI4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c8c7ef94b6600add651b3d3aea1db5665b1b92eb", "rev": "2dd8d2a429c834a0f85066f5313d38c5661bf5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,11 +541,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751500614, "lastModified": 1751549056,
"narHash": "sha256-mYiYNsTJkbQouC5YHOTgqVpjpELoNf9f4z5ZeY4NfPg=", "narHash": "sha256-miKaJ4SFNxhZ/WVDADae2jNd9zka5bV9hKmXspAzvxo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a5b56720841121d2189c011e445c4be4c943bab5", "rev": "1fa73bb2cc39e250eb01e511ae6ac83bfbf9f38c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -808,6 +808,24 @@
"type": "github" "type": "github"
} }
}, },
"nix-way-templates": {
"inputs": {
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1749399510,
"narHash": "sha256-o47eZ3TwqANphUVcGk1m2x94rfETfin79BV3j8lv+tQ=",
"owner": "the-nix-way",
"repo": "dev-templates",
"rev": "7209fa2f8cd9e4a6a25a3249b74dcaee7065a90f",
"type": "github"
},
"original": {
"owner": "the-nix-way",
"repo": "dev-templates",
"type": "github"
}
},
"nixarr": { "nixarr": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1019,6 +1037,20 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1746904237,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"revCount": 797896,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.797896%2Brev-d89fc19e405cb2d55ce7cc114356846a0ee5e956/0196c1a7-7ad3-74a9-9d50-1b854aca6d6c/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1"
}
},
"nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1751271578, "lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
@ -1034,7 +1066,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1751011381, "lastModified": 1751011381,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
@ -1050,13 +1082,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1747426788, "lastModified": 1751251929,
"narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", "narHash": "sha256-IJWIzZSkBsDzS7iS/iwSwur+xFkWqeLYC4kdf8ObtOM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", "rev": "b95255df2360a45ddbb03817a68869d5cb01bf96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1132,9 +1164,10 @@
"niri": "niri", "niri": "niri",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-rice": "nix-rice", "nix-rice": "nix-rice",
"nix-way-templates": "nix-way-templates",
"nixarr": "nixarr", "nixarr": "nixarr",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"waybar": "waybar", "waybar": "waybar",
@ -1152,11 +1185,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747449297, "lastModified": 1751251399,
"narHash": "sha256-veyXchTz6eWwvuW5X49UluHkheHkFcqHJSwGuKBhrmQ=", "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f44db7d7cea4528288780c6347756173a8248225", "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1450,7 +1483,7 @@
"waybar": { "waybar": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1751446291, "lastModified": 1751446291,
@ -1494,17 +1527,17 @@
"freetype2": "freetype2", "freetype2": "freetype2",
"harfbuzz": "harfbuzz", "harfbuzz": "harfbuzz",
"libpng": "libpng", "libpng": "libpng",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_9",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"zlib": "zlib" "zlib": "zlib"
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1751352443, "lastModified": 1751522981,
"narHash": "sha256-psuDPdulVRIl2DvVCvNfl4ZkKhUlZ/9/RvHc7vWr0js=", "narHash": "sha256-OisqRgWHKADyoAV5wuPPUI+wryP2gznfLdGuafEnho0=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "54675c9c35788466f7828f5d722832bd1f310a62", "rev": "c7f4b081a685ab71eef6571b4050af061fff9c85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1578,11 +1611,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1751469973, "lastModified": 1751550109,
"narHash": "sha256-5Y1aVAYFmV20kmkhcHEQrDDvHiJVQGyYhD1SBCp639E=", "narHash": "sha256-/pB2YpF8BG4zURq4v+M/+TW3fUIekm5qephBzlrw2pw=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "c7f800ad7ecf76e3431ad1b7005fa24b53726802", "rev": "ec7eb3e41663fd3654bd0995dd8d451bcc64fe18",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -109,7 +109,7 @@
}; };
# emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates"; # emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates";
# nix-way-templates.url = "github:the-nix-way/dev-templates"; nix-way-templates.url = "github:the-nix-way/dev-templates";
}; };

2
homes/emenel/dotfiles/dot_local/bin/on-unlock
View file

@ -1,2 +1,2 @@
#!/usr/bin/env sh #!/usr/bin/env sh
/run/current-system/sw/bin/brillo -e -u 15000 -I /run/current-system/sw/bin/brillo -e -u 150000 -I

2
homes/emenel/dotfiles/dot_local/bin/session-lock
View file

@ -1,2 +1,2 @@
#!/usr/bin/env sh #!/usr/bin/env sh
/run/current-system/sw/bin/pidof /etc/profiles/per-user/emenel/bin/swaylock || /etc/profiles/per-user/emenel/bin/swaylock /run/current-system/sw/bin/pidof swaylock || /etc/profiles/per-user/emenel/bin/swaylock

2
modules/home/desktop.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nix-config, inputs, lib, ... }: { pkgs, nix-config, lib, ... }:
{ {

2
modules/home/shell-conf.nix
View file

@ -97,6 +97,8 @@
"em" = "emacsclient -n -r"; "em" = "emacsclient -n -r";
"fg" = "job unfreeze"; "fg" = "job unfreeze";
"emm" = "emacsclient -nw"; "emm" = "emacsclient -nw";
"gt" = "gtrash";
"gtp" = "gtreash prune";
"gtr" = "gtrash restore"; "gtr" = "gtrash restore";
"rmr" = "gtrash restore"; "rmr" = "gtrash restore";
"rm" = "gtrash put"; "rm" = "gtrash put";

18
modules/home/sway-idle-lock.nix
View file

@ -7,12 +7,12 @@
events = [ events = [
{ {
event = "lock"; event = "lock";
command = "/home/emenel/.local/bin/session-lock"; command = "/run/current-system/sw/bin/pidof swaylock || ${pkgs.swaylock}/bin/swaylock";
}
{
event = "before-sleep";
command = "/home/emenel/.local/bin/session-lock";
} }
# {
# event = "before-sleep";
# command = "/home/emenel/.local/bin/session-lock";
# }
{ {
event = "after-resume"; event = "after-resume";
command = "/home/emenel/.local/bin/on-unlock"; command = "/home/emenel/.local/bin/on-unlock";
@ -33,11 +33,11 @@
} }
{ {
timeout = 120; timeout = 120;
command = "${pkgs.systemd}/bin/systemd-ac-power || /home/emenel/.local/bin/lock-power-off-monitors"; command = "${pkgs.systemd}/bin/systemd-ac-power || ${pkgs.niri-unstable}/bin/niri msg action power-off-monitors";
} }
{ {
timeout = 180; timeout = 180;
command = "${pkgs.systemd}/bin/systemd-ac-power || /home/emenel/.local/bin/lock-suspend"; command = "${pkgs.systemd}/bin/systemd-ac-power || ${pkgs.systemd}/bin/systemctl suspend";
} }
# ac power timers # ac power timers
@ -48,12 +48,12 @@
{ {
timeout = 240; timeout = 240;
command = "${pkgs.systemd}/bin/systemd-ac-power || /home/emenel/.local/bin/lock-power-off-monitors"; command = "${pkgs.systemd}/bin/systemd-ac-power && ${pkgs.niri-unstable}/bin/niri msg action power-off-monitors";
} }
{ {
timeout = 600; timeout = 600;
command = "${pkgs.systemd}/bin/systemd-ac-power && /home/emenel/.local/bin/lock-suspend"; command = "${pkgs.systemd}/bin/systemd-ac-power && ${pkgs.systemd}/bin/systemctl suspend";
} }
]; ];