From 3a07c0da83d06a4e106fa53a260268dee8d72b03 Mon Sep 17 00:00:00 2001 From: DACHXY Date: Fri, 25 Jul 2025 16:21:27 +0800 Subject: [PATCH] update: update flake --- flake.lock | 273 +++++++++--------- flake.nix | 81 +++--- home/config/ghostty/config | 1 + home/config/scripts/waybarRestart.sh | 9 - home/config/waybar/config.nix | 4 +- home/presets/basic.nix | 2 - home/user/hypr/bind.nix | 5 +- home/user/hypr/exec.nix | 2 - home/user/hypr/input.nix | 2 +- home/user/hyprland.nix | 116 ++++---- home/user/nvim.nix | 1 - home/user/swaync.nix | 187 ------------ system/dev/dn-pre7780/boot.nix | 17 +- system/dev/dn-pre7780/default.nix | 42 +-- .../dev/dn-pre7780/hardware-configuration.nix | 38 +-- system/dev/dn-pre7780/nginx.nix | 29 -- system/modules/hyprland.nix | 5 - system/modules/rustdesk-server.nix | 6 +- 18 files changed, 277 insertions(+), 543 deletions(-) delete mode 100755 home/config/scripts/waybarRestart.sh delete mode 100644 home/user/swaync.nix delete mode 100644 system/dev/dn-pre7780/nginx.nix diff --git a/flake.lock b/flake.lock index 3cd2afe..f7e4876 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1746741073, - "narHash": "sha256-qs8I5gBib+RLNGYa9om36VivHVrrisJDlZ4EnXNA6OQ=", + "lastModified": 1752663231, + "narHash": "sha256-rTItuAWpzICMREF8Ww8cK4hYgNMRXJ4wjkN0akLlaWE=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "82bdb6720ef6163f0b10b49ba49702f0bde815d8", + "rev": "0a82e3724f929de8ad8fb04d2b7fa128493f24f7", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1745357003, - "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", + "lastModified": 1752743471, + "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", + "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -98,11 +98,11 @@ ] }, "locked": { - "lastModified": 1746840230, - "narHash": "sha256-kbFjHfm/ETkdtHGD7aUeNlvJ8GEyJHObCTK98JrqpJI=", + "lastModified": 1753360872, + "narHash": "sha256-U6cjsjnGrUbZj8WLtwkdwmrPGTmHEuLY2eS2N1En+ZM=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "c20fac058ff68f20dfb1eb1a6c1f988f9d666595", + "rev": "843548be22ed257f97a28632c798fe1d95292b47", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "flake-compat_7": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -377,6 +377,7 @@ "original": { "owner": "ghostty-org", "repo": "ghostty", + "rev": "7f9bb3c0e54f585e11259bc0c9064813d061929c", "type": "github" } }, @@ -390,11 +391,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -478,11 +479,11 @@ ] }, "locked": { - "lastModified": 1744693102, - "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", + "lastModified": 1752595130, + "narHash": "sha256-CNBgr4OZSuklGtNOa9CnTNo9+Xceqn/EDAC1Tc43fH8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", + "rev": "5f2e09654b2e70ba643e41609d9f9b6640f22113", "type": "github" }, "original": { @@ -498,11 +499,11 @@ ] }, "locked": { - "lastModified": 1746798521, - "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", + "lastModified": 1753365873, + "narHash": "sha256-+Swd3wJppukESlWkbdopl9ZThjNVIFARVlb/eA2xjUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", + "rev": "e2fe7256c4ebbb35bfd1b4c6f52b57a3845ab1d0", "type": "github" }, "original": { @@ -527,11 +528,11 @@ ] }, "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", + "lastModified": 1749155331, + "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", + "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", "type": "github" }, "original": { @@ -556,11 +557,11 @@ ] }, "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "lastModified": 1752149140, + "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", "type": "github" }, "original": { @@ -581,11 +582,11 @@ ] }, "locked": { - "lastModified": 1746718195, - "narHash": "sha256-8Sl2V23EYcZMniBLmKenxH7bMLTGC6Q84ntyFvOUkWU=", + "lastModified": 1752219718, + "narHash": "sha256-P4tM0eom+p3XE+nqM+uI/s+nH15HfCGCaWOjfdUO1iI=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "7cf3779b5cdc6fa62fdc733b30c31a5b8e48609c", + "rev": "7dafd92afedda246a9c1c4187784c3fc1d6261e5", "type": "github" }, "original": { @@ -610,11 +611,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1746825381, - "narHash": "sha256-v2qMi18KHf8BZ7mltxx2nymeF55IzLwXPBGlcbRo0oo=", + "lastModified": 1753310189, + "narHash": "sha256-EgDpsy/2ge/88Zd5ML+m0tyFVwXCeUoPQTOs4YtWZ8w=", "ref": "refs/heads/main", - "rev": "60cd5b7a48af4a23717201d70395161a3bb4ab24", - "revCount": 6102, + "rev": "31cc7f3b87d1d9670b66e73e3720da2e2da49acd", + "revCount": 6311, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -642,11 +643,11 @@ ] }, "locked": { - "lastModified": 1746806942, - "narHash": "sha256-fziL5ORI599D6Wp+BKlspxOqZ1HhCCLkq4C4FBwIwJo=", + "lastModified": 1753028264, + "narHash": "sha256-GbfsRZWW5uBAOeddLkmrYV2XmAbI0etVUTBXFH5thcw=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "c491d2831448645f24a1597a17f564aa52691ac6", + "rev": "14f9a444793d6dd78c29033acf9c3c974ded708d", "type": "github" }, "original": { @@ -667,11 +668,11 @@ ] }, "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", "type": "github" }, "original": { @@ -699,11 +700,11 @@ ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", "type": "github" }, "original": { @@ -735,11 +736,11 @@ ] }, "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", + "lastModified": 1750371812, + "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", + "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", "type": "github" }, "original": { @@ -764,11 +765,11 @@ ] }, "locked": { - "lastModified": 1746655412, - "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "557241780c179cf7ef224df392f8e67dab6cef83", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", "type": "github" }, "original": { @@ -790,11 +791,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1741076329, - "narHash": "sha256-EiL/2wfTjUBuoUZ4TOat/dU2fCKbK3t/q6lTKdeZc20=", + "lastModified": 1752803880, + "narHash": "sha256-T25rxIWR2+PwrUBlFCLNHp5D0O3ec9Em+8lt+0yUb+8=", "owner": "raybbian", "repo": "hyprtasking", - "rev": "866abe4d617187ddbeba805467c85605f0fcf2d2", + "rev": "c4e1fa4d0d125c2d3280040343c5e42e4f153a8b", "type": "github" }, "original": { @@ -815,11 +816,11 @@ ] }, "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", + "lastModified": 1752252310, + "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", + "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82", "type": "github" }, "original": { @@ -840,11 +841,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1751897909, + "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", "type": "github" }, "original": { @@ -885,11 +886,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1746360860, - "narHash": "sha256-Vtl1JSnHbA6WlGVXjYPsex5mX8NTaGyeVSlYtkZGW24=", + "lastModified": 1753013761, + "narHash": "sha256-ggvjKAeIsjwdu6+ECBGieyBgtotD7BrsGX5BirCacYU=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "75d6b241245412361502277e607c67a004a6e5b0", + "rev": "f7c04e5ad6aa43a0f9698edb0d74b44e88ee99ee", "type": "github" }, "original": { @@ -909,11 +910,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746774188, - "narHash": "sha256-CRKb1MnBhcjs8Z1lJHKLHArhPRPZy19iN+814zoNvrg=", + "lastModified": 1753343196, + "narHash": "sha256-o9veRunwEQOhokmU9J+sQao/TRGtgwK20CGCiHtzKdM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "07cf14912cb39e1ad4e2b15503a8281e298914a0", + "rev": "e2091f21d83fd357ebb79ff566428826bbb4f565", "type": "github" }, "original": { @@ -925,11 +926,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1746746481, - "narHash": "sha256-pqNKlU7CNpO3CpXRga4zF2UlGb7K0NuSndFm91AjFJA=", + "lastModified": 1753271847, + "narHash": "sha256-RuuJ3b4otjQGraffcktEvP6Wk54MCHWwXnvoIy01dyo=", "owner": "neovim", "repo": "neovim", - "rev": "3121e02ae04e489fb11b7058f7b7d0da0901dafa", + "rev": "0dcdd65dcc08483d9a5c106f62b862a9de30983e", "type": "github" }, "original": { @@ -945,11 +946,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1752985182, + "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "type": "github" }, "original": { @@ -965,11 +966,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1746842210, - "narHash": "sha256-bGJ3q4BEJEEz9MNo2QwXgQULmSUItxn52lMQLNImZ+w=", + "lastModified": 1753237324, + "narHash": "sha256-iXvv/VYLMyAoaTadYrX0PGwd6N2wVX337Os6k8TAlF4=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "9acdd362e10b50cb36234544b5b80b3d0372456d", + "rev": "64ca2cbbf9c65dd3bd98192d74872a80e8dcb871", "type": "github" }, "original": { @@ -998,11 +999,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -1014,11 +1015,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1746321463, - "narHash": "sha256-43ZRYqB6pkhfKPZamMbuD/JrGYcapX87feHxMNyfyDQ=", + "lastModified": 1752974445, + "narHash": "sha256-jj/HBJFSapTk4LfeJgNLk2wEE2BO6dgBYVRbXMNOCeM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "168ab62539da203ca62ab16b7f8cf411530b91e7", + "rev": "9100109c11b6b5482ea949c980b86e24740dca08", "type": "github" }, "original": { @@ -1029,11 +1030,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741992157, - "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", + "lastModified": 1751290243, + "narHash": "sha256-kNf+obkpJZWar7HZymXZbW+Rlk3HTEIMlpc6FCNz0Ds=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da4b122f63095ca1199bd4d526f9e26426697689", + "rev": "5ab036a8d97cb9476fbe81b09076e6e91d15e1b6", "type": "github" }, "original": { @@ -1061,11 +1062,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1753369216, + "narHash": "sha256-Jx2i6loWL755GD+GlCXESMhIiO0aFc/pDo82N16fEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "b74a30dbc0a72e20df07d43109339f780b439291", "type": "github" }, "original": { @@ -1077,11 +1078,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746576598, - "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", + "lastModified": 1753151930, + "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", + "rev": "83e677f31c84212343f4cc553bab85c2efcad60a", "type": "github" }, "original": { @@ -1093,11 +1094,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -1109,11 +1110,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -1125,11 +1126,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -1157,11 +1158,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1752596105, + "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708", "type": "github" }, "original": { @@ -1181,11 +1182,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -1271,11 +1272,11 @@ ] }, "locked": { - "lastModified": 1745116541, - "narHash": "sha256-5xzA6dTfqCfTTDCo3ipPZzrg3wp01xmcr73y4cTNMP8=", + "lastModified": 1752633862, + "narHash": "sha256-Bj7ozT1+5P7NmvDcuAXJvj56txcXuAhk3Vd9FdWFQzk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e2142ef330a61c02f274ac9a9cb6f8487a5d0080", + "rev": "8668ca94858206ac3db0860a9dec471de0d995f8", "type": "github" }, "original": { @@ -1289,11 +1290,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { @@ -1415,11 +1416,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1753006367, + "narHash": "sha256-tzbhc4XttkyEhswByk5R38l+ztN9UDbnj0cTcP6Hp9A=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "421b56313c65a0815a52b424777f55acf0b56ddf", "type": "github" }, "original": { @@ -1456,11 +1457,11 @@ ] }, "locked": { - "lastModified": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", + "lastModified": 1751300244, + "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", + "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", "type": "github" }, "original": { @@ -1476,11 +1477,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1746849006, - "narHash": "sha256-v2mo8X3ZV2NVSo0cOnt70RsAA6fYt9PYqkYVZGi3VBU=", + "lastModified": 1753281791, + "narHash": "sha256-HfWJw+p8j9CQR2PG2mDhhJ1YRdFf5edoINUyc8/UcJI=", "owner": "sxyazi", "repo": "yazi", - "rev": "41cba40072d8cbb1e139aa982951e99bcadd3e80", + "rev": "c2883f1e05bdafead994d5d28098e58de0ad514b", "type": "github" }, "original": { @@ -1504,11 +1505,11 @@ ] }, "locked": { - "lastModified": 1741825901, - "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", + "lastModified": 1748261582, + "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "0b14285e283f5a747f372fb2931835dd937c4383", + "rev": "aafb1b093fb838f7a02613b719e85ec912914221", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 974ee14..9295c74 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ }; ghostty = { - url = "github:ghostty-org/ghostty"; + url = "github:ghostty-org/ghostty?rev=7f9bb3c0e54f585e11259bc0c9064813d061929c"; }; yazi = { @@ -111,6 +111,7 @@ settings = { personal = { hostname = "dn-pre7780"; + domain = "net.dn"; username = "danny"; git = { username = "DACHXY"; @@ -229,48 +230,48 @@ hostname = settings.personal.hostname; in nixpkgs.lib.nixosSystem { - modules = - [ - { - system.stateVersion = nix-version; - home-manager = { - backupFileExtension = "backup-hm"; - useUserPackages = true; - useGlobalPkgs = true; - extraSpecialArgs = { - inherit - inputs - system - nix-version - settings - devices - ; - }; - users."${username}" = { - imports = [ - inputs.hyprland.homeManagerModules.default - { - home = { - homeDirectory = "/home/${username}"; - stateVersion = nix-version; - }; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - } - ]; - }; + modules = [ + { + system.stateVersion = nix-version; + home-manager = { + backupFileExtension = "backup-hm"; + useUserPackages = true; + useGlobalPkgs = true; + extraSpecialArgs = { + inherit + inputs + system + nix-version + settings + devices + ; }; - networking.hostName = hostname; - nixpkgs.hostPlatform = system; - nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = ((import ./pkgs/overlays) ++ conf.overlays); - } - ] - ++ common-settings.modules - ++ conf.extra-modules; + users."${username}" = { + imports = [ + inputs.hyprland.homeManagerModules.default + { + home = { + homeDirectory = "/home/${username}"; + stateVersion = nix-version; + }; + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + } + ]; + }; + }; + networking.hostName = hostname; + nixpkgs.hostPlatform = system; + nixpkgs.config.allowUnfree = true; + nixpkgs.overlays = ((import ./pkgs/overlays) ++ conf.overlays); + } + ] + ++ common-settings.modules + ++ conf.extra-modules; specialArgs = { inherit settings; - } // common-settings.args; + } + // common-settings.args; } ) devices; }; diff --git a/home/config/ghostty/config b/home/config/ghostty/config index 31fbb85..ef49530 100644 --- a/home/config/ghostty/config +++ b/home/config/ghostty/config @@ -2,6 +2,7 @@ font-family = "CaskaydiaCove Nerd Font Mono" font-size = 15 theme = Espresso unfocused-split-opacity = 0.85 +desktop-notifications = false wait-after-command = false shell-integration = detect diff --git a/home/config/scripts/waybarRestart.sh b/home/config/scripts/waybarRestart.sh deleted file mode 100755 index 457ee37..0000000 --- a/home/config/scripts/waybarRestart.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Restart Waybar and swaync - -killall .waybar-wrapped -killall .swaync-wrapped -waybar -c ~/.config/waybar/config.jsonc -s ~/.config/waybar/style.css & - -XDG_CONFIG_HOME="$HOME/.dummy" # Prevent swaync use default gtk theme -swaync -c ~/.config/swaync/config.json -s ~/.config/swaync/style.css & diff --git a/home/config/waybar/config.nix b/home/config/waybar/config.nix index 07e7926..7027c56 100644 --- a/home/config/waybar/config.nix +++ b/home/config/waybar/config.nix @@ -9,7 +9,7 @@ in map (dev: dev // modulesConfig) [ # Monitor 1 { - output = "DP-2"; + output = "DP-6"; layer = "top"; exclusive = true; passthrough = false; @@ -56,7 +56,7 @@ map (dev: dev // modulesConfig) [ } # Monitor 2 { - output = "DP-3"; + output = "DP-5"; layer = "top"; exclusive = true; height = 54; diff --git a/home/presets/basic.nix b/home/presets/basic.nix index 50e12e7..8094c03 100644 --- a/home/presets/basic.nix +++ b/home/presets/basic.nix @@ -13,10 +13,8 @@ ../user/packages.nix ../user/firefox.nix ../user/shell.nix - ../user/swaync.nix ../user/tmux.nix ../user/virtualization.nix - ../user/swaync.nix ../user/vscode.nix ../user/yazi.nix ]; diff --git a/home/user/hypr/bind.nix b/home/user/hypr/bind.nix index a99c18c..0da2d81 100644 --- a/home/user/hypr/bind.nix +++ b/home/user/hypr/bind.nix @@ -13,9 +13,7 @@ let filemanager = "${terminal} -e yazi"; scripts = "~/.config/scripts"; - # freezeShot = "--freeze"; freezeShot = ""; - # clipboard-only = "${clipboardOnly}"; screenshotFolder = "--output-folder ~/Pictures/Screenshots"; clipboardOnly = "${screenshotFolder}"; @@ -30,6 +28,8 @@ let ''; toggleRofi = pkgs.writeShellScriptBin "toggle" '' + GDK_PIXBUF_MODULE_FILE="${pkgs.librsvg}/lib/gdk-pixbuf-2.0/${pkgs.librsvg.version}/loaders.cache" # Make rofi load svg + if ${pkgs.busybox}/bin/pgrep rofi > /dev/null; then ${pkgs.busybox}/bin/pkill rofi else @@ -54,7 +54,6 @@ in ''${mainMod}, E, exec, ${filemanager}'' ''${mainMod}, V, togglefloating, '' ''ALT, SPACE, exec, ${toggleRofi}/bin/toggle -config ~/.config/rofi/apps.rasi -show drun'' - ''${mainMod} ALT, W, exec, ${scripts}/waybarRestart.sh'' ''${mainMod}, P, pseudo, # dwindle'' ''${mainMod}, S, togglesplit, # dwindle'' ''CTRL ${mainMod} SHIFT, L, exec, hyprlock'' diff --git a/home/user/hypr/exec.nix b/home/user/hypr/exec.nix index 702f906..17d3133 100644 --- a/home/user/hypr/exec.nix +++ b/home/user/hypr/exec.nix @@ -11,8 +11,6 @@ let dconf write /org/cinnamon/desktop/applications/terminal/exec-arg "''\'''\'" & dconf write /org/gnome/desktop/interface/cursor-size ${builtins.toString xcursor-size} & - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP & - dbus-update-activation-environment --systemd --all & systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME & ''; in diff --git a/home/user/hypr/input.nix b/home/user/hypr/input.nix index 424abe8..437381b 100644 --- a/home/user/hypr/input.nix +++ b/home/user/hypr/input.nix @@ -9,7 +9,7 @@ follow_mouse = 1; accel_profile = "flat"; - kb_options = "caps:swapescape"; + kb_options = [ "caps:swapescape" ]; touchpad = { natural_scroll = true; diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix index b3d96b1..a090f54 100644 --- a/home/user/hyprland.nix +++ b/home/user/hyprland.nix @@ -76,61 +76,55 @@ in { home.packages = with pkgs; [ mpvpaper # Video Wallpaper - yt-dlp hyprcursor ]; - systemd.user.targets.hyprland-session.Unit.Wants = [ - "xdg-desktop-autostart.target" - ]; - wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - systemd.enable = true; + systemd = { + enable = true; + variables = [ "--all" ]; + }; package = null; portalPackage = null; - plugins = - (with inputs.hyprland-plugins.packages.${system}; [ + plugins = ( + with inputs.hyprland-plugins.packages.${system}; + [ xtra-dispatchers hyprwinwrap - ]) - ++ [ - # inputs.hyprgrass.packages.${system}.default - # inputs.hyprtasking.packages.${system}.hyprtasking - ]; + ] + ); - settings = - { - debug = { - disable_logs = true; - }; - bind = import ./hypr/bind.nix { - inherit settings; - inherit mainMod; - inherit pkgs; - nvidia-offload-enabled = osConfig.hardware.nvidia.prime.offload.enableOffloadCmd; - }; - bindm = import ./hypr/bindm.nix { inherit mainMod; }; - binde = import ./hypr/binde.nix { inherit mainMod; }; - monitor = import ./hypr/monitor.nix; - plugin = plugins; - exec-once = [ ''${startScript}'' ]; - env = [ - ''HYPRCURSOR_THEME, ${cursorName}'' - ''HYPRCURSOR_SIZE, ${builtins.toString settings.hyprland.cursor-size}'' - ''XCURSOR_THEME, ${cursorName}'' - ''XCURSOR_SIZE, ${builtins.toString settings.hyprland.xcursor-size}'' - ''XDG_CURRENT_DESKTOP, Hyprland'' - ''XDG_SESSION_DESKTOP, Hyprland'' - ''GDK_PIXBUF_MODULE_FILE, ${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache'' # Make rofi load svg - ]; - workspace = import ./hypr/workspace.nix { monitors = settings.hyprland.monitors; }; - } - // window - // windowrule - // input; + settings = { + debug = { + disable_logs = true; + }; + bind = import ./hypr/bind.nix { + inherit settings; + inherit mainMod; + inherit pkgs; + nvidia-offload-enabled = osConfig.hardware.nvidia.prime.offload.enableOffloadCmd; + }; + bindm = import ./hypr/bindm.nix { inherit mainMod; }; + binde = import ./hypr/binde.nix { inherit mainMod; }; + monitor = import ./hypr/monitor.nix; + plugin = plugins; + exec-once = [ ''${startScript}'' ]; + env = [ + ''HYPRCURSOR_THEME, ${cursorName}'' + ''HYPRCURSOR_SIZE, ${builtins.toString settings.hyprland.cursor-size}'' + ''XCURSOR_THEME, ${cursorName}'' + ''XCURSOR_SIZE, ${builtins.toString settings.hyprland.xcursor-size}'' + ''XDG_CURRENT_DESKTOP, Hyprland'' + ''XDG_SESSION_DESKTOP, Hyprland'' + ]; + workspace = import ./hypr/workspace.nix { monitors = settings.hyprland.monitors; }; + } + // window + // windowrule + // input; }; # === gamemode === # @@ -354,16 +348,25 @@ in ExecStart = "${pkgs.hyprsunset}/bin/hyprsunset -t 3000k"; Restart = "always"; RestartSec = 2; + KillSignal = "SIGKILL"; # Hyprsunset seems not handle the SIGTERM signal }; }; # === waybar === # + systemd.user.services.waybar = { + Unit = { + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + }; + programs.waybar = { enable = true; style = ../../home/config/waybar/style.css; settings = import ../../home/config/waybar/config.nix { inherit terminal osConfig wallRand; }; systemd = { enable = true; + target = "graphical-session.target"; }; }; @@ -550,13 +553,26 @@ in ''; }; - systemd.user.services.swaync.Service = { - ExecStart = lib.mkForce ''${pkgs.swaynotificationcenter}/bin/swaync --config ${ - config.xdg.configFile."swaync/config.json".target - } --style ${config.xdg.configFile."swaync/style.css".target}''; - Environment = [ - "XDG_CONFIG_HOME=/home/_dummy" - ]; + systemd.user.services.swaync = lib.mkIf config.services.swaync.enable { + Unit = { + Requires = [ "waybar.service" ]; + After = [ + "waybar.service" + "graphical-session.target" + ]; + PartOf = [ "graphical-session.target" ]; + }; + Install = { + WantedBy = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = lib.mkForce ''${pkgs.swaynotificationcenter}/bin/swaync --config ${ + config.xdg.configFile."swaync/config.json".target + } --style ${config.xdg.configFile."swaync/style.css".target}''; + Environment = [ + "XDG_CONFIG_HOME=/home/_dummy" + ]; + }; }; # === rofi === # diff --git a/home/user/nvim.nix b/home/user/nvim.nix index ed055a1..8d0951d 100644 --- a/home/user/nvim.nix +++ b/home/user/nvim.nix @@ -392,7 +392,6 @@ yaml zig - verilog ] )).dependencies; }; diff --git a/home/user/swaync.nix b/home/user/swaync.nix deleted file mode 100644 index f081fee..0000000 --- a/home/user/swaync.nix +++ /dev/null @@ -1,187 +0,0 @@ -# config from https://github.com/shub39/dotfiles -{ ... }: -{ - services.swaync = { - enable = true; - - settings = { - "positionX" = "right"; - "positionY" = "top"; - "layer" = "overlay"; - "control-center-margin-top" = 20; - "control-center-margin-bottom" = 20; - "control-center-margin-right" = 20; - "control-center-margin-left" = 20; - "notification-icon-size" = 64; - "notification-body-image-height" = 100; - "notification-body-image-width" = 200; - "timeout" = 3; - "timeout-low" = 2; - "timeout-critical" = 0; - "fit-to-screen" = false; - "control-center-width" = 500; - "control-center-height" = 900; - "notification-window-width" = 490; - "keyboard-shortcuts" = true; - "image-visibility" = "when-available"; - "transition-time" = 200; - "hide-on-clear" = true; - "hide-on-action" = true; - "script-fail-notify" = true; - "widgets" = [ - "title" - "notifications" - "mpris" - ]; - }; - - style = '' - @define-color bgc rgba(0, 0, 0, 0.1); - @define-color borderc #ebdbb2; - @define-color textc #282828; - - * { - font-family: JetBrainsMonoNerdFontMono; - font-weight: bold; - font-size: 15px; - border-width: 3px; - border-color: #ebdbb2; - color: #ebdbb2; - } - - .control-center .notification-row:focus, - .control-center .notification-row:hover { - opacity: 1; - background: @bgc; - } - - .notification-row { - outline: none; - margin: 20px; - padding: 0; - } - - .notification { - background: @textc; - margin: 0px; - border-radius: 6px; - border-width: 3px; - border-color: #ebdbb2; - } - - .notification-content { - background: @textc; - padding: 7px; - margin: 0; - } - - .close-button { - background: @textc; - color: @borderc; - text-shadow: none; - padding: 0; - border-radius: 20px; - margin-top: 9px; - margin-right: 5px; - } - - .close-button:hover { - box-shadow: none; - background: @borderc; - color: @textc; - transition: all .15s ease-in-out; - border: none; - } - - .notification-action { - color: @bgc; - background: @textc; - } - - .summary { - padding-top: 7px; - font-size: 13px; - color: @borderc; - } - - .time { - font-size: 11px; - color: @borderc; - margin-right: 40px; - } - - .body { - font-size: 12px; - color: @borderc; - } - - .control-center { - background-color: @bgc; - border-radius: 20px; - } - - .control-center-list { - background: transparent; - } - - .control-center-list-placeholder { - opacity: .5; - } - - .floating-notifications { - background: transparent; - } - - .blank-window { - background: alpha(black, 0.1); - } - - .widget-title { - color: @borderc; - padding: 10px 10px; - margin: 10px 10px 5px 10px; - font-size: 1.5rem; - } - - .widget-title>button { - font-size: 1rem; - color: @borderc; - padding: 10px; - text-shadow: none; - background: @bgc; - box-shadow: none; - border-radius: 5px; - } - - .widget-title>button:hover { - background: @borderc; - color: @textc; - } - - .widget-label { - margin: 10px 10px 10px 10px; - } - - .widget-label>label { - font-size: 1rem; - color: @borderc; - } - - .widget-mpris { - color: @borderc; - padding: 5px 5px 5px 5px; - margin: 10px; - border-radius: 20px; - } - - .widget-mpris>box>button { - border-radius: 20px; - } - - .widget-mpris-player { - padding: 5px 5px; - margin: 10px; - } - ''; - }; -} diff --git a/system/dev/dn-pre7780/boot.nix b/system/dev/dn-pre7780/boot.nix index a2bc00d..292ecf2 100644 --- a/system/dev/dn-pre7780/boot.nix +++ b/system/dev/dn-pre7780/boot.nix @@ -7,7 +7,7 @@ boot.kernelPackages = pkgs.linuxPackages_latest; fileSystems."/mnt/ssd" = { - device = "/dev/disk/by-uuid/4E21-0000"; + device = "/dev/disk/by-label/DN-SSD"; fsType = "exfat"; options = [ "x-systemd.automount" @@ -23,21 +23,6 @@ ]; }; - fileSystems."/mnt/windows" = { - enable = true; - device = "/dev/disk/by-uuid/460237D00237C429"; - fsType = "ntfs-3g"; - options = [ - "uid=1000" - "gid=100" - "umask=000" - "nofail" - "users" - "exec" - ]; - }; - - boot.supportedFilesystems = [ "ntfs" ]; boot.loader.systemd-boot.enable = true; # Enable F keys in some wireless keyboard (Ex. neo65) diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix index 98b7ade..344e993 100644 --- a/system/dev/dn-pre7780/default.nix +++ b/system/dev/dn-pre7780/default.nix @@ -1,7 +1,6 @@ { pkgs, settings, - config, ... }: { @@ -14,48 +13,26 @@ ./hardware-configuration.nix ./boot.nix ./sops-conf.nix - # ./nginx.nix - ../../modules/certbot.nix ../../modules/presets/basic.nix ../../modules/gaming.nix - ../../modules/secure-boot.nix + # ../../modules/secure-boot.nix ../../modules/virtualization.nix ../../modules/wine.nix ../../modules/wireguard.nix - (import ../../modules/rustdesk-server.nix { relayHosts = [ "10.0.0.0/24" ]; }) - # (import ../../modules/nextcloud.nix { - # hostname = "192.168.0.3"; - # datadir = "/mnt/nextcloud"; - # https = false; - # }) - ../../modules/mail-server + (import ../../modules/rustdesk-server.nix { + relayHosts = [ + "10.0.0.0/24" + "192.168.0.0/24" + ]; + }) ]; - mail-server = { - enable = true; - mailDir = "~/Maildir"; - virtualMailDir = "/var/mail/vhosts"; - domain = "vmail.net.dn"; - networks = [ - "127.0.0.0/8" - "10.0.0.0/24" - ]; - openFirewall = true; - sslKey = "/etc/letsencrypt/live/vmail.net.dn/privkey.pem"; - sslCert = "/etc/letsencrypt/live/vmail.net.dn/fullchain.pem"; - dovecot.ldapFile = config.sops.secrets."dovecot/openldap".path; - openldap = { - passwordFile = config.sops.secrets."openldap/adminPassword".path; - enableWebUI = true; - }; - }; - home-manager = { users."${settings.personal.username}" = { imports = [ ../../../home/presets/basic.nix (import ../../../home/user/bitwarden.nix { - email = "danny@dn-server.net.dn"; + email = "danny@net.dn"; baseUrl = "https://bitwarden.net.dn"; }) ]; @@ -63,8 +40,7 @@ }; environment.systemPackages = with pkgs; [ - prismlauncher - heroic + rustdesk ]; users.users = { diff --git a/system/dev/dn-pre7780/hardware-configuration.nix b/system/dev/dn-pre7780/hardware-configuration.nix index 72e79cf..e7b36d1 100644 --- a/system/dev/dn-pre7780/hardware-configuration.nix +++ b/system/dev/dn-pre7780/hardware-configuration.nix @@ -4,34 +4,25 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "vmd" - "dm-raid" - "xhci_pci" - "thunderbolt" - "nvme" - "usbhid" - "uas" - "sd_mod" - "rtsx_pci_sdmmc" - ]; + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; - boot.kernelParams = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; swapDevices = [ ]; @@ -44,6 +35,5 @@ # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/system/dev/dn-pre7780/nginx.nix b/system/dev/dn-pre7780/nginx.nix deleted file mode 100644 index c29a2ce..0000000 --- a/system/dev/dn-pre7780/nginx.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, ... }: -{ - networking.firewall.allowedTCPPorts = [ - 80 - 443 - ]; - - services.nginx = { - enable = true; - enableReload = true; - - virtualHosts = { - ${config.services.nextcloud.hostName} = { - listen = [ - { - addr = "0.0.0.0"; - port = 80; - } - ]; - - extraConfig = '' - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers 'TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384'; - ssl_prefer_server_ciphers on; - ''; - }; - }; - }; -} diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix index ce89b73..4cc8266 100644 --- a/system/modules/hyprland.nix +++ b/system/modules/hyprland.nix @@ -31,15 +31,10 @@ hyprshot kitty - # Notification - libnotify - swaynotificationcenter - qt5.qtwayland qt6.qtwayland wlogout wl-clipboard - waybar # Util grim diff --git a/system/modules/rustdesk-server.nix b/system/modules/rustdesk-server.nix index d245d07..8efcbd2 100644 --- a/system/modules/rustdesk-server.nix +++ b/system/modules/rustdesk-server.nix @@ -7,9 +7,9 @@ }: { services.rustdesk-server = { - enable = lib.mkDefault true; - openFirewall = lib.mkDefault true; - relay.enable = lib.mkDefault false; + enable = true; + openFirewall = true; + relay.enable = true; signal.relayHosts = relayHosts; }; }