Compare commits

..

No commits in common. "a1d8d5fe97b92c14ad5851dbb5689e32aa9c8452" and "d4cc3433a8746167c2bbf7f45226c39b685a71fc" have entirely different histories.

5 changed files with 53 additions and 74 deletions

104
flake.lock generated
View file

@ -179,11 +179,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1761548673, "lastModified": 1760986121,
"narHash": "sha256-/513FfwpfbeppPdGDbmLhgcctLqEHdx8Rs92jImKA3M=", "narHash": "sha256-ilwuwZDPh0pNPTUYKUQQarAnwJwsggr60lQyae5R1vc=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "25ef687b6a0a13e9d39c3949e7de05873f5571a9", "rev": "45286364d2570149037013a4fa098709776bdb41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,11 +284,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1761143269, "lastModified": 1760603229,
"narHash": "sha256-pebbh3IEl8crA9g0fbHeUvNyawAvhO2kNq8klpUWyk0=", "narHash": "sha256-PBienw3IxbOn95/0NU+78EdRR7LmhAnHtxEA3opGKic=",
"owner": "Sveske-Juice", "owner": "Sveske-Juice",
"repo": "declarative-jellyfin", "repo": "declarative-jellyfin",
"rev": "740743deba3de6bc227d9769adb94d4a14a3f25c", "rev": "301e653d70310e95fa72cdd340f95eb2f317b6d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,11 +330,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761596047, "lastModified": 1761275801,
"narHash": "sha256-/7XGQKEQ0Dxg2UaK/LEnUtQscbWNPO3NwfKKJNvGwjA=", "narHash": "sha256-qjrKWCrKf1Y4ygsyEa4Gls6V/5GqAlgc5hXC7TieNiQ=",
"owner": "KyleKrein", "owner": "KyleKrein",
"repo": "DesktopShell", "repo": "DesktopShell",
"rev": "e7debdcf46b8d0d5ead6c899593cd8e5929ffe63", "rev": "01e02232d7536dcc71d748a456089caa43b1ad6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1108,11 +1108,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761513701, "lastModified": 1760929667,
"narHash": "sha256-w7qOcQb1FSMZASvWe01r99QqZ5LnHO0k3rgs5ryyig0=", "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "255b6a0ef2f488a2fad051361699cc67db57338c", "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1188,11 +1188,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761376732, "lastModified": 1760534924,
"narHash": "sha256-wavx9gROyuRZKSvPCCBh78gOur7o88ndRi545njNRrM=", "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8bef482d65425d0cff6b20c11a5f054f85569a38", "rev": "100b4e000032b865563a9754e5bca189bc544764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1242,11 +1242,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1761597355, "lastModified": 1761229794,
"narHash": "sha256-U6BkpqTD5JyLl6DzTJb8fyoGD5CxaG5c9Z29IYnm8lM=", "narHash": "sha256-YkH1zHrMIFVPPbWN/smJVay/o2mLeV4Dynfn6J8MaHA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c776a087edb243fc0ed8d88d8a08c2cb7c5b168b", "rev": "ddd7747c41a3d12106c6a8d9c81720e13460b761",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1268,11 +1268,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1761542689, "lastModified": 1761187190,
"narHash": "sha256-l4TQRcQyp6hoUVQL/R4UBHvYX9whHTntaz5NxHi0PH4=", "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "75768e54ca2591bb0be17fa310992628e5efce2d", "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1301,11 +1301,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761460429, "lastModified": 1760940149,
"narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=", "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b", "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1484,11 +1484,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1761563673, "lastModified": 1760536587,
"narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=", "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3", "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1500,11 +1500,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761373498, "lastModified": 1760878510,
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1532,11 +1532,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1761468971, "lastModified": 1761016216,
"narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1644,11 +1644,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1761373498, "lastModified": 1759733170,
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1660,11 +1660,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1761468971, "lastModified": 1761016216,
"narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1880,11 +1880,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761446259, "lastModified": 1760927964,
"narHash": "sha256-JNNOtIIVIX+yBIsh1rq1Nxhc1LZq168vuQB5sqrZbCY=", "narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "95098bb4d55ebe167c082fc40705a73ef76b58e4", "rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2316,11 +2316,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1761373498, "lastModified": 1761114652,
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2373,11 +2373,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761297587, "lastModified": 1761154225,
"narHash": "sha256-wkv7mEXz6ebBTnEqYU32opUZ8DIWNF5h8rJ6K8WoExY=", "narHash": "sha256-4lCcz/jeGzhvnH3LAv3Y2EEili9JCYQ+Gn7DFpv/tpE=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "89d1c2e4f0084dd3fbba5ffedf5f9996bf8b6042", "rev": "2018d7aab68e79a4a3eaf1fe7288b8966d91b2db",
"revCount": 11, "revCount": 9,
"type": "git", "type": "git",
"url": "https://git.kylekrein.com/kylekrein/website.git" "url": "https://git.kylekrein.com/kylekrein/website.git"
}, },
@ -2406,11 +2406,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761422250, "lastModified": 1761173223,
"narHash": "sha256-+pN8VAh8OVUSj8zPoI8QfC93JMIKPaAOABrbeeiO/Hk=", "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "2dd40ecfe882c1659e0e46c761974702c7ab5fde", "rev": "bf745144acda1343934e9a094cf9458a54d57889",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -407,10 +407,6 @@ in
}; };
}; };
xdg.portal.extraPortals = with pkgs; [
xdg-desktop-portal-gtk
];
services.hypridle = let services.hypridle = let
niri = lib.getExe config.programs.niri.package; niri = lib.getExe config.programs.niri.package;
loginctl = "${pkgs.systemd}/bin/loginctl"; loginctl = "${pkgs.systemd}/bin/loginctl";

View file

@ -12,9 +12,7 @@ in {
options.${namespace}.presets.default = with types; { options.${namespace}.presets.default = with types; {
enable = mkBoolOpt false "Enable preset with all the default settings - locale, time, etc"; enable = mkBoolOpt false "Enable preset with all the default settings - locale, time, etc";
}; };
imports = [
./unfreeze-systemd.nix
];
config = mkIf cfg.enable { config = mkIf cfg.enable {
zramSwap = { zramSwap = {
enable = true; # Hopefully? helps with freezing when using swap enable = true; # Hopefully? helps with freezing when using swap

View file

@ -1,14 +0,0 @@
# 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;
};
}

View file

@ -115,7 +115,6 @@ in {
tmux tmux
icloudpd icloudpd
immich-go immich-go
wget
]; ];
hardware.enableAllHardware = true; hardware.enableAllHardware = true;