diff --git a/flake.lock b/flake.lock index 35671d7..212c4bf 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1735301051, - "narHash": "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=", + "lastModified": 1743762088, + "narHash": "sha256-f+oXT9b3xuBDmm4v4nDqJvlHabxxZRB6+pay4Ub/NvA=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "06017e753c8886d5296768dca80745ee09402a2d", + "rev": "786f539d69d5abcefa68978dbaa964ac14536a00", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1742213273, - "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", + "lastModified": 1743265529, + "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", + "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1742599566, - "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=", + "lastModified": 1743801669, + "narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=", "owner": "catppuccin", "repo": "nix", - "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402", + "rev": "07beb389d69a52c4dd5895da9553463c3740a26a", "type": "github" }, "original": { @@ -210,21 +210,6 @@ "type": "github" } }, - "crane_3": { - "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -232,11 +217,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -251,11 +236,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742750000, - "narHash": "sha256-03p4sJr5edbuXd5AkoUTr46co5+/B4APV/Sbv/hoDHk=", + "lastModified": 1743930892, + "narHash": "sha256-2efjGG9Mpz/QPZQjkeqOW/mpxf099t0NO0kK/tchWPQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7ea1ac244572b6186965d15ef05ec5d466aac1ea", + "rev": "3fb12f3aacdc18ee1f455cca300c33d5f20de175", "type": "github" }, "original": { @@ -432,11 +417,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -492,11 +477,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -531,11 +516,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -600,7 +585,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_8" + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1715533576, @@ -619,7 +604,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_9" + "flake-utils": "flake-utils_8" }, "locked": { "lastModified": 1715533576, @@ -712,24 +697,6 @@ "inputs": { "systems": "systems_13" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_14" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -744,9 +711,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_18" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -762,9 +729,9 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { - "systems": "systems_19" + "systems": "systems_18" }, "locked": { "lastModified": 1694529238, @@ -805,11 +772,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1742702839, - "narHash": "sha256-9atn1IrQH/R2ahK+Zj6JpS0CfjSPBLObHQeTw/4Vv5Q=", + "lastModified": 1743820100, + "narHash": "sha256-URg5DLo0IvpTLNGrWA9f6U4pl21JxsQWSJUpjvALyxs=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "c58fe676ad6212114455ac89a2703dcc3b8b67b7", + "rev": "6f7977fef186faa9b9afe7707dc21a2eff59883b", "type": "github" }, "original": { @@ -957,11 +924,32 @@ ] }, "locked": { - "lastModified": 1742744903, - "narHash": "sha256-qd2uiGol/kb9Dk0vgOOLBl9VsycG0VfteM78OduFl2Y=", + "lastModified": 1743948087, + "narHash": "sha256-B6cIi2ScgVSROPPlTti6len+TdR0K25B9R3oKvbw3M8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ff90f09d1bd189b722e60798513724cdd3580b6", + "rev": "ef3b2a6b602c3f1a80c6897d6de3ee62339a3eb7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -1040,11 +1028,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1742397293, - "narHash": "sha256-WVREToubLhIlogCoNJzo+HdatLKkEushwStDU1uyRnc=", + "lastModified": 1743294595, + "narHash": "sha256-kEr12UVk8Bul09wi9g8UwXADpTdDxinfAO2V5/1RhJA=", "owner": "hyprwm", "repo": "hypridle", - "rev": "71e875e49e583c7b8b1364b55dfe494375c4e3ea", + "rev": "66d1815b5ef5f7de083ec285aaab68064924b897", "type": "github" }, "original": { @@ -1071,11 +1059,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1742746774, - "narHash": "sha256-p33LUt9KoNQOAFBWOyN8OfWLVKUOyAyX8PLwWw6s454=", + "lastModified": 1743895813, + "narHash": "sha256-1K/UFvPrq0OBq4A8elxzIqjDFuq4311F6D0Sbe4APAQ=", "ref": "refs/heads/main", - "rev": "e4abf26069b4d43c8f6ad6b3dfb56c952abb38c2", - "revCount": 5924, + "rev": "e96b8ce4cc5e5856b6da653f1d92af856b5e72c9", + "revCount": 5968, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1123,11 +1111,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1743549251, + "narHash": "sha256-yf+AXt0RkAkCyF6iSnJt6EJAnNG/l6qv70CVzhRP6Bg=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "4ab17ccac08456cb5e00e8bd323de2efd30612be", "type": "github" }, "original": { @@ -1299,11 +1287,11 @@ ] }, "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "lastModified": 1742984269, + "narHash": "sha256-uz9FaCIbga/gQ5ZG1Hb4HVVjTWT1qjjCAFlCXiaefxg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "rev": "7248194a2ce0106ae647b70d0526a96dc9d6ad60", "type": "github" }, "original": { @@ -1417,8 +1405,8 @@ "lexical": { "inputs": { "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_18", - "systems": "systems_22" + "nixpkgs": "nixpkgs_19", + "systems": "systems_21" }, "locked": { "lastModified": 1727126932, @@ -1490,27 +1478,6 @@ "type": "gitlab" } }, - "mc-honeypot": { - "inputs": { - "crane": "crane_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732194526, - "narHash": "sha256-qgPm10THq0V3yc26TXU0RO2LFLAH3qpWKAbm9SNU66Q=", - "owner": "Duckulus", - "repo": "mc-honeypot", - "rev": "f0611215c6cea398736bbb2af4b5ad38c77d5c47", - "type": "github" - }, - "original": { - "owner": "Duckulus", - "repo": "mc-honeypot", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_5", @@ -1522,11 +1489,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1742688454, - "narHash": "sha256-gK9nPXWEXVtBWlZCBlwMZynlCDGJ1TtVlRBfC02PNxc=", + "lastModified": 1743898191, + "narHash": "sha256-JCcQDgwYV+C4igYA6DchGpKKA6eyZXLvRrxWHmQbmDk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "098d2af8c606ea8adc1b8b3084f454ca681a7ab3", + "rev": "276567b29d8c9aca7b6a54e93a9183e44a17f19c", "type": "github" }, "original": { @@ -1538,11 +1505,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1742654371, - "narHash": "sha256-fmOfoKTyGmjouWGFxfJvMdZVX3u2GSZyMlVE9yNhusA=", + "lastModified": 1743893800, + "narHash": "sha256-i/X0b3b/dAqjNIB5RoryeDvMkVfdoPBwK5xn06W6Wdo=", "owner": "neovim", "repo": "neovim", - "rev": "f4d9a2983a49c1729f78ffbf6b1e6dcc30215d0d", + "rev": "28e819018520a2300eaeeec6794ffcd614b25dd2", "type": "github" }, "original": { @@ -1551,6 +1518,62 @@ "type": "github" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable_4", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1743943715, + "narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1743923080, + "narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "430b155929a60644ea223012ee0c1389fc5e3755", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -1589,11 +1612,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "type": "github" }, "original": { @@ -1605,11 +1628,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -1646,11 +1669,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -1685,11 +1708,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -1731,6 +1754,22 @@ "type": "github" } }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1741865919, @@ -1749,15 +1788,15 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", - "owner": "nixos", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1765,15 +1804,15 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", - "owner": "NixOS", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1844,6 +1883,22 @@ } }, "nixpkgs_16": { + "locked": { + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1740547748, "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", @@ -1859,13 +1914,13 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -1875,7 +1930,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1719931832, "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", @@ -1923,11 +1978,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -1939,11 +1994,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -2002,11 +2057,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1742578646, - "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", + "lastModified": 1743689281, + "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", + "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", "type": "github" }, "original": { @@ -2016,25 +2071,6 @@ "type": "github" } }, - "opnix": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_11" - }, - "locked": { - "lastModified": 1733770284, - "narHash": "sha256-cZha5DPsmr1H007pn/95t2wIktEUSepjmLm0RL/bu50=", - "owner": "brizzbuzz", - "repo": "opnix", - "rev": "4696993a9ef5f37f7d75b8aa64db0053c85eaa10", - "type": "github" - }, - "original": { - "owner": "brizzbuzz", - "repo": "opnix", - "type": "github" - } - }, "pnpm2nix": { "inputs": { "flake-utils": "flake-utils_2", @@ -2056,7 +2092,7 @@ }, "pnpm2nix_2": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_12" }, "locked": { @@ -2102,11 +2138,11 @@ ] }, "locked": { - "lastModified": 1742058297, - "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -2160,7 +2196,7 @@ "resume": { "inputs": { "nixpkgs": "nixpkgs_14", - "systems": "systems_16" + "systems": "systems_15" }, "locked": { "lastModified": 1741033401, @@ -2183,14 +2219,14 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_17" + "systems": "systems_16" }, "locked": { - "lastModified": 1742634895, - "narHash": "sha256-vWxkx9/dGzAzaVo177H2VO796pc3UTUqwOqH1J9xUyM=", + "lastModified": 1743931237, + "narHash": "sha256-TiHJQYx0PkBceCG4UoavTO9UN8Dwoqglw5Lac5awLk8=", "owner": "raphamorim", "repo": "rio", - "rev": "d0ff00eca8d0a9f096d4245e4ec7af850d19d1a9", + "rev": "dbaf02f9ec66d8d55c363f697d4eab3ca24d80aa", "type": "github" }, "original": { @@ -2217,12 +2253,11 @@ "lanzaboote": "lanzaboote", "lix-module": "lix-module", "mailserver": "mailserver", - "mc-honeypot": "mc-honeypot", "neovim-nightly-overlay": "neovim-nightly-overlay", + "niri": "niri", "nixos-generators": "nixos-generators", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs_10", - "opnix": "opnix", + "nixpkgs": "nixpkgs_11", "pnpm2nix": "pnpm2nix_2", "posting": "posting", "resume": "resume", @@ -2230,8 +2265,9 @@ "rust-overlay": "rust-overlay_4", "snowfall-lib": "snowfall-lib", "solaar": "solaar", + "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", - "systems": "systems_21", + "systems": "systems_20", "umu": "umu", "waybar": "waybar", "zen-browser": "zen-browser", @@ -2286,11 +2322,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "lastModified": 1743820323, + "narHash": "sha256-UXxJogXhPhBFaX4uxmMudcD/x3sEGFtoSc4busTcftY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "rev": "b4734ce867252f92cdc7d25f8cc3b7cef153e703", "type": "github" }, "original": { @@ -2306,11 +2342,11 @@ ] }, "locked": { - "lastModified": 1742697269, - "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", + "lastModified": 1743906877, + "narHash": "sha256-Thah1oU8Vy0gs9bh5QhNcQh1iuQiowMnZPbrkURonZA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", + "rev": "9d00c6b69408dd40d067603012938d9fbe95cfcd", "type": "github" }, "original": { @@ -2388,19 +2424,37 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_16" + }, + "locked": { + "lastModified": 1743910657, + "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spicetify-nix": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "systems": "systems_20" + "systems": "systems_19" }, "locked": { - "lastModified": 1742703429, - "narHash": "sha256-/07c78WpRta925dyZEhwQi+D+rd+zVoDPApur+907p4=", + "lastModified": 1743946771, + "narHash": "sha256-n/LxWCGJtDi/rWMKEXWQn39v46iFZpW+V9mY4/4LJQs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "d86aca850354c8db834c20feb170356e3d28a5c6", + "rev": "af24d96983faa41e79fa00312106c37a7cc2ca0a", "type": "github" }, "original": { @@ -2515,6 +2569,7 @@ } }, "systems_16": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2530,7 +2585,6 @@ } }, "systems_17": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2635,21 +2689,6 @@ "type": "github" } }, - "systems_23": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_3": { "locked": { "lastModified": 1689347949, @@ -2781,11 +2820,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743748085, + "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", "type": "github" }, "original": { @@ -2796,15 +2835,15 @@ }, "umu": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "dir": "packaging/nix", - "lastModified": 1742441912, - "narHash": "sha256-8379sxse20nhUT6VcjjpsDmYoT8EJQCy0E8bLZZdos8=", + "lastModified": 1743524226, + "narHash": "sha256-af5xqPTOE3u+tsavSAuuuYgsGFMAq8sJYJTTr2V+tRw=", "owner": "Open-Wine-Components", "repo": "umu-launcher", - "rev": "28eef5f5638d5660fb2d7c1811c8f2915a5e8c5b", + "rev": "5fd075b7ece7fc1b22e8c5151b1804fc3939dbe3", "type": "github" }, "original": { @@ -2816,7 +2855,7 @@ }, "utils": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1726560853, @@ -2840,11 +2879,11 @@ ] }, "locked": { - "lastModified": 1740125099, - "narHash": "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=", + "lastModified": 1743754816, + "narHash": "sha256-UsDvxfAwR0qXSrCV3UOZLB6r6l08lfdvg9OoFWNVxSM=", "owner": "Alexays", "repo": "Waybar", - "rev": "8490a1d9b9a5c8770dd63e9faca0a5e01acedcae", + "rev": "056295cbc6d6b8efccae51251483c6f92b3b15b2", "type": "github" }, "original": { @@ -2894,16 +2933,50 @@ "type": "github" } }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_17" + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1742736106, - "narHash": "sha256-wzdYoYASPlITYBiw2xDyE56DnOcLNsO6QHRGUDj6kq4=", + "lastModified": 1743854692, + "narHash": "sha256-0j18TfmblTLRC/yJhx3uhaJZ1gmq1JDCZgKtJMjHb9s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7c3008fcc5a436c885d3faaf6d058afc41ae3762", + "rev": "d0b39aeb79744bc47c6cc3b0fde1d5156673d4a6", "type": "github" }, "original": { @@ -2948,7 +3021,7 @@ "nixpkgs" ], "process-compose-flake": "process-compose-flake", - "systems": "systems_23" + "systems": "systems_22" }, "locked": { "lastModified": 1731607548, diff --git a/flake.nix b/flake.nix index 1710869..bc2bb22 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,9 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.darwin.follows = ""; + # to replace with sops-nix + sops-nix.url = "github:Mic92/sops-nix"; + pnpm2nix.url = "github:nzbr/pnpm2nix-nzbr"; solaar = { @@ -128,10 +131,7 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - opnix.url = "github:brizzbuzz/opnix"; - - mc-honeypot.url = "github:Duckulus/mc-honeypot"; - mc-honeypot.inputs.nixpkgs.follows = "nixpkgs"; + niri.url = "github:sodiboo/niri-flake"; }; outputs = inputs @ {self, ...}: let @@ -139,10 +139,10 @@ inherit inputs; src = ./.; - overlays = [ - inputs.rust-overlay.overlays.default + overlays = with inputs; [ + rust-overlay.overlays.default (final: prev: { - ghostty = inputs.ghostty.packages."x86_64-linux".default; + ghostty = ghostty.packages."x86_64-linux".default; }) (final: prev: { shadps4 = prev.shadps4.overrideAttrs { @@ -156,6 +156,7 @@ patches = []; }; }) + niri.overlays.niri ]; snowfall = { @@ -171,10 +172,9 @@ homes.modules = with inputs; [ spicetify-nix.homeManagerModules.default - catppuccin.homeManagerModules.catppuccin + catppuccin.homeModules.catppuccin anyrun.homeManagerModules.default ags.homeManagerModules.default - opnix.homeManagerModules.default ]; systems.modules.nixos = with inputs; [ @@ -183,13 +183,13 @@ catppuccin.nixosModules.catppuccin blog.nixosModule agenix.nixosModules.default + sops-nix.nixosModules.sops solaar.nixosModules.default zoeycomputer.nixosModules.default lix-module.nixosModules.default mailserver.nixosModule disko.nixosModules.disko - mc-honeypot.nixosModules.default - opnix.nixosModules.default + niri.nixosModules.niri ]; }; in diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index 165d1ad..61c204c 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -5,10 +5,11 @@ lib, ... }: { - wms.hyprland.enable = true; + # wms.hyprland.enable = true; + wms.niri.enable = true; apps = { web.librewolf.enable = true; - web.librewolf.setDefault = true; + web.zen.setDefault = true; tools.git.enable = true; tools.tmux.enable = true; @@ -24,7 +25,7 @@ term.kitty.enable = true; term.foot.enable = true; - # term.rio.enable = true; + term.rio.enable = true; term.alacritty.enable = true; term.ghostty.enable = true; @@ -104,7 +105,7 @@ work.vpn.enable = true; - home.packages = [ + home.packages = with pkgs; [ pkgs.gimp pkgs.slack @@ -119,6 +120,7 @@ pkgs.ungoogled-chromium pkgs.uutils-coreutils-noprefix pkgs.yazi + pkgs.reaper pkgs.fragments inputs.posting.packages.${pkgs.system}.default @@ -135,6 +137,8 @@ pkgs.custom.enc + pkgs.neural-amp-modeler-lv2 + pkgs.nix-tree # inputs.g2claude.packages.${pkgs.system}.default @@ -197,6 +201,8 @@ pkgs.rofimoji pkgs.renderdoc + pkgs.xwayland-satellite + pkgs.nautilus pkgs.nautilus-python pkgs.loupe @@ -230,25 +236,29 @@ programs.cava = { enable = true; catppuccin.enable = true; - # settings = { - # general = { - # bars = 2; - # channels = 2; - # mono = "no"; - # - # # smoothing = 0; - # # falloff = 0.0; - # }; - # input = { - # method = "pipewire"; - # source = "alsa_input.pci-0000_0d_00.4.analog-stereo"; - # }; - # # output = { - # # method = "ncurses"; - # # }; - # }; + settings = { + general = { + # bars = 2; + # channels = 2; + # mono = "no"; + + # smoothing = 0; + # falloff = 0.0; + }; + input = { + method = "pipewire"; + source = "497"; + }; + # output = { + # method = "ncurses"; + # }; + }; }; + catppuccin.fuzzel.enable = true; + + programs.fuzzel.enable = true; + programs.btop = { enable = true; catppuccin.enable = true; diff --git a/lib/theme/default.nix b/lib/theme/default.nix index 6ba6215..41a48d0 100644 --- a/lib/theme/default.nix +++ b/lib/theme/default.nix @@ -28,5 +28,5 @@ }; }; - wallpaper = ./favs-98.png; + wallpaper = ./wall4p.jpg; } diff --git a/lib/theme/wall4p.jpg b/lib/theme/wall4p.jpg new file mode 100644 index 0000000..ce8ef4f Binary files /dev/null and b/lib/theme/wall4p.jpg differ diff --git a/lib/theme/wallp.jpg b/lib/theme/wallp.jpg new file mode 100644 index 0000000..d7be673 Binary files /dev/null and b/lib/theme/wallp.jpg differ diff --git a/modules/home/apps/helpers/waybar/default.nix b/modules/home/apps/helpers/waybar/default.nix index 719e39b..afe4848 100644 --- a/modules/home/apps/helpers/waybar/default.nix +++ b/modules/home/apps/helpers/waybar/default.nix @@ -497,7 +497,7 @@ in { "gtk-layer-shell" = true; passthrough = false; "fixed-center" = true; - "modules-left" = ["hyprland/workspaces" "hyprland/window"]; + "modules-left" = ["hyprland/workspaces" "hyprland/window" "niri/workspaces" "niri/window"]; "modules-center" = ["mpris"]; "modules-right" = [ "cpu" diff --git a/modules/home/apps/term/alacritty/default.nix b/modules/home/apps/term/alacritty/default.nix index 20d8a1a..90f5f87 100644 --- a/modules/home/apps/term/alacritty/default.nix +++ b/modules/home/apps/term/alacritty/default.nix @@ -12,22 +12,56 @@ in { enable = mkBoolOpt false "Enable Alacritty Term"; fonts = { + # normal = { + # family = mkStringOpt "Cozette" "The Family of the font"; + # # style = mkStringOpt "ExtraBold" "The Style of the font"; + # }; + # bold = { + # family = mkStringOpt "Cozette" "The Family of the font"; + # # style = mkStringOpt "Heavy" "The Style of the font"; + # }; + # italic = { + # family = mkStringOpt "Cozette" "The Family of the font"; + # # style = mkStringOpt "ExtraBold Italic" "The Style of the font"; + # }; + # bold_italic = { + # family = mkStringOpt "Cozette" "The Family of the font"; + # # style = mkStringOpt "Heavy Italic" "The Style of the font"; + # }; + normal = { - family = mkStringOpt "Iosevka" "The Family of the font"; - style = mkStringOpt "ExtraBold" "The Style of the font"; + family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font"; + style = mkStringOpt "SemiBold SemiExtended" "The Style of the font"; }; bold = { - family = mkStringOpt "Iosevka" "The Family of the font"; - style = mkStringOpt "Heavy" "The Style of the font"; + family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font"; + style = mkStringOpt "Bold SemiExtended" "The Style of the font"; }; italic = { - family = mkStringOpt "Iosevka" "The Family of the font"; - style = mkStringOpt "ExtraBold Italic" "The Style of the font"; + family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font"; + style = mkStringOpt "SemiBold Italic SemiExtended" "The Style of the font"; }; bold_italic = { - family = mkStringOpt "Iosevka" "The Family of the font"; - style = mkStringOpt "Heavy Italic" "The Style of the font"; + family = mkStringOpt "Iosevka Nerd Font Mono" "The Family of the font"; + style = mkStringOpt "Bold Italic SemiExtended" "The Style of the font"; }; + + # normal = { + # family = mkStringOpt "PragmataPro" "The Family of the font"; + # # style = mkStringOpt "" "The Style of the font"; + # }; + # bold = { + # family = mkStringOpt "PragmataPro" "The Family of the font"; + # style = mkStringOpt "Bold" "The Style of the font"; + # }; + # italic = { + # family = mkStringOpt "PragmataPro" "The Family of the font"; + # style = mkStringOpt "Italic" "The Style of the font"; + # }; + # bold_italic = { + # family = mkStringOpt "PragmataPro" "The Family of the font"; + # style = mkStringOpt "Bold Italic" "The Style of the font"; + # }; }; }; @@ -37,14 +71,29 @@ in { catppuccin.enable = true; settings = { + colors = { + primary.background = "#11111b"; + }; + env = { + term = "xterm-256color"; + }; + cursor = { + style = { + shape = "Beam"; + }; + vi_mode_style = { + shape = "Beam"; + }; + }; window = { - opacity = 0.95; + # opacity = 0.95; padding = { x = 20; y = 20; }; }; font = { + size = 16.0; normal = cfg.fonts.normal; bold = cfg.fonts.bold; italic = cfg.fonts.italic; diff --git a/modules/home/apps/term/ghostty/default.nix b/modules/home/apps/term/ghostty/default.nix index 7dcc845..100660a 100644 --- a/modules/home/apps/term/ghostty/default.nix +++ b/modules/home/apps/term/ghostty/default.nix @@ -16,10 +16,15 @@ in { # bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font"; # italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font"; # bold_italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font"; - normal = mkStringOpt "Pragmata Pro Mono" "Normal Font"; - bold = mkStringOpt "Iosevka ExtraBold" "Bold Font"; - italic = mkStringOpt "Iosevka Bold Italic" "Italic Font"; - bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font"; + # normal = mkStringOpt "Pragmata Pro Mono" "Normal Font"; + # bold = mkStringOpt "Pragmata Pro Mono" "Bold Font"; + # italic = mkStringOpt "Iosevka Bold Italic" "Italic Font"; + # bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font"; + + normal = mkStringOpt "Iosevka" "Normal Font"; + bold = mkStringOpt "Iosevka" "Bold Font"; + italic = mkStringOpt "Iosevka" "Italic Font"; + bold_italic = mkStringOpt "Iosevka" "Bold Italic Font"; }; }; diff --git a/modules/home/apps/term/kitty/default.nix b/modules/home/apps/term/kitty/default.nix index 6f0bae0..55a2958 100644 --- a/modules/home/apps/term/kitty/default.nix +++ b/modules/home/apps/term/kitty/default.nix @@ -12,14 +12,18 @@ in { enable = mkBoolOpt false "Enable Kitty Term"; fonts = { - normal = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold" "Normal Font"; - bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font"; - italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font"; - bold_italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font"; - # normal = mkStringOpt "Iosevka Bold" "Normal Font"; - # bold = mkStringOpt "Iosevka ExtraBold" "Bold Font"; - # italic = mkStringOpt "Iosevka Bold Italic" "Italic Font"; - # bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font"; + # normal = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold" "Normal Font"; + # bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font"; + # italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font"; + # bold_italic = mkStringOpt "JetBrainsMoIosevka ExtraBold ItalicnoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font"; + # normal = mkStringOpt "Kirsch Nerd Font Mono" "Normal Font"; + # bold = mkStringOpt "Kirsch Nerd Font Mono" "BBoldold Font"; + # italic = mkStringOpt "Kirsch Nerd Font Mono" "Italic Font"; + # bold_italic = mkStringOpt "Kirsch Nerd Font Mono" "Bold Italic Font"; + normal = mkStringOpt "CozetteVector" "Normal Font"; + bold = mkStringOpt "CozetteVector" "Bold Font"; + italic = mkStringOpt "CozetteVector" "Italic Font"; + bold_italic = mkStringOpt "CozetteVector" "Bold Italic Font"; }; }; @@ -28,7 +32,7 @@ in { enable = true; font = { name = cfg.fonts.normal; - size = 14; + size = 16; }; extraConfig = '' @@ -41,7 +45,7 @@ in { settings = { window_padding_width = 12; - background_opacity = "0.9"; + # background_opacity = "0.9"; # background = "#000000"; }; }; diff --git a/modules/home/apps/term/rio/default.nix b/modules/home/apps/term/rio/default.nix index 72cd2a8..b16419d 100644 --- a/modules/home/apps/term/rio/default.nix +++ b/modules/home/apps/term/rio/default.nix @@ -16,7 +16,7 @@ in { config = mkIf cfg.enable { programs.rio = { enable = true; - package = inputs.rio-term.packages.${pkgs.system}.default; + # package = inputs.rio-term.packages.${pkgs.system}.default; settings = { window = { opacity = 0.9; diff --git a/modules/home/apps/tools/neovim/config/lazyvim.json b/modules/home/apps/tools/neovim/config/lazyvim.json index 044f553..f2fecfc 100644 --- a/modules/home/apps/tools/neovim/config/lazyvim.json +++ b/modules/home/apps/tools/neovim/config/lazyvim.json @@ -14,6 +14,7 @@ "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.clangd", + "lazyvim.plugins.extras.lang.rust", "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.nix", "lazyvim.plugins.extras.lang.sql", @@ -32,8 +33,9 @@ "lazyvim.plugins.extras.coding.luasnip", "lazyvim.plugins.extras.coding.blink" ], + "install_version": 8, "news": { - "NEWS.md": "6520" + "NEWS.md": "10960" }, "version": 8 } diff --git a/modules/home/apps/tools/neovim/config/lua/config/lazy.lua b/modules/home/apps/tools/neovim/config/lua/config/lazy.lua index 7f21316..580d5dd 100644 --- a/modules/home/apps/tools/neovim/config/lua/config/lazy.lua +++ b/modules/home/apps/tools/neovim/config/lua/config/lazy.lua @@ -3,34 +3,7 @@ require("lazy").setup({ -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import/override with your plugins - -- { import = "lazyvim.plugins.extras.lang.rust" }, - -- { import = "lazyvim.plugins.extras.lang.json" }, - -- { import = "lazyvim.plugins.extras.lang.astro" }, - -- { import = "lazyvim.plugins.extras.lang.git" }, - -- { import = "lazyvim.plugins.extras.lang.docker" }, - -- { import = "lazyvim.plugins.extras.lang.clangd" }, - -- { import = "lazyvim.plugins.extras.lang.cmake" }, - -- { import = "lazyvim.plugins.extras.lang.haskell" }, - -- { import = "lazyvim.plugins.extras.lang.java" }, - -- { import = "lazyvim.plugins.extras.lang.markdown" }, - -- { import = "lazyvim.plugins.extras.lang.nix" }, - -- { import = "lazyvim.plugins.extras.lang.sql" }, - -- { import = "lazyvim.plugins.extras.lang.svelte" }, - -- { import = "lazyvim.plugins.extras.lang.tailwind" }, - -- { import = "lazyvim.plugins.extras.lang.tex" }, - -- { import = "lazyvim.plugins.extras.lang.typescript" }, - -- { import = "lazyvim.plugins.extras.lang.toml" }, - -- { import = "lazyvim.plugins.extras.lang.angular" }, - -- - -- { import = "lazyvim.plugins.extras.formatting.prettier" }, - -- - -- { import = "lazyvim.plugins.extras.coding.luasnip" }, - -- { import = "lazyvim.plugins.extras.coding.yanky" }, - -- - -- { import = "lazyvim.plugins.extras.dap.core" }, { import = "plugins" }, - { import = "plugins.extras.rust" }, - -- { import = "plugins.extras.clangd" }, }, defaults = { -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. diff --git a/modules/home/apps/tools/neovim/config/lua/config/options.lua b/modules/home/apps/tools/neovim/config/lua/config/options.lua index a2fd6f4..bd49ad3 100644 --- a/modules/home/apps/tools/neovim/config/lua/config/options.lua +++ b/modules/home/apps/tools/neovim/config/lua/config/options.lua @@ -9,3 +9,5 @@ end -- in this case. vim.g.lazyvim_blink_main = true + +vim.o.termguicolors = true diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index ef2df27..7ae7587 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -6,61 +6,51 @@ return { news = { lazyvim = false }, }, }, - { - "drewxs/ash.nvim", - lazy = false, - priority = 1000, - }, - { - "dgox16/oldworld.nvim", - lazy = false, - priority = 1000, - }, - { - "snacks.nvim", - opts = { - scroll = { - enabled = false, - }, - dashboard = { - preset = { - header = [[ - ／l、 - （ﾟ､ ｡ ７ - l ~ヽ - じしf_,)ノ - ]], - }, - }, - }, - }, - -- { - -- "uZer/pywal16.nvim", - -- -- for local dev replace with: - -- -- dir = '~/your/path/pywal16.nvim', - -- config = function() - -- vim.cmd.colorscheme("pywal16") - -- end, - -- }, { "catppuccin", - opts = { - transparent_background = true, - integrations = { - blink_cmp = true, - }, - -- color_overrides = { - -- mocha = { - -- base = "#000000", - -- mantle = "#000000", - -- crust = "#000000", - -- }, - -- }, - }, + config = function() + require("catppuccin").setup({ + transparent_background = false, + integrations = { + blink_cmp = true, + nvimtree = true, + }, + custom_highlights = function(colors) + return { + Normal = { bg = colors.crust }, + NormalFloat = { bg = colors.crust }, + + -- Completion menu (nvim-cmp) + Pmenu = { bg = colors.crust }, + PmenuSel = { bg = colors.surface0 }, + CmpItemAbbr = { bg = colors.crust }, + CmpItemAbbrMatch = { bg = colors.crust }, + + -- Tabs + TabLine = { bg = colors.crust }, + TabLineFill = { bg = colors.crust }, + TabLineSel = { bg = colors.crust }, + + -- Status line + StatusLine = { bg = colors.crust }, + StatusLineNC = { bg = colors.crust }, + + -- Line numbers + LineNr = { bg = colors.crust }, + SignColumn = { bg = colors.crust }, + } + end, + color_overrides = { + mocha = { + base = "#11111b", + mantle = "#11111b", + crust = "#11111b", + }, + }, + }) + end, }, "f-person/git-blame.nvim", - { "nvim-lualine/lualine.nvim", enabled = false }, - { "echasnovski/mini.statusline", opts = {} }, { "stevearc/conform.nvim", opts = { @@ -75,41 +65,20 @@ return { }, }, }, - { - "folke/snacks.nvim", - priority = 1000, - lazy = false, - keys = { - { - "z", - function() - Snacks.zen() - end, - desc = "Toggle Zen Mode", - }, - }, - }, - { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - tag = "v3.8.2", - ---@module "ibl" - ---@type ibl.config - -- opts = { - -- debounce = 100, - -- indent = { char = "|" }, - -- whitespace = { highlight = "Whitespace", "NonText" }, - -- }, - }, { "neovim/nvim-lspconfig", + ---@class PluginLspOpts opts = { servers = { emmet_ls = {}, - slang = { - inlayHints = { - deducedTypes = true, - paramaterNames = true, + slangd = { + settings = { + slangd = { + inlayHints = { + deducedTypes = true, + paramaterNames = true, + }, + }, }, }, nil_ls = { @@ -145,10 +114,4 @@ return { require("force-cul").setup() end, }, - -- { - -- "supermaven-inc/supermaven-nvim", - -- config = function() - -- require("supermaven-nvim").setup({}) - -- end, - -- }, } diff --git a/modules/home/apps/tools/tmux/default.nix b/modules/home/apps/tools/tmux/default.nix index 25b62ec..6f5cf6d 100644 --- a/modules/home/apps/tools/tmux/default.nix +++ b/modules/home/apps/tools/tmux/default.nix @@ -16,10 +16,10 @@ in { config = mkIf cfg.enable { catppuccin.tmux = { enable = true; - # extraConfig = '' - # set -g @catppuccin_window_status_style "basic" - # set -g @catppuccin_status_background "#000000" - # ''; + extraConfig = '' + set -g @catppuccin_window_status_style "basic" + set -g @catppuccin_status_background "#11111b" + ''; }; programs.tmux = { @@ -42,7 +42,8 @@ in { set-window-option -g pane-base-index 1 set-option -g renumber-windows on - set -g default-terminal "tmux-256color" + set -g default-terminal "$TERM" + set -ag terminal-overrides ",$TERM:Tc" set -g allow-passthrough on set -g status-right-length 100 diff --git a/modules/home/apps/web/librewolf/default.nix b/modules/home/apps/web/librewolf/default.nix index a96afd1..b6864c5 100644 --- a/modules/home/apps/web/librewolf/default.nix +++ b/modules/home/apps/web/librewolf/default.nix @@ -61,7 +61,7 @@ in { } ]; - iconUpdateURL = "https://www.openstreetmap.org/favicon.ico"; + icon = "https://www.openstreetmap.org/favicon.ico"; definedAliases = ["@openstreetmap" "@osm"]; }; @@ -72,7 +72,7 @@ in { } ]; - iconUpdateURL = "https://search.zoeys.computer/searx/static/themes/simple/img/favicon.svg"; + icon = "https://search.zoeys.computer/searx/static/themes/simple/img/favicon.svg"; definedAliases = ["@searx"]; }; @@ -83,7 +83,7 @@ in { } ]; - iconUpdateURL = "https://docs.rs/-/static/favicon.ico"; + icon = "https://docs.rs/-/static/favicon.ico"; definedAliases = ["@docs"]; }; @@ -94,7 +94,7 @@ in { } ]; - iconUpdateURL = "https://crates.io/assets/cargo.png"; + icon = "https://crates.io/assets/cargo.png"; definedAliases = ["@crates"]; }; }; diff --git a/modules/home/apps/web/zen/default.nix b/modules/home/apps/web/zen/default.nix new file mode 100644 index 0000000..e61cb9a --- /dev/null +++ b/modules/home/apps/web/zen/default.nix @@ -0,0 +1,24 @@ +{ + lib, + config, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.web.zen; +in { + options.apps.web.zen = with types; { + enable = mkBoolOpt false "Enable or disable zen"; + + setDefault = mkBoolOpt false "Set zen as default browser"; + }; + + config = mkIf cfg.enable { + xdg.mimeApps.defaultApplications = mkIf cfg.setDefault { + "text/html" = "zen-beta.desktop"; + "x-scheme-handler/http" = "zen-beta.desktop"; + "x-scheme-handler/https" = "zen-beta.desktop"; + }; + }; +} diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index 1d6d28d..eac1908 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -54,10 +54,7 @@ in { wayland.windowManager.hyprland.settings = with colors; { exec-once = [ - # "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"" - # "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - # "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "librewolf" + "zen" "thunderbird" "vesktop" "spotify" @@ -65,20 +62,31 @@ in { "signal-desktop" ]; - env = [ - "XDG_SESSION_TYPE,wayland" - "XDG_SESSION_DESKTOP,Hyprland" - "XDG_CURRENT_DESKTOP,Hyprland" - ]; + # env = [ + # "XDG_SESSION_TYPE,wayland" + # "XDG_SESSION_DESKTOP,Hyprland" + # "XDG_CURRENT_DESKTOP,Hyprland" + # ]; bind = [ - ''${mod},RETURN,exec,${lib.getExe pkgs.kitty}'' + "${mod},RETURN,exec,${lib.getExe pkgs.alacritty}" "${mod},D,exec,rofi -show drun" "${mod},Q,killactive" "${mod},M,exit" "${mod},P,pseudo" + "${mod},Z,exec,${pkgs.writeShellScriptBin "zen-launcher" '' + ZEN_RESULT=$(${inputs.hyprland.packages.${pkgs.system}.default}/bin/hyprctl clients -j | ${lib.getExe pkgs.jq} '.[] | select(.class | contains("zen"))') + + if [ -z "$ZEN_RESULT" ]; then + ${lib.getExe inputs.zen-browser.packages.${pkgs.system}.beta} & + disown + else + ZEN_WORKSPACE=$(echo "$ZEN_RESULT" | ${lib.getExe pkgs.jq} '.workspace.id') + ${pkgs.hyprland}/bin/hyprctl dispatch workspace "$ZEN_WORKSPACE" + fi + ''}/bin/zen-launcher" "${mod},J,togglesplit," @@ -116,13 +124,13 @@ in { gaps_out = 8; # border thiccness - border_size = 2; + border_size = 4; allow_tearing = true; # active border color - "col.active_border" = "rgb(${rose})"; - "col.inactive_border" = "rgb(${muted})"; + "col.active_border" = "rgb(${base})"; + "col.inactive_border" = "rgb(${base})"; }; input = { @@ -138,7 +146,7 @@ in { decoration = { # fancy corners - rounding = 4; + rounding = 0; # blur blur = { enabled = true; diff --git a/modules/home/wms/niri/default.nix b/modules/home/wms/niri/default.nix new file mode 100644 index 0000000..4fc5da7 --- /dev/null +++ b/modules/home/wms/niri/default.nix @@ -0,0 +1,458 @@ +{ + lib, + config, + pkgs, + inputs, + ... +}: +with lib; +with lib.custom; let + cfg = config.wms.niri; + + mkService = recursiveUpdate { + Unit.PartOf = ["graphical-session.target"]; + Unit.After = ["graphical-session.target"]; + Install.WantedBy = ["graphical-session.target"]; + }; + + actions = config.lib.niri.actions; + + mkColor = color: {inherit color;}; + mkGradient = from: to: { + angle ? 180, + relative-to ? "window", + in' ? null, + }: { + gradient = {inherit from to angle relative-to in';}; + }; +in { + options.wms.niri = with types; { + enable = mkBoolOpt false "Enable niri"; + }; + + config = mkIf cfg.enable { + programs.niri = { + package = pkgs.niri; + + settings = { + # Input device configuration + input = { + keyboard = { + # xkb settings are empty in KDL, using defaults/empty strings + xkb = { + rules = ""; + model = ""; + layout = ""; + variant = ""; + options = null; # Or "" if you prefer explicit empty + }; + }; + + touchpad = { + enable = true; # Not explicitly 'off' in KDL + tap = true; + dwt = false; # Commented out in KDL + dwtp = false; # Commented out in KDL + natural-scroll = true; + # accel-speed = 0.2; # Commented out + # accel-profile = "flat"; # Commented out + # scroll-method = "two-finger"; # Commented out + disabled-on-external-mouse = true; + }; + + mouse = { + enable = true; # Not explicitly 'off' in KDL + natural-scroll = false; # Commented out in KDL + accel-speed = 0.2; + accel-profile = "flat"; + # scroll-method = "no-scroll"; # Commented out + }; + + trackpoint = { + enable = true; # Not explicitly 'off' in KDL + natural-scroll = false; # Commented out + # accel-speed = 0.2; # Commented out + # accel-profile = "flat"; # Commented out + # scroll-method = "on-button-down"; # Commented out + # scroll-button = 273; # Commented out + middle-emulation = false; # Commented out + }; + + warp-mouse-to-focus = true; + + focus-follows-mouse = { + enable = false; # Commented out in KDL + # max-scroll-amount = "0%"; # Only relevant if enabled + }; + }; + + # Output configuration + outputs."DP-1" = { + enable = true; # Not explicitly 'off' + mode = { + width = 2560; + height = 1440; + refresh = 239.972; + }; + scale = 1; + transform = { + # "normal" + rotation = 0; + flipped = false; + }; + position = { + x = 0; + y = 0; + }; + }; + + # Environment variables + environment = { + DISPLAY = ":0"; + }; + + # Layout settings + layout = { + gaps = 16; + center-focused-column = "never"; + + preset-column-widths = [ + {proportion = 0.33333;} + {proportion = 0.5;} + {proportion = 0.66667;} + # { fixed = 1920; } # Example if needed + ]; + + # preset-window-heights = []; # Empty in KDL + + default-column-width = {proportion = 0.5;}; + # default-column-width = {}; # Alternative from KDL comments + + focus-ring = { + enable = true; # Not explicitly 'off' + width = 4; + active = mkGradient "#89b4fa" "#74c7ec" {angle = 45;}; + # active = mkColor "#7fc8ff"; # Alternative solid color from KDL + inactive = mkGradient "#505050" "#808080" { + angle = 45; + relative-to = "workspace-view"; + }; + # inactive = mkColor "#505050"; # Alternative solid color from KDL + }; + + border = { + enable = true; # Explicitly 'off' in KDL + width = 0; + active = mkColor "#89b4fa"; + inactive = mkColor "#1e1e2e"; + # active-gradient = ... # Commented out in KDL + # inactive-gradient = ... # Commented out in KDL + }; + + struts = { + # left = 64; # Commented out + # right = 64; # Commented out + # top = 64; # Commented out + # bottom = 64; # Commented out + }; + }; + + # Spawn processes at startup + spawn-at-startup = [ + {command = ["xwayland-satellite"];} + {command = ["thunderbird"];} + {command = ["zen"];} + { + command = [ + "${lib.getExe pkgs.bash} -c '(( $(date +%u) < 6 )) && ${lib.getExe pkgs.slack}'" + ]; + } + ]; + + # Prefer server-side decorations + prefer-no-csd = true; + + # Screenshot path + screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; + # screenshot-path = null; # Alternative from KDL comments + + # Animation settings + animations = { + enable = true; # Not explicitly 'off' + # slowdown = 3.0; # Commented out + # Individual animation settings can be added here if needed + }; + + debug = { + wait-for-frame-completion-in-pipewire = []; + }; + + # Window rules + window-rules = [ + # Password manager rule (example from KDL comments) + { + matches = [ + {app-id = "^org\\.keepassxc\\.KeePassXC$";} + {app-id = "^org\\.gnome\\.World\\.Secrets$";} + {app-id = "^thunderbird$";} + {app-id = "^signal$";} + {app-id = "^vesktop$";} + ]; + block-out-from = "screen-capture"; + # block-out-from = "screencast"; # Alternative + } + # Rounded corners rule (example from KDL comments) + { + # No matches means apply to all windows + geometry-corner-radius = { + top-left = 12.0; + top-right = 12.0; + bottom-left = 12.0; + bottom-right = 12.0; + }; + clip-to-geometry = true; + } + # Window cast target rule + { + matches = [{is-window-cast-target = true;}]; + focus-ring = { + active = mkColor "#f38ba8"; + inactive = mkColor "#7d0d2d"; + }; + border = { + # Only inactive is specified in KDL rule + active = mkColor "#f38ba8"; + width = 4; + inactive = mkColor "#7d0d2d"; + }; + shadow = { + # Only color is specified in KDL rule + color = "#7d0d2d70"; + }; + tab-indicator = { + active = mkColor "#f38ba8"; + inactive = mkColor "#7d0d2d"; + }; + } + + # fix steam popups holy fuck they're annoying + { + matches = [ + {app-id = "^steam$";} + ]; + + excludes = [{title = "^Steam$";}]; + + open-floating = true; + + open-focused = false; + + default-floating-position = { + relative-to = "bottom-right"; + x = 16; + y = 16; + }; + } + ]; + + # Keybindings + binds = { + "Mod+Shift+Slash" = {action = actions.show-hotkey-overlay;}; + + "Mod+Return" = {action = actions.spawn "alacritty";}; + "Mod+D" = {action = actions.spawn "fuzzel";}; + "Super+Alt+L" = {action = actions.spawn "swaylock";}; + # "Mod+T" = { action = actions.spawn "bash" "-c" "notify-send hello && exec alacritty"; }; + + "XF86AudioRaiseVolume" = { + allow-when-locked = true; + action = actions.spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; + }; + "XF86AudioLowerVolume" = { + allow-when-locked = true; + action = actions.spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; + }; + "XF86AudioMute" = { + allow-when-locked = true; + action = actions.spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; + }; + "XF86AudioMicMute" = { + allow-when-locked = true; + action = + actions.spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; + }; + + "Mod+Q" = {action = actions.close-window;}; + + "Mod+Left" = {action = actions.focus-column-left;}; + "Mod+Down" = {action = actions.focus-window-down;}; + "Mod+Up" = {action = actions.focus-window-up;}; + "Mod+Right" = {action = actions.focus-column-right;}; + "Mod+H" = {action = actions.focus-column-left;}; + "Mod+J" = {action = actions.focus-window-down;}; + "Mod+K" = {action = actions.focus-window-up;}; + "Mod+L" = {action = actions.focus-column-right;}; + + "Mod+Ctrl+Left" = {action = actions.move-column-left;}; + "Mod+Ctrl+Down" = {action = actions.move-window-down;}; + "Mod+Ctrl+Up" = {action = actions.move-window-up;}; + "Mod+Ctrl+Right" = {action = actions.move-column-right;}; + "Mod+Ctrl+H" = {action = actions.move-column-left;}; + "Mod+Ctrl+J" = {action = actions.move-window-down;}; + "Mod+Ctrl+K" = {action = actions.move-window-up;}; + "Mod+Ctrl+L" = {action = actions.move-column-right;}; + + # Alternative commands (commented out in KDL) + # "Mod+J" = { action = actions.focus-window-or-workspace-down; }; + # "Mod+K" = { action = actions.focus-window-or-workspace-up; }; + # "Mod+Ctrl+J" = { action = actions.move-window-down-or-to-workspace-down; }; + # "Mod+Ctrl+K" = { action = actions.move-window-up-or-to-workspace-up; }; + + "Mod+Home" = {action = actions.focus-column-first;}; + "Mod+End" = {action = actions.focus-column-last;}; + "Mod+Ctrl+Home" = {action = actions.move-column-to-first;}; + "Mod+Ctrl+End" = {action = actions.move-column-to-last;}; + + "Mod+Shift+Left" = {action = actions.focus-monitor-left;}; + "Mod+Shift+Down" = {action = actions.focus-monitor-down;}; + "Mod+Shift+Up" = {action = actions.focus-monitor-up;}; + "Mod+Shift+Right" = {action = actions.focus-monitor-right;}; + "Mod+Shift+H" = {action = actions.focus-monitor-left;}; + "Mod+Shift+J" = {action = actions.focus-workspace-down;}; + "Mod+Shift+K" = {action = actions.focus-workspace-up;}; + "Mod+Shift+L" = {action = actions.focus-monitor-right;}; + + "Mod+Shift+Ctrl+Left" = {action = actions.move-column-to-monitor-left;}; + "Mod+Shift+Ctrl+Down" = {action = actions.move-column-to-monitor-down;}; + "Mod+Shift+Ctrl+Up" = {action = actions.move-column-to-monitor-up;}; + "Mod+Shift+Ctrl+Right" = {action = actions.move-column-to-monitor-right;}; + "Mod+Shift+Ctrl+H" = {action = actions.move-column-to-monitor-left;}; + "Mod+Shift+Ctrl+J" = {action = actions.move-column-to-monitor-down;}; + "Mod+Shift+Ctrl+K" = {action = actions.move-column-to-monitor-up;}; + "Mod+Shift+Ctrl+L" = {action = actions.move-column-to-monitor-right;}; + + # Alternative move commands (commented out in KDL) + # "Mod+Shift+Ctrl+Left" = { action = actions.move-window-to-monitor-left; }; + # "Mod+Shift+Ctrl+Left" = { action = actions.move-workspace-to-monitor-left; }; + + "Mod+Page_Down" = {action = actions.focus-workspace-down;}; + "Mod+Page_Up" = {action = actions.focus-workspace-up;}; + "Mod+U" = {action = actions.focus-workspace-down;}; + "Mod+I" = {action = actions.focus-workspace-up;}; + "Mod+Ctrl+Page_Down" = {action = actions.move-column-to-workspace-down;}; + "Mod+Ctrl+Page_Up" = {action = actions.move-column-to-workspace-up;}; + "Mod+Ctrl+U" = {action = actions.move-column-to-workspace-down;}; + "Mod+Ctrl+I" = {action = actions.move-column-to-workspace-up;}; + + # Alternative move commands (commented out in KDL) + # "Mod+Ctrl+Page_Down" = { action = actions.move-window-to-workspace-down; }; + + "Mod+Shift+Page_Down" = {action = actions.move-workspace-down;}; + "Mod+Shift+Page_Up" = {action = actions.move-workspace-up;}; + "Mod+Shift+U" = {action = actions.move-workspace-down;}; + "Mod+Shift+I" = {action = actions.move-workspace-up;}; + + "Mod+WheelScrollDown" = { + cooldown-ms = 150; + action = actions.focus-workspace-down; + }; + "Mod+WheelScrollUp" = { + cooldown-ms = 150; + action = actions.focus-workspace-up; + }; + "Mod+Ctrl+WheelScrollDown" = { + cooldown-ms = 150; + action = actions.move-column-to-workspace-down; + }; + "Mod+Ctrl+WheelScrollUp" = { + cooldown-ms = 150; + action = actions.move-column-to-workspace-up; + }; + + "Mod+WheelScrollRight" = {action = actions.focus-column-right;}; + "Mod+WheelScrollLeft" = {action = actions.focus-column-left;}; + "Mod+Ctrl+WheelScrollRight" = {action = actions.move-column-right;}; + "Mod+Ctrl+WheelScrollLeft" = {action = actions.move-column-left;}; + + "Mod+Shift+WheelScrollDown" = {action = actions.focus-column-right;}; + "Mod+Shift+WheelScrollUp" = {action = actions.focus-column-left;}; + "Mod+Ctrl+Shift+WheelScrollDown" = {action = actions.move-column-right;}; + "Mod+Ctrl+Shift+WheelScrollUp" = {action = actions.move-column-left;}; + + # Touchpad scroll binds (commented out in KDL) + # "Mod+TouchpadScrollDown" = { action = actions.spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }; + # "Mod+TouchpadScrollUp" = { action = actions.spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }; + + "Mod+1" = {action = actions.focus-workspace 1;}; + "Mod+2" = {action = actions.focus-workspace 2;}; + "Mod+3" = {action = actions.focus-workspace 3;}; + "Mod+4" = {action = actions.focus-workspace 4;}; + "Mod+5" = {action = actions.focus-workspace 5;}; + "Mod+6" = {action = actions.focus-workspace 6;}; + "Mod+7" = {action = actions.focus-workspace 7;}; + "Mod+8" = {action = actions.focus-workspace 8;}; + "Mod+9" = {action = actions.focus-workspace 9;}; + "Mod+Shift+1" = {action = actions.move-column-to-workspace 1;}; + "Mod+Shift+2" = {action = actions.move-column-to-workspace 2;}; + "Mod+Shift+3" = {action = actions.move-column-to-workspace 3;}; + "Mod+Shift+4" = {action = actions.move-column-to-workspace 4;}; + "Mod+Shift+5" = {action = actions.move-column-to-workspace 5;}; + "Mod+Shift+6" = {action = actions.move-column-to-workspace 6;}; + "Mod+Shift+7" = {action = actions.move-column-to-workspace 7;}; + "Mod+Shift+8" = {action = actions.move-column-to-workspace 8;}; + "Mod+Shift+9" = {action = actions.move-column-to-workspace 9;}; + + # Alternative move commands (commented out in KDL) + # "Mod+Ctrl+1" = { action = actions.move-window-to-workspace 1; }; + + # "Mod+Tab" = { action = actions.focus-workspace-previous; }; # Commented out + + "Mod+Comma" = {action = actions.consume-window-into-column;}; + "Mod+Period" = {action = actions.expel-window-from-column;}; + + "Mod+BracketLeft" = {action = actions.consume-or-expel-window-left;}; + "Mod+BracketRight" = {action = actions.consume-or-expel-window-right;}; + + "Mod+R" = {action = actions.switch-preset-column-width;}; + "Mod+Shift+R" = {action = actions.switch-preset-window-height;}; + "Mod+Ctrl+R" = {action = actions.reset-window-height;}; + "Mod+F" = {action = actions.maximize-column;}; + "Mod+Shift+F" = {action = actions.fullscreen-window;}; + "Mod+C" = {action = actions.center-column;}; + "Mod+Ctrl+F" = {action = actions.expand-column-to-available-width;}; + + "Mod+V" = {action = actions.toggle-window-floating;}; + + "Mod+Minus" = {action = actions.set-column-width "-10%";}; + "Mod+Equal" = {action = actions.set-column-width "+10%";}; + + "Mod+Shift+Minus" = {action = actions.set-window-height "-10%";}; + "Mod+Shift+Equal" = {action = actions.set-window-height "+10%";}; + + # Layout switching (commented out in KDL) + # "Mod+Space" = { action = actions.switch-layout "next"; }; + # "Mod+Shift+Space" = { action = actions.switch-layout "prev"; }; + + "Print" = {action = actions.screenshot {};}; # Empty attrset for default args + # "Ctrl+Print" = {action = actions.screenshot-screen {};}; # Empty attrset for default args + # "Alt+Print" = {action = actions.screenshot-window {};}; # Empty attrset for default args + + "Mod+Shift+E" = {action = actions.quit {};}; # Default: no skip-confirmation + "Ctrl+Alt+Delete" = {action = actions.quit {};}; + + "Mod+Shift+P" = {action = actions.power-off-monitors;}; + }; + }; + }; + + systemd.user.services = { + swaybg = mkService { + Unit.Description = "Wallpaper Chooser"; + Service = { + ExecStart = "${getExe pkgs.swaybg} -i ${wallpaper}"; + Restart = "always"; + }; + }; + }; + }; +} diff --git a/modules/home/work/vpn/default.nix b/modules/home/work/vpn/default.nix index 42432a9..d3ceba9 100644 --- a/modules/home/work/vpn/default.nix +++ b/modules/home/work/vpn/default.nix @@ -16,8 +16,6 @@ in { config = mkIf cfg.enable { xdg.configFile."vpn/work.ovpn" = { text = '' - conifg /home/zoey/cvpn-client.ovpn - up ${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf down ${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf ''; diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix index 23b9e8d..043a134 100644 --- a/modules/nixos/hardware/audio/default.nix +++ b/modules/nixos/hardware/audio/default.nix @@ -22,100 +22,6 @@ in { pulse.enable = true; wireplumber.enable = true; jack.enable = true; - - # extraConfig.pipewire.adjust-sample-rate = { - # "context.properties" = { - # "default.clock.rate" = 41000; - # "default.clock.allowed-rates" = [44100]; - # }; - # }; - - # wireplumber.extraConfig = { - # "custom" = { - # "monitor.alsa.rules" = [ - # { - # matches = [ - # { - # "node.name" = "alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y76P5M4160A866-00.HiFi__Line1__sink"; - # } - # ]; - # actions = { - # update-props = { - # "audio.format" = "S32LE"; - # "audio.rate" = 192000; - # "api.alsa.period-size" = 1024; - # }; - # }; - # } - # { - # matches = [ - # { - # "node.name" = "alsa_input.pci-0000_0d_00.4.analog-stereo"; - # } - # ]; - # actions = { - # update-props = { - # "audio.format" = "S32LE"; - # "audio.rate" = 192000; - # "api.alsa.period-size" = 1024; - # }; - # }; - # } - # { - # matches = [ - # { - # "node.name" = "~alsa_output.*"; - # } - # ]; - # actions = { - # update-props = { - # "api.alsa.period-size" = 1024; - # "api.alsa.headroom" = 8192; - # }; - # }; - # } - # ]; - # }; - # - # "99-connect-tt" = { - # "wireplumber.components" = [ - # { - # name = "auto-connect-tt.lua"; - # type = "script/lua"; - # provides = "custom.connect-tt"; - # } - # ]; - # - # "wireplumber.profiles" = { - # main = { - # "custom.connect-tt" = "required"; - # }; - # }; - # }; - # }; - - # wireplumber.extraScripts = { - # "auto-connect-tt.lua" = builtins.readFile ./auto-connect-tt.lua; - # }; - # }; - # - # # PulseAudio compatibility layer configuration for 44.1kHz - # services.pipewire.extraConfig.pipewire-pulse."92-steam-config" = { - # context.modules = [ - # { - # name = "libpipewire-module-protocol-pulse"; - # args = { - # pulse.min.req = "32/44100"; - # pulse.default.req = "32/44100"; - # pulse.min.quantum = "32/44100"; - # pulse.max.quantum = "8192/44100"; - # }; - # } - # ]; - # }; - # - # environment.sessionVariables = { - # PIPEWIRE_LATENCY = "1024/44100"; }; }; } diff --git a/modules/nixos/hardware/gpu-passthru/default.nix b/modules/nixos/hardware/gpu-passthru/default.nix index 12a22de..2fa0f54 100644 --- a/modules/nixos/hardware/gpu-passthru/default.nix +++ b/modules/nixos/hardware/gpu-passthru/default.nix @@ -141,6 +141,8 @@ in { # Stop display manager systemctl stop display-manager.service killall gdm-wayland-session + killall niri + killall niri-session # Unbind VTconsoles echo 0 > /sys/class/vtconsole/vtcon0/bind diff --git a/modules/nixos/hardware/nvidia/default.nix b/modules/nixos/hardware/nvidia/default.nix index c27d05b..681f80c 100644 --- a/modules/nixos/hardware/nvidia/default.nix +++ b/modules/nixos/hardware/nvidia/default.nix @@ -37,7 +37,7 @@ in { # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # Only available from driver 515.43.04+ # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = true; + open = false; # Enable the Nvidia settings menu, # accessible via `nvidia-settings`. diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index cb1c1b8..0ab4f88 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -36,14 +36,19 @@ in { services.xserver.displayManager.gdm.enable = true; programs.uwsm = { - enable = true; - # waylandCompositors = { - # "mwc" = { - # prettyName = "MWC"; - # binPath = "/run/current-system/sw/bin/mwc"; - # comment = "previously owl"; - # }; - # }; + enable = false; + waylandCompositors = { + # "mwc" = { + # prettyName = "MWC"; + # binPath = "/run/current-system/sw/bin/mwc"; + # comment = "previously owl"; + # }; + # niri = { + # prettyName = "niri"; + # binPath = "/run/current-system/sw/bin/niri"; + # comment = "niri"; + # }; + }; }; # environment.systemPackages = [ @@ -52,13 +57,14 @@ in { programs.hyprland = { withUWSM = true; - enable = true; + enable = false; xwayland.enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; - programs.niri.enable = false; + programs.niri.enable = true; + programs.niri.package = pkgs.niri-unstable; environment = { variables = { @@ -78,26 +84,18 @@ in { WLR_BACKEND = "wayland"; WLR_RENDERER = "wayland"; XDG_SESSION_TYPE = "wayland"; - SDL_VIDEODRIVER = "wayland"; + SDL_VIDEODRIVER = "wayland,x11"; XDG_CACHE_HOME = "/home/zoey/.cache"; CLUTTER_BACKEND = "wayland"; DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; }; - loginShellInit = '' - dbus-update-activation-environment --systemd DISPLAY - eval $(gnome-keyring-daemon --start --components=ssh,secrets) - eval $(ssh-agent) - ''; }; hardware.pulseaudio.support32Bit = true; xdg.portal = { enable = true; - wlr.enable = false; - config.common.default = "*"; extraPortals = [ - pkgs.xdg-desktop-portal-gtk # pkgs.xwaylandvideobridge ]; }; diff --git a/modules/nixos/services/mail/default.nix b/modules/nixos/services/mail/default.nix index 21e6929..ed45ed1 100644 --- a/modules/nixos/services/mail/default.nix +++ b/modules/nixos/services/mail/default.nix @@ -27,6 +27,8 @@ in { }; zach-pw.file = ./sec/zach-pw.age; emily-pw.file = ./sec/emily-piccat.age; + + gitlab-email-pw-hashed.file = ./sec/gitlab-email-pw-hashed.age; }; mailserver = { @@ -51,6 +53,10 @@ in { hashedPasswordFile = sec.emily-pw.path; aliases = ["emily@pictureofcat.com"]; }; + "gitlab@zoeys.cloud" = { + hashedPasswordFile = sec.gitlab-email-pw-hashed.path; + aliases = ["noreply@zoeys.cloud"]; + }; }; certificateScheme = "acme-nginx"; diff --git a/modules/nixos/services/mail/sec/gitlab-email-pw-hashed.age b/modules/nixos/services/mail/sec/gitlab-email-pw-hashed.age new file mode 100644 index 0000000..b5210b0 Binary files /dev/null and b/modules/nixos/services/mail/sec/gitlab-email-pw-hashed.age differ diff --git a/modules/nixos/sites/gitlab/default.nix b/modules/nixos/sites/gitlab/default.nix index 33495d1..12ee702 100644 --- a/modules/nixos/sites/gitlab/default.nix +++ b/modules/nixos/sites/gitlab/default.nix @@ -48,6 +48,11 @@ in { gitlab_runner = { file = ./sec/gitlab_runner.age; }; + gitlab_email_pw = { + file = ./sec/gitlab-email-pw.age; + owner = user; + group = group; + }; }; boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 @@ -97,6 +102,15 @@ in { port = 443; https = true; host = cfg.domain; + + smtp = { + enable = true; + address = "mail.zoeys.cloud"; + username = "gitlab@zoeys.cloud"; + passwordFile = sec.gitlab_email_pw.path; + port = 465; + }; + secrets = { secretFile = sec.gitlab_sec.path; otpFile = sec.gitlab_otp.path; diff --git a/modules/nixos/sites/gitlab/sec/gitlab-email-pw.age b/modules/nixos/sites/gitlab/sec/gitlab-email-pw.age new file mode 100644 index 0000000..50a7cb8 --- /dev/null +++ b/modules/nixos/sites/gitlab/sec/gitlab-email-pw.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 CtmR6w wfPgH83/+qjITFELir/Q/zjH+wjlgrU+HNC5eOsFhg8 +orHZwCQOmlK9TFHOEOb/K2FszXoMbQfwHdYAbKIOnR0 +-> ssh-ed25519 RMNffg E7mah8eqt9cDw2SKQTah25M4j/iIWhPHtrtmJpSPDgo +eeoo3cfoiVh8xF9TVy9cKUlAw6NBhMg1iFs8JlpquPA +--- NB2RNduULAMPoBmfRByWGL1hdK5/b5kDe4vnzdW1Hb0 +H"y=,е5|V01qAsNIɗRqNY!l׮b\LGe{En'͔Fh> ./configs/linux/mozconfig - - # linux mozconfig - sed -i 's/x86-\(64\|64-v3\)/native/g' ./configs/linux/mozconfig - sed -i 's/x86_64-pc-linux/aarch64-linux-gnu/g' ./configs/linux/mozconfig - - # eme/widevine must be disabled on arm64 (thx google) - sed -i '/--enable-eme/s/^/# /' ./configs/common/mozconfig - sed -i 's/-msse3//g' ./configs/linux/mozconfig - sed -i 's/-mssse3//g' ./configs/linux/mozconfig - sed -i 's/-msse4.1//g' ./configs/linux/mozconfig - sed -i 's/-msse4.2//g' ./configs/linux/mozconfig - sed -i 's/-mavx2//g' ./configs/linux/mozconfig - sed -i 's/-mavx//g' ./configs/linux/mozconfig - sed -i 's/-mfma//g' ./configs/linux/mozconfig - sed -i 's/-maes//g' ./configs/linux/mozconfig - sed -i 's/-mpopcnt//g' ./configs/linux/mozconfig - sed -i 's/-mpclmul//g' ./configs/linux/mozconfig - sed -i 's/+avx2//g' ./configs/linux/mozconfig - sed -i 's/+sse4.1//g' ./configs/linux/mozconfig - - '') - + '' - for flag in $@; do - echo "ac_add_options $flag" >> mozconfig - done - '' - ); - - # To the person reading this wondering what is going on here, this is what - # happens when a build process relies on Git. Normally you would use `fetchgit` - # with `leaveDotGit = true`, however that leads to reproducibility issues, so - # instead we create our own Git repo with a single commit. - # - # `surfer` (the build tool made for zen-browser) uses git to read the latest - # HEAD commit, `git apply`, and likely a few other operations. - preConfigure = '' - export HOME="$TMPDIR" - git config --global user.email "nixbld@localhost" - git config --global user.name "nixbld" - git init - git add --all - git commit -m 'nixpkgs' - - export LLVM_PROFDATA=llvm-profdata - export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - export WASM_CC=${wasi32.stdenv.cc}/bin/${wasi32.stdenv.cc.targetPrefix}cc - export WASM_CXX=${wasi32.stdenv.cc}/bin/${wasi32.stdenv.cc.targetPrefix}c++ - - export ZEN_RELEASE=1 - surfer ci --brand beta --display-version ${finalAttrs.version} - - install -D ${finalAttrs.firefoxSrc} .surfer/engine/firefox-${finalAttrs.firefoxVersion}.source.tar.xz - surfer download - surfer import - patchShebangs engine/mach engine/build engine/tools - ''; - - preBuild = '' - cp -r ${firefox-l10n} l10n/firefox-l10n - - for lang in $(cat ./l10n/supported-languages); do - rsync -av --progress l10n/firefox-l10n/"$lang"/ l10n/"$lang" --exclude .git - done - - sh scripts/copy-language-pack.sh en-US - - for lang in $(cat ./l10n/supported-languages); do - sh scripts/copy-language-pack.sh "$lang" - done - - Xvfb :2 -screen 0 1024x768x24 & - export DISPLAY=:2 - ''; - - buildPhase = '' - runHook preBuild - - surfer build - - runHook postBuild - ''; - - preInstall = '' - cd engine/obj-* - ''; - - meta = { - mainProgram = "zen"; - description = "Firefox based browser with a focus on privacy and customization"; - homepage = "https://www.zen-browser.app/"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - matthewpi - titaniumtown - ]; - platforms = [ - "aarch64-linux" - "x86_64-linux" - ]; - }; - - enableParallelBuilding = true; - requiredSystemFeatures = ["big-parallel"]; - - passthru = { - updateScript = ./update.sh; - - # These values are used by `wrapFirefox`. - # ref; `pkgs/applications/networking/browsers/firefox/wrapper.nix' - binaryName = finalAttrs.meta.mainProgram; - inherit alsaSupport; - inherit jackSupport; - inherit pipewireSupport; - inherit sndioSupport; - inherit nspr; - inherit ffmpegSupport; - inherit gssSupport; - inherit gtk3; - inherit wasiSysRoot; - }; - }) diff --git a/packages/zen-browser-unwrapped/surfer-dont-check-update.patch b/packages/zen-browser-unwrapped/surfer-dont-check-update.patch deleted file mode 100644 index 355e7c9..0000000 --- a/packages/zen-browser-unwrapped/surfer-dont-check-update.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/index.ts b/src/index.ts -index 3d41389..f6bfb95 100644 ---- a/src/index.ts -+++ b/src/index.ts -@@ -19,7 +19,6 @@ import { resolve } from 'node:path' - import { errorHandler, config as configInited, versionFormatter } from './utils' - import { commands } from './cmds' - import { BIN_NAME, ENGINE_DIR } from './constants' --import { updateCheck } from './middleware/update-check' - import { registerCommand } from './middleware/register-command' - import { log } from './log' - -@@ -83,7 +82,6 @@ async function middleware(command: commander.Command) { - // If the program is verbose, store that fact within the logger - log.isDebug = program.opts().verbose - -- await updateCheck() - registerCommand(command.name()) - } diff --git a/packages/zen-browser-unwrapped/update.sh b/packages/zen-browser-unwrapped/update.sh deleted file mode 100755 index 1a4c004..0000000 --- a/packages/zen-browser-unwrapped/update.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-git nix-prefetch-github - -# Define the package file -PACKAGE_FILE="default.nix" - -# Function to get the latest version of zen-browser/desktop -get_latest_version() { - curl --silent "https://api.github.com/repos/zen-browser/desktop/releases" | - jq -r '[.[] | select(.prerelease==false)][0].tag_name' -} - -# Get the latest version -latest_version=$(get_latest_version) - -if [ -z "$latest_version" ] || [ "$latest_version" == "null" ]; then - echo "Failed to get the latest version." - exit 1 -fi - -echo "Latest version: $latest_version" - -# Update the 'version' variable in the Nix expression -sed -i "/pname = \"zen-browser-unwrapped\";/,/version = \".*\";/s/version = \".*\";/version = \"$latest_version\";/" "$PACKAGE_FILE" - -# Fetch the new 'src' hash -echo "Fetching new source hash..." -src_info=$(nix-prefetch-github zen-browser desktop --rev "$latest_version" --fetch-submodules) -src_hash=$(echo "$src_info" | jq -r .sha256) - -echo "New source hash: $src_hash" - -# Update 'rev' and 'hash' in the 'src' fetchFromGitHub -sed -i "/src = fetchFromGitHub {/,/};/{ - /owner = \"zen-browser\";/,/};/{ - s/rev = \".*\";/rev = \"$latest_version\";/ - s/hash = \".*\";/hash = \"$src_hash\";/ - } -}" "$PACKAGE_FILE" - -# Clone the repository to extract 'firefoxVersion' -tmpdir=$(mktemp -d) -trap 'rm -rf "$tmpdir"' EXIT - -git clone --depth 1 --branch "$latest_version" https://github.com/zen-browser/desktop.git "$tmpdir" - -# Extract 'firefoxVersion' from 'surfer.json' -firefoxVersion=$(jq --raw-output '.version.version' "$tmpdir/surfer.json") -echo "Firefox version: $firefoxVersion" - -# Update the 'firefoxVersion' in the Nix expression -sed -i "s/firefoxVersion = \".*\";/firefoxVersion = \"$firefoxVersion\";/" "$PACKAGE_FILE" - -# Fetch the new 'firefoxSrc' hash -firefox_url="mirror://mozilla/firefox/releases/$firefoxVersion/source/firefox-$firefoxVersion.source.tar.xz" -echo "Fetching Firefox source hash..." -firefox_hash=$(nix-prefetch-url --unpack "$firefox_url") - -echo "Firefox source hash: $firefox_hash" - -# Update the 'firefoxSrc' hash in the Nix expression -sed -i "/firefoxSrc = fetchurl {/,/};/{ - s/hash = \".*\";/hash = \"$firefox_hash\";/ -}" "$PACKAGE_FILE" - -echo "Update complete!" diff --git a/packages/zen-browser/default.nix b/packages/zen-browser/default.nix deleted file mode 100644 index 91c71fb..0000000 --- a/packages/zen-browser/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - wrapFirefox, - custom, -}: -wrapFirefox custom.zen-browser-unwrapped { - pname = "zen-browser"; - libName = "zen"; -} diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 6313e80..45509c2 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -162,7 +162,6 @@ pkgs.transmission_4 pkgs.protonup-qt pkgs.restic - inputs.opnix.packages.${system}.default pkgs.qt5.qtwayland (inputs.umu.packages.${system}.umu.override { version = inputs.umu.shortRev; diff --git a/systems/x86_64-linux/venus/default.nix b/systems/x86_64-linux/venus/default.nix index fee5213..1f2f0ba 100644 --- a/systems/x86_64-linux/venus/default.nix +++ b/systems/x86_64-linux/venus/default.nix @@ -64,16 +64,6 @@ }; }; - services.mc-honeypot = { - enable = true; - - openFirewall = true; - - settings = { - "webhook-url" = "https://discord.com/api/webhooks/1348850542398410834/1fqV4QLh4uTTuwZ0DjOczZa6gkDjsYECSlmWBwTXHWcYTHhwsE1ZLTP17z5v-vh6nn7H"; - }; - }; - networking.firewall.allowedTCPPorts = [80 443]; system.stateVersion = "24.05";