From 98b4f598f83ab5e2755c53c27f2405395f3cb396 Mon Sep 17 00:00:00 2001 From: danny Date: Fri, 6 Mar 2026 17:06:53 +0800 Subject: [PATCH] chore: update flake & niri blur --- flake.lock | 345 ++++++++++-------- flake.nix | 3 +- home/user/ghostty.nix | 6 +- home/user/zen-browser.nix | 13 +- options/systemconf.nix | 2 - system/dev/dn-lap/default.nix | 9 +- system/dev/dn-lap/home/default.nix | 40 +- system/dev/dn-lap/services/default.nix | 2 +- system/dev/dn-pre7780/common/nvidia.nix | 7 +- system/dev/dn-pre7780/default.nix | 5 +- system/dev/dn-pre7780/home/default.nix | 5 +- system/dev/dn-pre7780/sops/secret.yaml | 6 +- system/dev/dn-server/default.nix | 2 +- system/dev/dn-server/network/services.nix | 2 +- system/dev/dn-server/services/homepage.nix | 38 +- system/dev/dn-server/services/mail-server.nix | 2 + system/dev/dn-server/services/metrics.nix | 2 +- .../dn-server/services/minecraft-server.nix | 2 +- system/dev/dn-server/services/nextcloud.nix | 5 +- system/dev/dn-server/sops/secret.yaml | 6 +- system/dev/public/dn/common.nix | 63 ---- system/dev/public/dn/default.nix | 6 - system/dev/public/dn/nextcloud-sync.nix | 74 ++++ system/dev/public/dn/presets/local.nix | 9 + system/dev/public/dn/presets/server.nix | 6 + system/dev/public/dn/wm.nix | 63 ++++ system/dev/public/sops/dn-secret.yaml | 7 +- system/modules/nextcloud.nix | 6 +- system/modules/niri.nix | 41 ++- system/modules/nvidia.nix | 17 +- system/modules/presets/minimal.nix | 2 +- system/modules/shells/noctalia/bar.nix | 9 + system/modules/shells/noctalia/default.nix | 12 +- .../modules/shells/noctalia/sessionMenu.nix | 2 +- system/modules/sops-nix.nix | 12 + system/modules/wine.nix | 2 +- 36 files changed, 516 insertions(+), 317 deletions(-) delete mode 100755 system/dev/public/dn/default.nix create mode 100644 system/dev/public/dn/nextcloud-sync.nix create mode 100644 system/dev/public/dn/presets/local.nix create mode 100644 system/dev/public/dn/presets/server.nix create mode 100644 system/dev/public/dn/wm.nix diff --git a/flake.lock b/flake.lock index 14b0e6f..654e6d2 100755 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1769428758, - "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=", + "lastModified": 1772292445, + "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15", + "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766518114, - "narHash": "sha256-3zIOjIidbrHXTxEzjPVrwSd19Mwdfw58VvSnTWtlunc=", + "lastModified": 1770895252, + "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", "ref": "refs/heads/main", - "rev": "138c4ebdbe0c3eead5656373ea8837a5bd49c40b", - "revCount": 1329, + "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", + "revCount": 1331, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1769740633, - "narHash": "sha256-W4gMgX8RsDeJioRPQHhUgXD/TxqAQxdZjkhjHRX70Pk=", + "lastModified": 1771987897, + "narHash": "sha256-5pNQFGxG3fxS9pGnNBJjT76veotKIKq2XpAVFGAhCdI=", "owner": "caelestia-dots", "repo": "cli", - "rev": "90fc2a981e587d38edc5a899011eca7979ecf124", + "rev": "b0d68f0a1c48fa138d6fde94dcbecea801a86a01", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1770122420, - "narHash": "sha256-SWFov0EDEZIjFMMNKiwOpTIsbiKO4jE7LSO7L2Bv3zE=", + "lastModified": 1772330657, + "narHash": "sha256-cWblprYsDUeAWA57xAqxIjNxXvDI/rqYn6TFp2OPi/k=", "owner": "caelestia-dots", "repo": "shell", - "rev": "4c72e3e06bd58a31e16cc1588d94543069fbd00a", + "rev": "278fd4a4ed1bfb42c3fe197ff38b587539c012aa", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1772420042, + "narHash": "sha256-naZz40TUFMa0E0CutvwWsSPhgD5JldyTUDEgP9ADpfU=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "5af7af10f14706e4095bd6bc0d9373eb097283c6", "type": "github" }, "original": { @@ -454,11 +454,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -493,11 +493,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -679,11 +679,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1770091344, - "narHash": "sha256-tKS5jzMfcWJjzq1Rm2QVUohzHEG/1VOM57aH6RQ5ALk=", + "lastModified": 1772511675, + "narHash": "sha256-0VoWORbMVtDW7fwN0qwoc5SDZ6t/mdmt2NJSkQ1Mil0=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "51897c0cd51fee61fff824d616fb2901ac41e817", + "rev": "2502ca294efe5aa9722c36e25b2252b0150054e9", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1769939035, - "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -804,11 +804,11 @@ ] }, "locked": { - "lastModified": 1768068402, - "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -824,11 +824,11 @@ ] }, "locked": { - "lastModified": 1770164260, - "narHash": "sha256-mQgOAYWlVJyuyXjZN6yxqXWyODvQI5P/UZUCU7IOuYo=", + "lastModified": 1772516620, + "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fda26500b4539e0a1e3afba9f0e1616bdad4f85", + "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9", "type": "github" }, "original": { @@ -882,11 +882,11 @@ ] }, "locked": { - "lastModified": 1769284023, - "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=", + "lastModified": 1770511807, + "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "13c536659d46893596412d180449353a900a1d31", + "rev": "7c75487edd43a71b61adb01cae8326d277aab683", "type": "github" }, "original": { @@ -912,11 +912,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1770164868, - "narHash": "sha256-sPyea7oYf5h420tdvkrwn0Z1uxfZdqhpuGrEVcdC7q8=", + "lastModified": 1772487546, + "narHash": "sha256-DJugMsFeTNwV9MUIqQr+aE7xLBhKppYi8O+b2ACmUTU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1bc857b12c434b7255119de009a50237856a90b2", + "rev": "be03497b82be332a124dd170e8741623791ef7c4", "type": "github" }, "original": { @@ -988,11 +988,11 @@ ] }, "locked": { - "lastModified": 1769285097, - "narHash": "sha256-eVD4U3Oqzz0VU9ylJ5wo76xDcYKv2CpiiRXq4Is4QdA=", + "lastModified": 1771865848, + "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "06c0749a0dac978d89b1a76ae6adc76a3c15dbfa", + "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1767983607, - "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", + "lastModified": 1771866172, + "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", + "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", "type": "github" }, "original": { @@ -1119,11 +1119,11 @@ ] }, "locked": { - "lastModified": 1766253372, - "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1770501770, + "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", "type": "github" }, "original": { @@ -1173,11 +1173,11 @@ ] }, "locked": { - "lastModified": 1769202094, - "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=", + "lastModified": 1771606233, + "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c", + "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", "type": "github" }, "original": { @@ -1260,11 +1260,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1770169526, - "narHash": "sha256-GYe2+1AT3lGAXPjcd0BDZ+AclFK+Z6NiGJ2F4rM2rLc=", + "lastModified": 1772520692, + "narHash": "sha256-kF242TbUoMN1WwBu1G37lBZmITxqfmzPRE7IL5gmwIk=", "owner": "DreamMaoMao", "repo": "mango", - "rev": "8ba259fbb7737e4cef29ca20c731ed0a93e4017d", + "rev": "1e1d41e626aa12057c03ec79ed11bcc5619f6748", "type": "github" }, "original": { @@ -1297,11 +1297,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1770074118, - "narHash": "sha256-3JFYOqJGLgn5QsEnBwOm6K+vFX3uckiiyVt3b9VT5h0=", + "lastModified": 1772338235, + "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "4f7e75d2be8a4c99778275ad3b3e4421029dcde0", + "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", "type": "github" }, "original": { @@ -1312,11 +1312,11 @@ }, "mnw": { "locked": { - "lastModified": 1769981889, - "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", "owner": "Gerg-L", "repo": "mnw", - "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { @@ -1354,11 +1354,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1770163968, - "narHash": "sha256-Ggh7hAS0tAOcPF66rrho9WAFZQZE0+SZYs+dnLgidpw=", + "lastModified": 1772496284, + "narHash": "sha256-pDGgYqXFU5cY1Jn11R7N/Q6DFazg6CQq8KDlqvyl/XE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4ae5c0c99f5e7fe02f0df0220a7d09b1945df646", + "rev": "fc9e6626baffb5b577810269713aedc37e95ef60", "type": "github" }, "original": { @@ -1370,11 +1370,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1770163048, - "narHash": "sha256-MEaHWrzF6PqjyQH8+m84dhVr8R4lDYc3V+XW194O4no=", + "lastModified": 1772473891, + "narHash": "sha256-E/0dAqFsUm4DggmHBl8rfI67yK227RXpzbEkZ7729bM=", "owner": "neovim", "repo": "neovim", - "rev": "ddd1bf757fab3615301053acab5cc85508340844", + "rev": "a8361c3afc5b9281814e9f16a9d4291e095b38fa", "type": "github" }, "original": { @@ -1395,15 +1395,15 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770169657, - "narHash": "sha256-wiWbmO2xUoqh5DuSBYVLGOICo9AOcYq9mNPsvCtL7SM=", - "owner": "sodiboo", + "lastModified": 1772005724, + "narHash": "sha256-sPzg2S8vOV7iS7Tdi4XpFWIWNAe7XJiz9YQ/3lWweSw=", + "owner": "dachxy", "repo": "niri-flake", - "rev": "4c962a3fd37ef268337ed113cbffabfd1fe3ca5c", + "rev": "63b401cdbbafba0d7668714a6328a750326911f6", "type": "github" }, "original": { - "owner": "sodiboo", + "owner": "dachxy", "repo": "niri-flake", "type": "github" } @@ -1434,16 +1434,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", + "lastModified": 1771749270, + "narHash": "sha256-ZJCM1XOHIdud6Jfpl4jYQOzbOJId9wmXT+hNJ1IPBIY=", + "owner": "niri-wm", "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "rev": "734d86ec061d15d1980c5b940b2f4dc9aee80cf5", "type": "github" }, "original": { - "owner": "YaLTeR", - "ref": "v25.08", + "owner": "niri-wm", + "ref": "wip/branch", "repo": "niri", "type": "github" } @@ -1451,15 +1451,16 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770092965, - "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=", - "owner": "YaLTeR", + "lastModified": 1771749270, + "narHash": "sha256-ZJCM1XOHIdud6Jfpl4jYQOzbOJId9wmXT+hNJ1IPBIY=", + "owner": "niri-wm", "repo": "niri", - "rev": "189917c93329c86ac2ddd89f459c26a028d590ba", + "rev": "734d86ec061d15d1980c5b940b2f4dc9aee80cf5", "type": "github" }, "original": { - "owner": "YaLTeR", + "owner": "niri-wm", + "ref": "wip/branch", "repo": "niri", "type": "github" } @@ -1492,11 +1493,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1772341813, + "narHash": "sha256-/PQ0ubBCMj/MVCWEI/XMStn55a8dIKsvztj4ZVLvUrQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "a2051ff239ce2e8a0148fa7a152903d9a78e854f", "type": "github" }, "original": { @@ -1514,11 +1515,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1770172907, - "narHash": "sha256-rqYl9B+4shcM5b6OYjT+qdsdQNJ7SY64/xcPIb96NzU=", + "lastModified": 1772334875, + "narHash": "sha256-AveYVY2plEJ62Br6iAd4fB5PDYyjJoTEmgdWRV3m+Vo=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8958a5a4259e1aebf4916823bf463faaf2538566", + "rev": "a852ac73a4f9bf8270bdac90a72a28fef5df846b", "type": "github" }, "original": { @@ -1533,11 +1534,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1770174568, - "narHash": "sha256-CuNnGNo2ON3LsBc4CAcE0znKKKRosGjdCetDsycmJRI=", + "lastModified": 1771465079, + "narHash": "sha256-vWKMGj2fBUbsAvwoYjgT+L4hH0A96u4rDOaT0wnj7iw=", "owner": "3timeslazy", "repo": "nix-search-tv", - "rev": "e1f74da24e3aded600d69d44ed39bbcf9ab83cd3", + "rev": "73a34372b15b3824586b3f65c22c4ff8f0eb4c2c", "type": "github" }, "original": { @@ -1576,11 +1577,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769607914, - "narHash": "sha256-3eYf0yyS8yyXuzrIfbqDwpXZ+3z3TwHGFgbl1+/35DU=", + "lastModified": 1772441848, + "narHash": "sha256-H3W5PSJQTh8Yp51PGU3GUoGCcrD+y7nCsxYHQr+Orvw=", "owner": "nix-community", "repo": "nixd", - "rev": "12e3e96245e81fbcaf1f0bad5079403b57c00e67", + "rev": "c896f916addae5b133ee0f4f01f9cd93906f62ea", "type": "github" }, "original": { @@ -1650,11 +1651,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1771903837, + "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", "type": "github" }, "original": { @@ -1666,11 +1667,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768032153, - "narHash": "sha256-zvxtwlM8ZlulmZKyYCQAPpkm5dngSEnnHjmjV7Teloc=", - "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", + "lastModified": 1770537093, + "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre925418.3146c6aa9995/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1679,11 +1680,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "47472570b1e607482890801aeaf29bfb749884f6", "type": "github" }, "original": { @@ -1695,11 +1696,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -1711,11 +1712,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1770141374, - "narHash": "sha256-yD4K/vRHPwXbJf5CK3JkptBA6nFWUKNX/jlFp2eKEQc=", + "lastModified": 1772419343, + "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41965737c1797c1d83cfb0b644ed0840a6220bd1", + "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", "type": "github" }, "original": { @@ -1727,11 +1728,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757584362, - "narHash": "sha256-XeTX/w16rUNUNBsfaOVCDoMMa7Xu7KvIMT7tn1zIEcg=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d33e926c80e6521a55da380a4c4c44a7462af405", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { @@ -1743,11 +1744,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1770141374, - "narHash": "sha256-yD4K/vRHPwXbJf5CK3JkptBA6nFWUKNX/jlFp2eKEQc=", + "lastModified": 1772479524, + "narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41965737c1797c1d83cfb0b644ed0840a6220bd1", + "rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43", "type": "github" }, "original": { @@ -1759,11 +1760,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "lastModified": 1772173633, + "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", "type": "github" }, "original": { @@ -1775,11 +1776,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1768875095, - "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", + "lastModified": 1772419343, + "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", + "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", "type": "github" }, "original": { @@ -1793,14 +1794,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1770175191, - "narHash": "sha256-ge90SW/drqKfAFgnIedXJ0tn+5adDWL3ddDyGlnjH5E=", + "lastModified": 1772500480, + "narHash": "sha256-7Rj0vLxKBn25QDKaW1heAQPH9ICg/cyrlLsoEPO0E58=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "787aab1f0a6bf282fbba92816e06bdf62226a179", + "rev": "ddfb06fe5b8d859578b269362d2f3e21b5dc5a75", "type": "github" }, "original": { @@ -1809,6 +1811,27 @@ "type": "github" } }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -1846,11 +1869,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1770130359, - "narHash": "sha256-IfoT9oaeIE6XjXprMORG2qZFzGGZ0v6wJcOlQRdlpvY=", + "lastModified": 1772483693, + "narHash": "sha256-sOq/GUSR0uw1eQla0Wc5BKztPqBJBj3khd/GhaVg4xU=", "owner": "notashelf", "repo": "nvf", - "rev": "92854bd0eaaa06914afba345741c372439b8e335", + "rev": "750dbfaf6eb62db8e67afc03a3ae3078bfd8f098", "type": "github" }, "original": { @@ -1892,11 +1915,11 @@ ] }, "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -1913,11 +1936,11 @@ ] }, "locked": { - "lastModified": 1769593411, - "narHash": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=", + "lastModified": 1771926182, + "narHash": "sha256-QbXuSLhiSxOq6ydBL3+KGe1aiYWBW+e3J6qjJZaRMq0=", "ref": "refs/heads/master", - "rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a", - "revCount": 732, + "rev": "cddb4f061bab495f4473ca5f2c571b6c710efef7", + "revCount": 744, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -2012,11 +2035,11 @@ ] }, "locked": { - "lastModified": 1770174315, - "narHash": "sha256-GUaMxDmJB1UULsIYpHtfblskVC6zymAaQ/Zqfo+13jc=", + "lastModified": 1772507320, + "narHash": "sha256-GdGXniFvtIfRiakc+ncdQYnoQjKbTCv9Imjfl4ggquI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "095c394bb91342882f27f6c73f64064fb9de9f2a", + "rev": "1775eafa1879ac098ee436849bc9c3d963206f89", "type": "github" }, "original": { @@ -2033,11 +2056,11 @@ ] }, "locked": { - "lastModified": 1769091129, - "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=", + "lastModified": 1772420823, + "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596", + "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c", "type": "github" }, "original": { @@ -2072,11 +2095,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1770145881, - "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", "type": "github" }, "original": { @@ -2122,11 +2145,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769978605, - "narHash": "sha256-Vjniae6HHJCb9xZLeUOP15aRQXSZuKeeaZFM+gRDCgo=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "nix-community", "repo": "stylix", - "rev": "ce22070ec5ce6169a6841da31baea33ce930ed38", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { @@ -2462,11 +2485,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770167989, - "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", + "lastModified": 1771787042, + "narHash": "sha256-7bM6Y4KldhKnfopSALF8XALxcX7ehkomXH9sPl4MXp0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", + "rev": "33c344fee50504089a447a8fef5878cf4f6215fc", "type": "github" }, "original": { @@ -2482,11 +2505,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1769971982, - "narHash": "sha256-dc8lG9CxtrIk+tOsQx8TJKULQBG27Hoio4O4M/6CxFM=", + "lastModified": 1772502075, + "narHash": "sha256-FDyvMvqrpDb2CrXOvtUEr0b4qgbe7D/POqVWdFD7wuI=", "owner": "sxyazi", "repo": "yazi", - "rev": "6757fed5aa82bfdcd5ecd52e8f374dc286220cc0", + "rev": "0efeaf5f641c7809bc820680c8a7d43a69ff2e13", "type": "github" }, "original": { @@ -2505,11 +2528,11 @@ ] }, "locked": { - "lastModified": 1770097899, - "narHash": "sha256-FKRpvwWR96VDW4bdsxIrZgIAXvdXqsCTaV1HghCJBoQ=", + "lastModified": 1772517053, + "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "615a27db86f3fddd0f096b5e9ea832795a4608d1", + "rev": "32e9673aee2ae994ced561247918952398a3e933", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2b7dd0c..c65c286 100755 --- a/flake.nix +++ b/flake.nix @@ -125,7 +125,8 @@ nix-search-tv.url = "github:3timeslazy/nix-search-tv"; niri = { - url = "github:sodiboo/niri-flake"; + # url = "github:sodiboo/niri-flake"; + url = "github:dachxy/niri-flake"; # Wait for blur configurations inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/user/ghostty.nix b/home/user/ghostty.nix index fa170a9..06228f1 100755 --- a/home/user/ghostty.nix +++ b/home/user/ghostty.nix @@ -1,12 +1,10 @@ { inputs, pkgs, - lib, ... }: let inherit (pkgs.stdenv.hostPlatform) system; - inherit (lib) mkDefault; ghosttyShaders = pkgs.fetchFromGitHub { owner = "sahaj-b"; @@ -28,9 +26,9 @@ in "${ghosttyShaders}/ripple_cursor.glsl" ]; - unfocused-split-opacity = 0.85; + unfocused-split-opacity = 0.65; desktop-notifications = true; - background-opacity = mkDefault 0.6; + background-opacity = 0.5; background-blur = 20; wait-after-command = false; diff --git a/home/user/zen-browser.nix b/home/user/zen-browser.nix index efd591c..fa55872 100755 --- a/home/user/zen-browser.nix +++ b/home/user/zen-browser.nix @@ -3,12 +3,10 @@ config, helper, pkgs, - lib, ... }: let inherit (osConfig.systemConf) username; - inherit (lib) mkForce; inherit (helper) capitalize; inherit (pkgs) runCommand; @@ -39,6 +37,7 @@ let in { programs.zen-browser = { + suppressXdgMigrationWarning = true; enable = true; languagePacks = [ "en-US" @@ -137,15 +136,19 @@ in }; }; - home.file.".zen/${profileName}/zen-keyboard-shortcuts.json".source = + xdg.configFile."zen/${profileName}/zen-keyboard-shortcuts.json".source = ../config/zen/zen-keyboard-shortcuts.json; - home.file.".zen/${profileName}/chrome" = { + xdg.configFile."zen/${profileName}/chrome" = { source = patchedNebula; recursive = true; }; - home.file.".zen/${profileName}/search.json.mozlz4".force = mkForce true; + systemd.user.tmpfiles.rules = [ + '' + L+ ${config.home.homeDirectory}/.zen - - - - ${config.home.homeDirectory}/.config/zen + '' + ]; xdg.mimeApps = let diff --git a/options/systemconf.nix b/options/systemconf.nix index fa6922f..539add1 100755 --- a/options/systemconf.nix +++ b/options/systemconf.nix @@ -10,10 +10,8 @@ let inherit (pkgs.stdenv.hostPlatform) system; inherit (lib) - optional mkOption mkEnableOption - mkMerge types mkIf ; diff --git a/system/dev/dn-lap/default.nix b/system/dev/dn-lap/default.nix index 58754d9..7f81ad2 100755 --- a/system/dev/dn-lap/default.nix +++ b/system/dev/dn-lap/default.nix @@ -8,13 +8,13 @@ in { systemConf = { inherit hostname username; - niri.enable = true; + enableHomeManager = true; + windowManager = "niri"; }; imports = [ ../../modules/presets/basic.nix - ../public/dn - ../public/dn/ntfy.nix + ../public/dn/presets/local.nix ./common ./games ./home @@ -24,6 +24,9 @@ in ./utility ./virtualisation ./network + ../../modules/shells/noctalia + ../../modules/sunshine.nix + ../../modules/card-reader.nix ]; users.users."${username}".openssh.authorizedKeys.keys = [ diff --git a/system/dev/dn-lap/home/default.nix b/system/dev/dn-lap/home/default.nix index d37f782..8bc5415 100755 --- a/system/dev/dn-lap/home/default.nix +++ b/system/dev/dn-lap/home/default.nix @@ -1,4 +1,5 @@ { + pkgs, config, lib, ... @@ -10,6 +11,10 @@ let in { home-manager.users."${username}" = { + home.packages = with pkgs; [ + mattermost-desktop + ]; + home.sessionVariables = { BROWSER = mkForce "chromium"; }; @@ -27,9 +32,9 @@ in } ]; - programs.hyprlock.monitors = [ - "LG Display" - ]; + programs.noctalia-shell = { + settings = { }; + }; programs.chromium = { enable = true; @@ -55,34 +60,7 @@ in imports = [ ../../../../home/presets/basic.nix - - # waybar - (import ../../../../home/user/waybar.nix { - settings = [ - { - output = "eDP-1"; - height = 46; - modules-left = [ - "custom/os" - "hyprland/workspaces" - "clock" - "mpris" - ]; - modules-right = [ - "wlr/taskbar" - "temperature" - "custom/wallRand" - "custom/wireguard" - "custom/recording" - "idle_inhibitor" - "network" - "pulseaudio" - "battery" - "custom/swaync" - ]; - } - ]; - }) + ../../../../home/user/zellij.nix ]; }; } diff --git a/system/dev/dn-lap/services/default.nix b/system/dev/dn-lap/services/default.nix index b2e5388..cac831f 100755 --- a/system/dev/dn-lap/services/default.nix +++ b/system/dev/dn-lap/services/default.nix @@ -1,5 +1,5 @@ { imports = [ - ../../../modules/wireguard.nix + # ../../../modules/wireguard.nix ]; } diff --git a/system/dev/dn-pre7780/common/nvidia.nix b/system/dev/dn-pre7780/common/nvidia.nix index 6f75446..8698bbc 100755 --- a/system/dev/dn-pre7780/common/nvidia.nix +++ b/system/dev/dn-pre7780/common/nvidia.nix @@ -1,7 +1,4 @@ -{ config, lib, ... }: -let - inherit (lib) mkForce; -in +{ ... }: { imports = [ (import ../../../modules/nvidia.nix { @@ -10,6 +7,4 @@ in nvidia-bus-id = "PCI:1:0:0"; }) ]; - - hardware.nvidia.package = mkForce config.boot.kernelPackages.nvidiaPackages.beta; } diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix index 2832653..6436d8e 100755 --- a/system/dev/dn-pre7780/default.nix +++ b/system/dev/dn-pre7780/default.nix @@ -38,10 +38,11 @@ in } ]; + nix.settings.download-buffer-size = 671088640; + imports = [ ../../modules/presets/basic.nix - ../public/dn - ../public/dn/ntfy.nix + ../public/dn/presets/local.nix ./expr ./network ./common diff --git a/system/dev/dn-pre7780/home/default.nix b/system/dev/dn-pre7780/home/default.nix index e72b04a..881eeb1 100755 --- a/system/dev/dn-pre7780/home/default.nix +++ b/system/dev/dn-pre7780/home/default.nix @@ -76,10 +76,6 @@ in } ]; - programs.ghostty.settings = { - background-opacity = 0.9; - }; - # ==== Shells ==== # # Caelestia programs.caelestia.settings = { @@ -92,6 +88,7 @@ in # Noctalia programs.noctalia-shell.filteredIds = [ "Brightness" + "Battery" ]; # ==== WM ==== # diff --git a/system/dev/dn-pre7780/sops/secret.yaml b/system/dev/dn-pre7780/sops/secret.yaml index 10cca37..09dd4f0 100755 --- a/system/dev/dn-pre7780/sops/secret.yaml +++ b/system/dev/dn-pre7780/sops/secret.yaml @@ -40,7 +40,7 @@ sops: MEdmWkFwNXZoR1ZVRnQ0aWlkYzZwSmsK0EFecUIdqlDKX08oRCoDQQ3QCX1wzb8w lghDJhWlfuKr+X24GoE4UK04aJVLqVMRRI4BJW+LQXeHS+dWKu3mQA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-01-20T05:40:32Z" - mac: ENC[AES256_GCM,data:2UM15E3aYMunypx6THZTwHdedmUWYKQGgPEqMmT1D/CkWcCmau0Yk2nhALjcXWLuODlkedrjm6tYSPg7Yv/eZUnUwfI9reBAfoGBbJLCIoAloomzzm21xDvIJOco9xyHPKwT4buYYA/mylJvrSi07G0qRM6tINQjhEvVsDIbFR0=,iv:lPo3U/eCSZx6MmqvoTUpk+u6E+fFgED4eq0EF/jk/hs=,tag:b8XyedLJ706LplFF/VafAg==,type:str] + lastmodified: "2026-03-06T08:47:28Z" + mac: ENC[AES256_GCM,data:1q8l6J6ePg3M4YZAxIjvVMzKurmPQHa93wXIQ3YJirVLaPGyXXczFPKrl9iHTPlwI7Vt1KSQGw1hkO2Q6KWSZgKd3/aKJ+HliRhnqbdOJThwbdHzmVq80mnCzG/Z+yYY45ONPI369bVHydZZT7iEjAWi3ndSkC9KFhyEez3Wa2w=,iv:+w+riNzfF4R+EkTON72AskJscqEMJ1WJoFSiJHPSEGc=,tag:wG4ZuOxXE3dzTezHOu9yzg==,type:str] unencrypted_suffix: _unencrypted - version: 3.11.0 + version: 3.12.1 diff --git a/system/dev/dn-server/default.nix b/system/dev/dn-server/default.nix index 53ad4f3..123a233 100755 --- a/system/dev/dn-server/default.nix +++ b/system/dev/dn-server/default.nix @@ -46,7 +46,7 @@ in ''; imports = [ - ../public/dn + ../public/dn/presets/server.nix ./common ./home ./network diff --git a/system/dev/dn-server/network/services.nix b/system/dev/dn-server/network/services.nix index ac644b2..bdcff34 100755 --- a/system/dev/dn-server/network/services.nix +++ b/system/dev/dn-server/network/services.nix @@ -33,8 +33,8 @@ let }; allowedSSHIPs = concatStringsSep ", " [ - "122.117.215.55" "192.168.100.1/24" + "140.113.229.197/32" personal.range ]; diff --git a/system/dev/dn-server/services/homepage.nix b/system/dev/dn-server/services/homepage.nix index f986316..a0ff448 100644 --- a/system/dev/dn-server/services/homepage.nix +++ b/system/dev/dn-server/services/homepage.nix @@ -13,7 +13,7 @@ in enable = true; openFirewall = true; listenPort = 8044; - environmentFile = config.sops.secrets."homepage".path; + environmentFiles = [ config.sops.secrets."homepage".path ]; allowedHosts = "www.${domain},${domain},localhost:${toString cfg.listenPort}"; docker = { docker = { @@ -64,6 +64,17 @@ in } ]; } + { + "Development" = [ + { + "Forgejo" = { + icon = "forgejo.svg"; + description = "Git repository"; + href = config.services.forgejo.settings.server.ROOT_URL; + }; + } + ]; + } { "VPN & IDP" = [ { @@ -121,6 +132,31 @@ in icon = "powerdns.svg"; description = "DNS record management"; href = "https://powerdns.${domain}"; + widgets = + let + queryProp = ''job="powerdns_recursor"''; + in + [ + { + type = "prometheusmetric"; + url = "https://metrics.dnywe.com"; + refreshInterval = 10000; + metrics = [ + { + label = "Up"; + query = "up{${queryProp}}"; + } + { + label = "Query Rate"; + query = "sum(rate(pdns_recursor_questions{${queryProp}}[1h]))"; + format = { + type = "number"; + suffix = " req/s"; + }; + } + ]; + } + ]; }; } { diff --git a/system/dev/dn-server/services/mail-server.nix b/system/dev/dn-server/services/mail-server.nix index b40b4b5..7cdec3b 100755 --- a/system/dev/dn-server/services/mail-server.nix +++ b/system/dev/dn-server/services/mail-server.nix @@ -21,6 +21,8 @@ in "sa-update.surbl.org" ]; + services.opendkim.enable = mkForce false; + mail-server = let domain = "net.dn"; diff --git a/system/dev/dn-server/services/metrics.nix b/system/dev/dn-server/services/metrics.nix index d418eba..d71cba4 100755 --- a/system/dev/dn-server/services/metrics.nix +++ b/system/dev/dn-server/services/metrics.nix @@ -143,7 +143,7 @@ in { uid = "prometheus-dn-server"; name = "Prometheus"; - url = "https://metrics.net.dn"; + url = "https://${prometheusHostname}"; type = "prometheus"; } ]; diff --git a/system/dev/dn-server/services/minecraft-server.nix b/system/dev/dn-server/services/minecraft-server.nix index d48a08e..906fd23 100755 --- a/system/dev/dn-server/services/minecraft-server.nix +++ b/system/dev/dn-server/services/minecraft-server.nix @@ -119,7 +119,7 @@ in serverVersion = lib.replaceStrings [ "." ] [ "_" ] "fabric-${mcVersion}"; in { - enable = true; + enable = false; autoStart = true; enableReload = true; jvmOpts = "-Xms2144M -Xmx8240M"; diff --git a/system/dev/dn-server/services/nextcloud.nix b/system/dev/dn-server/services/nextcloud.nix index a27202e..46c0bc6 100755 --- a/system/dev/dn-server/services/nextcloud.nix +++ b/system/dev/dn-server/services/nextcloud.nix @@ -48,7 +48,10 @@ in (import ../../../modules/nextcloud.nix { hostname = "nextcloud.${domain}"; adminpassFile = secrets."nextcloud/adminPassword".path; - trusted-proxies = [ "10.0.0.0/24" ]; + trusted-proxies = [ + "10.0.0.0/24" + "10.10.0.0/24" + ]; whiteboardSecrets = [ secrets."nextcloud/whiteboard".path ]; diff --git a/system/dev/dn-server/sops/secret.yaml b/system/dev/dn-server/sops/secret.yaml index 113f423..6f17b5e 100755 --- a/system/dev/dn-server/sops/secret.yaml +++ b/system/dev/dn-server/sops/secret.yaml @@ -21,7 +21,7 @@ nextcloud: backendsecret: ENC[AES256_GCM,data:pV5yw755RkAwHBdmfeP37/SobFZqJouWyIiRJ+Y2mk0iiVdW04vhYVsyjcI=,iv:NhkewgnyE2Dw8mQMMSq6AWo6IOWu8BlyPZvZAszyZuQ=,tag:BlZO15qZWViV8pCWIgZHZQ==,type:str] step_ca: password: ENC[AES256_GCM,data:3NtUAl344gHiXLlMl88X17Vsm/4OKFM0W8bntzbXC0U=,iv:q9cWW8xTxYQnRYohBxnPIsbVSpvkZYVpYLRVeZgmsRM=,tag:ibumK7ebPKNO/CXAS0eeRA==,type:str] -vaultwarden: ENC[AES256_GCM,data:unu2+istP/NHcns2HUvNYveGElAEDFI+6X/KXYu2hKvY9c57PhmGVEmwlNhMWjHOSLaIvF48iDKCMnFnk20Fop5S2PS8WdNQ5sAA3mhoBnYGKIVsSsjpAqdIKj5c+AozeFODuIrCPRFm1JbOlgcmniwWNwbKtXt8GrgHzBbFUNX00npOwK9NmZOTxPVCj6gs3purULbsTzxDYZKdtqoM0Rv8E+MM/SLTR3QJnTCi7CxWfqy2tSsNzFh4puyZ0xf03m/fMP2iJqwZKjr0G5DwMl8ng0XvnojUcAg3OO34T7VCR1E6unqOpt8Mxc4l5eDVZEp6euchLB1GHP1OaElLCGvlp16xFKQyu+XtuFKxDrgl+AjVXl/rdl8Sk7fa9x6VzYbbJIR5Nzrwb+x9sJIc0Q5u6MroVsfawUzNH3aWkBCxQ0jGqkWyAZyumOuLxODpYETUCxiaBW6unEYSABibY5Q=,iv:5T/N41eLnPThRs1nwFiqMqyd6+RMWkDz6N4yVuAojH0=,tag:1gyxAtpZw/uhPWOoioFqKw==,type:str] +vaultwarden: ENC[AES256_GCM,data:iQ6fu3rs0b4kiBKKMwv7EwNCHEbDnOvy0LhxoCo6ppo+3iYy55a86+gf9N2nDG1JiKEGSq6SAWqAG4Zhv4XEXZmjGzuVfpUWvPrXvlHFOv12/OWjOTTojf7JyJXuMNBbElC9aBLh6bfpF9jxMugs1s421QrG4irbK4jIwnKztADlzq+GlkWJgjIXatW6cZ8W3lx2yQO1D/n+MQJom4aCaMz+sbv2EF5hZW90VdLdgunzR15sIF6puremZFq4exS8W6QBV4fD3FgCHGelPLx8En0MyFxkVq2wLyQ88BzQI4eQf3wswOBD26OOH/hgwwzDk7Olv8w0FialtDEa3sM8lL6FHj9/+1RoFs/bLzSCz50PtlwIRChjoeD6zzfvyCuxg3nAJaI8Zm7JbbaLm+QMR0OE7f9H0+/fuxSmXu8pj1vuTXYs0bsrZv6Hr9sbNhIA3+kzzMtUaE8BuPKisx1M4FZiDFr2OPDsxqpkKB5ldqeqX6hVSYq6Skb7Kq7dLQyMWjQcNg==,iv:2pnql+V1QbuB11x7m4figiGJvxusOeVuadINrgjJXCo=,tag:tc/XruhnJ5iybOtajV/Lfg==,type:str] ldap: password: ENC[AES256_GCM,data:gz5WBopSffGyvJxKDPekPQ==,iv:bX7N9/oNMhtE/KbPah2ge4s87P2VsxHGoFkOyl83dxs=,tag:YoTe6NPAJgp/0nvhHC9Y5A==,type:str] env: ENC[AES256_GCM,data:68EvTHeBqtCVfde5oO+Wzny+l/YIMWQmbcNQ0Wl59EjMrSlJM0rmFm2lMJpxKzCN2cFs0N2z6zG1/eQ9t/SxxyVBrNA6ECnCZrerIo2YGlaT30tc1rffpd8TchMH1VKP5qHnbLUqORMx5z0LR4U49l2HVcHgSCjt/1f127oMi411vIU=,iv:+m1F0CBaoJGv6Z1u+h6rbsXGPUhxgHouTalj13ccJiY=,tag:I/hK65yPaIcgHEZVaXJHBA==,type:str] @@ -95,7 +95,7 @@ sops: OFloWEFuTC9GTXJsMG5NNktmdmIrY1kK0yN0ae0xNaydujV5lt2FiwXdyursG0DK 9i/B3TTAm9csDMMSTSFbiAUJDzG7kIqn++JU/cxvsGScSnhMqjEK/g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-01-30T04:08:29Z" - mac: ENC[AES256_GCM,data:egK9zlAccBV2IeJ+DYTP3AKQUUMFPmts8eZMilQlyh+EE/oXhNnKeKkmNg9h1RwoZ6zh0LRDsyjubCc06PI/wVx2lJ0JfPs4bt6PckC1hZglRSHHjmocyx1eF5bMVfBLmluDzQ3Zms1Ryvuh+M+EjtdhttBljAIb0JIRx8Wzwks=,iv:wWrRiOvzZDboZSMgTzmbVVWzpSIhLdlgxgUIFXCFet0=,tag:YLBtLivKLBvByyfm4PbVXQ==,type:str] + lastmodified: "2026-02-15T10:06:42Z" + mac: ENC[AES256_GCM,data:Cuy342Fl4oze+1+eT0tJcOMR+c8iXpJWLH74g3+MAKWlU6F1uIW7qTXAYzkXiQRKtwG0+Hfbp8xQV/Ay19c20FyfWuDl8JAse+RbP50lHeX6GqW/P4I2s2B056emmamwb71NIlS03AkVoii7n8xqkzGmJz2bS+SWLvK/INS0eGM=,iv:bVgs5Xn7vvkmTpSbDJy+ZJ2vbcaomV1qcTIUyHXmpL4=,tag:Vc0IJLA2MFh7toqlDg8xUw==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/system/dev/public/dn/common.nix b/system/dev/public/dn/common.nix index 50271c2..13f201b 100755 --- a/system/dev/public/dn/common.nix +++ b/system/dev/public/dn/common.nix @@ -18,68 +18,5 @@ in email = "Danny01161013@gmail.com"; }) ]; - - # ==== Niri ==== # - programs.niri.settings = { - input.keyboard.xkb = { - layout = "us"; - options = "caps:escape"; - }; - workspaces."game" = { }; - window-rules = [ - # Wine systray - { - matches = [ - { - title = "^$"; - app-id = "^steam_app_(.*)$"; - } - ]; - open-fullscreen = false; - } - # Steam Game Fullscreen - { - matches = [ - { - app-id = "^steam_app_(.*)$"; - is-floating = false; - } - ]; - open-fullscreen = true; - } - # Steam & Steam Game - { - matches = [ - { app-id = "^steam_app_*"; } - { app-id = "^pioneergame.exe$"; } - { - app-id = "^steam$"; - title = "^Steam$"; - } - ]; - open-on-workspace = "game"; - } - # Steam Dialog float - { - matches = [ - { app-id = "^steam$"; } - { title = "(.*)(EasyAntiCheat_EOS_Setup)(.*)"; } - { - app-id = "^pioneergame.exe$"; - title = "^$"; - } - ]; - excludes = [ - { - title = "^Steam$"; - } - ]; - open-floating = true; - } - ]; - }; - wayland.windowManager.mango.settings = '' - xkb_rules_options = caps:escape - ''; }; } diff --git a/system/dev/public/dn/default.nix b/system/dev/public/dn/default.nix deleted file mode 100755 index d64a720..0000000 --- a/system/dev/public/dn/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./yubikey.nix - ./common.nix - ]; -} diff --git a/system/dev/public/dn/nextcloud-sync.nix b/system/dev/public/dn/nextcloud-sync.nix new file mode 100644 index 0000000..4075a6c --- /dev/null +++ b/system/dev/public/dn/nextcloud-sync.nix @@ -0,0 +1,74 @@ +{ + config, + lib, + self, + ... +}: +let + inherit (builtins) length; + inherit (lib) getExe' optionalString; + inherit (config.systemConf) username; + serverCfg = self.nixosConfigurations.dn-server.config; + serverNextcloudCfg = serverCfg.services.nextcloud; + nextcloudURL = + (if serverNextcloudCfg.https then "https" else "http") + "://" + serverNextcloudCfg.hostName; +in +{ + + home-manager.users."${username}" = + { + pkgs, + config, + ... + }: + let + inherit (config.home) homeDirectory; + pathToSync = [ + { + target = "/Wallpapers"; + source = "${homeDirectory}/Pictures/Wallpapers"; + } + ]; + in + { + sops.secrets."netrc" = { + mode = "0700"; + sopsFile = ../sops/dn-secret.yaml; + path = "${homeDirectory}/.netrc"; + }; + + systemd.user = { + services.nextcloud-autosync = { + Unit = { + Description = "Auto sync Nextcloud"; + After = "network-online.target"; + }; + Service = { + Type = "simple"; + ExecStart = "${getExe' pkgs.nextcloud-client "nextcloudcmd"} -h -n ${ + optionalString (length pathToSync > 0) "--path" + } ${toString (map (x: "${x.target} ${x.source}") pathToSync)} ${nextcloudURL}"; + TimeoutStopSec = "180"; + KillMode = "process"; + KillSignal = "SIGINT"; + }; + Install.WantedBy = [ "multi-user.target" ]; + }; + + timers.nextcloud-autosync = + let + cfg = config.systemd.user.timers.nextcloud-autosync; + in + { + Unit.Description = "Automatic async files with nextcloud when booted up after ${cfg.Timer.OnBootSec} then rerun every ${cfg.Timer.OnUnitActiveSec} "; + Timer.OnBootSec = "5min"; + Timer.OnUnitActiveSec = "60min"; + Install.WantedBy = [ + "multi-user.target" + "timers.target" + ]; + }; + startServices = true; + }; + }; +} diff --git a/system/dev/public/dn/presets/local.nix b/system/dev/public/dn/presets/local.nix new file mode 100644 index 0000000..8497e6e --- /dev/null +++ b/system/dev/public/dn/presets/local.nix @@ -0,0 +1,9 @@ +{ + imports = [ + ../common.nix + ../nextcloud-sync.nix + ../yubikey.nix + ../ntfy.nix + ../wm.nix + ]; +} diff --git a/system/dev/public/dn/presets/server.nix b/system/dev/public/dn/presets/server.nix new file mode 100644 index 0000000..b34315a --- /dev/null +++ b/system/dev/public/dn/presets/server.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../common.nix + ../yubikey.nix + ]; +} diff --git a/system/dev/public/dn/wm.nix b/system/dev/public/dn/wm.nix new file mode 100644 index 0000000..72fc7b3 --- /dev/null +++ b/system/dev/public/dn/wm.nix @@ -0,0 +1,63 @@ +{ config, ... }: +let + inherit (config.systemConf) username; +in +{ + home-manager.users."${username}" = + { ... }: + { + # ==== Niri ==== # + programs.niri.settings = { + input.keyboard.xkb = { + layout = "us"; + options = "caps:escape"; + }; + workspaces."game" = { }; + window-rules = [ + # Steam Game Fullscreen + { + matches = [ + { + app-id = "^steam_app_(.*)$"; + title = "^.+$"; + is-floating = false; + } + ]; + open-fullscreen = true; + } + # Steam & Steam Game + { + matches = [ + { app-id = "^steam_app_*"; } + { app-id = "^pioneergame.exe$"; } + { + app-id = "^steam$"; + title = "^Steam$"; + } + ]; + open-on-workspace = "game"; + } + # Steam Dialog float + { + matches = [ + { app-id = "^steam$"; } + { title = "(.*)(EasyAntiCheat_EOS_Setup)(.*)"; } + { + app-id = "^pioneergame.exe$"; + title = "^$"; + } + ]; + excludes = [ + { + title = "^Steam$"; + } + ]; + open-floating = true; + } + ]; + }; + wayland.windowManager.mango.settings = '' + xkb_rules_options = caps:escape + ''; + }; +} diff --git a/system/dev/public/sops/dn-secret.yaml b/system/dev/public/sops/dn-secret.yaml index 540713f..0d3ec2b 100755 --- a/system/dev/public/sops/dn-secret.yaml +++ b/system/dev/public/sops/dn-secret.yaml @@ -1,5 +1,6 @@ ntfy: ENC[AES256_GCM,data:7m7hwmDWu6qP/mX7QujXPiDAmRC542CKyWzFaOL5sHza,iv:nn1F44LSFmrV2USRDD0z8CNfUhi40LZnvoU3j0nklcU=,tag:WhqQpThDaG10kNTk1tZxOQ==,type:str] u2f_keys: ENC[AES256_GCM,data:0EofFtgar18YzbzXiT6NdC9nwMTQoYkeU8snRTwhUX2Hz+k4B46839xZet4Df5a8xpaB2CuoPvRkEMSxknBWGKkK+gZr2m+zogbpMTGQVTYqmqlnunywrhe9u9FQ5D1hwU4PYcOgDqox5dw4QMg/AUontu5BYTG3WKCCTDVIL+i6PejwXKcfoKHd9G1K2QHV33S40EM4/jjijgxW+NoO6vkEWIwxih/DxQ4YZYTHHBZXhKRD7Hwhikd6G3Vs3/xD/UOVVJKtkyn1wKNQf+O30Q2LNOhDQ8/weNfN9IAMpVtRqvEtFXA2rfp9zI7TY1iuSN9nN9hYuZJeCktvK1WiRvspU5wYn2jDtM83zCA8Udnq1XJbsGEv2aA3SYyxoldtkjFcjlupGa1lJiaANxhmpOfJp0IIkeXqnIkLE/FzRFiced58H1UV6InlH5S/Lz42854ec/jDlgvzCnDoWIsgfgQf+KmwRHznzeepPW7S3tyB/jbJETEfCJfZ3E6YmeAMWd85drTKsySjBGiM7mueb4thGstfgnAEO/Y3PuVc/qGS1j95lUc0w0zbr3VzwibxCsS02PgMIUE5gZPEllknbhh6QiqbS2AtTAb9pIwrpYfEmcZU2blofQ8WzkLEjqNnRGaDXzgIEw4OirM0tSaFGmT9Vy1XN4yvSVssjsW/wXg19U4S/6FS+zOvyg+lIkT3NOfu5dKQecz8cH0czEN5MoVj3fm5LBhFmDOawP5AAA8dLafMEepxbBIGr/9nzDP17trMfzFf78hymHTgQk/qFb6oWl9Ai1dFZRwHO7HcXpBveTpPMCaeNOjcvRrvKsm2HSzsWPCVsfX6nrmNjqyFJXpPuuNaPezclL/ApPdEXpi9Q+aVHAgjllBLAH/R8UJu71cJAo+x7TCWykG31xLO0xodtJ5Lwk3O1lMnznnQXT/fCVaFYV24OT/nS7hQOtDvlJOCfmSpZTmZxX31xF4Gt0Auok+0uPJzDfbFQH9WwifXn6F8ixdsLK/VJMEk8EZbHpkNSV6hzWJkiOeJCDl7SBKEcQ+FizYSfZuOcVEt83ScJuVa7IScVLdatnTTTpR4c5GASYLr3lahqYwhuZGcQEUIwjDXu8Oymo0Sbvnmev60wY5Q3BEMSX1iwt3QWdCe5Kzq2vEUQHP9s6lg7DgOeIA2xQRK5siqwOhw9i1qaHbPG+1yTFOx7gRu0+yBy2Qzkwsc9naD8Ce0hpwQmu4Nvpd5TjMnS51ljDMWBok5evdOtGeWL9mDz6VdxtuHbcBShmEOk+lfKKjpDeK5319veBX5ugCm8WXeDmIIhG12gI07xRVzPaeYEhnRG2pHy/+JdjlyGeh0oHCJOYPhxtwVbqXwmH83BGn3H05bdIWEjXs=,iv:pAdO+Uja/Zyf5uLMa9zbKvEMoOOjQgkqHYnEH+Bxd5k=,tag:mYngzcv0bGwVJBHOR6D4uw==,type:str] +netrc: ENC[AES256_GCM,data:UaTMV459ApE94Lg/MsbEttaBskwTgQ/UJRejFa2KjxMQ1CKF38A6BOZip/yeE/lrDy5y4WblS7Hru38ytkPGCikZIjsdn61sLMstw1RQAHs=,iv:imk+pjmPu7soPImWQQHYapy46SvYTyWj/+4gwu9I/18=,tag:VhOCAWtUd/AC/DBxuNmt8A==,type:str] sops: age: - recipient: age1uvsvf5ljaezh5wze32p685kfentyle0l2mvysc67yvgct2h4850qqph9lv @@ -29,7 +30,7 @@ sops: QWV3VjRjNC9RaXNwbDdLWmVQNS94UzAKeLZSqcXRwkVoUUKd4PuRusbJwFlubdJy kcxGMzvfT0BMYDp61vV+F5Vh4TkgddCzp6Lphbb/6orkWWpjmE9I4g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-09T08:03:16Z" - mac: ENC[AES256_GCM,data:6njhvipu8iUze0mmgFIWT6Neqy2xvNPB/4fW7OObHknXAh3VGAveBnigxAJmULua6HdQx4hZ2UkUrVBG8oStjCihFYJA0eBA9j9mM3rF7Piq2U98oGtw4A9Qj2PVC7Y8pOOuX25VRmDn78cw1PpwSEZL3zZ+8cqS5btHywJackY=,iv:AeRcrhhxl5v5YLNWUPx9qvGcMKHFQD/m87PJAGWa9iE=,tag:TN1KCUNa7lVWgxQ16WRijg==,type:str] + lastmodified: "2026-03-06T08:47:47Z" + mac: ENC[AES256_GCM,data:RMHOwVwL4tGKWOOOjh9OlAFnJxDGcQvgLb8vTACDAY5Mky+0+8gL1GO7hK+r0G7tbfMB4A/4CHeZtHqoXWjfhIEoDLVkkpAmckMpHVMd7bNlhvL0fkzi5YOLPgW8RCRO6VCXJM3Hb0v6N0NjcK37jdZdYJyr6DZI6aV3oY72mz0=,iv:CBAUv12RSLNY73JBZT4iHpRTLpRIm6a6mo1pz+lYEwc=,tag:l7RZNUzbZpG0Wkntl0qfLQ==,type:str] unencrypted_suffix: _unencrypted - version: 3.11.0 + version: 3.12.1 diff --git a/system/modules/nextcloud.nix b/system/modules/nextcloud.nix index 1da492f..3962331 100755 --- a/system/modules/nextcloud.nix +++ b/system/modules/nextcloud.nix @@ -83,10 +83,7 @@ in hostName = hostname; https = https; datadir = lib.mkIf (datadir != null) datadir; - phpExtraExtensions = - allEx: with allEx; [ - imagick - ]; + enableImagemagick = true; extraApps = { inherit (config.services.nextcloud.package.packages.apps) @@ -132,6 +129,7 @@ in "OC\\Preview\\HEIC" "OC\\Preview\\SVG" "OC\\Preview\\FONT" + "OC\\Preview\\Movie" ]; }; }; diff --git a/system/modules/niri.nix b/system/modules/niri.nix index 63d0152..00061c7 100755 --- a/system/modules/niri.nix +++ b/system/modules/niri.nix @@ -108,9 +108,40 @@ in }; }; + blur = { + passes = 3; + offset = 3; + noise = 0.02; + saturation = 1.5; + }; + + debug = { + honor-xdg-activation-with-invalid-serial = [ ]; + }; + + layer-rules = [ + { + matches = [ + { namespace = "^noctalia-overview*"; } + ]; + place-within-backdrop = true; + } + { + matches = [ + { namespace = "^noctalia-background-.*$"; } + ]; + background-effect = { + blur = true; + }; + } + ]; + window-rules = [ # Global { + background-effect = { + blur = true; + }; geometry-corner-radius = let round = wmCfg.border.radius + 0.0; @@ -122,9 +153,17 @@ in top-right = round; }; clip-to-geometry = true; - opacity = 1.0; + opacity = 0.8; draw-border-with-background = false; } + # non transparent + { + matches = [ + { app-id = "^(com.mitchellh.ghostty)$"; } + { app-id = "^(zen-twilight)$"; } + ]; + opacity = 1.0; + } # Float { matches = [ diff --git a/system/modules/nvidia.nix b/system/modules/nvidia.nix index 35d9502..d61b7d3 100755 --- a/system/modules/nvidia.nix +++ b/system/modules/nvidia.nix @@ -54,7 +54,22 @@ lib.checkListOfEnum "Nvidia Prime Mode" validModes [ nvidia-mode ] { nvidia.nvidiaSettings = true; nvidia.dynamicBoost.enable = true; - nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; + nvidia.package = + let + base = config.boot.kernelPackages.nvidiaPackages.latest; + cachyos-nvidia-patch = pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/CachyOS/CachyOS-PKGBUILDS/master/nvidia/nvidia-utils/kernel-6.19.patch"; + sha256 = "sha256-YuJjSUXE6jYSuZySYGnWSNG5sfVei7vvxDcHx3K+IN4="; + }; + + driverAttr = if config.hardware.nvidia.open then "open" else "bin"; + in + base + // { + ${driverAttr} = base.${driverAttr}.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or [ ]) ++ [ cachyos-nvidia-patch ]; + }); + }; nvidia.prime = ( diff --git a/system/modules/presets/minimal.nix b/system/modules/presets/minimal.nix index 8312883..75fc218 100755 --- a/system/modules/presets/minimal.nix +++ b/system/modules/presets/minimal.nix @@ -25,5 +25,5 @@ in ]; # Disable man cache - documentation.man.generateCaches = mkForce false; + documentation.man.cache.enable = mkForce false; } diff --git a/system/modules/shells/noctalia/bar.nix b/system/modules/shells/noctalia/bar.nix index 1481c86..2e16588 100755 --- a/system/modules/shells/noctalia/bar.nix +++ b/system/modules/shells/noctalia/bar.nix @@ -130,6 +130,15 @@ in id = "NotificationHistory"; showUnreadBadge = true; } + { + deviceNativePath = "__default__"; + displayMode = "graphic"; + hideIfIdle = false; + hideIfNotDetected = true; + id = "Battery"; + showNoctaliaPerformance = true; + showPowerProfiles = true; + } { colorizeDistroLogo = false; colorizeSystemIcon = "primary"; diff --git a/system/modules/shells/noctalia/default.nix b/system/modules/shells/noctalia/default.nix index fdf42fc..57646be 100755 --- a/system/modules/shells/noctalia/default.nix +++ b/system/modules/shells/noctalia/default.nix @@ -59,6 +59,7 @@ in programs.noctalia-shell = { enable = true; systemd.enable = true; + colors = mkForce { }; settings = { settingsVersion = 26; appLauncher = { @@ -126,7 +127,7 @@ in }; controlCenter = import ./controlCenter.nix; dock = { - backgroundOpacity = 1.0; + backgroundOpacity = mkForce 1.0; colorizeIcons = false; displayMode = "auto_hide"; enabled = false; @@ -159,6 +160,8 @@ in shadowOffsetY = 3; showHibernateOnLockScreen = false; showScreenCorners = true; + lockScreenAnimation = true; + lockScreenCountdownDuration = 3000; }; hooks = { enabled = false; @@ -190,7 +193,8 @@ in manualSunset = "18:30"; }; notifications = { - backgroundOpacity = 1.0; + enableMarkdown = true; + backgroundOpacity = mkForce 1.00; criticalUrgencyDuration = 15; enableKeyboardLayoutToast = true; enabled = true; @@ -204,7 +208,7 @@ in }; osd = { autoHideMs = 1500; - backgroundOpacity = 1.0; + backgroundOpacity = mkForce 0.55; enabled = true; enabledTypes = [ 0 @@ -249,7 +253,7 @@ in hideWallpaperFilenames = true; monitorDirectories = [ ]; - overviewEnabled = false; + overviewEnabled = true; panelPosition = "follow_bar"; randomEnabled = false; randomIntervalSec = 300; diff --git a/system/modules/shells/noctalia/sessionMenu.nix b/system/modules/shells/noctalia/sessionMenu.nix index 747bdfa..6d81ded 100755 --- a/system/modules/shells/noctalia/sessionMenu.nix +++ b/system/modules/shells/noctalia/sessionMenu.nix @@ -1,5 +1,5 @@ { - countdownDuration = 10000; + countdownDuration = 3000; enableCountdown = true; position = "bottom_center"; powerOptions = [ diff --git a/system/modules/sops-nix.nix b/system/modules/sops-nix.nix index 4b9c0f7..4f14cdc 100755 --- a/system/modules/sops-nix.nix +++ b/system/modules/sops-nix.nix @@ -12,6 +12,18 @@ in }; }; + home-manager.sharedModules = [ + { + sops = { + defaultSopsFile = defaultSopsFile; + + age = { + keyFile = ageKeyFile; + }; + }; + } + ]; + environment.variables = { SOPS_AGE_KEY_FILE = ageKeyFile; }; diff --git a/system/modules/wine.nix b/system/modules/wine.nix index b568e62..53ffbeb 100755 --- a/system/modules/wine.nix +++ b/system/modules/wine.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - wineWowPackages.waylandFull # 32-bit & 64-bit + wineWow64Packages.waylandFull winetricks ]; }