diff --git a/flake.lock b/flake.lock index 8ad11c2..3efb4eb 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1760986121, - "narHash": "sha256-ilwuwZDPh0pNPTUYKUQQarAnwJwsggr60lQyae5R1vc=", + "lastModified": 1761548673, + "narHash": "sha256-/513FfwpfbeppPdGDbmLhgcctLqEHdx8Rs92jImKA3M=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "45286364d2570149037013a4fa098709776bdb41", + "rev": "25ef687b6a0a13e9d39c3949e7de05873f5571a9", "type": "github" }, "original": { @@ -284,11 +284,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1760603229, - "narHash": "sha256-PBienw3IxbOn95/0NU+78EdRR7LmhAnHtxEA3opGKic=", + "lastModified": 1761143269, + "narHash": "sha256-pebbh3IEl8crA9g0fbHeUvNyawAvhO2kNq8klpUWyk0=", "owner": "Sveske-Juice", "repo": "declarative-jellyfin", - "rev": "301e653d70310e95fa72cdd340f95eb2f317b6d0", + "rev": "740743deba3de6bc227d9769adb94d4a14a3f25c", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1761275801, - "narHash": "sha256-qjrKWCrKf1Y4ygsyEa4Gls6V/5GqAlgc5hXC7TieNiQ=", + "lastModified": 1761596047, + "narHash": "sha256-/7XGQKEQ0Dxg2UaK/LEnUtQscbWNPO3NwfKKJNvGwjA=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "01e02232d7536dcc71d748a456089caa43b1ad6a", + "rev": "e7debdcf46b8d0d5ead6c899593cd8e5929ffe63", "type": "github" }, "original": { @@ -1108,11 +1108,11 @@ ] }, "locked": { - "lastModified": 1760929667, - "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=", + "lastModified": 1761513701, + "narHash": "sha256-w7qOcQb1FSMZASvWe01r99QqZ5LnHO0k3rgs5ryyig0=", "owner": "nix-community", "repo": "home-manager", - "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0", + "rev": "255b6a0ef2f488a2fad051361699cc67db57338c", "type": "github" }, "original": { @@ -1188,11 +1188,11 @@ ] }, "locked": { - "lastModified": 1760534924, - "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", + "lastModified": 1761376732, + "narHash": "sha256-wavx9gROyuRZKSvPCCBh78gOur7o88ndRi545njNRrM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "100b4e000032b865563a9754e5bca189bc544764", + "rev": "8bef482d65425d0cff6b20c11a5f054f85569a38", "type": "github" }, "original": { @@ -1242,11 +1242,11 @@ }, "master": { "locked": { - "lastModified": 1761229794, - "narHash": "sha256-YkH1zHrMIFVPPbWN/smJVay/o2mLeV4Dynfn6J8MaHA=", + "lastModified": 1761597355, + "narHash": "sha256-U6BkpqTD5JyLl6DzTJb8fyoGD5CxaG5c9Z29IYnm8lM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddd7747c41a3d12106c6a8d9c81720e13460b761", + "rev": "c776a087edb243fc0ed8d88d8a08c2cb7c5b168b", "type": "github" }, "original": { @@ -1268,11 +1268,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761187190, - "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=", + "lastModified": 1761542689, + "narHash": "sha256-l4TQRcQyp6hoUVQL/R4UBHvYX9whHTntaz5NxHi0PH4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c", + "rev": "75768e54ca2591bb0be17fa310992628e5efce2d", "type": "github" }, "original": { @@ -1301,11 +1301,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760940149, - "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", + "lastModified": 1761460429, + "narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=", "owner": "YaLTeR", "repo": "niri", - "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", + "rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b", "type": "github" }, "original": { @@ -1484,11 +1484,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1760536587, - "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", + "lastModified": 1761563673, + "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", + "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3", "type": "github" }, "original": { @@ -1500,11 +1500,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -1532,11 +1532,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -1644,11 +1644,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -1660,11 +1660,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -1880,11 +1880,11 @@ ] }, "locked": { - "lastModified": 1760927964, - "narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=", + "lastModified": 1761446259, + "narHash": "sha256-JNNOtIIVIX+yBIsh1rq1Nxhc1LZq168vuQB5sqrZbCY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3", + "rev": "95098bb4d55ebe167c082fc40705a73ef76b58e4", "type": "github" }, "original": { @@ -2316,11 +2316,11 @@ }, "unstable": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -2373,11 +2373,11 @@ ] }, "locked": { - "lastModified": 1761154225, - "narHash": "sha256-4lCcz/jeGzhvnH3LAv3Y2EEili9JCYQ+Gn7DFpv/tpE=", + "lastModified": 1761297587, + "narHash": "sha256-wkv7mEXz6ebBTnEqYU32opUZ8DIWNF5h8rJ6K8WoExY=", "ref": "refs/heads/master", - "rev": "2018d7aab68e79a4a3eaf1fe7288b8966d91b2db", - "revCount": 9, + "rev": "89d1c2e4f0084dd3fbba5ffedf5f9996bf8b6042", + "revCount": 11, "type": "git", "url": "https://git.kylekrein.com/kylekrein/website.git" }, @@ -2406,11 +2406,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761173223, - "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=", + "lastModified": 1761422250, + "narHash": "sha256-+pN8VAh8OVUSj8zPoI8QfC93JMIKPaAOABrbeeiO/Hk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "bf745144acda1343934e9a094cf9458a54d57889", + "rev": "2dd40ecfe882c1659e0e46c761974702c7ab5fde", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 3bd368b..35115a3 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -407,6 +407,10 @@ in }; }; + xdg.portal.extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + ]; + services.hypridle = let niri = lib.getExe config.programs.niri.package; loginctl = "${pkgs.systemd}/bin/loginctl"; diff --git a/modules/nixos/presets/default/default.nix b/modules/nixos/presets/default/default.nix index e24cc34..04d0f07 100644 --- a/modules/nixos/presets/default/default.nix +++ b/modules/nixos/presets/default/default.nix @@ -12,7 +12,9 @@ in { options.${namespace}.presets.default = with types; { enable = mkBoolOpt false "Enable preset with all the default settings - locale, time, etc"; }; - + imports = [ + ./unfreeze-systemd.nix + ]; config = mkIf cfg.enable { zramSwap = { enable = true; # Hopefully? helps with freezing when using swap diff --git a/modules/nixos/presets/default/unfreeze-systemd.nix b/modules/nixos/presets/default/unfreeze-systemd.nix new file mode 100644 index 0000000..c900e5a --- /dev/null +++ b/modules/nixos/presets/default/unfreeze-systemd.nix @@ -0,0 +1,14 @@ +# https://t.me/s/tazlog/65 +# https://cl.tvl.fyi/c/depot/+/12961 +# Workaround for disabling semi-broken systemd user slice freezing (whatever +# that is). This can cause machines to become unusable after resume. +let + override.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false"; +in { + systemd.services = { + systemd-suspend = override; + systemd-hibernate = override; + systemd-hybrid-sleep = override; + systemd-suspend-then-hibernate = override; + }; +} diff --git a/systems/x86_64-linux/stargate/default.nix b/systems/x86_64-linux/stargate/default.nix index b54ee27..c0c385c 100644 --- a/systems/x86_64-linux/stargate/default.nix +++ b/systems/x86_64-linux/stargate/default.nix @@ -115,6 +115,7 @@ in { tmux icloudpd immich-go + wget ]; hardware.enableAllHardware = true;