From 7aed32eea74d10680e4f27c60a25546dcc8280af Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 23 May 2025 11:58:24 -0400 Subject: [PATCH] changes --- flake.lock | 224 +++++++++--------- flake.nix | 13 +- homes/x86_64-linux/zoey@earth/default.nix | 2 + modules/home/apps/term/kitty/default.nix | 2 - modules/home/apps/tools/starship/default.nix | 1 + modules/home/apps/tools/tmux/default.nix | 2 +- modules/home/shells/aliases.nix | 3 +- modules/home/shells/fish/default.nix | 6 +- modules/home/wms/niri/default.nix | 12 + .../nixos/hardware/gpu-passthru/default.nix | 62 ++++- modules/nixos/sites/hydra/default.nix | 3 + overlays/libvirt-hooks/defualt.nix | 23 -- systems/x86_64-linux/earth/default.nix | 5 +- .../earth/hardware-configuration.nix | 2 +- systems/x86_64-linux/pluto/default.nix | 4 +- 15 files changed, 210 insertions(+), 154 deletions(-) delete mode 100644 overlays/libvirt-hooks/defualt.nix diff --git a/flake.lock b/flake.lock index df5784e..6a90bfc 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1745357003, - "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", + "lastModified": 1747864449, + "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", + "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1747519437, - "narHash": "sha256-uv9Wv59d+mckS2CkorOF484wp2G5TNGijdoBZ5RkAk0=", + "lastModified": 1747989804, + "narHash": "sha256-FACXQA+OH5jHx/MZIJoGNxg5H5XolsxOMmBLMWUCIQs=", "owner": "catppuccin", "repo": "nix", - "rev": "3ba714046ee32373e88166e6e9474d6ae6a5b734", + "rev": "21e495cba91b63e8897d1a00155d58787d0e6e18", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1747576719, - "narHash": "sha256-a+QFKYlsgWZyuCdFqjRout85mZjrtkq1dmMEPuB50qA=", + "lastModified": 1747983519, + "narHash": "sha256-34lBcWPnN9z6M98VjaVCyxRew5XIhgxwWY0iuUatokQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a5137694fccd0a36dc0c578c3ce9b02278a8f198", + "rev": "984cbc0e62124837f2171bcd0636d851f9f168f0", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -256,11 +256,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1747618089, - "narHash": "sha256-mbzwxQlxNamIMErEfwWRZ+ECmlQzxJ4eJvOM6/fxV5s=", + "lastModified": 1747993936, + "narHash": "sha256-q0WVevi2qcN8/xkRK5IjujhJoHhAOi7KFO1/MqZ/3C4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1b2bc802bbac29f4695e39fbf982944c0999b45d", + "rev": "88b4b5a913f6f2c257851d275640831fb8dd5825", "type": "github" }, "original": { @@ -825,11 +825,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1747426608, - "narHash": "sha256-ygRFvCVdVEAU95tH2EMMacYH/T42tC3mtDkt5lBJT9U=", + "lastModified": 1748009746, + "narHash": "sha256-ycF9T9pZKiA2pqNt4BztsQK6qf+L4EYE2f7fgE3fG9w=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b1af4a597f359491f4b3197a845b39ec86db475a", + "rev": "26a42fac0ec8f612a3ddce60bab9842c79a2756a", "type": "github" }, "original": { @@ -1026,11 +1026,11 @@ ] }, "locked": { - "lastModified": 1747439237, - "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", + "lastModified": 1747875884, + "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", + "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", "type": "github" }, "original": { @@ -1046,11 +1046,11 @@ ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -1150,11 +1150,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1747052241, - "narHash": "sha256-X979gxgClu/MnL0vcBaKDkpFIWg2KhOZfAI8BFlNsEM=", + "lastModified": 1747688623, + "narHash": "sha256-QfFRh7FBbMtN/MPZKSTuVCtauRGPHg9Pgx9tV5rb5bg=", "owner": "hyprwm", "repo": "hypridle", - "rev": "ecf2a3649dfb2e8a45aa63757ed571f1bfedb320", + "rev": "4f1c165d3e340331de020b46b33a3edb2fd9d55e", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1747610850, - "narHash": "sha256-eGOtDlq3h+r/X/j4oSNo6cmQlt67TVolgUJMnGKTRt4=", + "lastModified": 1747926140, + "narHash": "sha256-j5LAlXg5o8p52+OfzjgOakyyzvG7Zf2IZbanTaHUbmA=", "ref": "refs/heads/main", - "rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164", - "revCount": 6127, + "rev": "bd4733a0ff2b89fd3f22dc6ec9ff00e070753662", + "revCount": 6131, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1359,11 +1359,11 @@ ] }, "locked": { - "lastModified": 1746655412, - "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", + "lastModified": 1747484975, + "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "557241780c179cf7ef224df392f8e67dab6cef83", + "rev": "163c83b3db48a17c113729c220a60b94596c9291", "type": "github" }, "original": { @@ -1459,11 +1459,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1747584298, + "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", "type": "github" }, "original": { @@ -1481,11 +1481,11 @@ ] }, "locked": { - "lastModified": 1747466853, - "narHash": "sha256-/evYltwuF8Kz1odgocWnguh/8VQV1i76VB4yMTU9m7k=", + "lastModified": 1747893327, + "narHash": "sha256-9MVhGXDVDG3+eqzNsxK4n2uriPGVvjOvlxUKEEnGiAs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ba1a34fa6d995fe433109f0ad66de8d5613d46e", + "rev": "953023adda652e7ff9c64dacaa9f44da7c120191", "type": "github" }, "original": { @@ -1607,14 +1607,14 @@ "flake-compat": "flake-compat_4", "git-hooks": "git-hooks", "nixpkgs": "nixpkgs_9", - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1747320434, - "narHash": "sha256-wOW99SCOovRlX5y8+W1cRrS3mEN1QA0XTHMRfr3NMB8=", + "lastModified": 1747965231, + "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "433520257af7170824ab6e567d49b8e305e776e9", + "rev": "53007af63fade28853408370c4c600a63dd97f41", "type": "gitlab" }, "original": { @@ -1634,11 +1634,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1747554936, - "narHash": "sha256-LBFEVTt3JISA/HDHznJanvlNvKllNfILr1nfI8KZmVM=", + "lastModified": 1747987636, + "narHash": "sha256-fJtS5KNmnucEjMr62t/fqU0w7/O4ANmmfcl054nFU7M=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5a732bf3edb47767a25c3b05436e4c21f91edf91", + "rev": "6536895e719b971f664a6f055bdd950f93efb414", "type": "github" }, "original": { @@ -1650,11 +1650,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1747523215, - "narHash": "sha256-55RIMak4EwDaLdNTkM+4d3LjC90wlkNRaaG8DupK3AM=", + "lastModified": 1747957932, + "narHash": "sha256-SC6hFCcDtsD/n0L65RqJvKPvgzzOV4sYGy/h+TsJgnw=", "owner": "neovim", "repo": "neovim", - "rev": "5661f74ab2a6ef0c497ef2ea49bc58ea89b6ab6b", + "rev": "079e7d2b112af0e0b4bc1b2de8f706c02e220049", "type": "github" }, "original": { @@ -1673,11 +1673,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747600015, - "narHash": "sha256-ztNwDGru5Z/wu5I5SgkU03cx3Vz9gwLeFwcmlzeDwiA=", + "lastModified": 1747980132, + "narHash": "sha256-jdQZZDMYl9JBtWupRRneP1NLDylf2KPUu8z72tJVBJI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1db4f11c1d3e30e29ef87162a6137bccbcf8e18f", + "rev": "d5ccd8c5e6198bdac760ea65dd6c46e83a55b6f6", "type": "github" }, "original": { @@ -1695,11 +1695,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1747486745, - "narHash": "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI=", + "lastModified": 1747977864, + "narHash": "sha256-BEXi6zHNguEsBD3TIUk/2EMOh5c4Z664UaDeUYpWDhw=", "owner": "YaLTeR", "repo": "niri", - "rev": "ae89cb6017668f3a81ccd92461cbbc70ab8377d0", + "rev": "7fdb918cd04076b173a38f026dc5c27ac830b028", "type": "github" }, "original": { @@ -1728,11 +1728,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747486745, - "narHash": "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI=", + "lastModified": 1747977864, + "narHash": "sha256-BEXi6zHNguEsBD3TIUk/2EMOh5c4Z664UaDeUYpWDhw=", "owner": "YaLTeR", "repo": "niri", - "rev": "ae89cb6017668f3a81ccd92461cbbc70ab8377d0", + "rev": "7fdb918cd04076b173a38f026dc5c27ac830b028", "type": "github" }, "original": { @@ -1818,11 +1818,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -1833,11 +1833,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -1849,11 +1849,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -1861,18 +1861,18 @@ "type": "indirect" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -1945,11 +1945,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -1993,11 +1993,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -2025,11 +2025,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1747426788, - "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", + "lastModified": 1747920628, + "narHash": "sha256-IlAuXnIi+ZmyS89tt1YOFDCv7FKs9bNBHd3MXMp8PxE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12a55407652e04dcf2309436eb06fef0d3713ef3", + "rev": "e314d5c6d3b3a0f40ec5bcbc007b0cbe412f48ae", "type": "github" }, "original": { @@ -2041,11 +2041,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -2073,11 +2073,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -2201,11 +2201,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -2279,11 +2279,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -2295,11 +2295,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -2505,11 +2505,11 @@ "systems": "systems_15" }, "locked": { - "lastModified": 1747559815, - "narHash": "sha256-8hVMUrue1shGUEqnJ/yWzbgxjy0390XgbQONo0YfUbA=", + "lastModified": 1747905296, + "narHash": "sha256-+8PQ2g24U4TWUsIUY+ORcEzVxFXIPq1kfdiTq69Qy54=", "owner": "raphamorim", "repo": "rio", - "rev": "13434cbbb8f0fc74e71e6fbc66db35fe6698f2ac", + "rev": "903a7d2f52031467f877da5a6804ede9c86c1486", "type": "github" }, "original": { @@ -2666,11 +2666,11 @@ ] }, "locked": { - "lastModified": 1747535902, - "narHash": "sha256-rKWBtLcqQeu8PpfKIBn1ORXS2udSH/MwnQFwfSpFOLg=", + "lastModified": 1747967795, + "narHash": "sha256-76s4jDRbQzxRO+5y8ilMp5V30qVgY9R6n8U7aOap8ig=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b7a99615d26b82c39b73ccc9026545c3f3403b71", + "rev": "f1d5bfa8c692cacd798a3e1fb93d54c1b9ac701a", "type": "github" }, "original": { @@ -3144,11 +3144,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { @@ -3201,11 +3201,11 @@ "systems": "systems_20" }, "locked": { - "lastModified": 1746253489, - "narHash": "sha256-Lsegrsus7oZLLglhjYDUWKSh544Rylkc9y2GBnsD4TE=", + "lastModified": 1747746261, + "narHash": "sha256-qZ9AwEiAB2GkSLBR23NUVi35TWhcy7lTFEdGHXLAr94=", "owner": "abenz1267", "repo": "walker", - "rev": "65fd786cf25c207efe0b5f2963d4cb5b2125bc22", + "rev": "0fed5e4af1530ede04da6d18e0d3bd423f7caceb", "type": "github" }, "original": { @@ -3315,11 +3315,11 @@ "nixpkgs": "nixpkgs_21" }, "locked": { - "lastModified": 1747592715, - "narHash": "sha256-2rq/h8xHOuGi+Vhi4cfioN1HA06qFssiIN2ZgMTITnM=", + "lastModified": 1747998984, + "narHash": "sha256-G5UvtOKD3fmVTnVTh1XCZVoD0HsKO8QI18sMWlYxjLs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "16e095bf03d26fd26d22f589b96e7b8853a05b70", + "rev": "e48b7105d570f5e66e1891292525e585eeffa58d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 89fc84c..a681bbc 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ walker.url = "github:abenz1267/walker"; - resume.url = "path:/home/zoey/dev/resume"; + resume.url = "git+https://code.zoeys.cloud/zoey/resume.git"; ags.url = "github:Aylur/ags/v1"; ags.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; @@ -51,7 +51,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - blog.url = "path:/home/zoey/dev/web"; + blog.url = "git+https://code.zoeys.cloud/zoey/web.git"; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; @@ -104,7 +104,7 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; zoeycomputer = { - url = "path:/home/zoey/dev/zoeys.computer"; + url = "git+https://code.zoeys.cloud/zoey/zoeys.computer.git"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -129,8 +129,6 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - nix-gaming.url = "path:/home/zoey/dev/nix-gaming"; - niri-src.url = "github:YaLTeR/niri"; niri-src.inputs.nixpkgs.follows = "nixpkgs"; @@ -191,12 +189,15 @@ sops-nix.nixosModules.sops solaar.nixosModules.default zoeycomputer.nixosModules.default - lix-module.nixosModules.default mailserver.nixosModule disko.nixosModules.disko niri.nixosModules.niri chaotic.nixosModules.default ]; + + systems.modules.earth = with inputs; [ + lix-module.nixosModules.default + ]; }; in snowfallConfig diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index b7fe050..eb64917 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -43,6 +43,7 @@ shells.nu.enable = true; shells.zsh.enable = true; + shells.fish.enable = true; rice.gtk.enable = true; rice.qt.enable = true; @@ -298,6 +299,7 @@ pinentryPackage = lib.mkForce pkgs.pinentry-gnome3; enableSshSupport = true; enableZshIntegration = true; + enableFishIntegration = true; enableNushellIntegration = true; }; }; diff --git a/modules/home/apps/term/kitty/default.nix b/modules/home/apps/term/kitty/default.nix index fd89b18..f3f458d 100644 --- a/modules/home/apps/term/kitty/default.nix +++ b/modules/home/apps/term/kitty/default.nix @@ -25,8 +25,6 @@ in { bold_font ${fonts.mono} Bold Italic italic_font ${fonts.mono} Italic bold_italic_font ${fonts.mono} Bold Italic - - shell ${lib.getExe pkgs.nushell} ''; catppuccin.enable = true; diff --git a/modules/home/apps/tools/starship/default.nix b/modules/home/apps/tools/starship/default.nix index 2b5f420..bf801db 100644 --- a/modules/home/apps/tools/starship/default.nix +++ b/modules/home/apps/tools/starship/default.nix @@ -16,6 +16,7 @@ in { programs.starship = { enable = true; enableZshIntegration = config.programs.zsh.enable; + enableFishIntegration = config.programs.fish.enable; enableNushellIntegration = config.programs.nushell.enable; settings = { add_newline = false; diff --git a/modules/home/apps/tools/tmux/default.nix b/modules/home/apps/tools/tmux/default.nix index a2ef3c9..1325924 100644 --- a/modules/home/apps/tools/tmux/default.nix +++ b/modules/home/apps/tools/tmux/default.nix @@ -24,7 +24,7 @@ in { programs.tmux = { enable = true; - shell = "${lib.getExe pkgs.nushell}"; + shell = "${lib.getExe pkgs.fish}"; historyLimit = 100000; plugins = with pkgs; [ tmuxPlugins.sensible diff --git a/modules/home/shells/aliases.nix b/modules/home/shells/aliases.nix index d3fc4d3..4a8ca73 100644 --- a/modules/home/shells/aliases.nix +++ b/modules/home/shells/aliases.nix @@ -29,7 +29,7 @@ with pkgs; { ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension"; tree = "${getExe eza} --tree --icons --tree"; kys = "shutdown now"; - w = ''| nvim -c "setlocal buftype=nofile bufhidden=wipe" -c "nnoremap q :q!" -''; + # w = ''| nvim -c "setlocal buftype=nofile bufhidden=wipe" -c "nnoremap q :q!" -''; lv = "nvim -c \"normal '\''0\""; pf = '' fzf --bind ctrl-y:preview-up,ctrl-e:preview-down \ @@ -38,7 +38,6 @@ with pkgs; { --bind ctrl-k:up,ctrl-j:down \ --preview='bat --style=numbers --color=always --line-range :100 {}' ''; - ff = "for file in \`pf\`; do cmd=\"v \$file\" && print -rs -- \$cmd && eval \$cmd; done"; gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE"; agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE"; tsm = "transmission-remote"; diff --git a/modules/home/shells/fish/default.nix b/modules/home/shells/fish/default.nix index 77fda66..f10cbba 100644 --- a/modules/home/shells/fish/default.nix +++ b/modules/home/shells/fish/default.nix @@ -20,9 +20,13 @@ in { interactiveShellInit = '' set -gx LC_ALL en_US.UTF-8 set -gx SSH_AUTH_SOCK /run/user/1000/keyring/ssh - set -gx FLAKE /home/zoey/nixos/ + set -gx NH_FLAKE /home/zoey/nixos/ set -g FZF_PREVIEW_FILE_CMD "head -n 10" set -g FZF_PREVIEW_DIR_CMD "ls" + + if not set -q TMUX + tmux + end ''; plugins = [ diff --git a/modules/home/wms/niri/default.nix b/modules/home/wms/niri/default.nix index 45a2d72..ee0eccb 100644 --- a/modules/home/wms/niri/default.nix +++ b/modules/home/wms/niri/default.nix @@ -110,6 +110,7 @@ in { height = 1440; refresh = 239.972; }; + variable-refresh-rate = "on-demand"; scale = 1; transform = { # "normal" @@ -277,7 +278,18 @@ in { y = 16; }; } + { + matches = [ + { + app-id = "^cyberpunk2077.exe$"; + } + { + app-id = "^Overwatch2.exe$"; + } + ]; + variable-refresh-rate = true; + } { matches = [ { diff --git a/modules/nixos/hardware/gpu-passthru/default.nix b/modules/nixos/hardware/gpu-passthru/default.nix index fd24086..9ba0531 100644 --- a/modules/nixos/hardware/gpu-passthru/default.nix +++ b/modules/nixos/hardware/gpu-passthru/default.nix @@ -106,6 +106,26 @@ with lib.custom; let # Change to powersave governor echo powersave | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor ''; + + libvirtd-cfg = config.virtualisation.libvirtd; + + qemuConfigFile = pkgs.writeText "qemu.conf" '' + ${optionalString libvirtd-cfg.qemu.ovmf.enable '' + nvram = [ + "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", + "/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd", + "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd", + "/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd" + ] + ''} + ${optionalString (!libvirtd-cfg.qemu.runAsRoot) '' + user = "qemu-libvirtd" + group = "qemu-libvirtd" + ''} + ${libvirtd-cfg.qemu.verbatimConfig} + ''; + + dirName = "libvirt"; in { options.hardware.gpu-passthru = with types; { enable = mkBoolOpt false "Enable support for single gpu-passthru"; @@ -173,9 +193,45 @@ in { in [env]; }; - systemd.services.libvirtd-config = { - enable = lib.mkForce false; - }; + systemd.services.libvirtd-config.script = lib.mkForce '' + # Copy default libvirt network config .xml files to /var/lib + # Files modified by the user will not be overwritten + for i in $(cd ${libvirtd-cfg.package}/var/lib && echo \ + libvirt/qemu/networks/*.xml \ + libvirt/nwfilter/*.xml ); + do + # Intended behavior + # shellcheck disable=SC2174 + mkdir -p "/var/lib/$(dirname "$i")" -m 755 + if [ ! -e "/var/lib/$i" ]; then + cp -pd "${libvirtd-cfg.package}/var/lib/$i" "/var/lib/$i" + fi + done + + # Copy generated qemu config to libvirt directory + cp -f ${qemuConfigFile} /var/lib/${dirName}/qemu.conf + + # stable (not GC'able as in /nix/store) paths for using in section of xml configs + for emulator in ${libvirtd-cfg.package}/libexec/libvirt_lxc ${libvirtd-cfg.qemu.package}/bin/qemu-kvm ${libvirtd-cfg.qemu.package}/bin/qemu-system-*; do + ln -s --force "$emulator" /run/${dirName}/nix-emulators/ + done + + ln -s --force ${libvirtd-cfg.qemu.package}/bin/qemu-pr-helper /run/${dirName}/nix-helpers/ + + ${optionalString libvirtd-cfg.qemu.ovmf.enable ( + let + ovmfpackage = pkgs.buildEnv { + name = "qemu-ovmf"; + paths = libvirtd-cfg.qemu.ovmf.packages; + }; + in '' + ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/ + '' + )} + ''; system.activationScripts.libvirt-hooks.text = '' ln -Tfs /etc/libvirt/hooks /var/lib/libvirt/hooks diff --git a/modules/nixos/sites/hydra/default.nix b/modules/nixos/sites/hydra/default.nix index 89f8a90..f5ceda0 100644 --- a/modules/nixos/sites/hydra/default.nix +++ b/modules/nixos/sites/hydra/default.nix @@ -20,6 +20,9 @@ in { hydraURL = "https://hydra.zoeys.computer"; useSubstitutes = true; notificationSender = "hydra@localhost"; # e-mail of hydra service + extraConfig = '' + Include /var/lib/hydra/github_authorizations.conf + ''; }; services.nginx.virtualHosts."hydra.zoeys.computer" = { diff --git a/overlays/libvirt-hooks/defualt.nix b/overlays/libvirt-hooks/defualt.nix deleted file mode 100644 index 07c8caa..0000000 --- a/overlays/libvirt-hooks/defualt.nix +++ /dev/null @@ -1,23 +0,0 @@ -self: super: { - nixosModules = - super.nixosModules - // { - libvirtd = { - config, - lib, - pkgs, - ... - } @ args: let - originalModule = import super.nixosModules.libvirtd args; - in - lib.mkMerge [ - originalModule - - { - config = lib.mkIf config.virtualisation.libvirtd.enable { - virtualisation.libvirtd.hooks = lib.mkForce {}; - }; - } - ]; - }; -} diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 3cb2eee..ff00a6f 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -50,6 +50,8 @@ }; }; + documentation.man.generateCaches = false; + services.gdm-monitors.enable = true; specialisation = { @@ -218,13 +220,14 @@ inputs.awsvpnclient.packages.${system}.awsvpnclient ]; + programs.fish.enable = true; programs.zsh.enable = true; programs.fuse.userAllowOther = true; users.users.zoey = { isNormalUser = true; description = "zoey"; extraGroups = ["networkmanager" "wheel" "docker" "libvirtd" "plugdev"]; - shell = pkgs.zsh; + shell = pkgs.fish; initialHashedPassword = "$6$rounds=2000000$rFBJH7LwdEHvv.0i$HdHorWqp8REPdWPk5fEgZXX1TujRJkMxumGK0f0elFN0KRPlBjJMW2.35A.ID/o3eC/hGTwbSJAcJcwVN2zyV/"; }; diff --git a/systems/x86_64-linux/earth/hardware-configuration.nix b/systems/x86_64-linux/earth/hardware-configuration.nix index 70dc156..c7cdb55 100644 --- a/systems/x86_64-linux/earth/hardware-configuration.nix +++ b/systems/x86_64-linux/earth/hardware-configuration.nix @@ -14,7 +14,7 @@ boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-amd"]; + boot.kernelModules = ["kvm-amd" "ntsync"]; boot.extraModulePackages = []; fileSystems."/" = { diff --git a/systems/x86_64-linux/pluto/default.nix b/systems/x86_64-linux/pluto/default.nix index 79db280..5f65ffe 100644 --- a/systems/x86_64-linux/pluto/default.nix +++ b/systems/x86_64-linux/pluto/default.nix @@ -91,13 +91,13 @@ sites = { cv.enable = true; - gitlab.enable = true; + gitlab.enable = false; grafana.enable = true; mirror.enable = true; pterodactyl.enable = true; search.enable = true; map.enable = true; - hydra.enable = false; + hydra.enable = true; cache.enable = true; minio.enable = true; immich.enable = true;