From 796a3c54452e37eed0820b9d7e1d9b64c8b3ce74 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Sun, 5 Oct 2025 09:51:47 +0200 Subject: [PATCH] Turned off hibernation and deep sleep on framework12 --- flake.lock | 236 +++++++----------- flake.nix | 7 +- homes/x86_64-linux/kylekrein/niri/niri.nix | 2 +- modules/nixos/presets/default/default.nix | 5 + .../kylekrein-framework12/default.nix | 2 +- 5 files changed, 105 insertions(+), 147 deletions(-) diff --git a/flake.lock b/flake.lock index ab2fd19..6b44dd1 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759155412, - "narHash": "sha256-5JMoXMQt0C1SAHzhHwKLIEZ8/Q8f0vqBGxrMnmuOvJg=", + "lastModified": 1759532138, + "narHash": "sha256-sLQIlgDwMP3mEY2PwjGW+cL56QQ2n2WXoZ3GpG5QWOY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ae7eac57b8dfc221270bb4f4752a87fe4f17ca11", + "rev": "bad02bbca5b5c6d45539a0d740ad0e21b1ba9afc", "type": "github" }, "original": { @@ -320,17 +320,23 @@ }, "desktopShell": { "inputs": { - "dgop": "dgop", + "dgop": [ + "dgop" + ], "dms-cli": "dms-cli", - "nixpkgs": "nixpkgs_6", - "quickshell": "quickshell" + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": [ + "quickshell" + ] }, "locked": { - "lastModified": 1759118159, - "narHash": "sha256-rC7whKS+HyxHOGhUMNyzD0xHXFCYrA/R+kz4S6OOQYw=", + "lastModified": 1759603110, + "narHash": "sha256-N9vbCzCx7tv3McHjOLZ5HMcYAP7k0aDMgrnpYJ1pJeI=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "bd8976c6209c07776a966fb4a0677b3ed864f2c8", + "rev": "df2469468bc7d5e59de865d0791c1cee71e748e5", "type": "github" }, "original": { @@ -374,27 +380,6 @@ } }, "dgop": { - "inputs": { - "nixpkgs": [ - "desktopShell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757252286, - "narHash": "sha256-QwWQzlxAGvIi6VAc8DQ6ONCKKwtPyaHQW1cQyGbP7Og=", - "owner": "AvengeMedia", - "repo": "dgop", - "rev": "a65a02ddf8bade9c109d055e644e4bd851183bd5", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "dgop", - "type": "github" - } - }, - "dgop_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1082,11 +1067,11 @@ ] }, "locked": { - "lastModified": 1758928860, - "narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -1162,11 +1147,11 @@ ] }, "locked": { - "lastModified": 1757230583, - "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", + "lastModified": 1759387127, + "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", + "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7", "type": "github" }, "original": { @@ -1180,7 +1165,7 @@ "crane": "crane_3", "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -1216,11 +1201,11 @@ }, "master": { "locked": { - "lastModified": 1759168410, - "narHash": "sha256-ADlf9oDgV3xOeCmFpi9XfPzlWj/BNzbuNfmWJlsZzU8=", + "lastModified": 1759612253, + "narHash": "sha256-ngVqIfFJM3fgHZyhiNPQZffiffsu+5JVLPdxmnnihl4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "adbb27e1356b93a06003f8e1598bc98294030cbe", + "rev": "f86361a4ddd8a5c00ea95152b3ffa55e6f0112c1", "type": "github" }, "original": { @@ -1242,11 +1227,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759145674, - "narHash": "sha256-idmFGQ0G5WYVP2zTZkYAv151b8yZcmeCdTlWpPKP85M=", + "lastModified": 1759570525, + "narHash": "sha256-wQbq5QgzlG10u3TzZDEMjyQdOs8tVyMjKsdks+WKmZQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f10780ea5ae2407bbd3008a38de4746522eb3d54", + "rev": "069c3908df7e6caf4eae0eaeba9c1a70ec32ca27", "type": "github" }, "original": { @@ -1275,11 +1260,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758691861, - "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -1438,11 +1423,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -1455,14 +1440,14 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1758785683, - "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=", + "lastModified": 1759348509, + "narHash": "sha256-at9xMhxMP65JYWlGWYJ412VKbS+tXkTM3f5t9Q8IyMA=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70", + "rev": "d96dda76c1f1827634ddf28d386feabd2d135d21", "type": "github" }, "original": { @@ -1506,11 +1491,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759439645, + "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", "type": "github" }, "original": { @@ -1521,22 +1506,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1758976413, - "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1751211869, "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", @@ -1617,22 +1586,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1754243818, "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", @@ -1648,13 +1601,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -1664,13 +1617,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759439645, + "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", "type": "github" }, "original": { @@ -1680,6 +1633,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1758976413, + "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -1715,11 +1684,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -1757,36 +1726,15 @@ "quickshell": { "inputs": { "nixpkgs": [ - "desktopShell", "nixpkgs" ] }, "locked": { - "lastModified": 1756981260, - "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", + "lastModified": 1759610621, + "narHash": "sha256-P3UPFd95mS/3aNgy40nCXAmyfR2bEEBd+tX6xfkYFb0=", "ref": "refs/heads/master", - "rev": "6eb12551baf924f8fdecdd04113863a754259c34", - "revCount": 672, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - } - }, - "quickshell_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1759128992, - "narHash": "sha256-crjxt1g3zc3OtmE4xfbFouiDwAxqUmRfpTtfnkkJ8/0=", - "ref": "refs/heads/master", - "rev": "1d94144976252a922e03e4c0fbb921ee8b8bb079", - "revCount": 682, + "rev": "c5c438f1cd1a76660a8658ef929a3d19e968e2ce", + "revCount": 689, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -1820,7 +1768,7 @@ "declarative-jellyfin": "declarative-jellyfin", "deploy-rs": "deploy-rs", "desktopShell": "desktopShell", - "dgop": "dgop_2", + "dgop": "dgop", "disko": "disko", "emacs-kylekrein": "emacs-kylekrein", "home-manager": "home-manager_2", @@ -1832,9 +1780,9 @@ "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks", - "quickshell": "quickshell_2", + "quickshell": "quickshell", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_3", @@ -1890,11 +1838,11 @@ ] }, "locked": { - "lastModified": 1758940228, - "narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=", + "lastModified": 1759458749, + "narHash": "sha256-WKnbJnm1B2+TO2ZUudgS39EzecQeLl4/bnRtd3y46LI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2", + "rev": "bbc3a8ae797d1700e57a4f4bcc4e79af727d4138", "type": "github" }, "original": { @@ -2017,14 +1965,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1759030640, - "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=", + "lastModified": 1759188042, + "narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e", + "rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "type": "github" }, "original": { @@ -2042,7 +1990,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nur": "nur", "systems": "systems_8", "tinted-foot": "tinted-foot", @@ -2052,11 +2000,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759050585, - "narHash": "sha256-Mj99rGy+K9jaQ85U2YWydZ9OKCIAdkxClrJlfG04GxU=", + "lastModified": 1759596342, + "narHash": "sha256-1Eda1V8pjpviMdBTdDXrFp7jkaUokIgXgBYTZyzDODk=", "owner": "danth", "repo": "stylix", - "rev": "3f71498ed14405aea347b9f5b7f56d97e64e904c", + "rev": "4d065856e936fc6a99ba55d39ac2df9ded6bedbe", "type": "github" }, "original": { @@ -2311,11 +2259,11 @@ }, "unstable": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -2381,11 +2329,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1758577423, - "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", + "lastModified": 1759449168, + "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", + "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d350afc..ff7c896 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,12 @@ url = "github:AvengeMedia/dgop"; inputs.nixpkgs.follows = "nixpkgs"; }; - desktopShell.url = "github:KyleKrein/DesktopShell"; #?ref=d4816bd174901cb5582151dac6ead636cf96090d"; + desktopShell = { + url = "github:KyleKrein/DesktopShell"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.dgop.follows = "dgop"; + inputs.quickshell.follows = "quickshell"; + }; rose-pine-hyprcursor = { url = "github:ndom91/rose-pine-hyprcursor"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 1d623a5..e6a7568 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -290,7 +290,7 @@ in "Mod+Tab".action = toggle-overview; }; input = { - power-key-handling.enable = !osConfig.custom.hardware.hibernation.enable; + power-key-handling.enable = false; focus-follows-mouse = { #enable = true; }; diff --git a/modules/nixos/presets/default/default.nix b/modules/nixos/presets/default/default.nix index 22ec849..e24cc34 100644 --- a/modules/nixos/presets/default/default.nix +++ b/modules/nixos/presets/default/default.nix @@ -52,6 +52,11 @@ in { clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/etc/nixos-config"; }; + services.logind = { + lidSwitch = mkDefault "suspend"; + powerKey = mkDefault "suspend"; + powerKeyLongPress = mkDefault "poweroff"; + }; environment.systemPackages = with pkgs; [ nix-output-monitor fzf diff --git a/systems/x86_64-linux/kylekrein-framework12/default.nix b/systems/x86_64-linux/kylekrein-framework12/default.nix index 969f333..b899108 100644 --- a/systems/x86_64-linux/kylekrein-framework12/default.nix +++ b/systems/x86_64-linux/kylekrein-framework12/default.nix @@ -33,7 +33,7 @@ in systemd.network.wait-online.enable = lib.mkForce false; #facter custom.hardware.hibernation = { - enable = true; + enable = false; swapFileOffset = 533760; }; custom.presets.disko.impermanenceBtrfsLuks = {