From 0bf4c9cfca1b84c1c5058239bc7bfe49c02333f0 Mon Sep 17 00:00:00 2001 From: s0me1newithhand7s Date: Mon, 29 Dec 2025 16:32:00 +0300 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'ayugram-desktop': 'github:ndfined-crp/ayugram-desktop/8ef41c9c9f5d5329a7bff71c709880ab26238d52?narHash=sha256-6/o3/R/QzqQSxWiekcTvJmf2d9UdULrVL%2BIuLELXR1E%3D' (2025-12-07) → 'github:ndfined-crp/ayugram-desktop/5d5fa3d7791821cc5f46c8cde7fc89a378126caa?narHash=sha256-t3ftHtsgAStn4hrihg3/dduLJHhA%2B0TJ4t7%2BeF6t3UI%3D' (2025-12-28) • Updated input 'ayugram-desktop/flake-parts': 'github:hercules-ci/flake-parts/2cccadc7357c0ba201788ae99c4dfa90728ef5e0?narHash=sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q%3D' (2025-11-21) → 'github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9?narHash=sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw%3D' (2025-12-15) • Updated input 'ayugram-desktop/flake-parts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/719359f4562934ae99f5443f20aa06c2ffff91fc?narHash=sha256-b0yj6kfvO8ApcSE%2BQmA6mUfu8IYG6/uU28OFn4PaC8M%3D' (2025-10-29) → 'github:nix-community/nixpkgs.lib/2075416fcb47225d9b68ac469a5c4801a9c4dd85?narHash=sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo%3D' (2025-12-14) • Updated input 'ayugram-desktop/nixpkgs': 'github:nixos/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05) → 'github:nixos/nixpkgs/3e2499d5539c16d0d173ba53552a4ff8547f4539?narHash=sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU%3D' (2025-12-25) • Updated input 'deploy-rs': 'github:serokell/deploy-rs/9c870f63e28ec1e83305f7f6cb73c941e699f74f?narHash=sha256-9I2H9x5We6Pl%2BDBYHjR1s3UT8wgwcpAH03kn9CqtdQc%3D' (2025-11-04) → 'github:serokell/deploy-rs/d5eff7f948535b9c723d60cd8239f8f11ddc90fa?narHash=sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik%3D' (2025-12-18) • Updated input 'disko': 'github:nix-community/disko/d64e5cdca35b5fad7c504f615357a7afe6d9c49e?narHash=sha256-fTLX9kDwLr9Y0rH/nG%2Bh1XG5UU%2BjBcy0PFYn5eneRX8%3D' (2025-12-10) → 'github:nix-community/disko/916506443ecd0d0b4a0f4cf9d40a3c22ce39b378?narHash=sha256-P0kM%2B5o%2BDKnB6raXgFEk3azw8Wqg5FL6wyl9jD%2BG5a4%3D' (2025-12-19) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/5635c32d666a59ec9a55cab87e898889869f7b71?narHash=sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM%3D' (2025-12-11) → 'github:hercules-ci/flake-parts/a34fae9c08a15ad73f295041fec82323541400a9?narHash=sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw%3D' (2025-12-15) • Updated input 'flake-parts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/719359f4562934ae99f5443f20aa06c2ffff91fc?narHash=sha256-b0yj6kfvO8ApcSE%2BQmA6mUfu8IYG6/uU28OFn4PaC8M%3D' (2025-10-29) → 'github:nix-community/nixpkgs.lib/2075416fcb47225d9b68ac469a5c4801a9c4dd85?narHash=sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo%3D' (2025-12-14) • Updated input 'freesm': 'github:freesmteam/freesmlauncher/927f8da082b24f8f2f393bf0d78f23f152979729?narHash=sha256-bh20vq7SlX2du9i6g5VTVEgKf5EeJaCj46b84Z5AHhQ%3D' (2025-12-07) → 'github:freesmteam/freesmlauncher/8437e33318adf0d1c13a0f00b5865c4a2d45d273?narHash=sha256-ou/w74yGjLwCyyC3au8H6AHzXNIGfS6UYwTcgHk2jlA%3D' (2025-12-28) • Updated input 'freesm/flake-compat': 'github:edolstra/flake-compat/3b279e4317ccfa4865356387935310531357d919?narHash=sha256-DhsrZsMebdvpjZC2EzPsqiLGI84tD7kZz7zc6tTCmqg%3D' (2025-12-02) → 'github:edolstra/flake-compat/f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2?narHash=sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94%3D' (2025-12-25) • Updated input 'freesm/nixpkgs': 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05) → 'github:NixOS/nixpkgs/3e2499d5539c16d0d173ba53552a4ff8547f4539?narHash=sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU%3D' (2025-12-25) • Updated input 'home-manager': 'github:nix-community/home-manager/d787ec69c3216ea33be1c0424fe65cb23aa8fb31?narHash=sha256-KOP4QnkiRwiD5KEOr6ceF67rfTP1OqPmCCft6xDC3k4%3D' (2025-12-13) → 'github:nix-community/home-manager/7a7b43c7231a439d248179ba8d561dd6cd81799b?narHash=sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw%3D' (2025-12-29) • Updated input 'homebrew-cask': 'github:homebrew/homebrew-cask/6768ffffa9d06cfce4ac1962b677920334ef9bd5?narHash=sha256-kUidvdq9hR06mhpHekT4b5An6abmrN/FqiHmqQOjQfc%3D' (2025-12-14) → 'github:homebrew/homebrew-cask/c1cd7a67e525f5d899fd7b6331962c7d89bce5b4?narHash=sha256-AE9W5hVXt173hrxRe7PPflBFKO91F/ECXxvJLGhqamE%3D' (2025-12-29) • Updated input 'homebrew-core': 'github:homebrew/homebrew-core/54db75e2e4a85b855007c2156878170959b938d9?narHash=sha256-uwVMR3rfG8W9AIXoj/MXXD7SG/mFq/62J5Tt/Dn4gMc%3D' (2025-12-14) → 'github:homebrew/homebrew-core/013afd0970597dd92bb2862b2ef887ef983df546?narHash=sha256-wHXQgi4PKfE0L4hX%2BSeNbSL9K5dVRviiFSL4NvAvRMA%3D' (2025-12-29) • Updated input 'hyprland': 'github:hyprwm/Hyprland/09e195d1f293a876ce21a077af3d7c5047881b79?narHash=sha256-hZ6klhLeWe%2B/S%2BLZlp49xf7qlmYMs1n/23krK3JkESY%3D' (2025-12-13) → 'github:hyprwm/Hyprland/6a055fc747a5a899b97f9b4c1d1a52229a805b1e?narHash=sha256-mGk%2Bmk/miObjivy%2B6qMqQm%2BJyl8R7t6B/1SaiBkUUyY%3D' (2025-12-28) • Updated input 'hyprland/aquamarine': 'github:hyprwm/aquamarine/a43bedcceced5c21ad36578ed823e6099af78214?narHash=sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe%2Bo7ikibpCM%3D' (2025-12-02) → 'github:hyprwm/aquamarine/d83c97f8f5c0aae553c1489c7d9eff3eadcadace?narHash=sha256-%2Bhn8v9jkkLP9m%2Bo0Nm5SiEq10W0iWDSotH2XfjU45fA%3D' (2025-12-16) • Updated input 'hyprland/hyprland-guiutils': 'github:hyprwm/hyprland-guiutils/fd321368a40c782cfa299991e5584ca338e36ebe?narHash=sha256-1bK1yGgaR82vajUrt6z%2BBSljQvFn91D74WJ/vJsydtE%3D' (2025-12-04) → 'github:hyprwm/hyprland-guiutils/e50ae912813bdfa8372d62daf454f48d6df02297?narHash=sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0%3D' (2025-12-13) • Updated input 'hyprland/hyprland-protocols': 'github:hyprwm/hyprland-protocols/bd153e76f751f150a09328dbdeb5e4fab9d23622?narHash=sha256-%2BKEVnKBe8wz%2Ba6dTLq8YDcF3UrhQElwsYJaVaHXJtoI%3D' (2025-10-04) → 'github:hyprwm/hyprland-protocols/3f3860b869014c00e8b9e0528c7b4ddc335c21ab?narHash=sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs%3D' (2025-12-08) • Updated input 'hyprland/hyprutils': 'github:hyprwm/hyprutils/fe686486ac867a1a24f99c753bb40ffed338e4b0?narHash=sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy%2BzHsfo%3D' (2025-12-05) → 'github:hyprwm/hyprutils/5ac060bfcf2f12b3a6381156ebbc13826a05b09f?narHash=sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw%3D' (2025-12-19) • Updated input 'hyprland/hyprwire': 'github:hyprwm/hyprwire/7997451dcaab7b9d9d442f18985d514ec5891608?narHash=sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc%3D' (2025-12-04) → 'github:hyprwm/hyprwire/1079777525b30a947c8d657fac158e00ae85de9d?narHash=sha256-26qPwrd3od%2BxoYVywSB7hC2cz9ivN46VPLlrsXyGxvE%3D' (2025-12-20) • Updated input 'hyprland/nixpkgs': 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05) → 'github:NixOS/nixpkgs/c6245e83d836d0433170a16eb185cefe0572f8b8?narHash=sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc%3D' (2025-12-18) • Updated input 'hyprland/pre-commit-hooks': 'github:cachix/git-hooks.nix/548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c?narHash=sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ%3D' (2025-12-06) → 'github:cachix/git-hooks.nix/b68b780b69702a090c8bb1b973bab13756cc7a27?narHash=sha256-t3T/xm8zstHRLx%2BpIHxVpQTiySbKqcQbK%2Br%2B01XVKc0%3D' (2025-12-16) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/7e22bf538aa3e0937effcb1cee73d5f1bcc26f79?narHash=sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE%2BoEE%3D' (2025-12-06) → 'github:LnL7/nix-darwin/f0c8e1f6feb562b5db09cee9fb566a2f989e6b55?narHash=sha256-rIlgatT0JtwxsEpzq%2BUrrIJCRfVAXgbYPzose1DmAcM%3D' (2025-12-26) • Updated input 'nixos-anywhere': 'github:nix-community/nixos-anywhere/bad98b0685cf47eaeadcaf6787da8b51cf025693?narHash=sha256-61zO8zsFE8C104hCTv04z6a4H8U03OEMrRAXtGsszkE%3D' (2025-11-13) → 'github:nix-community/nixos-anywhere/e86fad431cf9161ca39747972bd255897572dc3b?narHash=sha256-DdJ0OIngRjekqXJauSQ8y9vyDO24dX8v7DiaWmxk7PU%3D' (2025-12-23) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/2fbfb1d73d239d2402a8fe03963e37aab15abe8b?narHash=sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0%3D' (2025-12-11) → 'github:nixos/nixpkgs/c0b0e0fddf73fd517c3471e546c0df87a42d53f4?narHash=sha256-coBu0ONtFzlwwVBzmjacUQwj3G%2BlybcZ1oeNSQkgC0M%3D' (2025-12-28) • Updated input 'noctalia': 'github:noctalia-dev/noctalia-shell/7d795256de6dbe7b4044161af2b6002421bdb188?narHash=sha256-GSa/jaWld%2BWKxt39DDBPoX1j%2BkCdNmFF9stTWbeVhp8%3D' (2025-12-14) → 'github:noctalia-dev/noctalia-shell/fb6f2259cb49c7533b834676530570e54e06facb?narHash=sha256-fvrQP91KneK1Zigm5kLl46V1Zpwqu88hSl9aDybq5dk%3D' (2025-12-29) • Updated input 'sops-nix': 'github:Mic92/sops-nix/496a6f625f63b780ce849891868f2fad22fd49c6?narHash=sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q%3D' (2025-12-12) → 'github:Mic92/sops-nix/61b39c7b657081c2adc91b75dd3ad8a91d6f07a7?narHash=sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ%3D' (2025-12-28) • Updated input 'sops-nix/nixpkgs': 'github:NixOS/nixpkgs/a672be65651c80d3f592a89b3945466584a22069?narHash=sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx%2BJ2FfutM7T9w%3D' (2025-12-05) → 'github:NixOS/nixpkgs/3edc4a30ed3903fdf6f90c837f961fa6b49582d1?narHash=sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio%3D' (2025-12-27) • Updated input 'spicetify-nix': 'github:Gerg-L/spicetify-nix/ac4927ea1ec7e7ea3635a1d8b933106a596c4356?narHash=sha256-EcefoixU9ht%2BP6QB/TfjLY9E3MdJVfeSec6G8Ges0pA%3D' (2025-12-07) → 'github:Gerg-L/spicetify-nix/6b49c4094e93629af2fcf789e0897450f57e2551?narHash=sha256-oKp9luuuXuMoUwpGUKUdt0G7lZGovcyOEI3guG0rNCw%3D' (2025-12-28) • Updated input 'stylix': 'github:nix-community/stylix/dd14de4432a94e93e10d0159f1d411487e435e1e?narHash=sha256-sDG%2Bc73xEnIw1pFNRWffKDnTWiTuyZiEP%2BIub0D3mWA%3D' (2025-12-11) → 'github:nix-community/stylix/551df12ee3ebac52c5712058bd97fd9faa4c3430?narHash=sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE%3D' (2025-12-24) • Updated input 'stylix/base16-fish': 'github:tomyun/base16-fish/23ae20a0093dca0d7b39d76ba2401af0ccf9c561?narHash=sha256-l9xHIy%2B85FN%2BbEo6yquq2IjD1rSg9fjfjpyGP1W8YXo%3D' (2025-08-05) → 'github:tomyun/base16-fish/86cbea4dca62e08fb7fd83a70e96472f92574782?narHash=sha256-XCUQLoLfBJ8saWms2HCIj4NEN%2BxNsWBlU1NrEPcQG4s%3D' (2025-12-15) • Updated input 'system-manager': 'github:numtide/system-manager/a015a476120dc741200213ac8dd1556fc25bac9e?narHash=sha256-PJX/Zrmi29lWkznqQS1BnqgBqSBG%2BJnpp%2BkRSWri41M%3D' (2025-12-12) → 'github:numtide/system-manager/bd3e4193c2bde18329e314b896b8e0ac8e17debd?narHash=sha256-qFKkS3kz8gzQ1hjFeXYINOOGNHeYSmsa5Nj1Xs4rAec%3D' (2025-12-17) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4?narHash=sha256-AlEObg0syDl%2BSpi4LsZIBrjw%2BsnSVU4T8MOeuZJUJjM%3D' (2025-11-12) → 'github:numtide/treefmt-nix/42d96e75aa56a3f70cab7e7dc4a32868db28e8fd?narHash=sha256-%2BcqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI%3D' (2025-12-17) --- flake.lock | 796 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 619 insertions(+), 177 deletions(-) diff --git a/flake.lock b/flake.lock index 3dd8f50..f33adfe 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765120947, - "narHash": "sha256-6/o3/R/QzqQSxWiekcTvJmf2d9UdULrVL+IuLELXR1E=", + "lastModified": 1766923289, + "narHash": "sha256-t3ftHtsgAStn4hrihg3/dduLJHhA+0TJ4t7+eF6t3UI=", "owner": "ndfined-crp", "repo": "ayugram-desktop", - "rev": "8ef41c9c9f5d5329a7bff71c709880ab26238d52", + "rev": "5d5fa3d7791821cc5f46c8cde7fc89a378126caa", "type": "github" }, "original": { @@ -143,17 +143,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -207,6 +207,39 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": [ + "devenv" + ], + "flake-compat": [ + "devenv", + "flake-compat" + ], + "git-hooks": [ + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760971495, + "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=", + "owner": "cachix", + "repo": "cachix", + "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -290,11 +323,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", + "lastModified": 1766051518, + "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", "owner": "serokell", "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", + "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", "type": "github" }, "original": { @@ -303,6 +336,29 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", + "nix": "nix", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1766921574, + "narHash": "sha256-dfKDsaBHJXrPOOJHnZlS7NJRNdl15nEiC0IS28m6caU=", + "owner": "cachix", + "repo": "devenv", + "rev": "02c9dcf3e050400d8101057f9f00ec458af7c959", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -326,7 +382,7 @@ }, "devshell_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1764011051, @@ -349,11 +405,11 @@ ] }, "locked": { - "lastModified": 1765326679, - "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -416,6 +472,22 @@ "type": "github" } }, + "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_2": { "flake": false, "locked": { @@ -435,11 +507,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1764712249, - "narHash": "sha256-DhsrZsMebdvpjZC2EzPsqiLGI84tD7kZz7zc6tTCmqg=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "3b279e4317ccfa4865356387935310531357d919", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -449,6 +521,22 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1766661267, + "narHash": "sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1761588595, @@ -464,7 +552,23 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -480,6 +584,38 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -506,11 +642,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -521,14 +657,17 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "devenv", + "nixpkgs" + ] }, "locked": { - "lastModified": 1765495779, - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -538,6 +677,24 @@ } }, "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -558,7 +715,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixos-anywhere", @@ -579,7 +736,25 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_8": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -652,17 +827,17 @@ }, "freesm": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "libnbtplusplus": "libnbtplusplus", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1765121024, - "narHash": "sha256-bh20vq7SlX2du9i6g5VTVEgKf5EeJaCj46b84Z5AHhQ=", + "lastModified": 1766923174, + "narHash": "sha256-ou/w74yGjLwCyyC3au8H6AHzXNIGfS6UYwTcgHk2jlA=", "owner": "freesmteam", "repo": "freesmlauncher", - "rev": "927f8da082b24f8f2f393bf0d78f23f152979729", + "rev": "8437e33318adf0d1c13a0f00b5865c4a2d45d273", "type": "github" }, "original": { @@ -687,6 +862,52 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -710,6 +931,49 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "devenv", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "git-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "hyprland", @@ -731,7 +995,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_5": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -822,11 +1086,11 @@ ] }, "locked": { - "lastModified": 1765606130, - "narHash": "sha256-KOP4QnkiRwiD5KEOr6ceF67rfTP1OqPmCCft6xDC3k4=", + "lastModified": 1766980997, + "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d787ec69c3216ea33be1c0424fe65cb23aa8fb31", + "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b", "type": "github" }, "original": { @@ -854,11 +1118,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1765676129, - "narHash": "sha256-kUidvdq9hR06mhpHekT4b5An6abmrN/FqiHmqQOjQfc=", + "lastModified": 1767014651, + "narHash": "sha256-AE9W5hVXt173hrxRe7PPflBFKO91F/ECXxvJLGhqamE=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "6768ffffa9d06cfce4ac1962b677920334ef9bd5", + "rev": "c1cd7a67e525f5d899fd7b6331962c7d89bce5b4", "type": "github" }, "original": { @@ -870,11 +1134,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1765672164, - "narHash": "sha256-uwVMR3rfG8W9AIXoj/MXXD7SG/mFq/62J5Tt/Dn4gMc=", + "lastModified": 1767011689, + "narHash": "sha256-wHXQgi4PKfE0L4hX+SeNbSL9K5dVRviiFSL4NvAvRMA=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "54db75e2e4a85b855007c2156878170959b938d9", + "rev": "013afd0970597dd92bb2862b2ef887ef983df546", "type": "github" }, "original": { @@ -952,17 +1216,17 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1765634149, - "narHash": "sha256-hZ6klhLeWe+/S+LZlp49xf7qlmYMs1n/23krK3JkESY=", + "lastModified": 1766929444, + "narHash": "sha256-mGk+mk/miObjivy+6qMqQm+Jyl8R7t6B/1SaiBkUUyY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "09e195d1f293a876ce21a077af3d7c5047881b79", + "rev": "6a055fc747a5a899b97f9b4c1d1a52229a805b1e", "type": "github" }, "original": { @@ -1004,11 +1268,11 @@ ] }, "locked": { - "lastModified": 1764812575, - "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -1029,11 +1293,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -1135,11 +1399,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -1189,11 +1453,11 @@ ] }, "locked": { - "lastModified": 1764872015, - "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", "type": "github" }, "original": { @@ -1227,8 +1491,8 @@ "lanzaboote": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_7", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ], @@ -1268,7 +1532,7 @@ }, "nekoflake": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1744631782, @@ -1284,6 +1548,46 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "flake-parts": [ + "devenv", + "flake-parts" + ], + "git-hooks-nix": [ + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-23-11": [ + "devenv" + ], + "nixpkgs-regression": [ + "devenv" + ] + }, + "locked": { + "lastModified": 1761648602, + "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=", + "owner": "cachix", + "repo": "nix", + "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "devenv-2.30.6", + "repo": "nix", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -1291,11 +1595,11 @@ ] }, "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", + "lastModified": 1766784396, + "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", + "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55", "type": "github" }, "original": { @@ -1472,19 +1776,19 @@ "nixos-anywhere": { "inputs": { "disko": "disko_2", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nix-vm-test": "nix-vm-test", "nixos-images": "nixos-images", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_11", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1763045507, - "narHash": "sha256-61zO8zsFE8C104hCTv04z6a4H8U03OEMrRAXtGsszkE=", + "lastModified": 1766503044, + "narHash": "sha256-DdJ0OIngRjekqXJauSQ8y9vyDO24dX8v7DiaWmxk7PU=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "bad98b0685cf47eaeadcaf6787da8b51cf025693", + "rev": "e86fad431cf9161ca39747972bd255897572dc3b", "type": "github" }, "original": { @@ -1493,6 +1797,27 @@ "type": "github" } }, + "nixos-cli": { + "inputs": { + "flake-compat": "flake-compat_8", + "flake-parts": "flake-parts_7", + "nixpkgs": "nixpkgs_12", + "optnix": "optnix" + }, + "locked": { + "lastModified": 1766287443, + "narHash": "sha256-voUed/NmqwJuCjZDgRp9H8LLECyrEB2QAXhM/slePwU=", + "owner": "nix-community", + "repo": "nixos-cli", + "rev": "5a856cb469b7565e79cf12c1607fce29b6d5d371", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-cli", + "type": "github" + } + }, "nixos-generators": { "inputs": { "nixlib": "nixlib", @@ -1555,6 +1880,26 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat_10", + "nixpkgs": "nixpkgs_14" + }, + "locked": { + "lastModified": 1765841014, + "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=", + "owner": "nix-community", + "repo": "nixos-wsl", + "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "nixos-wsl", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1761672384, @@ -1605,11 +1950,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -1619,6 +1964,21 @@ } }, "nixpkgs-lib_2": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_3": { "locked": { "lastModified": 1761765539, "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", @@ -1651,27 +2011,42 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1742283249, + "narHash": "sha256-hYz59vIFHjPt3l4iaXwCGUPu85EVRomzZRONksMVmgY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "96fd046807e107b6f41e397b74aedfe6d9e53083", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_11": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1749201760, + "narHash": "sha256-LEZbj+VD/AR/dWL5ns1gMwzMvp4mLlv4WalxmZTKy5Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ebd3748a6b97de45844aa62701b81df35c5c1269", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1764527385, + "narHash": "sha256-nA5ywiGKl76atrbdZ5Aucd8SjF/v8ew9b9QsC+MKL14=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "23258e03aaa49b3a68597e3e50eb0cbce7e42e9d", "type": "github" }, "original": { @@ -1681,7 +2056,71 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { + "locked": { + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { + "locked": { + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1766840161, + "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1764517877, "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", @@ -1697,7 +2136,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_18": { "locked": { "lastModified": 1761236834, "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", @@ -1713,7 +2152,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_19": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -1729,11 +2168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -1776,6 +2215,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1761313199, + "narHash": "sha256-wCIACXbNtXAlwvQUo1Ed++loFALPjYUA3dpcUJiXO44=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "d1c30452ebecfc55185ae6d1c983c09da0c274ff", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1762156382, "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", @@ -1791,29 +2246,13 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_7": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -1825,31 +2264,32 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1742283249, - "narHash": "sha256-hYz59vIFHjPt3l4iaXwCGUPu85EVRomzZRONksMVmgY=", - "owner": "nixos", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "96fd046807e107b6f41e397b74aedfe6d9e53083", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1749201760, - "narHash": "sha256-LEZbj+VD/AR/dWL5ns1gMwzMvp4mLlv4WalxmZTKy5Y=", - "owner": "nixos", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebd3748a6b97de45844aa62701b81df35c5c1269", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1899,11 +2339,11 @@ ] }, "locked": { - "lastModified": 1765675278, - "narHash": "sha256-GSa/jaWld+WKxt39DDBPoX1j+kCdNmFF9stTWbeVhp8=", + "lastModified": 1767011923, + "narHash": "sha256-fvrQP91KneK1Zigm5kLl46V1Zpwqu88hSl9aDybq5dk=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "7d795256de6dbe7b4044161af2b6002421bdb188", + "rev": "fb6f2259cb49c7533b834676530570e54e06facb", "type": "github" }, "original": { @@ -1937,6 +2377,25 @@ "type": "github" } }, + "optnix": { + "inputs": { + "flake-compat": "flake-compat_9", + "nixpkgs": "nixpkgs_13" + }, + "locked": { + "lastModified": 1765418479, + "narHash": "sha256-33VCCXiEnEL9N2wVxo9FHLwL8KWH6qk+MNRcSThOPWs=", + "owner": "water-sucks", + "repo": "optnix", + "rev": "01facc3de860bf479723bf19535586564e59fe73", + "type": "github" + }, + "original": { + "owner": "water-sucks", + "repo": "optnix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -1966,7 +2425,7 @@ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_5", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -1989,19 +2448,19 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_4", "nixpkgs": [ "hyprland", "nixpkgs" ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -2017,17 +2476,17 @@ ] }, "locked": { - "lastModified": 1764663772, - "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "lastModified": 1766725085, + "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", "ref": "refs/heads/master", - "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", - "revCount": 713, + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "revCount": 715, "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "url": "https://git.outfoxxed.me/quickshell/quickshell" } }, "root": { @@ -2037,10 +2496,12 @@ "ayugram-desktop": "ayugram-desktop", "chaotic": "chaotic", "deploy-rs": "deploy-rs", + "devenv": "devenv", "devshell": "devshell_2", "disko": "disko", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "freesm": "freesm", + "git-hooks-nix": "git-hooks-nix", "home-manager": "home-manager_3", "homebrew-bundle": "homebrew-bundle", "homebrew-cask": "homebrew-cask", @@ -2053,8 +2514,10 @@ "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", "nixos-anywhere": "nixos-anywhere", + "nixos-cli": "nixos-cli", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_10", + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_15", "noctalia": "noctalia", "quickshell": "quickshell", "sops-nix": "sops-nix", @@ -2062,8 +2525,7 @@ "stylix": "stylix", "system-manager": "system-manager", "treefmt-nix": "treefmt-nix_3", - "vscserver": "vscserver", - "zen-browser": "zen-browser" + "vscserver": "vscserver" } }, "rust-overlay": { @@ -2147,14 +2609,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1765553226, - "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "496a6f625f63b780ce849891868f2fad22fd49c6", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -2171,11 +2633,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1765082296, - "narHash": "sha256-EcefoixU9ht+P6QB/TfjLY9E3MdJVfeSec6G8Ges0pA=", + "lastModified": 1766897356, + "narHash": "sha256-oKp9luuuXuMoUwpGUKUdt0G7lZGovcyOEI3guG0rNCw=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "ac4927ea1ec7e7ea3635a1d8b933106a596c4356", + "rev": "6b49c4094e93629af2fcf789e0897450f57e2551", "type": "github" }, "original": { @@ -2191,9 +2653,9 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_8", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_17", "nur": "nur", "systems": "systems_6", "tinted-foot": "tinted-foot", @@ -2203,11 +2665,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765474444, - "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", + "lastModified": 1766603026, + "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "owner": "nix-community", "repo": "stylix", - "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", + "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "type": "github" }, "original": { @@ -2223,11 +2685,11 @@ ] }, "locked": { - "lastModified": 1765536359, - "narHash": "sha256-PJX/Zrmi29lWkznqQS1BnqgBqSBG+Jnpp+kRSWri41M=", + "lastModified": 1766013091, + "narHash": "sha256-qFKkS3kz8gzQ1hjFeXYINOOGNHeYSmsa5Nj1Xs4rAec=", "owner": "numtide", "repo": "system-manager", - "rev": "a015a476120dc741200213ac8dd1556fc25bac9e", + "rev": "bd3e4193c2bde18329e314b896b8e0ac8e17debd", "type": "github" }, "original": { @@ -2466,14 +2928,14 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { @@ -2503,7 +2965,7 @@ "vscserver": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1753541826, @@ -2559,26 +3021,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zen-browser": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765598946, - "narHash": "sha256-rWU7YexLhbsAhjj1b7nAsnVjXaEo3NuecK1WBfNarbA=", - "owner": "youwen5", - "repo": "zen-browser-flake", - "rev": "26057e4ccdc3f2b268f8abcc68996e4645fa3ada", - "type": "github" - }, - "original": { - "owner": "youwen5", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", From 2939b08891f0ce270654324faae3b64eb88369ad Mon Sep 17 00:00:00 2001 From: s0me1newithhand7s Date: Mon, 29 Dec 2025 16:42:07 +0300 Subject: [PATCH 2/3] big staging update Signed-off-by: s0me1newithhand7s --- .pre-commit-config.yaml | 1 + flake.nix | 1116 +++++++++-------- hand7s/default.nix | 86 +- hand7s/fonts/fonts.nix | 8 +- hand7s/gtk/gtk.nix | 6 +- hand7s/home/defaults.nix | 10 +- hand7s/home/gui.nix | 55 +- hand7s/home/keyboard.nix | 16 +- hand7s/home/packages.nix | 118 +- hand7s/home/shellAliases.nix | 18 +- hand7s/nix/package.nix | 6 +- hand7s/nix/settings/substituters.nix | 30 +- hand7s/nix/settings/trusted-public-keys.nix | 30 +- hand7s/nixpkgs/config.nix | 10 +- hand7s/nixpkgs/overlays.nix | 8 +- hand7s/options/gui.nix | 198 +-- hand7s/programs/bat.nix | 20 +- hand7s/programs/chrome.nix | 22 +- hand7s/programs/direnv.nix | 14 +- hand7s/programs/eza.nix | 14 +- hand7s/programs/firefox.nix | 24 +- hand7s/programs/fish.nix | 24 +- hand7s/programs/fzf.nix | 16 +- hand7s/programs/ghostty.nix | 34 +- hand7s/programs/git.nix | 44 +- hand7s/programs/helix.nix | 116 +- hand7s/programs/hyprlock.nix | 179 +-- hand7s/programs/hyprpanel.nix | 868 ++++++------- hand7s/programs/index.nix | 10 +- hand7s/programs/kitty.nix | 16 +- hand7s/programs/mangohud.nix | 8 +- hand7s/programs/mpv.nix | 8 +- hand7s/programs/noctalia.nix | 394 +++--- hand7s/programs/obs-studio.nix | 35 +- hand7s/programs/spicetify.nix | 28 +- hand7s/programs/starship.nix | 92 +- hand7s/programs/swaylock.nix | 27 +- hand7s/programs/vscode.nix | 70 +- hand7s/programs/yazi.nix | 200 +-- hand7s/programs/zed-editor.nix | 56 +- hand7s/programs/zellij.nix | 36 +- hand7s/programs/zoxide.nix | 10 +- hand7s/qt/qt.nix | 6 +- hand7s/services/hypridle.nix | 69 +- hand7s/services/kdeconnect.nix | 10 +- hand7s/services/swayidle.nix | 81 +- hand7s/standalone.nix | 22 +- hand7s/stylix/base16Scheme.nix | 42 +- hand7s/stylix/cursor.nix | 12 +- hand7s/stylix/defaults.nix | 10 +- hand7s/stylix/fonts.nix | 50 +- hand7s/stylix/image.nix | 6 +- hand7s/stylix/red_ish.nix | 58 +- hand7s/systemd/hyprpolkitagent-service.nix | 52 +- hand7s/wayland/hyprland.nix | 527 ++++---- hand7s/wayland/river.nix | 191 +-- hand7s/wayland/sway.nix | 301 ++--- s0meMiniPC-nix/boot/initrd.nix | 42 +- s0meMiniPC-nix/boot/kernel.nix | 154 +-- s0meMiniPC-nix/boot/lanzaboote.nix | 20 +- s0meMiniPC-nix/boot/loader/systemd-boot.nix | 30 +- s0meMiniPC-nix/boot/plymouth.nix | 14 +- s0meMiniPC-nix/boot/tmp.nix | 10 +- s0meMiniPC-nix/boot/zfs.nix | 12 +- s0meMiniPC-nix/console/console.nix | 6 +- s0meMiniPC-nix/default.nix | 152 +-- s0meMiniPC-nix/disko/disk.nix | 66 +- s0meMiniPC-nix/disko/lvm_vg.nix | 84 +- s0meMiniPC-nix/environment/systemPackages.nix | 22 +- s0meMiniPC-nix/environment/variables.nix | 32 +- s0meMiniPC-nix/hardware/cpu.nix | 14 +- s0meMiniPC-nix/hardware/graphics.nix | 10 +- s0meMiniPC-nix/hardware/zram.nix | 12 +- s0meMiniPC-nix/home-manager/users.nix | 50 +- s0meMiniPC-nix/i18n/locales.nix | 14 +- s0meMiniPC-nix/networking/dhcp.nix | 14 +- s0meMiniPC-nix/networking/firewall.nix | 44 +- s0meMiniPC-nix/networking/hostId.nix | 6 +- s0meMiniPC-nix/networking/hostname.nix | 6 +- s0meMiniPC-nix/networking/hosts.nix | 8 +- s0meMiniPC-nix/networking/interfaces.nix | 48 +- s0meMiniPC-nix/networking/nameservers.nix | 48 +- s0meMiniPC-nix/networking/networkmanager.nix | 12 +- s0meMiniPC-nix/networking/timeServers.nix | 16 +- s0meMiniPC-nix/networking/wireguard.nix | 8 +- s0meMiniPC-nix/nix/package.nix | 6 +- s0meMiniPC-nix/nix/settings/allowed-users.nix | 14 +- .../nix/settings/auto-optimise-store.nix | 8 +- .../nix/settings/experimental-features.nix | 14 +- s0meMiniPC-nix/nix/settings/substituters.nix | 32 +- .../nix/settings/trusted-public-keys.nix | 32 +- s0meMiniPC-nix/nix/settings/trusted-users.nix | 12 +- s0meMiniPC-nix/nixpkgs/config.nix | 10 +- s0meMiniPC-nix/nixpkgs/overlays.nix | 8 +- s0meMiniPC-nix/nixpkgs/system.nix | 8 +- s0meMiniPC-nix/programs/nh.nix | 18 +- s0meMiniPC-nix/programs/ssh.nix | 8 +- s0meMiniPC-nix/security/polkit.nix | 14 +- s0meMiniPC-nix/security/rtkit.nix | 8 +- s0meMiniPC-nix/security/sudo-rs.nix | 12 +- s0meMiniPC-nix/security/sudo.nix | 8 +- s0meMiniPC-nix/services/forgejo.nix | 234 ++-- s0meMiniPC-nix/services/greetd.nix | 26 +- s0meMiniPC-nix/services/homepage.nix | 150 +-- s0meMiniPC-nix/services/irqbalance.nix | 8 +- s0meMiniPC-nix/services/libinput.nix | 24 +- s0meMiniPC-nix/services/netbird.nix | 8 +- s0meMiniPC-nix/services/openssh.nix | 34 +- s0meMiniPC-nix/services/pipewire.nix | 110 +- s0meMiniPC-nix/services/privatebin.nix | 78 +- s0meMiniPC-nix/services/scx.nix | 12 +- s0meMiniPC-nix/services/usbmuxd.nix | 10 +- s0meMiniPC-nix/services/xserver.nix | 38 +- s0meMiniPC-nix/services/zapret.nix | 262 ++-- s0meMiniPC-nix/services/zerotier.nix | 14 +- s0meMiniPC-nix/services/zitadel.nix | 138 +- s0meMiniPC-nix/system/name.nix | 6 +- s0meMiniPC-nix/system/stateVersion.nix | 6 +- s0meMiniPC-nix/systemd/oomd.nix | 14 +- s0meMiniPC-nix/systemd/slices/root-slice.nix | 20 +- .../systemd/slices/system-slice.nix | 20 +- s0meMiniPC-nix/systemd/slices/user-slice.nix | 20 +- s0meMiniPC-nix/time/timeZone.nix | 8 +- s0meMiniPC-nix/users/mutableUsers.nix | 6 +- s0meMiniPC-nix/users/users/hand7s.nix | 26 +- s0meMiniPC-nix/users/users/root.nix | 10 +- s0meMiniPC-nix/virtualisation/docker.nix | 14 +- s0mePC-nix/boot/initrd.nix | 78 +- s0mePC-nix/boot/kernel.nix | 174 +-- s0mePC-nix/boot/lanzaboote.nix | 20 +- s0mePC-nix/boot/loader/systemd-boot.nix | 30 +- s0mePC-nix/boot/plymouth.nix | 14 +- s0mePC-nix/boot/tmp.nix | 10 +- s0mePC-nix/boot/zfs.nix | 12 +- s0mePC-nix/console/console.nix | 6 +- s0mePC-nix/default.nix | 178 +-- s0mePC-nix/disko/disk.nix | 80 +- s0mePC-nix/disko/lvm_vg.nix | 84 +- s0mePC-nix/environment/systemPackages.nix | 28 +- s0mePC-nix/environment/variables.nix | 28 +- s0mePC-nix/hardware/amdgpu.nix | 12 +- s0mePC-nix/hardware/cpu.nix | 14 +- s0mePC-nix/hardware/graphics.nix | 10 +- s0mePC-nix/hardware/openrazer.nix | 22 +- s0mePC-nix/hardware/qmk.nix | 12 +- s0mePC-nix/hardware/zram.nix | 12 +- s0mePC-nix/home-manager/users.nix | 52 +- s0mePC-nix/i18n/locales.nix | 14 +- s0mePC-nix/networking/dhcp.nix | 14 +- s0mePC-nix/networking/firewall.nix | 48 +- s0mePC-nix/networking/hostId.nix | 6 +- s0mePC-nix/networking/hostname.nix | 6 +- s0mePC-nix/networking/hosts.nix | 8 +- s0mePC-nix/networking/nameservers.nix | 48 +- s0mePC-nix/networking/networkmanager.nix | 12 +- s0mePC-nix/networking/timeServers.nix | 16 +- s0mePC-nix/networking/wireguard.nix | 8 +- s0mePC-nix/nix/package.nix | 6 +- s0mePC-nix/nix/settings/allowed-users.nix | 14 +- .../nix/settings/auto-optimise-store.nix | 8 +- .../nix/settings/experimental-features.nix | 14 +- s0mePC-nix/nix/settings/substituters.nix | 32 +- .../nix/settings/trusted-public-keys.nix | 32 +- .../nix/settings/trusted-substituters.nix | 34 +- s0mePC-nix/nix/settings/trusted-users.nix | 12 +- s0mePC-nix/nixpkgs/config.nix | 10 +- s0mePC-nix/nixpkgs/overlays.nix | 8 +- s0mePC-nix/nixpkgs/system.nix | 8 +- s0mePC-nix/programs/gamemode.nix | 10 +- s0mePC-nix/programs/gamescope.nix | 16 +- s0mePC-nix/programs/nekoray.nix | 16 +- s0mePC-nix/programs/nh.nix | 18 +- s0mePC-nix/programs/ssh.nix | 10 +- s0mePC-nix/programs/steam.nix | 32 +- .../programs/yubikey-touch-detector.nix | 12 +- s0mePC-nix/security/pam/yubico.nix | 24 +- s0mePC-nix/security/polkit.nix | 14 +- s0mePC-nix/security/rtkit.nix | 8 +- s0mePC-nix/security/sudo-rs.nix | 12 +- s0mePC-nix/security/sudo.nix | 8 +- s0mePC-nix/services/greetd.nix | 26 +- s0mePC-nix/services/irqbalance.nix | 8 +- s0mePC-nix/services/libinput.nix | 24 +- s0mePC-nix/services/netbird.nix | 8 +- s0mePC-nix/services/openssh.nix | 34 +- s0mePC-nix/services/pipewire.nix | 110 +- s0mePC-nix/services/qmk.nix | 12 +- s0mePC-nix/services/resolved.nix | 64 +- s0mePC-nix/services/scx.nix | 12 +- s0mePC-nix/services/sunshine.nix | 14 +- s0mePC-nix/services/usbmuxd.nix | 10 +- s0mePC-nix/services/xserver.nix | 38 +- s0mePC-nix/services/yggdrasil.nix | 108 +- s0mePC-nix/services/yubikey-agent.nix | 10 +- s0mePC-nix/services/zapret.nix | 262 ++-- s0mePC-nix/services/zerotier.nix | 14 +- s0mePC-nix/system/name.nix | 6 +- s0mePC-nix/system/stateVersion.nix | 6 +- s0mePC-nix/systemd/oomd.nix | 14 +- s0mePC-nix/systemd/slices/root-slice.nix | 20 +- s0mePC-nix/systemd/slices/system-slice.nix | 20 +- s0mePC-nix/systemd/slices/user-slice.nix | 20 +- s0mePC-nix/time/timeZone.nix | 8 +- s0mePC-nix/users/mutableUsers.nix | 6 +- s0mePC-nix/users/users/hand7s.nix | 26 +- s0mePC-nix/users/users/root.nix | 10 +- s0mePC-nix/virtualisation/docker.nix | 14 +- s0mePC-nix/xdg/icons.nix | 8 +- s0mePC-nix/xdg/mime.nix | 16 +- s0mePC-nix/xdg/portal.nix | 46 +- s0melapt0p-nix/boot/initrd.nix | 70 +- s0melapt0p-nix/boot/kernel.nix | 162 +-- s0melapt0p-nix/boot/lanzaboote.nix | 20 +- s0melapt0p-nix/boot/loader/systemd-boot.nix | 30 +- s0melapt0p-nix/boot/plymouth.nix | 14 +- s0melapt0p-nix/boot/tmp.nix | 10 +- s0melapt0p-nix/console/console.nix | 6 +- s0melapt0p-nix/default.nix | 154 +-- s0melapt0p-nix/disko/disk.nix | 82 +- s0melapt0p-nix/disko/lvm_vg.nix | 96 +- s0melapt0p-nix/environment/systemPackages.nix | 28 +- s0melapt0p-nix/environment/variables.nix | 24 +- s0melapt0p-nix/hardware/cpu.nix | 14 +- s0melapt0p-nix/hardware/graphics.nix | 22 +- s0melapt0p-nix/hardware/qmk.nix | 12 +- s0melapt0p-nix/hardware/zram.nix | 12 +- s0melapt0p-nix/home-manager/users.nix | 50 +- s0melapt0p-nix/i18n/locales.nix | 14 +- s0melapt0p-nix/networking/dhcp.nix | 14 +- s0melapt0p-nix/networking/firewall.nix | 12 +- s0melapt0p-nix/networking/hostId.nix | 6 +- s0melapt0p-nix/networking/hostname.nix | 6 +- s0melapt0p-nix/networking/hosts.nix | 102 +- s0melapt0p-nix/networking/nameservers.nix | 48 +- s0melapt0p-nix/networking/networkmanager.nix | 20 +- s0melapt0p-nix/networking/timeServers.nix | 16 +- s0melapt0p-nix/networking/wireguard.nix | 8 +- s0melapt0p-nix/nix/package.nix | 6 +- s0melapt0p-nix/nix/settings/allowed-users.nix | 14 +- .../nix/settings/auto-optimise-store.nix | 8 +- .../nix/settings/experimental-features.nix | 14 +- s0melapt0p-nix/nix/settings/substituters.nix | 32 +- .../nix/settings/trusted-public-keys.nix | 32 +- s0melapt0p-nix/nix/settings/trusted-users.nix | 12 +- s0melapt0p-nix/nixpkgs/config.nix | 10 +- s0melapt0p-nix/nixpkgs/overlays.nix | 8 +- s0melapt0p-nix/nixpkgs/system.nix | 8 +- s0melapt0p-nix/programs/gamemode.nix | 8 +- s0melapt0p-nix/programs/nh.nix | 18 +- s0melapt0p-nix/programs/ssh.nix | 8 +- s0melapt0p-nix/programs/steam.nix | 32 +- .../programs/yubikey-touch-detector.nix | 12 +- s0melapt0p-nix/security/pam/services.nix | 20 +- s0melapt0p-nix/security/polkit.nix | 14 +- s0melapt0p-nix/security/rtkit.nix | 8 +- s0melapt0p-nix/security/sudo-rs.nix | 12 +- s0melapt0p-nix/security/sudo.nix | 8 +- s0melapt0p-nix/services/fprintd.nix | 16 +- s0melapt0p-nix/services/greetd.nix | 26 +- s0melapt0p-nix/services/libinput.nix | 38 +- s0melapt0p-nix/services/netbird.nix | 8 +- s0melapt0p-nix/services/openssh.nix | 34 +- s0melapt0p-nix/services/pipewire.nix | 110 +- s0melapt0p-nix/services/qmk.nix | 12 +- s0melapt0p-nix/services/thinkfan.nix | 10 +- s0melapt0p-nix/services/usbmuxd.nix | 10 +- s0melapt0p-nix/services/xserver.nix | 38 +- s0melapt0p-nix/services/yggdrasil.nix | 70 +- s0melapt0p-nix/services/yubikey-agent.nix | 10 +- s0melapt0p-nix/services/zapret.nix | 262 ++-- s0melapt0p-nix/services/zerotier.nix | 14 +- s0melapt0p-nix/system/name.nix | 6 +- s0melapt0p-nix/system/stateVersion.nix | 6 +- s0melapt0p-nix/systemd/oomd.nix | 14 +- s0melapt0p-nix/time/timeZone.nix | 8 +- s0melapt0p-nix/users/mutableUsers.nix | 6 +- s0melapt0p-nix/users/users/hand7s.nix | 26 +- s0melapt0p-nix/users/users/root.nix | 10 +- s0melapt0p-nix/virtualisation/docker.nix | 14 +- s0melapt0p-nix/xdg/icons.nix | 8 +- s0melapt0p-nix/xdg/mime.nix | 16 +- s0melapt0p-nix/xdg/portal.nix | 46 +- .../boot/initrd/availableKernelModules.nix | 32 +- .../boot/initrd/kernelModules.nix | 22 +- s0mev1rtn0de-nix/boot/kernel.nix | 14 +- s0mev1rtn0de-nix/boot/loader/grub.nix | 16 +- s0mev1rtn0de-nix/boot/tmp.nix | 8 +- s0mev1rtn0de-nix/default.nix | 88 +- s0mev1rtn0de-nix/disko/disk.nix | 74 +- s0mev1rtn0de-nix/disko/lvm_vg.nix | 42 +- .../environment/systemPackages.nix | 14 +- s0mev1rtn0de-nix/hardware/zram.nix | 12 +- s0mev1rtn0de-nix/networking/dns.nix | 28 +- s0mev1rtn0de-nix/networking/firewall.nix | 16 +- s0mev1rtn0de-nix/networking/firewall/ens3.nix | 32 +- s0mev1rtn0de-nix/networking/firewall/wt0.nix | 24 +- s0mev1rtn0de-nix/networking/hostname.nix | 6 +- .../networking/interfaces/ens3.nix | 24 +- s0mev1rtn0de-nix/networking/nat.nix | 18 +- s0mev1rtn0de-nix/networking/nftables.nix | 8 +- s0mev1rtn0de-nix/networking/wg-quick.nix | 80 +- s0mev1rtn0de-nix/networking/wireguard.nix | 8 +- .../nix/settings/allowed-users.nix | 14 +- .../nix/settings/auto-optimise-store.nix | 8 +- .../nix/settings/experimental-features.nix | 14 +- .../nix/settings/substituters.nix | 32 +- .../nix/settings/trusted-public-keys.nix | 30 +- .../nix/settings/trusted-users.nix | 12 +- s0mev1rtn0de-nix/nixpkgs/config.nix | 10 +- s0mev1rtn0de-nix/nixpkgs/platform.nix | 8 +- s0mev1rtn0de-nix/programs/nh.nix | 8 +- s0mev1rtn0de-nix/services/caddy.nix | 88 +- s0mev1rtn0de-nix/services/fail2ban.nix | 22 +- s0mev1rtn0de-nix/services/netbird.nix | 8 +- s0mev1rtn0de-nix/services/openssh.nix | 32 +- s0mev1rtn0de-nix/services/qemuGuest.nix | 8 +- s0mev1rtn0de-nix/services/sing-box.nix | 172 +-- s0mev1rtn0de-nix/system/stateVersion.nix | 6 +- s0mev1rtn0de-nix/users/users.nix | 6 +- s0mev1rtn0de-nix/users/users/askhat.nix | 34 +- s0mev1rtn0de-nix/users/users/hand7s.nix | 22 +- s0mev1rtn0de-nix/users/users/root.nix | 10 +- s0mev1rtn0de-nix/virtualisation/docker.nix | 22 +- .../virtualisation/oci-containers/3x-ui.nix | 40 +- 324 files changed, 6897 insertions(+), 6797 deletions(-) create mode 120000 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 120000 index 0000000..b19354f --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1 @@ +/nix/store/0nibh6zrkxhh7qc1q6kkq5810iqd0059-pre-commit-config.json \ No newline at end of file diff --git a/flake.nix b/flake.nix index 1564568..16aee49 100644 --- a/flake.nix +++ b/flake.nix @@ -1,556 +1,646 @@ { - description = "hand7s'es flake"; + description = "hand7s'es flake"; - inputs = { - agenix = { - flake = true; - type = "github"; - owner = "yaxitech"; - repo = "ragenix"; + inputs = { + agenix = { + flake = true; + type = "github"; + owner = "yaxitech"; + repo = "ragenix"; + }; + + agenix-rekey = { + flake = true; + type = "github"; + owner = "oddlama"; + repo = "agenix-rekey"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; + }; + }; - agenix-rekey = { - flake = true; - type = "github"; - owner = "oddlama"; - repo = "agenix-rekey"; + ayugram-desktop = { + flake = true; + type = "github"; + owner = "ndfined-crp"; + repo = "ayugram-desktop"; + }; - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; + chaotic = { + flake = true; + type = "github"; + owner = "chaotic-cx"; + repo = "nyx"; + ref = "nyxpkgs-unstable"; + }; + + deploy-rs = { + flake = true; + type = "github"; + owner = "serokell"; + repo = "deploy-rs"; + }; + + devenv = { + flake = true; + type = "github"; + owner = "cachix"; + repo = "devenv"; + }; + + devshell = { + flake = true; + type = "github"; + owner = "numtide"; + repo = "devshell"; + }; + + disko = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "disko"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; + }; + }; - ayugram-desktop = { - flake = true; - type = "github"; - owner = "ndfined-crp"; - repo = "ayugram-desktop"; + flake-parts = { + flake = true; + type = "github"; + owner = "hercules-ci"; + repo = "flake-parts"; + }; + + freesm = { + flake = true; + type = "github"; + owner = "freesmteam"; + repo = "freesmlauncher"; + }; + + git-hooks-nix = { + flake = true; + type = "github"; + owner = "cachix"; + repo = "git-hooks.nix"; + }; + + home-manager = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "home-manager"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; + }; + }; - chaotic = { - flake = true; - type = "github"; - owner = "chaotic-cx"; - repo = "nyx"; - ref = "nyxpkgs-unstable"; + homebrew-bundle = { + flake = false; + type = "github"; + owner = "homebrew"; + repo = "homebrew-bundle"; + }; + + homebrew-cask = { + flake = false; + type = "github"; + owner = "homebrew"; + repo = "homebrew-cask"; + }; + + homebrew-core = { + flake = false; + type = "github"; + owner = "homebrew"; + repo = "homebrew-core"; + }; + + hyprland = { + flake = true; + type = "github"; + owner = "hyprwm"; + repo = "Hyprland"; + }; + + lanzaboote = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "lanzaboote"; + ref = "v0.4.2"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; + }; + }; - deploy-rs = { - flake = true; - type = "github"; - owner = "serokell"; - repo = "deploy-rs"; + nekoflake = { + flake = true; + type = "github"; + owner = "s0me1newithhand7s"; + repo = "nekoflake"; + }; + + nix-darwin = { + flake = true; + type = "github"; + owner = "LnL7"; + repo = "nix-darwin"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; + }; + }; - devshell = { - flake = true; - type = "github"; - owner = "numtide"; - repo = "devshell"; + nix-homebrew = { + flake = true; + type = "github"; + owner = "zhaofengli"; + repo = "nix-homebrew"; + }; + + nix-index-database = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nix-index-database"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; + }; + }; - disko = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "disko"; + nix-on-droid = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nix-on-droid"; - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - flake-parts = { - flake = true; - type = "github"; - owner = "hercules-ci"; - repo = "flake-parts"; - }; - - freesm = { - flake = true; - type = "github"; - owner = "freesmteam"; - repo = "freesmlauncher"; + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; home-manager = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "home-manager"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; + follows = "home-manager"; }; + }; + }; - homebrew-bundle = { - flake = false; - type = "github"; - owner = "homebrew"; - repo = "homebrew-bundle"; - }; + nixos-anywhere = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nixos-anywhere"; + }; - homebrew-cask = { - flake = false; - type = "github"; - owner = "homebrew"; - repo = "homebrew-cask"; - }; + nixos-cli = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nixos-cli"; + }; - homebrew-core = { - flake = false; - type = "github"; - owner = "homebrew"; - repo = "homebrew-core"; - }; - - hyprland = { - flake = true; - type = "github"; - owner = "hyprwm"; - repo = "Hyprland"; - }; - - lanzaboote = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "lanzaboote"; - ref = "v0.4.2"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - nekoflake = { - flake = true; - type = "github"; - owner = "s0me1newithhand7s"; - repo = "nekoflake"; - }; - - nix-darwin = { - flake = true; - type = "github"; - owner = "LnL7"; - repo = "nix-darwin"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - nix-homebrew = { - flake = true; - type = "github"; - owner = "zhaofengli"; - repo = "nix-homebrew"; - }; - - nix-index-database = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "nix-index-database"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - nix-on-droid = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "nix-on-droid"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - - home-manager = { - follows = "home-manager"; - }; - }; - }; - - nixos-anywhere = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "nixos-anywhere"; - }; - - nixos-generators = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "nixos-generators"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; + nixos-generators = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nixos-generators"; + inputs = { nixpkgs = { - flake = true; - type = "github"; - owner = "nixos"; - repo = "nixpkgs"; - ref = "nixos-unstable"; + follows = "nixpkgs"; }; + }; + }; - noctalia = { - flake = true; - type = "github"; - owner = "noctalia-dev"; - repo = "noctalia-shell"; + nixos-wsl = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nixos-wsl"; + ref = "main"; + }; - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; + nixpkgs = { + flake = true; + type = "github"; + owner = "nixos"; + repo = "nixpkgs"; + ref = "nixos-unstable"; + }; - quickshell = { - follows = "quickshell"; - }; - }; + noctalia = { + flake = true; + type = "github"; + owner = "noctalia-dev"; + repo = "noctalia-shell"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; }; quickshell = { - flake = true; - type = "git"; - url = "https://git.outfoxxed.me/outfoxxed/quickshell"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - sops-nix = { - flake = true; - type = "github"; - owner = "Mic92"; - repo = "sops-nix"; - }; - - spicetify-nix = { - flake = true; - type = "github"; - owner = "Gerg-L"; - repo = "spicetify-nix"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - stylix = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "stylix"; - }; - - system-manager = { - flake = true; - type = "github"; - owner = "numtide"; - repo = "system-manager"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; - }; - - treefmt-nix = { - flake = true; - type = "github"; - owner = "numtide"; - repo = "treefmt-nix"; - }; - - vscserver = { - flake = true; - type = "github"; - owner = "nix-community"; - repo = "nixos-vscode-server"; - }; - - zen-browser = { - flake = true; - type = "github"; - owner = "youwen5"; - repo = "zen-browser-flake"; - - inputs = { - nixpkgs = { - follows = "nixpkgs"; - }; - }; + follows = "quickshell"; }; + }; }; - outputs = inputs @ { - flake-parts, - self, - ... - }: - flake-parts.lib.mkFlake { - inherit + quickshell = { + flake = true; + type = "git"; + url = "https://git.outfoxxed.me/quickshell/quickshell"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; + }; + }; + }; + + sops-nix = { + flake = true; + type = "github"; + owner = "Mic92"; + repo = "sops-nix"; + }; + + spicetify-nix = { + flake = true; + type = "github"; + owner = "Gerg-L"; + repo = "spicetify-nix"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; + }; + }; + }; + + stylix = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "stylix"; + }; + + system-manager = { + flake = true; + type = "github"; + owner = "numtide"; + repo = "system-manager"; + + inputs = { + nixpkgs = { + follows = "nixpkgs"; + }; + }; + }; + + treefmt-nix = { + flake = true; + type = "github"; + owner = "numtide"; + repo = "treefmt-nix"; + }; + + vscserver = { + flake = true; + type = "github"; + owner = "nix-community"; + repo = "nixos-vscode-server"; + }; + }; + + outputs = inputs @ { + flake-parts, + self, + ... + }: + flake-parts.lib.mkFlake { + inherit + inputs + self + ; + } { + debug = false; + + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + + imports = [ + # modules + inputs.agenix-rekey.flakeModule + inputs.disko.flakeModules.default + inputs.devshell.flakeModule + inputs.treefmt-nix.flakeModule + inputs.home-manager.flakeModules.home-manager + inputs.git-hooks-nix.flakeModule + inputs.devenv.flakeModule + # i can't really deside between devenv, devshells and devShells they are equally good for me + # for now, at least, i'm using numtide/devshells + ]; + + flake = { + # home-manager, sorta broken when standalone + homeConfigurations = { + "hand7s" = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { + osConfig.networking.hostName = ""; + inherit inputs self ; - } { - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - - imports = [ - # modules - inputs.devshell.flakeModule - inputs.treefmt-nix.flakeModule - inputs.home-manager.flakeModules.home-manager - ]; - - flake = { - homeConfigurations = { - "hand7s" = inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - "${self}/hand7s/standalone.nix" - inputs.spicetify-nix.homeManagerModules.default - inputs.hyprland.homeManagerModules.default - inputs.chaotic.homeManagerModules.default - inputs.sops-nix.homeManagerModules.sops - - inputs.nix-index-database.homeModules.nix-index - inputs.noctalia.homeModules.default - ]; - }; - }; - - nixosConfigurations = { - "s0mePC-nix" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - "${self}/s0mePC-nix/" - inputs.chaotic.nixosModules.default - inputs.stylix.nixosModules.stylix - inputs.sops-nix.nixosModules.sops - inputs.disko.nixosModules.disko - inputs.lanzaboote.nixosModules.lanzaboote - inputs.home-manager.nixosModules.default - inputs.nix-index-database.nixosModules.nix-index - ]; - }; - - "s0melapt0p-nix" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - "${self}/s0melapt0p-nix/" - inputs.chaotic.nixosModules.default - inputs.stylix.nixosModules.stylix - inputs.sops-nix.nixosModules.sops - inputs.disko.nixosModules.disko - inputs.home-manager.nixosModules.home-manager - inputs.lanzaboote.nixosModules.lanzaboote - inputs.nix-index-database.nixosModules.nix-index - ]; - }; - - "s0mev1rtn0de-nix" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - "${self}/s0mev1rtn0de-nix/" - inputs.disko.nixosModules.disko - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - inputs.nix-index-database.nixosModules.nix-index - ]; - }; - - "s0meMiniPC-nix" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - "${self}/s0meMiniPC-nix" - inputs.chaotic.nixosModules.default - inputs.stylix.nixosModules.stylix - inputs.sops-nix.nixosModules.sops - inputs.disko.nixosModules.disko - inputs.lanzaboote.nixosModules.lanzaboote - inputs.home-manager.nixosModules.default - inputs.nix-index-database.nixosModules.nix-index - ]; - }; - }; - - nixOnDroidConfigurations = { - n0thing-3a = inputs.nix-on-droid.lib.nixOnDroidConfiguration { - pkgs = import inputs.nixpkgs { - system = "aarch64-linux"; - overlays = [ - inputs.nix-on-droid.overlays.default - ]; - }; - - extraSpecialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - inputs.home-manager.nixOnDroidModules.default - ]; - }; - }; - - systemConfigs = { - s0mePC = inputs.system-manager.lib.makeSystemConfig { - extraSpecialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - # "${self}/s0mePC/" - inputs.home-manager.nixosModules.default - - { - nixpkgs.hostPlatform = "x86_64-linux"; - } - ]; - }; - }; - - deploy = { - user = "hand7s"; - interactiveSudo = true; - autoRollback = true; - magicRollback = true; - remoteBuild = false; - sshOpts = [ - "-p" - "6969" - ]; - - nodes = { - "s0mev1rtn0de-nix" = { - hostname = "90.156.226.152"; - profiles = { - main = { - path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix; - profilePath = "/nix/var/nix/profiles/system"; - }; - }; - }; - }; - }; }; - perSystem = {...}: { - treefmt = { - flakeFormatter = true; - flakeCheck = false; - enableDefaultExcludes = true; + modules = [ + "${self}/hand7s/standalone.nix" + inputs.spicetify-nix.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.chaotic.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops - programs = { - statix = { - enable = true; - priority = 1; - includes = [ - "*.nix" - ]; - - disabled-lints = [ - "empty_pattern" - ]; - }; - - deadnix = { - enable = true; - priority = 2; - includes = [ - "*.nix" - ]; - }; - }; - - settings = { - global = { - on-unmatched = "fatal"; - excludes = [ - "secrets/*" - ".sops.yaml" - ".gitignore" - ]; - }; - }; - }; - }; + inputs.nix-index-database.homeModules.nix-index + inputs.noctalia.homeModules.default + inputs.stylix.homeModules.stylix + ]; + }; }; + + # nixos hosts + nixosConfigurations = { + "s0mePC-nix" = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit + inputs + self + ; + }; + + modules = [ + "${self}/s0mePC-nix/" + inputs.chaotic.nixosModules.default + inputs.stylix.nixosModules.stylix + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.lanzaboote.nixosModules.lanzaboote + inputs.home-manager.nixosModules.default + inputs.nix-index-database.nixosModules.nix-index + ]; + }; + + "s0melapt0p-nix" = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit + inputs + self + ; + }; + + modules = [ + "${self}/s0melapt0p-nix/" + inputs.chaotic.nixosModules.default + inputs.stylix.nixosModules.stylix + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.home-manager.nixosModules.home-manager + inputs.lanzaboote.nixosModules.lanzaboote + inputs.nix-index-database.nixosModules.nix-index + ]; + }; + + "s0mev1rtn0de-nix" = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit + inputs + self + ; + }; + + modules = [ + "${self}/s0mev1rtn0de-nix/" + inputs.disko.nixosModules.disko + inputs.home-manager.nixosModules.default + inputs.sops-nix.nixosModules.sops + inputs.nix-index-database.nixosModules.nix-index + ]; + }; + + "s0meMiniPC-nix" = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit + inputs + self + ; + }; + + modules = [ + "${self}/s0meMiniPC-nix" + inputs.chaotic.nixosModules.default + inputs.stylix.nixosModules.stylix + inputs.sops-nix.nixosModules.sops + inputs.disko.nixosModules.disko + inputs.lanzaboote.nixosModules.lanzaboote + inputs.home-manager.nixosModules.default + inputs.nix-index-database.nixosModules.nix-index + ]; + }; + }; + + # deploy-rs + deploy = { + user = "hand7s"; + interactiveSudo = true; + autoRollback = true; + magicRollback = true; + remoteBuild = false; + sshOpts = [ + "-p" + "6969" + ]; + + nodes = { + "s0mev1rtn0de-nix" = { + hostname = "100.109.213.170"; + profiles = { + main = { + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix; + profilePath = "/nix/var/nix/profiles/system"; + }; + }; + }; + + "s0meMiniPC-nix" = { + hostname = "100.109.71.194"; + profiles = { + main = { + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix; + profilePath = "/nix/var/nix/profiles/system"; + }; + }; + }; + }; + }; + }; + + perSystem = { + config, + pkgs, + ... + }: { + # numtide/treefmt-nix, treefmt integrated into nix + treefmt = { + flakeFormatter = true; + flakeCheck = true; + + programs = { + alejandra = { + enable = true; + priority = 1; + includes = [ + "*.nix" + ]; + }; + + statix = { + enable = true; + priority = 1; + includes = [ + "*.nix" + ]; + + disabled-lints = [ + "empty_pattern" + ]; + }; + + deadnix = { + enable = true; + priority = 1; + includes = [ + "*.nix" + ]; + }; + }; + + settings = { + global = { + on-unmatched = "warn"; + excludes = [ + "secrets/*" + ".sops.yaml" + ".gitignore" + ]; + }; + }; + }; + + # cachix/git-hooks-nix, pre-commit-hooks integrated into nix + pre-commit = { + check = { + enable = true; + }; + + settings = { + enable = true; + package = pkgs.prek; + gitPackage = pkgs.git; + + hooks = { + alejandra = { + enable = true; + settings = { + check = true; + }; + }; + + deadnix = { + enable = true; + settings = { + edit = false; + }; + }; + + statix = { + enable = true; + settings = { + config = "${pkgs.writeText ''statix.toml'' '' + disabled = [ + "empty_pattern" + ] + ''}"; + }; + }; + }; + }; + }; + + # numtide/devshells, basically a devShells but better + devshells = { + "default" = { + name = "default"; + + commands = [ + { + name = "pre"; + category = "[tools]"; + command = "prek run -a"; + help = '' + pre-commit-hook is a tool to execute linters / formatters before `git commit` to verify that code is meeting standarts of code setted up in projects; + ''; + } + + { + name = "fmt"; + category = "[formatters]"; + command = "nix fmt"; + help = '' + nix fmt is built-in formatting solution for nix pacakage manager; + ''; + } + ]; + + devshell = { + startup = { + "git-hooks-nix" = { + text = config.pre-commit.shellHook; + }; + }; + }; + + packages = with pkgs; + [ + just + ] + ++ config.pre-commit.settings.enabledPackages; + }; + }; + }; + }; } diff --git a/hand7s/default.nix b/hand7s/default.nix index 733b8ae..e72a53c 100644 --- a/hand7s/default.nix +++ b/hand7s/default.nix @@ -1,51 +1,51 @@ {self, ...}: { - imports = [ - "${self}/hand7s/fonts/fonts.nix" - "${self}/hand7s/options/gui.nix" + imports = [ + "${self}/hand7s/fonts/fonts.nix" + "${self}/hand7s/options/gui.nix" - "${self}/hand7s/wayland/hyprland.nix" - "${self}/hand7s/wayland/river.nix" - "${self}/hand7s/wayland/sway.nix" + "${self}/hand7s/wayland/hyprland.nix" + "${self}/hand7s/wayland/river.nix" + "${self}/hand7s/wayland/sway.nix" - "${self}/hand7s/home/defaults.nix" - "${self}/hand7s/home/gui.nix" - "${self}/hand7s/home/keyboard.nix" - "${self}/hand7s/home/packages.nix" - "${self}/hand7s/home/shellAliases.nix" + "${self}/hand7s/home/defaults.nix" + "${self}/hand7s/home/gui.nix" + "${self}/hand7s/home/keyboard.nix" + "${self}/hand7s/home/packages.nix" + "${self}/hand7s/home/shellAliases.nix" - "${self}/hand7s/nixpkgs/config.nix" - "${self}/hand7s/nixpkgs/overlays.nix" + "${self}/hand7s/nixpkgs/config.nix" + "${self}/hand7s/nixpkgs/overlays.nix" - "${self}/hand7s/services/hypridle.nix" - "${self}/hand7s/services/swayidle.nix" - "${self}/hand7s/services/kdeconnect.nix" + "${self}/hand7s/services/hypridle.nix" + "${self}/hand7s/services/swayidle.nix" + "${self}/hand7s/services/kdeconnect.nix" - "${self}/hand7s/systemd/hyprpolkitagent-service.nix" + "${self}/hand7s/systemd/hyprpolkitagent-service.nix" - "${self}/hand7s/programs/bat.nix" - "${self}/hand7s/programs/eza.nix" - "${self}/hand7s/programs/fish.nix" - "${self}/hand7s/programs/fzf.nix" - "${self}/hand7s/programs/ghostty.nix" - "${self}/hand7s/programs/git.nix" - "${self}/hand7s/programs/mpv.nix" - "${self}/hand7s/programs/helix.nix" - "${self}/hand7s/programs/index.nix" - "${self}/hand7s/programs/obs-studio.nix" - "${self}/hand7s/programs/starship.nix" - "${self}/hand7s/programs/firefox.nix" - "${self}/hand7s/programs/swaylock.nix" - "${self}/hand7s/programs/yazi.nix" - "${self}/hand7s/programs/zoxide.nix" - "${self}/hand7s/programs/chrome.nix" - "${self}/hand7s/programs/hyprlock.nix" - "${self}/hand7s/programs/hyprpanel.nix" - "${self}/hand7s/programs/spicetify.nix" - "${self}/hand7s/programs/vscode.nix" - "${self}/hand7s/programs/zellij.nix" - "${self}/hand7s/programs/zed-editor.nix" - "${self}/hand7s/programs/direnv.nix" - "${self}/hand7s/programs/kitty.nix" - "${self}/hand7s/programs/noctalia.nix" - ]; + "${self}/hand7s/programs/bat.nix" + "${self}/hand7s/programs/eza.nix" + "${self}/hand7s/programs/fish.nix" + "${self}/hand7s/programs/fzf.nix" + "${self}/hand7s/programs/ghostty.nix" + "${self}/hand7s/programs/git.nix" + "${self}/hand7s/programs/mpv.nix" + "${self}/hand7s/programs/helix.nix" + "${self}/hand7s/programs/index.nix" + "${self}/hand7s/programs/obs-studio.nix" + "${self}/hand7s/programs/starship.nix" + "${self}/hand7s/programs/firefox.nix" + "${self}/hand7s/programs/swaylock.nix" + "${self}/hand7s/programs/yazi.nix" + "${self}/hand7s/programs/zoxide.nix" + "${self}/hand7s/programs/chrome.nix" + "${self}/hand7s/programs/hyprlock.nix" + "${self}/hand7s/programs/hyprpanel.nix" + "${self}/hand7s/programs/spicetify.nix" + "${self}/hand7s/programs/vscode.nix" + "${self}/hand7s/programs/zellij.nix" + "${self}/hand7s/programs/zed-editor.nix" + "${self}/hand7s/programs/direnv.nix" + "${self}/hand7s/programs/kitty.nix" + "${self}/hand7s/programs/noctalia.nix" + ]; } diff --git a/hand7s/fonts/fonts.nix b/hand7s/fonts/fonts.nix index 8100b65..f02660a 100644 --- a/hand7s/fonts/fonts.nix +++ b/hand7s/fonts/fonts.nix @@ -1,7 +1,7 @@ {...}: { - fonts = { - fontconfig = { - enable = true; - }; + fonts = { + fontconfig = { + enable = true; }; + }; } diff --git a/hand7s/gtk/gtk.nix b/hand7s/gtk/gtk.nix index c32faef..8ddb6c4 100644 --- a/hand7s/gtk/gtk.nix +++ b/hand7s/gtk/gtk.nix @@ -1,5 +1,5 @@ {...}: { - gtk = { - enable = true; - }; + gtk = { + enable = true; + }; } diff --git a/hand7s/home/defaults.nix b/hand7s/home/defaults.nix index 192edcf..63fe9e9 100644 --- a/hand7s/home/defaults.nix +++ b/hand7s/home/defaults.nix @@ -1,7 +1,7 @@ {...}: { - home = { - stateVersion = "24.11"; - username = "hand7s"; - homeDirectory = "/home/hand7s"; - }; + home = { + stateVersion = "24.11"; + username = "hand7s"; + homeDirectory = "/home/hand7s"; + }; } diff --git a/hand7s/home/gui.nix b/hand7s/home/gui.nix index a81493a..611056d 100644 --- a/hand7s/home/gui.nix +++ b/hand7s/home/gui.nix @@ -1,32 +1,33 @@ { - osConfig, - lib, - ... + osConfig, + lib, + ... }: { - home = { - gui = { - enable = lib.mkIf ( - osConfig.networking.hostName == "s0mePC-nix" || osConfig.networking.hostName == "s0melapt0p-nix" - ) - true; + home = { + gui = { + enable = + lib.mkIf ( + osConfig.networking.hostName == "s0mePC-nix" || osConfig.networking.hostName == "s0melapt0p-nix" + ) + true; - sessionType = - if - ( - osConfig.networking.hostName == "s0mePC-nix" - ) - then "Hyprland" - else if - ( - osConfig.networking.hostName == "s0mew0rkstat1on-nix" - ) - then "Hyprland" - else if - ( - osConfig.networking.hostName == "s0melapt0p-nix" - ) - then "Sway" - else "None"; - }; + sessionType = + if + ( + osConfig.networking.hostName == "s0mePC-nix" + ) + then "Hyprland" + else if + ( + osConfig.networking.hostName == "s0mew0rkstat1on-nix" + ) + then "Hyprland" + else if + ( + osConfig.networking.hostName == "s0melapt0p-nix" + ) + then "Sway" + else "None"; }; + }; } diff --git a/hand7s/home/keyboard.nix b/hand7s/home/keyboard.nix index 9d5031b..25887b5 100644 --- a/hand7s/home/keyboard.nix +++ b/hand7s/home/keyboard.nix @@ -1,11 +1,11 @@ {...}: { - home = { - keyboard = { - variant = ""; - layout = "us, ru"; - options = [ - "grp:caps_toggle" - ]; - }; + home = { + keyboard = { + variant = ""; + layout = "us, ru"; + options = [ + "grp:caps_toggle" + ]; }; + }; } diff --git a/hand7s/home/packages.nix b/hand7s/home/packages.nix index f0dcd0e..99ef80d 100644 --- a/hand7s/home/packages.nix +++ b/hand7s/home/packages.nix @@ -1,62 +1,62 @@ { - osConfig, - pkgs, - lib, - ... + osConfig, + pkgs, + lib, + ... }: { - home = { - packages = with pkgs; - [ - fd - gh - sd - xh - dua - nvd - gat - dust - sops - rsync - procs - sbctl - gping - dconf - tokei - comma - ifuse - trippy - bottom - kubectl - yt-dlp - ripgrep - gitoxide - tty-clock - deploy-rs - monero-cli - nixos-anywhere - wireguard-tools - yubico-piv-tool - yubikey-manager - libimobiledevice - nix-output-monitor - yubikey-touch-detector - yubikey-personalization - netbird-ui - ] - ++ lib.optionals ( - osConfig.networking.hostName == "s0mePC-nix" - ) [ - mindustry - thunderbird - tetrio-desktop - min-ed-launcher - qbittorrent-enhanced - ] - ++ lib.optionals ( - osConfig.networking.hostName == "s0melapt0p-nix" - ) [ - iwgtk - brightnessctl - ]; - }; + home = { + packages = with pkgs; + [ + fd + gh + sd + xh + dua + nvd + gat + dust + sops + rsync + procs + sbctl + gping + dconf + tokei + comma + ifuse + trippy + bottom + kubectl + yt-dlp + ripgrep + gitoxide + tty-clock + deploy-rs + monero-cli + nixos-anywhere + wireguard-tools + yubico-piv-tool + yubikey-manager + libimobiledevice + nix-output-monitor + yubikey-touch-detector + yubikey-personalization + netbird-ui + ] + ++ lib.optionals ( + osConfig.networking.hostName == "s0mePC-nix" + ) [ + mindustry + thunderbird + tetrio-desktop + min-ed-launcher + qbittorrent-enhanced + ] + ++ lib.optionals ( + osConfig.networking.hostName == "s0melapt0p-nix" + ) [ + iwgtk + brightnessctl + ]; + }; } diff --git a/hand7s/home/shellAliases.nix b/hand7s/home/shellAliases.nix index 5055b64..273cf7b 100644 --- a/hand7s/home/shellAliases.nix +++ b/hand7s/home/shellAliases.nix @@ -1,13 +1,13 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - home = { - shellAliases = { - e = "${lib.getExe pkgs.eza}"; - et = "${lib.getExe pkgs.eza} -T"; - k = "${lib.getExe pkgs.kubectl}"; - }; + home = { + shellAliases = { + e = "${lib.getExe pkgs.eza}"; + et = "${lib.getExe pkgs.eza} -T"; + k = "${lib.getExe pkgs.kubectl}"; }; + }; } diff --git a/hand7s/nix/package.nix b/hand7s/nix/package.nix index c947a27..b2d6823 100644 --- a/hand7s/nix/package.nix +++ b/hand7s/nix/package.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - nix = { - package = pkgs.nixVersions.latest; - }; + nix = { + package = pkgs.nixVersions.latest; + }; } diff --git a/hand7s/nix/settings/substituters.nix b/hand7s/nix/settings/substituters.nix index 5df9612..4cc1aa4 100644 --- a/hand7s/nix/settings/substituters.nix +++ b/hand7s/nix/settings/substituters.nix @@ -1,18 +1,18 @@ {...}: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://ags.cachix.org" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - ]; - }; + nix = { + settings = { + substituters = [ + # cache.nixos.org + "https://cache.nixos.org" + # cache.garnix.org + "https://cache.garnix.io" + # cachix + "https://nix-community.cachix.org/" + "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" + "https://hyprland.cachix.org" + "https://chaotic-nyx.cachix.org/" + ]; }; + }; } diff --git a/hand7s/nix/settings/trusted-public-keys.nix b/hand7s/nix/settings/trusted-public-keys.nix index 053e721..62cbbde 100644 --- a/hand7s/nix/settings/trusted-public-keys.nix +++ b/hand7s/nix/settings/trusted-public-keys.nix @@ -1,18 +1,18 @@ {...}: { - nix = { - settings = { - trusted-public-keys = [ - # cache.nixos.org - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - # cache.garnix.io - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # cachix.org - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - ]; - }; + nix = { + settings = { + trusted-public-keys = [ + # cache.nixos.org + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + # cache.garnix.io + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # cachix.org + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + ]; }; + }; } diff --git a/hand7s/nixpkgs/config.nix b/hand7s/nixpkgs/config.nix index 4532569..0425353 100644 --- a/hand7s/nixpkgs/config.nix +++ b/hand7s/nixpkgs/config.nix @@ -1,8 +1,8 @@ {...}: { - nixpkgs = { - config = { - allowBroken = true; - allowUnfree = true; - }; + nixpkgs = { + config = { + allowBroken = true; + allowUnfree = true; }; + }; } diff --git a/hand7s/nixpkgs/overlays.nix b/hand7s/nixpkgs/overlays.nix index da060e9..2881eba 100644 --- a/hand7s/nixpkgs/overlays.nix +++ b/hand7s/nixpkgs/overlays.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - overlays = [ - ]; - }; + nixpkgs = { + overlays = [ + ]; + }; } diff --git a/hand7s/options/gui.nix b/hand7s/options/gui.nix index d3af179..5f8fc37 100644 --- a/hand7s/options/gui.nix +++ b/hand7s/options/gui.nix @@ -1,108 +1,108 @@ { - lib, - pkgs, - config, - inputs, - ... + lib, + pkgs, + config, + inputs, + ... }: let - cfg = config.home.gui; - ayugram = inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop; - freesm-launcher = inputs.freesm.packages.${pkgs.system}.freesmlauncher; + cfg = config.home.gui; + ayugram = inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop; + freesm-launcher = inputs.freesm.packages.${pkgs.system}.freesmlauncher; in { - options.home.gui = { - enable = lib.mkEnableOption '' - Enabling this option will allow you to activate GUI Software, - that exist in my home-manager setup. Enabling this, as you can - see, is depending on hostname of my system. To bypass this, - either delete expression in `home.nix`, or change hostname - to yours. - ''; + options.home.gui = { + enable = lib.mkEnableOption '' + Enabling this option will allow you to activate GUI Software, + that exist in my home-manager setup. Enabling this, as you can + see, is depending on hostname of my system. To bypass this, + either delete expression in `home.nix`, or change hostname + to yours. + ''; - sessionType = lib.mkOption { - type = lib.types.enum [ - "DWL" - "Sway" - "River" - "Hyprland" - "None" - ]; - default = "None"; - description = '' - This option allows to choose current desktop session. All - three: riverwm, sway and Hyprland has their own config. Almost - all of them - their respectful software. WIP. - ''; - }; + sessionType = lib.mkOption { + type = lib.types.enum [ + "DWL" + "Sway" + "River" + "Hyprland" + "None" + ]; + default = "None"; + description = '' + This option allows to choose current desktop session. All + three: riverwm, sway and Hyprland has their own config. Almost + all of them - their respectful software. WIP. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + home = { + packages = with pkgs; + [ + vesktop + nekoray + anki-bin + obsidian + playerctl + monero-gui + mindustry + bitwarden + lan-mouse + parsec-bin + pwvucontrol + easyeffects + ayugram + element-desktop + hyprpolkitagent + freesm-launcher + + (discord.override { + withVencord = true; + withOpenASAR = false; + }) + ] + ++ lib.optionals ( + cfg.sessionType == "Sway" + ) [ + swaykbdd + autotiling-rs + sway-audio-idle-inhibit + sway-contrib.grimshot + sway-contrib.inactive-windows-transparency + ] + ++ lib.optionals ( + cfg.sessionType == "River" + ) [ + wayshot + waylock + wayidle + ] + ++ lib.optionals ( + cfg.sessionType == "Hyprland" + ) [ + inputs.noctalia.packages.${system}.default + grimblast + ]; }; - config = lib.mkIf cfg.enable { - home = { - packages = with pkgs; - [ - vesktop - nekoray - anki-bin - obsidian - playerctl - monero-gui - mindustry - bitwarden - lan-mouse - parsec-bin - pwvucontrol - easyeffects - ayugram - element-desktop - hyprpolkitagent - freesm-launcher - - (discord.override { - withVencord = true; - withOpenASAR = false; - }) - ] - ++ lib.optionals ( - cfg.sessionType == "Sway" - ) [ - swaykbdd - autotiling-rs - sway-audio-idle-inhibit - sway-contrib.grimshot - sway-contrib.inactive-windows-transparency - ] - ++ lib.optionals ( - cfg.sessionType == "River" - ) [ - wayshot - waylock - wayidle - ] - ++ lib.optionals ( - cfg.sessionType == "Hyprland" - ) [ - inputs.noctalia.packages.${system}.default - grimblast - ]; - }; - - programs = { - chromium.enable = true; - spicetify.enable = true; - vscode.enable = true; - fuzzel.enable = true; - ghostty.enable = true; - firefox.enable = true; - alacritty.enable = true; - }; - - services = with lib.mkDefault; { - hyprpaper.enable = true; - kdeconnect.enable = true; - }; + programs = { + chromium.enable = true; + spicetify.enable = true; + vscode.enable = true; + fuzzel.enable = true; + ghostty.enable = true; + firefox.enable = true; + alacritty.enable = true; }; - meta.maintainers = with lib.maintainers; [ - s0me1newithhan7ds - # aka hand7s - ]; + services = with lib.mkDefault; { + hyprpaper.enable = true; + kdeconnect.enable = true; + }; + }; + + meta.maintainers = with lib.maintainers; [ + s0me1newithhan7ds + # aka hand7s + ]; } diff --git a/hand7s/programs/bat.nix b/hand7s/programs/bat.nix index 3cab743..e082d3f 100644 --- a/hand7s/programs/bat.nix +++ b/hand7s/programs/bat.nix @@ -1,14 +1,14 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - programs = { - bat = { - enable = true; - config = { - pager = "${lib.getExe pkgs.less} -FR"; - }; - }; + programs = { + bat = { + enable = true; + config = { + pager = "${lib.getExe pkgs.less} -FR"; + }; }; + }; } diff --git a/hand7s/programs/chrome.nix b/hand7s/programs/chrome.nix index 4186157..0259f9d 100644 --- a/hand7s/programs/chrome.nix +++ b/hand7s/programs/chrome.nix @@ -1,14 +1,14 @@ {pkgs, ...}: { - programs = { - chromium = { - package = pkgs.google-chrome.override { - commandLineArgs = [ - "--enable-features=AcceleratedVideoEncoder,VaapiIgnoreDriverChecks,Vulkan,DefaultANGLEVulkan,VulkanFromANGLE,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,UseMultiPlaneFormatForHardwareVideo,SkiaGraphite" - "--enable-unsafe-webgpu" - "--ignore-gpu-blocklist" - "--enable-zero-copy" - ]; - }; - }; + programs = { + chromium = { + package = pkgs.google-chrome.override { + commandLineArgs = [ + "--enable-features=AcceleratedVideoEncoder,VaapiIgnoreDriverChecks,Vulkan,DefaultANGLEVulkan,VulkanFromANGLE,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport,UseMultiPlaneFormatForHardwareVideo,SkiaGraphite" + "--enable-unsafe-webgpu" + "--ignore-gpu-blocklist" + "--enable-zero-copy" + ]; + }; }; + }; } diff --git a/hand7s/programs/direnv.nix b/hand7s/programs/direnv.nix index 030b93e..973693c 100644 --- a/hand7s/programs/direnv.nix +++ b/hand7s/programs/direnv.nix @@ -1,10 +1,10 @@ {...}: { - programs = { - direnv = { - enable = true; - nix-direnv = { - enable = true; - }; - }; + programs = { + direnv = { + enable = true; + nix-direnv = { + enable = true; + }; }; + }; } diff --git a/hand7s/programs/eza.nix b/hand7s/programs/eza.nix index de69c64..21fe51b 100644 --- a/hand7s/programs/eza.nix +++ b/hand7s/programs/eza.nix @@ -1,10 +1,10 @@ {...}: { - programs = { - eza = { - enable = true; - enableFishIntegration = true; - git = true; - icons = "always"; - }; + programs = { + eza = { + enable = true; + enableFishIntegration = true; + git = true; + icons = "always"; }; + }; } diff --git a/hand7s/programs/firefox.nix b/hand7s/programs/firefox.nix index 3198ed1..a2a2aca 100644 --- a/hand7s/programs/firefox.nix +++ b/hand7s/programs/firefox.nix @@ -1,16 +1,16 @@ { - inputs, - pkgs, - ... + inputs, + pkgs, + ... }: let - zen-browser = inputs.zen-browser.packages.${pkgs.system}.default; + zen-browser = inputs.zen-browser.packages.${pkgs.system}.default; in { - programs = { - firefox = { - package = zen-browser; - profiles = rec { - default = { - userContent = " + programs = { + firefox = { + package = zen-browser; + profiles = rec { + default = { + userContent = " --zen-colors-primary: #82aaff !important; --zen-colors-secondary: #c099ff !important; --zen-colors-tertiary: #1e2030 !important; @@ -21,8 +21,8 @@ in { background-color: #6c598c !important; } "; - }; - }; }; + }; }; + }; } diff --git a/hand7s/programs/fish.nix b/hand7s/programs/fish.nix index 8eb9452..d7b4dde 100644 --- a/hand7s/programs/fish.nix +++ b/hand7s/programs/fish.nix @@ -1,17 +1,17 @@ { - lib, - pkgs, - ... + lib, + pkgs, + ... }: { - programs = { - fish = { - enable = true; - generateCompletions = true; - functions = { - fish_greeting = { - body = "${lib.getExe' pkgs.uutils-coreutils-noprefix "echo"} ' ~ 𝑠𝑛𝑜𝑤𝑦 𝑝𝑙𝑎𝑐𝑒, 𝑓𝑢𝑙𝑙 𝑜𝑓 𝑓𝑙𝑎𝑘𝑒𝑠! '"; - }; - }; + programs = { + fish = { + enable = true; + generateCompletions = true; + functions = { + fish_greeting = { + body = "${lib.getExe' pkgs.uutils-coreutils-noprefix "echo"} ' ~ 𝑠𝑛𝑜𝑤𝑦 𝑝𝑙𝑎𝑐𝑒, 𝑓𝑢𝑙𝑙 𝑜𝑓 𝑓𝑙𝑎𝑘𝑒𝑠! '"; }; + }; }; + }; } diff --git a/hand7s/programs/fzf.nix b/hand7s/programs/fzf.nix index 344a890..47bc89b 100644 --- a/hand7s/programs/fzf.nix +++ b/hand7s/programs/fzf.nix @@ -1,11 +1,11 @@ {...}: { - programs = { - fzf = { - enable = true; - enableFishIntegration = true; - tmux = { - enableShellIntegration = true; - }; - }; + programs = { + fzf = { + enable = true; + enableFishIntegration = true; + tmux = { + enableShellIntegration = true; + }; }; + }; } diff --git a/hand7s/programs/ghostty.nix b/hand7s/programs/ghostty.nix index 4e703d4..28ed2f7 100644 --- a/hand7s/programs/ghostty.nix +++ b/hand7s/programs/ghostty.nix @@ -1,24 +1,24 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - programs = { - ghostty = { - enableFishIntegration = true; - installBatSyntax = true; - settings = { - title = "spooky scary tty"; + programs = { + ghostty = { + enableFishIntegration = true; + installBatSyntax = true; + settings = { + title = "spooky scary tty"; - command = "${lib.getExe pkgs.fish} --login --interactive"; + command = "${lib.getExe pkgs.fish} --login --interactive"; - confirm-close-surface = false; + confirm-close-surface = false; - keybind = [ - "ctrl+shift+d=new_split:right" - "ctrl+shift+a=new_split:down" - ]; - }; - }; + keybind = [ + "ctrl+shift+d=new_split:right" + "ctrl+shift+a=new_split:down" + ]; + }; }; + }; } diff --git a/hand7s/programs/git.nix b/hand7s/programs/git.nix index 25a5fdf..459f49f 100644 --- a/hand7s/programs/git.nix +++ b/hand7s/programs/git.nix @@ -1,28 +1,28 @@ { - pkgs, - osConfig, - ... + pkgs, + osConfig, + ... }: { - programs = { - git = { - enable = true; - package = pkgs.git; - userEmail = "117505144+s0me1newithhand7s@users.noreply.github.com"; - userName = "s0me1newithhand7s"; - aliases = { - pushall = "push github && push gitlab"; - pushall-f = "push --force github && push --force gitlab"; - }; + programs = { + git = { + enable = true; + package = pkgs.git; + userEmail = "117505144+s0me1newithhand7s@users.noreply.github.com"; + userName = "s0me1newithhand7s"; + aliases = { + pushall = "push github && push gitlab"; + pushall-f = "push --force github && push --force gitlab"; + }; - signing = { - format = "ssh"; - signByDefault = true; - key = osConfig.sops.secrets.sshKey.path; - }; + signing = { + format = "ssh"; + signByDefault = true; + key = osConfig.sops.secrets.sshKey.path; + }; - lfs = { - enable = true; - }; - }; + lfs = { + enable = true; + }; }; + }; } diff --git a/hand7s/programs/helix.nix b/hand7s/programs/helix.nix index 525f2d5..65b6973 100644 --- a/hand7s/programs/helix.nix +++ b/hand7s/programs/helix.nix @@ -1,64 +1,64 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - programs = { - helix = { - package = pkgs.helix_git; - enable = true; - defaultEditor = true; - extraPackages = with pkgs; [ - nixd + programs = { + helix = { + package = pkgs.helix_git; + enable = true; + defaultEditor = true; + extraPackages = with pkgs; [ + nixd + ]; + + settings = { + editor = { + line-number = "relative"; + cursorline = true; + lsp = { + display-messages = true; + }; + }; + }; + + languages = { + language-servers = { + nixd = { + command = "${lib.getExe pkgs.nixd}"; + args = [ + "--inlay-hints=true" + ]; + }; + }; + + language = [ + { + name = "nix"; + comment-token = "#"; + injection-regex = "nix"; + indent = { + tab-width = 4; + unit = " "; + }; + + formatter = { + command = "${lib.getExe pkgs.nix}"; + args = [ + "fmt" + ]; + }; + + file-types = [ + "nix" ]; - settings = { - editor = { - line-number = "relative"; - cursorline = true; - lsp = { - display-messages = true; - }; - }; - }; - - languages = { - language-servers = { - nixd = { - command = "${lib.getExe pkgs.nixd}"; - args = [ - "--inlay-hints=true" - ]; - }; - }; - - language = [ - { - name = "nix"; - comment-token = "#"; - injection-regex = "nix"; - indent = { - tab-width = 4; - unit = " "; - }; - - formatter = { - command = "${lib.getExe pkgs.nix}"; - args = [ - "fmt" - ]; - }; - - file-types = [ - "nix" - ]; - - language-servers = [ - "nixd" - ]; - } - ]; - }; - }; + language-servers = [ + "nixd" + ]; + } + ]; + }; }; + }; } diff --git a/hand7s/programs/hyprlock.nix b/hand7s/programs/hyprlock.nix index 405fa19..64952a1 100644 --- a/hand7s/programs/hyprlock.nix +++ b/hand7s/programs/hyprlock.nix @@ -1,95 +1,96 @@ { - config, - lib, - ... + config, + lib, + ... }: { - programs = { - hyprlock = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Hyprland" - ) - true; + programs = { + hyprlock = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Hyprland" + ) + true; - settings = { - general = { - hide_cursor = true; - ignore_empty_input = true; - }; - - label = [ - { - monitor = ""; - text = "$TIME"; - text_align = "center"; - color = config.lib.stylix.colors.base01; - font_size = 48; - font_family = config.stylix.fonts.emoji.name; - rotate = 0; - - position = "0, 50"; - halign = "center"; - valign = "center"; - - shadow_passes = 1; - shadow_size = 2; - shadow_color = "rgba(38, 3, 4, 1)"; - shadow_boost = 2; - } - - { - monitor = ""; - text = "> $LAYOUT[en,ru]"; - text_align = "center"; - color = config.lib.stylix.colors.base06; - font_size = 26; - font_family = config.stylix.fonts.emoji.name; - rotate = 0; - - position = "200, -50"; - halign = "center"; - valign = "center"; - - shadow_passes = 1; - shadow_size = 2; - shadow_color = "rgba(38, 3, 4, 1)"; - shadow_boost = 2; - } - ]; - - input-field = lib.mkForce [ - { - monitor = ""; - size = "250, 50"; - outline_thickness = 2; - dots_size = 0.35; - dots_spacing = 0.5; - dots_center = true; - dots_rounding = -2; - - fade_on_empty = false; - fade_timeout = 0; - placeholder_text = " "; - hide_input = false; - rounding = -0.3; - - fail_text = "$FAIL ($ATTEMPTS)"; - fail_transition = 1000; - capslock_color = -1; - numlock_color = -1; - bothlock_color = -1; - invert_numlock = false; - swap_font_color = false; - - position = "0, -50"; - halign = "center"; - valign = "center"; - - shadow_passes = 1; - shadow_size = 5; - shadow_boost = 1; - } - ]; - }; + settings = { + general = { + hide_cursor = true; + ignore_empty_input = true; }; + + label = [ + { + monitor = ""; + text = "$TIME"; + text_align = "center"; + color = config.lib.stylix.colors.base01; + font_size = 48; + font_family = config.stylix.fonts.emoji.name; + rotate = 0; + + position = "0, 50"; + halign = "center"; + valign = "center"; + + shadow_passes = 1; + shadow_size = 2; + shadow_color = "rgba(38, 3, 4, 1)"; + shadow_boost = 2; + } + + { + monitor = ""; + text = "> $LAYOUT[en,ru]"; + text_align = "center"; + color = config.lib.stylix.colors.base06; + font_size = 26; + font_family = config.stylix.fonts.emoji.name; + rotate = 0; + + position = "200, -50"; + halign = "center"; + valign = "center"; + + shadow_passes = 1; + shadow_size = 2; + shadow_color = "rgba(38, 3, 4, 1)"; + shadow_boost = 2; + } + ]; + + input-field = lib.mkForce [ + { + monitor = ""; + size = "250, 50"; + outline_thickness = 2; + dots_size = 0.35; + dots_spacing = 0.5; + dots_center = true; + dots_rounding = -2; + + fade_on_empty = false; + fade_timeout = 0; + placeholder_text = " "; + hide_input = false; + rounding = -0.3; + + fail_text = "$FAIL ($ATTEMPTS)"; + fail_transition = 1000; + capslock_color = -1; + numlock_color = -1; + bothlock_color = -1; + invert_numlock = false; + swap_font_color = false; + + position = "0, -50"; + halign = "center"; + valign = "center"; + + shadow_passes = 1; + shadow_size = 5; + shadow_boost = 1; + } + ]; + }; }; + }; } diff --git a/hand7s/programs/hyprpanel.nix b/hand7s/programs/hyprpanel.nix index ac7f8eb..4d8e995 100644 --- a/hand7s/programs/hyprpanel.nix +++ b/hand7s/programs/hyprpanel.nix @@ -1,440 +1,440 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - programs = { - hyprpanel = { - enable = false; - - settings = { - layout = { - "bar.layouts" = { - "*" = { - left = [ - "dashboard" - "workspaces" - "media" - ]; - - middle = [ - "clock" - "power" - ]; - - right = [ - "network" - "kbinput" - "volume" - "systray" - "notifications" - ]; - }; - }; - }; - - scalingPriority = "hyprland"; - - tear = false; - dummy = true; - - hyprpanel = { - restartAgs = true; - restartCommand = "${lib.getExe' pkgs.systemd "systemctl"} --user restart hyprpanel.service"; - }; - - bar = { - autoHide = "never"; - scrollSpeed = 5; - - battery = { - hideLabelWhenFull = true; - label = true; - }; - - bluetooth = { - label = true; - }; - - clock = { - format = "%a, %b %d %I:%M:%S %p"; - icon = "󰸗"; - showIcon = true; - showTime = true; - }; - - launcher = { - icon = " "; - autoDetectIcon = true; - }; - - media = { - format = "{artist: - }{title}"; - show_active_only = true; - show_label = true; - truncation = true; - truncation_size = 30; - }; - - network = { - label = true; - showWifiInfo = true; - truncation = true; - truncation_size = 10; - }; - - notifications = { - show_total = false; - hideCountWhenZero = true; - }; - - volume = { - label = true; - scrollDown = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"; - scrollUp = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"; - rightClick = "${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; - }; - - windowtitle = { - icon = true; - label = true; - class_name = false; - custom_title = true; - truncation = true; - truncation_size = 50; - }; - - workspaces = { - show_icons = false; - show_numbered = false; - showApplicationIcons = true; - showAllActive = true; - showWsIcons = true; - numbered_active_indicator = "highlight"; - workspaces = 20; - monitorSpecific = true; - reverse_scroll = false; - scroll_speed = 5; - spacing = 1.0; - workspaceMask = true; - ignored = ""; - - applicationIconEmptyWorkspace = ""; - applicationIconFallback = "󰣆"; - - icons = { - active = ""; - available = ""; - occupied = ""; - }; - }; - - customModules = { - scrollSpeed = 5; - - cava = { - showIcon = true; - icon = ""; - spaceCharacter = " "; - showActiveOnly = true; - stereo = false; - autoSensitivity = true; - - bars = 10; - channels = 2; - framerate = 165; - samplerate = 48000; - lowCutoff = 20; - highCutoff = 20000; - - barCharacters = [ - "▁" - "▂" - "▃" - "▄" - "▅" - "▆" - "▇" - "█" - ]; - }; - - cpu = { - icon = ""; - label = true; - round = true; - pollingInterval = 1000; - }; - - cpuTemp = { - icon = ""; - label = true; - pollingInterval = 500; - round = true; - showUnit = true; - sensor = ""; - }; - - hypridle = { - label = true; - pollingInterval = 500; - - offIcon = ""; - offLabel = "OFF"; - onIcon = ""; - onLabel = "ON"; - }; - - hyprsunset = { - label = true; - pollingInterval = 500; - - offIcon = "󰛨"; - offLabel = "OFF"; - onIcon = "󱩌"; - onLabel = "ON"; - }; - - kbLayout = { - icon = "󰌌"; - label = true; - labelType = "code"; - rightClick = "${lib.getExe' pkgs.hyprland "hyprctl"} switchxkblayout monsgeek-monsgeek-keyboard next"; - }; - - netstat = { - icon = "󰖟"; - label = true; - pollingInterval = 250; - dynamicIcon = true; - round = true; - - rateUnit = "auto"; - networkInLabel = "↓"; - networkOutLabel = "↑"; - }; - - power = { - icon = ""; - showLabel = true; - leftClick = "menu:powerdropdown"; - }; - - microphone = { - label = true; - mutedIcon = ""; - unmutedIcon = ""; - - leftClick = "menu:audio"; - }; - - ram = { - icon = ""; - label = true; - labelType = "percentage"; - pollingInterval = 250; - round = true; - }; - - storage = { - icon = "󰋊"; - label = true; - labelType = "percentage"; - pollingInterval = 2000; - round = false; - }; - - submap = { - label = true; - showSubmapName = true; - enabledIcon = "󰌐"; - enabledText = "ON"; - disabledIcon = "󰌌"; - disabledText = "OFF"; - }; - - updates = { - label = true; - autoHide = true; - padZero = true; - pollingInterval = 1440000; - updateCommand = "nix flake update --flake ~/Projects/flake"; - - icon = { - pending = "󰏗"; - updated = "󰏖"; - }; - }; - - weather = { - label = true; - unit = "metric"; - }; - }; - }; - - menus = { - transition = "crossfade"; - transitionTime = 200; - - clock = { - time = { - military = false; - hideSeconds = true; - }; - - weather = { - enabled = true; - location = "Yelabuga"; - unit = "metric"; - key = "ac3df6535cac4448a4c83337252702"; - }; - }; - - dashboard = { - shortcuts = { - left = { - shortcut1 = { - command = "${lib.getExe pkgs.google-chrome}"; - icon = ""; - tooltip = "Google Chrome"; - }; - - shortcut2 = { - command = "spotify"; - icon = ""; - tooltip = "Spotify"; - }; - - shortcut3 = { - command = "${lib.getExe pkgs.discord}"; - icon = ""; - tooltip = "Discord"; - }; - - shortcut4 = { - command = "ayugram-desktop"; - icon = ""; - tooltip = "Telegram"; - }; - }; - - right = { - shortcut1 = { - command = "${lib.getExe pkgs.fuzzel}"; - icon = ""; - tooltip = "Search"; - }; - - shortcut3 = { - command = "${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"; - icon = "󰄀"; - tooltip = "Screenshot"; - }; - }; - }; - - stats = { - enable_gpu = false; - enabled = true; - interval = 1000; - }; - - directories = { - enabled = true; - }; - - powermenu = { - avatar = { - image = "/home/hand7s/Pictures/pfp4_mini.jpg"; - name = "system"; - }; - }; - }; - - media = { - displayTime = true; - displayTimeTooltip = true; - noMediaText = "-"; - hideAlbum = false; - hideAuthor = false; - }; - - power = { - confirmation = true; - showLabel = true; - logout = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch exit"; - reboot = "${lib.getExe' pkgs.systemd "systemctl"} reboot"; - shutdown = "${lib.getExe' pkgs.systemd "systemctl"} poweroff"; - sleep = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; - }; - - volume = { - raiseMaximumVolume = false; - }; - }; - - notifications = { - active_monitor = true; - cache_actions = true; - clearDelay = 50; - displayedTotal = 5; - showActionsOnHover = true; - timeout = 5000; - }; - - theme = { - matugen = false; - - name = "tokyo-night-vivid"; - - font = { - name = "Hack Font Nerd Regular"; - size = "16px"; - weight = 600; - }; - - bar = { - transparent = false; - floating = true; - layer = "top"; - location = "top"; - - margin_bottom = "0"; - margin_sides = "20px"; - margin_top = "20px"; - - border_radius = "10px"; - - border = { - location = "full"; - width = "2px"; - }; - - buttons = { - enableBorders = false; - monochrome = false; - style = "default"; - }; - }; - - osd = { - enable = true; - active_monitor = true; - duration = 2500; - location = "right"; - margins = "5px 5px 5px 5px"; - muted_zero = false; - radius = "10px"; - }; - }; - - wallpaper = { - enable = false; - pywal = false; - image = ""; - }; + programs = { + hyprpanel = { + enable = false; + + settings = { + layout = { + "bar.layouts" = { + "*" = { + left = [ + "dashboard" + "workspaces" + "media" + ]; + + middle = [ + "clock" + "power" + ]; + + right = [ + "network" + "kbinput" + "volume" + "systray" + "notifications" + ]; }; + }; }; + + scalingPriority = "hyprland"; + + tear = false; + dummy = true; + + hyprpanel = { + restartAgs = true; + restartCommand = "${lib.getExe' pkgs.systemd "systemctl"} --user restart hyprpanel.service"; + }; + + bar = { + autoHide = "never"; + scrollSpeed = 5; + + battery = { + hideLabelWhenFull = true; + label = true; + }; + + bluetooth = { + label = true; + }; + + clock = { + format = "%a, %b %d %I:%M:%S %p"; + icon = "󰸗"; + showIcon = true; + showTime = true; + }; + + launcher = { + icon = " "; + autoDetectIcon = true; + }; + + media = { + format = "{artist: - }{title}"; + show_active_only = true; + show_label = true; + truncation = true; + truncation_size = 30; + }; + + network = { + label = true; + showWifiInfo = true; + truncation = true; + truncation_size = 10; + }; + + notifications = { + show_total = false; + hideCountWhenZero = true; + }; + + volume = { + label = true; + scrollDown = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"; + scrollUp = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"; + rightClick = "${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; + }; + + windowtitle = { + icon = true; + label = true; + class_name = false; + custom_title = true; + truncation = true; + truncation_size = 50; + }; + + workspaces = { + show_icons = false; + show_numbered = false; + showApplicationIcons = true; + showAllActive = true; + showWsIcons = true; + numbered_active_indicator = "highlight"; + workspaces = 20; + monitorSpecific = true; + reverse_scroll = false; + scroll_speed = 5; + spacing = 1.0; + workspaceMask = true; + ignored = ""; + + applicationIconEmptyWorkspace = ""; + applicationIconFallback = "󰣆"; + + icons = { + active = ""; + available = ""; + occupied = ""; + }; + }; + + customModules = { + scrollSpeed = 5; + + cava = { + showIcon = true; + icon = ""; + spaceCharacter = " "; + showActiveOnly = true; + stereo = false; + autoSensitivity = true; + + bars = 10; + channels = 2; + framerate = 165; + samplerate = 48000; + lowCutoff = 20; + highCutoff = 20000; + + barCharacters = [ + "▁" + "▂" + "▃" + "▄" + "▅" + "▆" + "▇" + "█" + ]; + }; + + cpu = { + icon = ""; + label = true; + round = true; + pollingInterval = 1000; + }; + + cpuTemp = { + icon = ""; + label = true; + pollingInterval = 500; + round = true; + showUnit = true; + sensor = ""; + }; + + hypridle = { + label = true; + pollingInterval = 500; + + offIcon = ""; + offLabel = "OFF"; + onIcon = ""; + onLabel = "ON"; + }; + + hyprsunset = { + label = true; + pollingInterval = 500; + + offIcon = "󰛨"; + offLabel = "OFF"; + onIcon = "󱩌"; + onLabel = "ON"; + }; + + kbLayout = { + icon = "󰌌"; + label = true; + labelType = "code"; + rightClick = "${lib.getExe' pkgs.hyprland "hyprctl"} switchxkblayout monsgeek-monsgeek-keyboard next"; + }; + + netstat = { + icon = "󰖟"; + label = true; + pollingInterval = 250; + dynamicIcon = true; + round = true; + + rateUnit = "auto"; + networkInLabel = "↓"; + networkOutLabel = "↑"; + }; + + power = { + icon = ""; + showLabel = true; + leftClick = "menu:powerdropdown"; + }; + + microphone = { + label = true; + mutedIcon = ""; + unmutedIcon = ""; + + leftClick = "menu:audio"; + }; + + ram = { + icon = ""; + label = true; + labelType = "percentage"; + pollingInterval = 250; + round = true; + }; + + storage = { + icon = "󰋊"; + label = true; + labelType = "percentage"; + pollingInterval = 2000; + round = false; + }; + + submap = { + label = true; + showSubmapName = true; + enabledIcon = "󰌐"; + enabledText = "ON"; + disabledIcon = "󰌌"; + disabledText = "OFF"; + }; + + updates = { + label = true; + autoHide = true; + padZero = true; + pollingInterval = 1440000; + updateCommand = "nix flake update --flake ~/Projects/flake"; + + icon = { + pending = "󰏗"; + updated = "󰏖"; + }; + }; + + weather = { + label = true; + unit = "metric"; + }; + }; + }; + + menus = { + transition = "crossfade"; + transitionTime = 200; + + clock = { + time = { + military = false; + hideSeconds = true; + }; + + weather = { + enabled = true; + location = "Yelabuga"; + unit = "metric"; + key = "ac3df6535cac4448a4c83337252702"; + }; + }; + + dashboard = { + shortcuts = { + left = { + shortcut1 = { + command = "${lib.getExe pkgs.google-chrome}"; + icon = ""; + tooltip = "Google Chrome"; + }; + + shortcut2 = { + command = "spotify"; + icon = ""; + tooltip = "Spotify"; + }; + + shortcut3 = { + command = "${lib.getExe pkgs.discord}"; + icon = ""; + tooltip = "Discord"; + }; + + shortcut4 = { + command = "ayugram-desktop"; + icon = ""; + tooltip = "Telegram"; + }; + }; + + right = { + shortcut1 = { + command = "${lib.getExe pkgs.fuzzel}"; + icon = ""; + tooltip = "Search"; + }; + + shortcut3 = { + command = "${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"; + icon = "󰄀"; + tooltip = "Screenshot"; + }; + }; + }; + + stats = { + enable_gpu = false; + enabled = true; + interval = 1000; + }; + + directories = { + enabled = true; + }; + + powermenu = { + avatar = { + image = "/home/hand7s/Pictures/pfp4_mini.jpg"; + name = "system"; + }; + }; + }; + + media = { + displayTime = true; + displayTimeTooltip = true; + noMediaText = "-"; + hideAlbum = false; + hideAuthor = false; + }; + + power = { + confirmation = true; + showLabel = true; + logout = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch exit"; + reboot = "${lib.getExe' pkgs.systemd "systemctl"} reboot"; + shutdown = "${lib.getExe' pkgs.systemd "systemctl"} poweroff"; + sleep = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; + }; + + volume = { + raiseMaximumVolume = false; + }; + }; + + notifications = { + active_monitor = true; + cache_actions = true; + clearDelay = 50; + displayedTotal = 5; + showActionsOnHover = true; + timeout = 5000; + }; + + theme = { + matugen = false; + + name = "tokyo-night-vivid"; + + font = { + name = "Hack Font Nerd Regular"; + size = "16px"; + weight = 600; + }; + + bar = { + transparent = false; + floating = true; + layer = "top"; + location = "top"; + + margin_bottom = "0"; + margin_sides = "20px"; + margin_top = "20px"; + + border_radius = "10px"; + + border = { + location = "full"; + width = "2px"; + }; + + buttons = { + enableBorders = false; + monochrome = false; + style = "default"; + }; + }; + + osd = { + enable = true; + active_monitor = true; + duration = 2500; + location = "right"; + margins = "5px 5px 5px 5px"; + muted_zero = false; + radius = "10px"; + }; + }; + + wallpaper = { + enable = false; + pywal = false; + image = ""; + }; + }; }; + }; } diff --git a/hand7s/programs/index.nix b/hand7s/programs/index.nix index f71269d..a3c61a7 100644 --- a/hand7s/programs/index.nix +++ b/hand7s/programs/index.nix @@ -1,8 +1,8 @@ {...}: { - programs = { - nix-index = { - enable = true; - enableFishIntegration = true; - }; + programs = { + nix-index = { + enable = true; + enableFishIntegration = true; }; + }; } diff --git a/hand7s/programs/kitty.nix b/hand7s/programs/kitty.nix index acc775a..6c3c04b 100644 --- a/hand7s/programs/kitty.nix +++ b/hand7s/programs/kitty.nix @@ -1,12 +1,12 @@ {...}: { - programs = { - kitty = { - enable = true; - enableGitIntegration = true; + programs = { + kitty = { + enable = true; + enableGitIntegration = true; - shellIntegration = { - enableFishIntegration = true; - }; - }; + shellIntegration = { + enableFishIntegration = true; + }; }; + }; } diff --git a/hand7s/programs/mangohud.nix b/hand7s/programs/mangohud.nix index d7dd667..820c2db 100644 --- a/hand7s/programs/mangohud.nix +++ b/hand7s/programs/mangohud.nix @@ -1,7 +1,7 @@ {...}: { - programs = { - mangohud = { - enable = true; - }; + programs = { + mangohud = { + enable = true; }; + }; } diff --git a/hand7s/programs/mpv.nix b/hand7s/programs/mpv.nix index a294b2b..6c75a39 100644 --- a/hand7s/programs/mpv.nix +++ b/hand7s/programs/mpv.nix @@ -1,7 +1,7 @@ {...}: { - programs = { - mpv = { - enable = true; - }; + programs = { + mpv = { + enable = true; }; + }; } diff --git a/hand7s/programs/noctalia.nix b/hand7s/programs/noctalia.nix index 8cbf6bf..b425b99 100644 --- a/hand7s/programs/noctalia.nix +++ b/hand7s/programs/noctalia.nix @@ -1,213 +1,213 @@ {config, ...}: { - programs = - if - ( - config.home.gui.sessionType == "Hyprland" - ) - then { - noctalia-shell = { - enable = true; - settings = { - general = { - avatarImage = "/home/hand7s/Pictures/pfp4_mini.jpg"; - animationDisabled = false; - dimDesktop = false; - forceBlackScreenCorners = true; - showScreenCorners = true; - screenRadiusRatio = 2; - radiusRatio = 0.7; - }; + programs = + if + ( + config.home.gui.sessionType == "Hyprland" + ) + then { + noctalia-shell = { + enable = true; + settings = { + general = { + avatarImage = "/home/hand7s/Pictures/pfp4_mini.jpg"; + animationDisabled = false; + dimDesktop = false; + forceBlackScreenCorners = true; + showScreenCorners = true; + screenRadiusRatio = 2; + radiusRatio = 0.7; + }; - appLauncher = { - position = "center"; - useApp2Unit = false; - sortByMostUsed = true; - enableClipboardHistory = false; - terminalCommand = "ghostty -e"; - }; + appLauncher = { + position = "center"; + useApp2Unit = false; + sortByMostUsed = true; + enableClipboardHistory = false; + terminalCommand = "ghostty -e"; + }; - audio = { - visualizerType = "mirrored"; - volumeOverdrive = true; - cavaFrameRate = 165; - volumeStep = 5; - }; + audio = { + visualizerType = "mirrored"; + volumeOverdrive = true; + cavaFrameRate = 165; + volumeStep = 5; + }; - bar = { - floating = true; - density = "comfortable"; - position = "right"; - showCapsule = false; - marginVertical = 1; - marginHorizontal = 0.6; - monitors = [ - "DP-3" - ]; + bar = { + floating = true; + density = "comfortable"; + position = "right"; + showCapsule = false; + marginVertical = 1; + marginHorizontal = 0.6; + monitors = [ + "DP-3" + ]; - widgets = { - left = [ - { - id = "SidePanelToggle"; - useDistroLogo = true; - } + widgets = { + left = [ + { + id = "SidePanelToggle"; + useDistroLogo = true; + } - { - id = "Workspace"; - hideUnoccupied = true; - labelMode = "index"; - } + { + id = "Workspace"; + hideUnoccupied = true; + labelMode = "index"; + } - { - id = "MediaMini"; - autoHide = true; - scrollingMode = "hover"; - showAlbumArt = true; - showVisualizer = true; - visualizerType = "mirrored"; - } - ]; + { + id = "MediaMini"; + autoHide = true; + scrollingMode = "hover"; + showAlbumArt = true; + showVisualizer = true; + visualizerType = "mirrored"; + } + ]; - center = [ - { - id = "Clock"; - formatHorizontal = "⏱HH:mm:ss"; - formatVertical = "⏱ HH mm ss"; - useMonospacedFont = true; - usePrimaryColor = true; - } - ]; + center = [ + { + id = "Clock"; + formatHorizontal = "⏱HH:mm:ss"; + formatVertical = "⏱ HH mm ss"; + useMonospacedFont = true; + usePrimaryColor = true; + } + ]; - right = [ - { - id = "KeyboardLayout"; - displayMode = "onhover"; - } + right = [ + { + id = "KeyboardLayout"; + displayMode = "onhover"; + } - { - id = "Microphone"; - displayMode = "onhover"; - } + { + id = "Microphone"; + displayMode = "onhover"; + } - { - id = "Volume"; - displayMode = "onhover"; - } + { + id = "Volume"; + displayMode = "onhover"; + } - { - id = "Spacer"; - } + { + id = "Spacer"; + } - { - id = "Tray"; - blacklist = []; - colorizeIcons = true; - } + { + id = "Tray"; + blacklist = []; + colorizeIcons = true; + } - { - id = "NotificationHistory"; - hideWhenZero = false; - showUnreadBadge = true; - } - ]; - }; - }; - - controlCenter = { - position = "close_to_bar_button"; - quickSettingsStyle = "compact"; - widgets = { - quickSettings = [ - { - id = "Notifications"; - } - - { - id = "ScreenRecorder"; - } - - { - id = "KeepAwake"; - } - - { - id = "NightLight"; - } - ]; - }; - }; - - dock = { - displayMode = "auto_hide"; - floatingRatio = 1; - onlySameOutput = true; - colorizeIcons = true; - monitors = [ - "DP-3" - ]; - }; - - colors = with config.lib.stylix.colors; { - mBackground = base00; - mSurface = base01; - mOverlay = base02; - mMuted = base03; - mBorder = base04; - mText = base05; - mTextAlt = base06; - mTextDim = base07; - mError = base08; - mWarning = base09; - mAccent = base0A; - mSuccess = base0B; - mCyan = base0C; - mPrimary = base0D; - mMagenta = base0E; - mOrange = base0F; - mOnBackground = base05; - mOnSurface = base05; - mOnPrimary = base00; - mOnError = base00; - }; - - colorSchemes = { - darkMode = true; - useWallpaperColors = false; - generateTemplatesForPredefined = false; - predefinedScheme = "Tokyo Night"; - matugenSchemeType = "scheme-fruit-salad"; - }; - - osd = { - enabled = true; - alwaysOnTop = true; - autoHideMs = 2500; - location = "top"; - monitors = [ - "DP-3" - ]; - }; - - ui = { - fontDefault = "Nerd Fonts Hack"; - fontDefaultScale = 1; - fontFixed = "Nerd Fonts Hack"; - fontFixedScale = 1; - idleInhibitorEnabled = false; - tooltipsEnabled = true; - }; - - location = { - name = "Yelaguba"; - showWeekNumberInCalendar = true; - use12hourFormat = false; - useFahrenheit = false; - }; - - network = { - wifiEnabled = false; - }; - }; + { + id = "NotificationHistory"; + hideWhenZero = false; + showUnreadBadge = true; + } + ]; }; - } - else {}; + }; + + controlCenter = { + position = "close_to_bar_button"; + quickSettingsStyle = "compact"; + widgets = { + quickSettings = [ + { + id = "Notifications"; + } + + { + id = "ScreenRecorder"; + } + + { + id = "KeepAwake"; + } + + { + id = "NightLight"; + } + ]; + }; + }; + + dock = { + displayMode = "auto_hide"; + floatingRatio = 1; + onlySameOutput = true; + colorizeIcons = true; + monitors = [ + "DP-3" + ]; + }; + + colors = with config.lib.stylix.colors; { + mBackground = base00; + mSurface = base01; + mOverlay = base02; + mMuted = base03; + mBorder = base04; + mText = base05; + mTextAlt = base06; + mTextDim = base07; + mError = base08; + mWarning = base09; + mAccent = base0A; + mSuccess = base0B; + mCyan = base0C; + mPrimary = base0D; + mMagenta = base0E; + mOrange = base0F; + mOnBackground = base05; + mOnSurface = base05; + mOnPrimary = base00; + mOnError = base00; + }; + + colorSchemes = { + darkMode = true; + useWallpaperColors = false; + generateTemplatesForPredefined = false; + predefinedScheme = "Tokyo Night"; + matugenSchemeType = "scheme-fruit-salad"; + }; + + osd = { + enabled = true; + alwaysOnTop = true; + autoHideMs = 2500; + location = "top"; + monitors = [ + "DP-3" + ]; + }; + + ui = { + fontDefault = "Nerd Fonts Hack"; + fontDefaultScale = 1; + fontFixed = "Nerd Fonts Hack"; + fontFixedScale = 1; + idleInhibitorEnabled = false; + tooltipsEnabled = true; + }; + + location = { + name = "Yelaguba"; + showWeekNumberInCalendar = true; + use12hourFormat = false; + useFahrenheit = false; + }; + + network = { + wifiEnabled = false; + }; + }; + }; + } + else {}; } diff --git a/hand7s/programs/obs-studio.nix b/hand7s/programs/obs-studio.nix index a749f14..b1e055d 100644 --- a/hand7s/programs/obs-studio.nix +++ b/hand7s/programs/obs-studio.nix @@ -1,22 +1,23 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - programs = { - obs-studio = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Hyprland" - ) - true; + programs = { + obs-studio = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Hyprland" + ) + true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - waveform - obs-vkcapture - obs-pipewire-audio-capture - ]; - }; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + waveform + obs-vkcapture + obs-pipewire-audio-capture + ]; }; + }; } diff --git a/hand7s/programs/spicetify.nix b/hand7s/programs/spicetify.nix index 11e0c42..4e59070 100644 --- a/hand7s/programs/spicetify.nix +++ b/hand7s/programs/spicetify.nix @@ -1,19 +1,19 @@ { - lib, - pkgs, - inputs, - ... + lib, + pkgs, + inputs, + ... }: { - programs = { - spicetify = { - enabledExtensions = with inputs.spicetify-nix.legacyPackages.${pkgs.system}.extensions; [ - adblock - hidePodcasts - shuffle - ]; + programs = { + spicetify = { + enabledExtensions = with inputs.spicetify-nix.legacyPackages.${pkgs.system}.extensions; [ + adblock + hidePodcasts + shuffle + ]; - theme = lib.mkForce inputs.spicetify-nix.legacyPackages.${pkgs.system}.themes.text; - colorScheme = lib.mkForce "Spotify"; - }; + theme = lib.mkForce inputs.spicetify-nix.legacyPackages.${pkgs.system}.themes.text; + colorScheme = lib.mkForce "Spotify"; }; + }; } diff --git a/hand7s/programs/starship.nix b/hand7s/programs/starship.nix index 3f846d9..b89715f 100644 --- a/hand7s/programs/starship.nix +++ b/hand7s/programs/starship.nix @@ -1,53 +1,53 @@ {...}: { - programs = { - starship = { - enable = true; - enableFishIntegration = true; - settings = { - add_newline = true; + programs = { + starship = { + enable = true; + enableFishIntegration = true; + settings = { + add_newline = true; - format = '' - [╭──╼](bold blue) $hostname $os - [┆](bold blue) $directory$git_branch$git_commit$git_state$git_metrics$git_status - [╰─>](bold blue) - ''; + format = '' + [╭──╼](bold blue) $hostname $os + [┆](bold blue) $directory$git_branch$git_commit$git_state$git_metrics$git_status + [╰─>](bold blue) + ''; - right_format = ''$cmd_duration ($character) at ❗$time''; + right_format = ''$cmd_duration ($character) at ❗$time''; - os = { - format = "on [($name $codename$version$edition $symbol )]($style)"; - style = "bold blue"; - disabled = false; - }; - - hostname = { - ssh_only = false; - format = "[$hostname]($style)"; - style = "bold red"; - disabled = false; - }; - - character = { - success_symbol = "[✓](bold green)"; - error_symbol = "[✗](bold red)"; - }; - - time = { - disabled = false; - format = " [$time]($style)"; - time_format = "%H:%M"; - utc_time_offset = "local"; - style = "pale blue"; - }; - - cmd_duration = { - disabled = false; - min_time = 250; - show_milliseconds = false; - show_notifications = false; - format = "was [$duration](bold green)"; - }; - }; + os = { + format = "on [($name $codename$version$edition $symbol )]($style)"; + style = "bold blue"; + disabled = false; }; + + hostname = { + ssh_only = false; + format = "[$hostname]($style)"; + style = "bold red"; + disabled = false; + }; + + character = { + success_symbol = "[✓](bold green)"; + error_symbol = "[✗](bold red)"; + }; + + time = { + disabled = false; + format = " [$time]($style)"; + time_format = "%H:%M"; + utc_time_offset = "local"; + style = "pale blue"; + }; + + cmd_duration = { + disabled = false; + min_time = 250; + show_milliseconds = false; + show_notifications = false; + format = "was [$duration](bold green)"; + }; + }; }; + }; } diff --git a/hand7s/programs/swaylock.nix b/hand7s/programs/swaylock.nix index 992a788..8a2927d 100644 --- a/hand7s/programs/swaylock.nix +++ b/hand7s/programs/swaylock.nix @@ -1,18 +1,19 @@ { - config, - lib, - ... + config, + lib, + ... }: { - programs = { - swaylock = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Sway" - ) - true; + programs = { + swaylock = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Sway" + ) + true; - settings = { - show-failed-attempts = true; - }; - }; + settings = { + show-failed-attempts = true; + }; }; + }; } diff --git a/hand7s/programs/vscode.nix b/hand7s/programs/vscode.nix index 82119af..f6cdb04 100644 --- a/hand7s/programs/vscode.nix +++ b/hand7s/programs/vscode.nix @@ -1,48 +1,48 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - programs = { - vscode = { - profiles = { - default = { - extensions = with pkgs.vscode-extensions; [ - jnoortheen.nix-ide - ms-vscode-remote.vscode-remote-extensionpack - ms-vsliveshare.vsliveshare - redhat.vscode-yaml - redhat.ansible - ]; + programs = { + vscode = { + profiles = { + default = { + extensions = with pkgs.vscode-extensions; [ + jnoortheen.nix-ide + ms-vscode-remote.vscode-remote-extensionpack + ms-vsliveshare.vsliveshare + redhat.vscode-yaml + redhat.ansible + ]; - userSettings = lib.mkForce { - "editor.fontFamily" = config.stylix.fonts.emoji.name; - "editor.fontSize" = 16; + userSettings = lib.mkForce { + "editor.fontFamily" = config.stylix.fonts.emoji.name; + "editor.fontSize" = 16; - "editor.cursorBlinking" = "smooth"; - "editor.cursorSmoothCaretAnimation" = "on"; - "editor.wordWrap" = "on"; + "editor.cursorBlinking" = "smooth"; + "editor.cursorSmoothCaretAnimation" = "on"; + "editor.wordWrap" = "on"; - "workbench.colorTheme" = "Tokyo Night Moon"; - "workbench.sideBar.location" = "right"; - "workbench.activityBar.location" = "top"; - "workbench.editor.editorActionsLocation" = "titleBar"; - "workbench.editor.showTabs" = "none"; + "workbench.colorTheme" = "Tokyo Night Moon"; + "workbench.sideBar.location" = "right"; + "workbench.activityBar.location" = "top"; + "workbench.editor.editorActionsLocation" = "titleBar"; + "workbench.editor.showTabs" = "none"; - "window.menuBarVisibility" = "hidden"; + "window.menuBarVisibility" = "hidden"; - "terminal.integrated.cursorBlinking" = true; + "terminal.integrated.cursorBlinking" = true; - "files.autoSave" = "afterDelay"; + "files.autoSave" = "afterDelay"; - "[nix]" = { - "editor.insertSpaces" = true; - "editor.tabSize" = 4; - }; - }; - }; + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 4; }; + }; }; + }; }; + }; } diff --git a/hand7s/programs/yazi.nix b/hand7s/programs/yazi.nix index aa3f871..3cd61fe 100644 --- a/hand7s/programs/yazi.nix +++ b/hand7s/programs/yazi.nix @@ -1,109 +1,109 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - programs = { - yazi = { - enable = true; - enableFishIntegration = true; - shellWrapperName = "yz"; - settings = { - mgr = { - sort_by = "natural"; - sort_sensitive = true; - sort_reverse = false; - sort_translit = true; + programs = { + yazi = { + enable = true; + enableFishIntegration = true; + shellWrapperName = "yz"; + settings = { + mgr = { + sort_by = "natural"; + sort_sensitive = true; + sort_reverse = false; + sort_translit = true; - linemode = "size"; + linemode = "size"; - show_hidden = true; - show_symlink = true; + show_hidden = true; + show_symlink = true; - prepend_keymap = [ - { - on = "R"; - run = "plugin rsync"; - desc = "Copy files using rsync"; - } + prepend_keymap = [ + { + on = "R"; + run = "plugin rsync"; + desc = "Copy files using rsync"; + } - { - on = "c, m"; - run = "plugin chmod"; - desc = "Chmod on selected files"; - } - ]; - }; - - preview = { - tab_size = 4; - image_filter = "lanczos3"; - image_quality = 90; - }; - - opener = { - play = [ - { - run = "${lib.getExe pkgs.mpv} ''$@''"; - block = true; - for = "unix"; - } - ]; - - edit = [ - { - run = "${lib.getExe pkgs.helix} ''$@''"; - block = true; - for = "unix"; - } - ]; - - open = [ - { - run = "${lib.getExe' pkgs.xdg-utils "xdg-open"} ''$@''"; - block = true; - for = "unix"; - } - ]; - }; - - input = { - cursor_blink = true; - }; - - plugin = { - prepend_fetchers = [ - { - id = "git"; - name = "*"; - run = "git"; - } - - { - id = "git"; - name = "*/"; - run = "git"; - } - ]; - }; - }; - - plugins = { - inherit - (pkgs.yaziPlugins) - starship - rsync - git - chmod - full-border - ; - }; - - initLua = '' - require("full-border"):setup({ type = ui.Border.ROUNDED }) - require("starship"):setup() - require("git"):setup() - ''; + { + on = "c, m"; + run = "plugin chmod"; + desc = "Chmod on selected files"; + } + ]; }; + + preview = { + tab_size = 4; + image_filter = "lanczos3"; + image_quality = 90; + }; + + opener = { + play = [ + { + run = "${lib.getExe pkgs.mpv} ''$@''"; + block = true; + for = "unix"; + } + ]; + + edit = [ + { + run = "${lib.getExe pkgs.helix} ''$@''"; + block = true; + for = "unix"; + } + ]; + + open = [ + { + run = "${lib.getExe' pkgs.xdg-utils "xdg-open"} ''$@''"; + block = true; + for = "unix"; + } + ]; + }; + + input = { + cursor_blink = true; + }; + + plugin = { + prepend_fetchers = [ + { + id = "git"; + name = "*"; + run = "git"; + } + + { + id = "git"; + name = "*/"; + run = "git"; + } + ]; + }; + }; + + plugins = { + inherit + (pkgs.yaziPlugins) + starship + rsync + git + chmod + full-border + ; + }; + + initLua = '' + require("full-border"):setup({ type = ui.Border.ROUNDED }) + require("starship"):setup() + require("git"):setup() + ''; }; + }; } diff --git a/hand7s/programs/zed-editor.nix b/hand7s/programs/zed-editor.nix index a671607..c49e0e9 100644 --- a/hand7s/programs/zed-editor.nix +++ b/hand7s/programs/zed-editor.nix @@ -1,32 +1,32 @@ {pkgs, ...}: { - programs = { - zed-editor = { - enable = false; - package = pkgs.zed-editor_git; - installRemoteServer = true; - userSettings = { - vim_mode = true; - features = { - copilot = false; - }; - - tab_bar = { - show = false; - }; - - telemetry = { - metrics = false; - }; - }; - - extensions = [ - "nix" - "xy-zed" - ]; - - extraPackages = [ - pkgs.nixd - ]; + programs = { + zed-editor = { + enable = false; + package = pkgs.zed-editor_git; + installRemoteServer = true; + userSettings = { + vim_mode = true; + features = { + copilot = false; }; + + tab_bar = { + show = false; + }; + + telemetry = { + metrics = false; + }; + }; + + extensions = [ + "nix" + "xy-zed" + ]; + + extraPackages = [ + pkgs.nixd + ]; }; + }; } diff --git a/hand7s/programs/zellij.nix b/hand7s/programs/zellij.nix index 6fa5fa9..907eca4 100644 --- a/hand7s/programs/zellij.nix +++ b/hand7s/programs/zellij.nix @@ -1,24 +1,24 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - programs = { - zellij = { - enable = true; - settings = { - default_shell = "${lib.getExe pkgs.fish}"; - show_startup_tips = false; - show_release_notes = false; - simplified_ui = true; + programs = { + zellij = { + enable = true; + settings = { + default_shell = "${lib.getExe pkgs.fish}"; + show_startup_tips = false; + show_release_notes = false; + simplified_ui = true; - ui = { - pane_frames = { - rounded_corners = true; - hide_session_name = false; - }; - }; - }; + ui = { + pane_frames = { + rounded_corners = true; + hide_session_name = false; + }; }; + }; }; + }; } diff --git a/hand7s/programs/zoxide.nix b/hand7s/programs/zoxide.nix index 2c72ca5..5f82533 100644 --- a/hand7s/programs/zoxide.nix +++ b/hand7s/programs/zoxide.nix @@ -1,8 +1,8 @@ {...}: { - programs = { - zoxide = { - enable = true; - enableFishIntegration = true; - }; + programs = { + zoxide = { + enable = true; + enableFishIntegration = true; }; + }; } diff --git a/hand7s/qt/qt.nix b/hand7s/qt/qt.nix index d10f3ac..b79437c 100644 --- a/hand7s/qt/qt.nix +++ b/hand7s/qt/qt.nix @@ -1,5 +1,5 @@ {...}: { - qt = { - enable = true; - }; + qt = { + enable = true; + }; } diff --git a/hand7s/services/hypridle.nix b/hand7s/services/hypridle.nix index 2428ea3..1bac9e2 100644 --- a/hand7s/services/hypridle.nix +++ b/hand7s/services/hypridle.nix @@ -1,40 +1,41 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - services = { - hypridle = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Hyprland" - ) - true; + services = { + hypridle = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Hyprland" + ) + true; - settings = { - general = { - before_sleep_cmd = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch dpms off"; - after_sleep_cmd = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch dpms on"; - }; - - listener = [ - { - timeout = 300; - on-timeout = "${lib.getExe pkgs.brightnessctl} -s set 10"; - on-resume = "${lib.getExe pkgs.brightnessctl} -r"; - } - - { - timeout = 600; - on-timeout = "${lib.getExe pkgs.hyprlock}"; - } - - { - timeout = 900; - on-timeout = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; - } - ]; - }; + settings = { + general = { + before_sleep_cmd = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch dpms off"; + after_sleep_cmd = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch dpms on"; }; + + listener = [ + { + timeout = 300; + on-timeout = "${lib.getExe pkgs.brightnessctl} -s set 10"; + on-resume = "${lib.getExe pkgs.brightnessctl} -r"; + } + + { + timeout = 600; + on-timeout = "${lib.getExe pkgs.hyprlock}"; + } + + { + timeout = 900; + on-timeout = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; + } + ]; + }; }; + }; } diff --git a/hand7s/services/kdeconnect.nix b/hand7s/services/kdeconnect.nix index d4ff623..c54c25c 100644 --- a/hand7s/services/kdeconnect.nix +++ b/hand7s/services/kdeconnect.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - services = { - kdeconnect = { - package = pkgs.valent; - indicator = true; - }; + services = { + kdeconnect = { + package = pkgs.valent; + indicator = true; }; + }; } diff --git a/hand7s/services/swayidle.nix b/hand7s/services/swayidle.nix index 2399584..a6f9f94 100644 --- a/hand7s/services/swayidle.nix +++ b/hand7s/services/swayidle.nix @@ -1,50 +1,51 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - services = { - swayidle = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Sway" - ) - true; + services = { + swayidle = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Sway" + ) + true; - events = [ - { - event = "lock"; - command = "${lib.getExe pkgs.swaylock}"; - } + events = [ + { + event = "lock"; + command = "${lib.getExe pkgs.swaylock}"; + } - { - event = "before-sleep"; - command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power off'"; - } + { + event = "before-sleep"; + command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power off'"; + } - { - event = "after-resume"; - command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power on'"; - } - ]; + { + event = "after-resume"; + command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power on'"; + } + ]; - timeouts = [ - { - timeout = 300; - command = "${lib.getExe pkgs.brightnessctl} -s set 10"; - resumeCommand = "${lib.getExe pkgs.brightnessctl} -r"; - } + timeouts = [ + { + timeout = 300; + command = "${lib.getExe pkgs.brightnessctl} -s set 10"; + resumeCommand = "${lib.getExe pkgs.brightnessctl} -r"; + } - { - timeout = 600; - command = "${lib.getExe pkgs.swaylock}"; - } + { + timeout = 600; + command = "${lib.getExe pkgs.swaylock}"; + } - { - timeout = 900; - command = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; - } - ]; - }; + { + timeout = 900; + command = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; + } + ]; }; + }; } diff --git a/hand7s/standalone.nix b/hand7s/standalone.nix index fef9617..270fec4 100644 --- a/hand7s/standalone.nix +++ b/hand7s/standalone.nix @@ -1,15 +1,15 @@ {self, ...}: { - imports = [ - "${self}/hand7s/nix/settings/substituters.nix" - "${self}/hand7s/nix/settings/trusted-public-keys.nix" - "${self}/hand7s/nix/package.nix" + imports = [ + "${self}/hand7s/nix/settings/substituters.nix" + "${self}/hand7s/nix/settings/trusted-public-keys.nix" + "${self}/hand7s/nix/package.nix" - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" - "${self}/hand7s/" - ]; + "${self}/hand7s/" + ]; } diff --git a/hand7s/stylix/base16Scheme.nix b/hand7s/stylix/base16Scheme.nix index 9b22447..8edbd4d 100644 --- a/hand7s/stylix/base16Scheme.nix +++ b/hand7s/stylix/base16Scheme.nix @@ -1,24 +1,24 @@ {...}: { - stylix = { - base16Scheme = { - scheme = "Tokyonight by Folke Lemaitre (https://github.com/folke)"; - name = "Tokyonight"; - base00 = "#24283b"; - base01 = "#1f2335"; - base02 = "#292e42"; - base03 = "#565f89"; - base04 = "#a9b1d6"; - base05 = "#c0caf5"; - base06 = "#c0caf5"; - base07 = "#c0caf5"; - base08 = "#f7768e"; - base09 = "#ff9e64"; - base0A = "#e0af68"; - base0B = "#9ece6a"; - base0C = "#1abc9c"; - base0D = "#41a6b5"; - base0E = "#bb9af7"; - base0F = "#ff007c"; - }; + stylix = { + base16Scheme = { + scheme = "Tokyonight by Folke Lemaitre (https://github.com/folke)"; + name = "Tokyonight"; + base00 = "#24283b"; + base01 = "#1f2335"; + base02 = "#292e42"; + base03 = "#565f89"; + base04 = "#a9b1d6"; + base05 = "#c0caf5"; + base06 = "#c0caf5"; + base07 = "#c0caf5"; + base08 = "#f7768e"; + base09 = "#ff9e64"; + base0A = "#e0af68"; + base0B = "#9ece6a"; + base0C = "#1abc9c"; + base0D = "#41a6b5"; + base0E = "#bb9af7"; + base0F = "#ff007c"; }; + }; } diff --git a/hand7s/stylix/cursor.nix b/hand7s/stylix/cursor.nix index 519cc36..70c26d0 100644 --- a/hand7s/stylix/cursor.nix +++ b/hand7s/stylix/cursor.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { - stylix = { - cursor = { - name = "material_light_cursors"; - package = pkgs.material-cursors; - size = 20; - }; + stylix = { + cursor = { + name = "material_light_cursors"; + package = pkgs.material-cursors; + size = 20; }; + }; } diff --git a/hand7s/stylix/defaults.nix b/hand7s/stylix/defaults.nix index 9a036ff..30f65de 100644 --- a/hand7s/stylix/defaults.nix +++ b/hand7s/stylix/defaults.nix @@ -1,7 +1,7 @@ {...}: { - stylix = { - enable = true; - autoEnable = true; - polarity = "dark"; - }; + stylix = { + enable = true; + autoEnable = true; + polarity = "dark"; + }; } diff --git a/hand7s/stylix/fonts.nix b/hand7s/stylix/fonts.nix index a625b8d..1cea8c4 100644 --- a/hand7s/stylix/fonts.nix +++ b/hand7s/stylix/fonts.nix @@ -1,32 +1,32 @@ {pkgs, ...}: { - stylix = { - fonts = { - sizes = { - applications = 10; - desktop = 8; - popups = 10; - terminal = 10; - }; + stylix = { + fonts = { + sizes = { + applications = 10; + desktop = 8; + popups = 10; + terminal = 10; + }; - monospace = { - package = pkgs.nerd-fonts.roboto-mono; - name = "Roboto-Mono Nerd Font"; - }; + monospace = { + package = pkgs.nerd-fonts.roboto-mono; + name = "Roboto-Mono Nerd Font"; + }; - emoji = { - package = pkgs.nerd-fonts.symbols-only; - name = "Symbols Only Nerd Font"; - }; + emoji = { + package = pkgs.nerd-fonts.symbols-only; + name = "Symbols Only Nerd Font"; + }; - sansSerif = { - package = pkgs.nerd-fonts.aurulent-sans-mono; - name = "Aurulent Sans Mono Nerd Font"; - }; + sansSerif = { + package = pkgs.nerd-fonts.aurulent-sans-mono; + name = "Aurulent Sans Mono Nerd Font"; + }; - serif = { - package = pkgs.nerd-fonts.hack; - name = "Hack Nerd Font"; - }; - }; + serif = { + package = pkgs.nerd-fonts.hack; + name = "Hack Nerd Font"; + }; }; + }; } diff --git a/hand7s/stylix/image.nix b/hand7s/stylix/image.nix index c7fb25a..17a3c49 100644 --- a/hand7s/stylix/image.nix +++ b/hand7s/stylix/image.nix @@ -1,5 +1,5 @@ {...}: { - stylix = { - image = ./wallpaper3.jpg; - }; + stylix = { + image = ./wallpaper3.jpg; + }; } diff --git a/hand7s/stylix/red_ish.nix b/hand7s/stylix/red_ish.nix index 747d9da..909ea6d 100644 --- a/hand7s/stylix/red_ish.nix +++ b/hand7s/stylix/red_ish.nix @@ -1,32 +1,32 @@ {...}: { - stylix = { - base16Scheme = { - base00 = "2a1617"; - base01 = "5d3f3f"; - base02 = "7a5bab"; - base03 = "bb9499"; - base04 = "eea1cf"; - base05 = "f5dddd"; - base06 = "ffebff"; - base07 = "ffede9"; - base08 = "e36b70"; - base09 = "ac878e"; - base0A = "db7356"; - base0B = "a78897"; - base0C = "ca7a79"; - base0D = "b28776"; - base0E = "d8708b"; - base0F = "ec6653"; - base10 = "2a1617"; - base11 = "2a1617"; - base12 = "e36b70"; - base13 = "ac878e"; - base14 = "a78897"; - base15 = "ca7a79"; - base16 = "b28776"; - base17 = "d8708b"; - scheme = "hand7s"; - name = "red_ish"; - }; + stylix = { + base16Scheme = { + base00 = "2a1617"; + base01 = "5d3f3f"; + base02 = "7a5bab"; + base03 = "bb9499"; + base04 = "eea1cf"; + base05 = "f5dddd"; + base06 = "ffebff"; + base07 = "ffede9"; + base08 = "e36b70"; + base09 = "ac878e"; + base0A = "db7356"; + base0B = "a78897"; + base0C = "ca7a79"; + base0D = "b28776"; + base0E = "d8708b"; + base0F = "ec6653"; + base10 = "2a1617"; + base11 = "2a1617"; + base12 = "e36b70"; + base13 = "ac878e"; + base14 = "a78897"; + base15 = "ca7a79"; + base16 = "b28776"; + base17 = "d8708b"; + scheme = "hand7s"; + name = "red_ish"; }; + }; } diff --git a/hand7s/systemd/hyprpolkitagent-service.nix b/hand7s/systemd/hyprpolkitagent-service.nix index 571e857..297fde4 100644 --- a/hand7s/systemd/hyprpolkitagent-service.nix +++ b/hand7s/systemd/hyprpolkitagent-service.nix @@ -1,33 +1,33 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - systemd = { - user = { - services = { - hyprpolkitagent = { - Unit = { - Description = "Hyprpolkitagent service."; - After = "graphical-session.target"; - PartOf = "graphical-session.target"; - }; + systemd = { + user = { + services = { + hyprpolkitagent = { + Unit = { + Description = "Hyprpolkitagent service."; + After = "graphical-session.target"; + PartOf = "graphical-session.target"; + }; - Service = { - Type = "simple"; - ExecStart = "${lib.getExe pkgs.hyprpolkitagent}"; - Restart = "always"; - RestartSec = 1; - TimeoutStopSec = 10; - }; + Service = { + Type = "simple"; + ExecStart = "${lib.getExe pkgs.hyprpolkitagent}"; + Restart = "always"; + RestartSec = 1; + TimeoutStopSec = 10; + }; - Install = { - WantedBy = [ - "graphical-session.target" - ]; - }; - }; - }; + Install = { + WantedBy = [ + "graphical-session.target" + ]; + }; }; + }; }; + }; } diff --git a/hand7s/wayland/hyprland.nix b/hand7s/wayland/hyprland.nix index 7f52641..e9812fe 100644 --- a/hand7s/wayland/hyprland.nix +++ b/hand7s/wayland/hyprland.nix @@ -1,273 +1,274 @@ { - inputs, - config, - pkgs, - lib, - ... + inputs, + config, + pkgs, + lib, + ... }: { - wayland = { - windowManager = { - hyprland = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Hyprland" - ) - true; + wayland = { + windowManager = { + hyprland = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Hyprland" + ) + true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; - settings = { - monitor = ", 2560x1440@165.00Hz, 0x0, 1"; + settings = { + monitor = ", 2560x1440@165.00Hz, 0x0, 1"; - general = { - gaps_in = "5"; - gaps_out = "20"; - border_size = "2"; - layout = "dwindle"; + general = { + gaps_in = "5"; + gaps_out = "20"; + border_size = "2"; + layout = "dwindle"; - snap = { - enabled = false; - window_gap = "5"; - monitor_gap = "5"; - border_overlap = false; - }; - }; - - input = { - kb_layout = "us, ru"; - kb_options = "grp:caps_toggle"; - - numlock_by_default = true; - follow_mouse = "1"; - left_handed = false; - sensitivity = "0"; - - special_fallthrough = true; - focus_on_close = 1; - - touchpad = { - disable_while_typing = true; - tap-to-click = true; - }; - - tablet = { - output = "current"; - left_handed = true; - }; - }; - - gestures = { - workspace_swipe = true; - workspace_swipe_fingers = true; - workspace_swipe_distance = 400; - }; - - decoration = { - active_opacity = "0.85"; - inactive_opacity = "0.65"; - fullscreen_opacity = "1.0"; - rounding = "10"; - - dim_inactive = true; - dim_strength = "0.15"; - dim_special = "0.0"; - dim_around = "0.05"; - - shadow = { - enabled = true; - render_power = "4"; - range = "4"; - ignore_window = false; - }; - - blur = { - enabled = true; - size = "10"; - passes = "5"; - }; - }; - - execr-once = [ - "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service" - "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service" - "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service" - - # "${lib.getExe' pkgs.systemd "systemctl"} --user start noctalis.service" - "${lib.getExe inputs.noctalia.packages.${pkgs.system}.default}" - - "${lib.getExe' pkgs.hyprland "hyprctl"} setcursor material_light_cursors 20" - ]; - - bind = [ - "ALT, return, exec, ${lib.getExe pkgs.ghostty}" - "ALT, Q, killactive," - "ALT, S, exec, ${lib.getExe inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle" - "ALT, F, fullscreen, 0" - "ALT, L, exec, ${lib.getExe pkgs.hyprlock}" - - "ALT SHIFT, E, exit," - "ALT SHIFT, space, togglefloating, active" - "ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png" - - "ALT, left, movefocus, l" - "ALT, right, movefocus, r" - "ALT, up, movefocus, u" - "ALT, down, movefocus, d" - - "ALT, 1, workspace, 1" - "ALT, 2, workspace, 2" - "ALT, 3, workspace, 3" - "ALT, 4, workspace, 4" - "ALT, 5, workspace, 5" - "ALT, 6, workspace, 6" - "ALT, 7, workspace, 7" - "ALT, 8, workspace, 8" - "ALT, 9, workspace, 9" - "ALT, 0, workspace, 10" - "ALT, H, togglespecialworkspace, special" - - "ALT SHIFT, 1, movetoworkspacesilent, 1" - "ALT SHIFT, 2, movetoworkspacesilent, 2" - "ALT SHIFT, 3, movetoworkspacesilent, 3" - "ALT SHIFT, 4, movetoworkspacesilent, 4" - "ALT SHIFT, 5, movetoworkspacesilent, 5" - "ALT SHIFT, 6, movetoworkspacesilent, 6" - "ALT SHIFT, 7, movetoworkspacesilent, 7" - "ALT SHIFT, 8, movetoworkspacesilent, 8" - "ALT SHIFT, 9, movetoworkspacesilent, 9" - "ALT SHIFT, 0, movetoworkspacesilent, 10" - "ALT SHIFT, H, movetoworkspacesilent, special" - - "ALT, mouse_down, workspace, e+1" - "ALT, mouse_up, workspace, e-1" - ]; - - bindel = [ - ", XF86AudioRaiseVolume, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-" - - ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-" - ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set +5%" - ]; - - bindl = [ - ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause" - ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous" - ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next" - ", XF86AudioMute, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle" - ]; - - bindm = [ - "ALT, mouse:272, movewindow" - "ALT, mouse:273, resizewindow" - ]; - - animation = [ - "enabled = true" - - "bezier = bez, 0.05, 0.9, 0.1, 1.05" - - "animation = windows, 1, 7, bez" - "animation = windowsOut, 1, 7, default, popin 80%" - "animation = border, 1, 10, default" - "animation = borderangle, 1, 10, default" - "animation = fade, 1, 7, default" - "animation = workspaces, 1, 7, default" - ]; - - misc = { - disable_hyprland_logo = true; - disable_splash_rendering = true; - middle_click_paste = false; - animate_manual_resizes = true; - animate_mouse_windowdragging = true; - focus_on_activate = true; - close_special_on_empty = true; - initial_workspace_tracking = "2"; - }; - - render = { - cm_auto_hdr = 0; - }; - - binds = { - workspace_back_and_forth = true; - allow_workspace_cycles = true; - workspace_center_on = true; - }; - - xwayland = { - enabled = true; - use_nearest_neighbor = true; - force_zero_scaling = false; - }; - - ecosystem = { - no_update_news = true; - no_donation_nag = true; - }; - - debug = { - suppress_errors = true; - }; - - plugin = { - hyprscrolling = { - fullscreen_on_one_column = true; - follow_focus = true; - }; - - easymotion = { - only_special = false; - }; - - dynamic-cursors = { - enabled = true; - mode = "strech"; - threshold = 2; - stretch = { - limit = 4000; - function = "quadratic"; - }; - - shake = { - enabled = true; - nearest = true; - threshold = 10.0; - effects = true; - }; - - hyprcursor = { - enabled = true; - nearest = true; - fallback = "clientside"; - }; - }; - - touch_gestures = { - sensitivity = 0.0; - workspace_swipe_fingers = 4; - long_press_delay = 400; - resize_on_border_long_press = true; - edge_margin = 10; - emulate_touchpad_swipe = false; - }; - }; - }; - - plugins = [ - # pkgs.hyprlandPlugins.hypr-dynamic-cursors - # pkgs.hyprlandPlugins.xtra-dispatchers - # pkgs.hyprlandPlugins.hyprwinwrap - # pkgs.hyprlandPlugins.hyprgrass - # pkgs.hyprlandPlugins.hyprscrolling - - # inputs.hyprcurs.packages.${pkgs.system}.hypr-dynamic-cursors - # inputs.hyprplugs.packages.${pkgs.system}.hyprscrolling - # inputs.hyprplugs.packages.${pkgs.system}.xtra-dispatchers - # inputs.hyprplugs.packages.${pkgs.system}.hyprwinwrap - ]; + snap = { + enabled = false; + window_gap = "5"; + monitor_gap = "5"; + border_overlap = false; }; + }; + + input = { + kb_layout = "us, ru"; + kb_options = "grp:caps_toggle"; + + numlock_by_default = true; + follow_mouse = "1"; + left_handed = false; + sensitivity = "0"; + + special_fallthrough = true; + focus_on_close = 1; + + touchpad = { + disable_while_typing = true; + tap-to-click = true; + }; + + tablet = { + output = "current"; + left_handed = true; + }; + }; + + gestures = { + workspace_swipe = true; + workspace_swipe_fingers = true; + workspace_swipe_distance = 400; + }; + + decoration = { + active_opacity = "0.85"; + inactive_opacity = "0.65"; + fullscreen_opacity = "1.0"; + rounding = "10"; + + dim_inactive = true; + dim_strength = "0.15"; + dim_special = "0.0"; + dim_around = "0.05"; + + shadow = { + enabled = true; + render_power = "4"; + range = "4"; + ignore_window = false; + }; + + blur = { + enabled = true; + size = "10"; + passes = "5"; + }; + }; + + execr-once = [ + "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service" + "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service" + "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service" + + # "${lib.getExe' pkgs.systemd "systemctl"} --user start noctalis.service" + "${lib.getExe inputs.noctalia.packages.${pkgs.system}.default}" + + "${lib.getExe' pkgs.hyprland "hyprctl"} setcursor material_light_cursors 20" + ]; + + bind = [ + "ALT, return, exec, ${lib.getExe pkgs.ghostty}" + "ALT, Q, killactive," + "ALT, S, exec, ${lib.getExe inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle" + "ALT, F, fullscreen, 0" + "ALT, L, exec, ${lib.getExe pkgs.hyprlock}" + + "ALT SHIFT, E, exit," + "ALT SHIFT, space, togglefloating, active" + "ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png" + + "ALT, left, movefocus, l" + "ALT, right, movefocus, r" + "ALT, up, movefocus, u" + "ALT, down, movefocus, d" + + "ALT, 1, workspace, 1" + "ALT, 2, workspace, 2" + "ALT, 3, workspace, 3" + "ALT, 4, workspace, 4" + "ALT, 5, workspace, 5" + "ALT, 6, workspace, 6" + "ALT, 7, workspace, 7" + "ALT, 8, workspace, 8" + "ALT, 9, workspace, 9" + "ALT, 0, workspace, 10" + "ALT, H, togglespecialworkspace, special" + + "ALT SHIFT, 1, movetoworkspacesilent, 1" + "ALT SHIFT, 2, movetoworkspacesilent, 2" + "ALT SHIFT, 3, movetoworkspacesilent, 3" + "ALT SHIFT, 4, movetoworkspacesilent, 4" + "ALT SHIFT, 5, movetoworkspacesilent, 5" + "ALT SHIFT, 6, movetoworkspacesilent, 6" + "ALT SHIFT, 7, movetoworkspacesilent, 7" + "ALT SHIFT, 8, movetoworkspacesilent, 8" + "ALT SHIFT, 9, movetoworkspacesilent, 9" + "ALT SHIFT, 0, movetoworkspacesilent, 10" + "ALT SHIFT, H, movetoworkspacesilent, special" + + "ALT, mouse_down, workspace, e+1" + "ALT, mouse_up, workspace, e-1" + ]; + + bindel = [ + ", XF86AudioRaiseVolume, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-" + + ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%-" + ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set +5%" + ]; + + bindl = [ + ", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} play-pause" + ", XF86AudioPrev, exec, ${lib.getExe pkgs.playerctl} previous" + ", XF86AudioNext, exec, ${lib.getExe pkgs.playerctl} next" + ", XF86AudioMute, exec, ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle" + ]; + + bindm = [ + "ALT, mouse:272, movewindow" + "ALT, mouse:273, resizewindow" + ]; + + animation = [ + "enabled = true" + + "bezier = bez, 0.05, 0.9, 0.1, 1.05" + + "animation = windows, 1, 7, bez" + "animation = windowsOut, 1, 7, default, popin 80%" + "animation = border, 1, 10, default" + "animation = borderangle, 1, 10, default" + "animation = fade, 1, 7, default" + "animation = workspaces, 1, 7, default" + ]; + + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + middle_click_paste = false; + animate_manual_resizes = true; + animate_mouse_windowdragging = true; + focus_on_activate = true; + close_special_on_empty = true; + initial_workspace_tracking = "2"; + }; + + render = { + cm_auto_hdr = 0; + }; + + binds = { + workspace_back_and_forth = true; + allow_workspace_cycles = true; + workspace_center_on = true; + }; + + xwayland = { + enabled = true; + use_nearest_neighbor = true; + force_zero_scaling = false; + }; + + ecosystem = { + no_update_news = true; + no_donation_nag = true; + }; + + debug = { + suppress_errors = true; + }; + + plugin = { + hyprscrolling = { + fullscreen_on_one_column = true; + follow_focus = true; + }; + + easymotion = { + only_special = false; + }; + + dynamic-cursors = { + enabled = true; + mode = "strech"; + threshold = 2; + stretch = { + limit = 4000; + function = "quadratic"; + }; + + shake = { + enabled = true; + nearest = true; + threshold = 10.0; + effects = true; + }; + + hyprcursor = { + enabled = true; + nearest = true; + fallback = "clientside"; + }; + }; + + touch_gestures = { + sensitivity = 0.0; + workspace_swipe_fingers = 4; + long_press_delay = 400; + resize_on_border_long_press = true; + edge_margin = 10; + emulate_touchpad_swipe = false; + }; + }; }; + + plugins = [ + # pkgs.hyprlandPlugins.hypr-dynamic-cursors + # pkgs.hyprlandPlugins.xtra-dispatchers + # pkgs.hyprlandPlugins.hyprwinwrap + # pkgs.hyprlandPlugins.hyprgrass + # pkgs.hyprlandPlugins.hyprscrolling + + # inputs.hyprcurs.packages.${pkgs.system}.hypr-dynamic-cursors + # inputs.hyprplugs.packages.${pkgs.system}.hyprscrolling + # inputs.hyprplugs.packages.${pkgs.system}.xtra-dispatchers + # inputs.hyprplugs.packages.${pkgs.system}.hyprwinwrap + ]; + }; }; + }; } diff --git a/hand7s/wayland/river.nix b/hand7s/wayland/river.nix index 5238a4a..6b0415e 100644 --- a/hand7s/wayland/river.nix +++ b/hand7s/wayland/river.nix @@ -1,111 +1,112 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - wayland = { - windowManager = { - river = { - enable = lib.mkIf ( - config.home.gui.sessionType == "River" - ) - true; + wayland = { + windowManager = { + river = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "River" + ) + true; - settings = { - default-layout = "rivertile"; - focus-follows-cursor = "normal"; - border-width = 2; + settings = { + default-layout = "rivertile"; + focus-follows-cursor = "normal"; + border-width = 2; - declare-mod = [ - "locked" - "normal" - ]; + declare-mod = [ + "locked" + "normal" + ]; - xwayland = { - enable = true; - }; + xwayland = { + enable = true; + }; - map = { - normal = { - "Alt Q" = "close"; - "Alt S" = "spawn fuzzel"; - "Alt Return" = "spawn ghostty"; - "Alt L" = "spawn hyprlock"; - "Alt F" = "toggle-fullscreen"; + map = { + normal = { + "Alt Q" = "close"; + "Alt S" = "spawn fuzzel"; + "Alt Return" = "spawn ghostty"; + "Alt L" = "spawn hyprlock"; + "Alt F" = "toggle-fullscreen"; - "Alt+Shift S" = "spawn wayshot --clipboard"; - "Alt+Shift E" = "exit"; - "Alt+Shift Space" = "toggle-float"; + "Alt+Shift S" = "spawn wayshot --clipboard"; + "Alt+Shift E" = "exit"; + "Alt+Shift Space" = "toggle-float"; - "Alt Up" = "send-to-output next"; - "Alt Down" = "send-to-output previous"; - "Alt Right" = "send-to-output next"; - "Alt Left" = "send-to-output previous"; + "Alt Up" = "send-to-output next"; + "Alt Down" = "send-to-output previous"; + "Alt Right" = "send-to-output next"; + "Alt Left" = "send-to-output previous"; - "Alt 1" = "set-focused-tags 0"; - "Alt 2" = "set-focused-tags 1"; - "Alt 3" = "set-focused-tags 2"; - "Alt 4" = "set-focused-tags 3"; - "Alt 5" = "set-focused-tags 4"; - "Alt 6" = "set-focused-tags 5"; - "Alt 7" = "set-focused-tags 6"; - "Alt 8" = "set-focused-tags 7"; - "Alt 9" = "set-focused-tags 8"; - "Alt H" = "toggle-focused-tags 20"; + "Alt 1" = "set-focused-tags 0"; + "Alt 2" = "set-focused-tags 1"; + "Alt 3" = "set-focused-tags 2"; + "Alt 4" = "set-focused-tags 3"; + "Alt 5" = "set-focused-tags 4"; + "Alt 6" = "set-focused-tags 5"; + "Alt 7" = "set-focused-tags 6"; + "Alt 8" = "set-focused-tags 7"; + "Alt 9" = "set-focused-tags 8"; + "Alt H" = "toggle-focused-tags 20"; - "Alt+Shift 1" = "set-view-tags 0"; - "Alt+Shift 2" = "set-view-tags 1"; - "Alt+Shift 3" = "set-view-tags 2"; - "Alt+Shift 4" = "set-view-tags 3"; - "Alt+Shift 5" = "set-view-tags 4"; - "Alt+Shift 6" = "set-view-tags 5"; - "Alt+Shift 7" = "set-view-tags 6"; - "Alt+Shift 8" = "set-view-tags 7"; - "Alt+Shift 9" = "set-view-tags 8"; - "Alt+Shift H" = "set-view-tags 20"; + "Alt+Shift 1" = "set-view-tags 0"; + "Alt+Shift 2" = "set-view-tags 1"; + "Alt+Shift 3" = "set-view-tags 2"; + "Alt+Shift 4" = "set-view-tags 3"; + "Alt+Shift 5" = "set-view-tags 4"; + "Alt+Shift 6" = "set-view-tags 5"; + "Alt+Shift 7" = "set-view-tags 6"; + "Alt+Shift 8" = "set-view-tags 7"; + "Alt+Shift 9" = "set-view-tags 8"; + "Alt+Shift H" = "set-view-tags 20"; - "Alt+Control 1" = "toggle-focused-tags 0"; - "Alt+Control 2" = "toggle-focused-tags 1"; - "Alt+Control 3" = "toggle-focused-tags 2"; - "Alt+Control 4" = "toggle-focused-tags 3"; - "Alt+Control 5" = "toggle-focused-tags 4"; - "Alt+Control 6" = "toggle-focused-tags 5"; - "Alt+Control 7" = "toggle-focused-tags 6"; - "Alt+Control 8" = "toggle-focused-tags 7"; - "Alt+Control 9" = "toggle-focused-tags 8"; - "Alt+Control H" = "toggle-focused-tags 20"; + "Alt+Control 1" = "toggle-focused-tags 0"; + "Alt+Control 2" = "toggle-focused-tags 1"; + "Alt+Control 3" = "toggle-focused-tags 2"; + "Alt+Control 4" = "toggle-focused-tags 3"; + "Alt+Control 5" = "toggle-focused-tags 4"; + "Alt+Control 6" = "toggle-focused-tags 5"; + "Alt+Control 7" = "toggle-focused-tags 6"; + "Alt+Control 8" = "toggle-focused-tags 7"; + "Alt+Control 9" = "toggle-focused-tags 8"; + "Alt+Control H" = "toggle-focused-tags 20"; - "Alt+Shift+Control 1" = "toggle-view-tags 0"; - "Alt+Shift+Control 2" = "toggle-view-tags 1"; - "Alt+Shift+Control 3" = "toggle-view-tags 2"; - "Alt+Shift+Control 4" = "toggle-view-tags 3"; - "Alt+Shift+Control 5" = "toggle-view-tags 4"; - "Alt+Shift+Control 6" = "toggle-view-tags 5"; - "Alt+Shift+Control 7" = "toggle-view-tags 6"; - "Alt+Shift+Control 8" = "toggle-view-tags 7"; - "Alt+Shift+Control 9" = "toggle-view-tags 8"; - "Alt+Shift+Control H" = "toggle-view-tags 20"; - }; - - map-pointer = { - normal = { - "Alt BTN_LEFT" = "move-view"; - "Alt BTN_RIGHT" = "resize-view"; - }; - }; - }; - }; - - extraConfig = '' - ${lib.getExe' pkgs.river "riverctl"} keyboard-layout -options "grp:caps_toggle" "us,ru" - ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service - ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service - ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service - ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10 - ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock} - ''; + "Alt+Shift+Control 1" = "toggle-view-tags 0"; + "Alt+Shift+Control 2" = "toggle-view-tags 1"; + "Alt+Shift+Control 3" = "toggle-view-tags 2"; + "Alt+Shift+Control 4" = "toggle-view-tags 3"; + "Alt+Shift+Control 5" = "toggle-view-tags 4"; + "Alt+Shift+Control 6" = "toggle-view-tags 5"; + "Alt+Shift+Control 7" = "toggle-view-tags 6"; + "Alt+Shift+Control 8" = "toggle-view-tags 7"; + "Alt+Shift+Control 9" = "toggle-view-tags 8"; + "Alt+Shift+Control H" = "toggle-view-tags 20"; }; + + map-pointer = { + normal = { + "Alt BTN_LEFT" = "move-view"; + "Alt BTN_RIGHT" = "resize-view"; + }; + }; + }; }; + + extraConfig = '' + ${lib.getExe' pkgs.river "riverctl"} keyboard-layout -options "grp:caps_toggle" "us,ru" + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10 + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock} + ''; + }; }; + }; } diff --git a/hand7s/wayland/sway.nix b/hand7s/wayland/sway.nix index f429acb..e81b3d1 100644 --- a/hand7s/wayland/sway.nix +++ b/hand7s/wayland/sway.nix @@ -1,184 +1,185 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - wayland = { - windowManager = { - sway = { - enable = lib.mkIf ( - config.home.gui.sessionType == "Sway" - ) - true; + wayland = { + windowManager = { + sway = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Sway" + ) + true; - package = pkgs.sway; + package = pkgs.sway; - config = { - bindkeysToCode = true; - defaultWorkspace = "workspace number 1"; - workspaceAutoBackAndForth = true; + config = { + bindkeysToCode = true; + defaultWorkspace = "workspace number 1"; + workspaceAutoBackAndForth = true; - bars = []; + bars = []; - window = { - border = 2; - titlebar = false; - hideEdgeBorders = "both"; - }; + window = { + border = 2; + titlebar = false; + hideEdgeBorders = "both"; + }; - floating = { - border = 2; - titlebar = false; - modifier = "Mod1"; - }; + floating = { + border = 2; + titlebar = false; + modifier = "Mod1"; + }; - focus = { - forceWrapping = true; - mouseWarping = true; + focus = { + forceWrapping = true; + mouseWarping = true; - followMouse = "always"; - newWindow = "smart"; - wrapping = "yes"; - }; + followMouse = "always"; + newWindow = "smart"; + wrapping = "yes"; + }; - gaps = { - vertical = null; - horizontal = null; + gaps = { + vertical = null; + horizontal = null; - outer = null; - inner = null; + outer = null; + inner = null; - top = null; - bottom = null; - left = null; - right = null; + top = null; + bottom = null; + left = null; + right = null; - smartGaps = false; - smartBorders = "no_gaps"; - }; + smartGaps = false; + smartBorders = "no_gaps"; + }; - startup = [ - { - command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service"; - } + startup = [ + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service"; + } - { - command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service"; - } + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service"; + } - { - command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service"; - } + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service"; + } - { - command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service"; - } + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service"; + } - { - command = "${lib.getExe pkgs.sway-audio-idle-inhibit}"; - } + { + command = "${lib.getExe pkgs.sway-audio-idle-inhibit}"; + } - { - command = "${lib.getExe pkgs.autotiling-rs}"; - } + { + command = "${lib.getExe pkgs.autotiling-rs}"; + } - { - command = "${lib.getExe pkgs.swaykbdd}"; - } - ]; + { + command = "${lib.getExe pkgs.swaykbdd}"; + } + ]; - keybindings = lib.mkOptionDefault { - "Mod1+q" = "kill"; - "Mod1+s" = "exec ${lib.getExe pkgs.fuzzel}"; - "Mod1+Return" = "exec ${lib.getExe pkgs.ghostty}"; - "Mod1+l" = "exec ${lib.getExe pkgs.swaylock}"; - "Mod1+f" = "fullscreen toggle"; - "Mod1+Shift+s" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} --notify copy area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"; + keybindings = lib.mkOptionDefault { + "Mod1+q" = "kill"; + "Mod1+s" = "exec ${lib.getExe pkgs.fuzzel}"; + "Mod1+Return" = "exec ${lib.getExe pkgs.ghostty}"; + "Mod1+l" = "exec ${lib.getExe pkgs.swaylock}"; + "Mod1+f" = "fullscreen toggle"; + "Mod1+Shift+s" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} --notify copy area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"; - "Mod1+Shift+e" = "exec ${lib.getExe' pkgs.sway "swaymsg"} exit"; - "Mod1+Space" = "floating toggle"; - "Mod1+r" = "mode resize"; + "Mod1+Shift+e" = "exec ${lib.getExe' pkgs.sway "swaymsg"} exit"; + "Mod1+Space" = "floating toggle"; + "Mod1+r" = "mode resize"; - "Mod1+Left" = "focus left"; - "Mod1+Right" = "focus right"; - "Mod1+Up" = "focus up"; - "Mod1+Down" = "focus down"; + "Mod1+Left" = "focus left"; + "Mod1+Right" = "focus right"; + "Mod1+Up" = "focus up"; + "Mod1+Down" = "focus down"; - "Mod1+1" = "workspace number 1"; - "Mod1+2" = "workspace number 2"; - "Mod1+3" = "workspace number 3"; - "Mod1+4" = "workspace number 4"; - "Mod1+5" = "workspace number 5"; - "Mod1+6" = "workspace number 6"; - "Mod1+7" = "workspace number 7"; - "Mod1+8" = "workspace number 8"; - "Mod1+9" = "workspace number 9"; - "Mod1+0" = "workspace number 10"; - "Mod1+h" = "scratchpad show"; + "Mod1+1" = "workspace number 1"; + "Mod1+2" = "workspace number 2"; + "Mod1+3" = "workspace number 3"; + "Mod1+4" = "workspace number 4"; + "Mod1+5" = "workspace number 5"; + "Mod1+6" = "workspace number 6"; + "Mod1+7" = "workspace number 7"; + "Mod1+8" = "workspace number 8"; + "Mod1+9" = "workspace number 9"; + "Mod1+0" = "workspace number 10"; + "Mod1+h" = "scratchpad show"; - "Mod1+Shift+1" = "move container to workspace number 1"; - "Mod1+Shift+2" = "move container to workspace number 2"; - "Mod1+Shift+3" = "move container to workspace number 3"; - "Mod1+Shift+4" = "move container to workspace number 4"; - "Mod1+Shift+5" = "move container to workspace number 5"; - "Mod1+Shift+6" = "move container to workspace number 6"; - "Mod1+Shift+7" = "move container to workspace number 7"; - "Mod1+Shift+8" = "move container to workspace number 8"; - "Mod1+Shift+9" = "move container to workspace number 9"; - "Mod1+Shift+0" = "move container to workspace number 10"; - "Mod1+Shift+h" = "move scratchpad"; + "Mod1+Shift+1" = "move container to workspace number 1"; + "Mod1+Shift+2" = "move container to workspace number 2"; + "Mod1+Shift+3" = "move container to workspace number 3"; + "Mod1+Shift+4" = "move container to workspace number 4"; + "Mod1+Shift+5" = "move container to workspace number 5"; + "Mod1+Shift+6" = "move container to workspace number 6"; + "Mod1+Shift+7" = "move container to workspace number 7"; + "Mod1+Shift+8" = "move container to workspace number 8"; + "Mod1+Shift+9" = "move container to workspace number 9"; + "Mod1+Shift+0" = "move container to workspace number 10"; + "Mod1+Shift+h" = "move scratchpad"; - "XF86AudioRaiseVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"; - "XF86AudioLowerVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"; - "XF86AudioMute" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; + "XF86AudioRaiseVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"; + "XF86AudioLowerVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"; + "XF86AudioMute" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; - "XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause"; - "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous"; - "XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next"; + "XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause"; + "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous"; + "XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next"; - "XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-"; - "XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.brightnessctl} set +5%"; - }; + "XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-"; + "XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.brightnessctl} set +5%"; + }; - modes = { - resize = { - "Left" = "resize shrink width 10px"; - "Right" = "resize shrink width 10px"; - "Up" = "resize shrink height 10px"; - "Down" = "resize shrink height 10px"; + modes = { + resize = { + "Left" = "resize shrink width 10px"; + "Right" = "resize shrink width 10px"; + "Up" = "resize shrink height 10px"; + "Down" = "resize shrink height 10px"; - "Shift+Left" = "resize grow width 10px"; - "Shift+Right" = "resize grow width 10px"; - "Shift+Up" = "resize grow height 10px"; - "Shift+Down" = "resize grow height 10px"; - "Escape" = "mode default"; - "Return" = "mode default"; - }; - }; - - input = { - "type:pointer" = { - accel_profile = "flat"; - pointer_accel = "0"; - }; - - "type:keyboard" = { - xkb_layout = "us,ru"; - xkb_options = "grp:caps_toggle"; - }; - - "type:touchpad" = { - natural_scroll = "enabled"; - tap = "enabled"; - }; - }; - }; - - extraConfig = '' - bindswitch lid:on exec swaylock - ''; + "Shift+Left" = "resize grow width 10px"; + "Shift+Right" = "resize grow width 10px"; + "Shift+Up" = "resize grow height 10px"; + "Shift+Down" = "resize grow height 10px"; + "Escape" = "mode default"; + "Return" = "mode default"; }; + }; + + input = { + "type:pointer" = { + accel_profile = "flat"; + pointer_accel = "0"; + }; + + "type:keyboard" = { + xkb_layout = "us,ru"; + xkb_options = "grp:caps_toggle"; + }; + + "type:touchpad" = { + natural_scroll = "enabled"; + tap = "enabled"; + }; + }; }; + + extraConfig = '' + bindswitch lid:on exec swaylock + ''; + }; }; + }; } diff --git a/s0meMiniPC-nix/boot/initrd.nix b/s0meMiniPC-nix/boot/initrd.nix index c30c164..568c6d0 100644 --- a/s0meMiniPC-nix/boot/initrd.nix +++ b/s0meMiniPC-nix/boot/initrd.nix @@ -1,27 +1,27 @@ {lib, ...}: { - boot = { - initrd = { - availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "btrfs" - ]; + boot = { + initrd = { + availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + "btrfs" + ]; - supportedFilesystems = { - vfat = true; - btrfs = true; - zfs = lib.mkForce true; - }; + supportedFilesystems = { + vfat = true; + btrfs = true; + zfs = lib.mkForce true; + }; - systemd = { - enable = true; - }; + systemd = { + enable = true; + }; - verbose = false; - }; + verbose = false; }; + }; } diff --git a/s0meMiniPC-nix/boot/kernel.nix b/s0meMiniPC-nix/boot/kernel.nix index 810c126..5f182f8 100644 --- a/s0meMiniPC-nix/boot/kernel.nix +++ b/s0meMiniPC-nix/boot/kernel.nix @@ -1,81 +1,81 @@ { - config, - lib, - ... + config, + lib, + ... }: { - boot = { - kernel = { - sysctl = { - "vm.swappiness" = 100; - "vm.dirty_background_bytes" = 67108864; - "vm.dirty_bytes" = 268435456; - "vm.dirty_expire_centisecs" = 1500; - "vm.dirty_writeback_centisecs" = 100; - "vm.vfs_cache_pressure" = 50; - "vm.max_map_count" = 1048576; - }; - }; - - kernelPackages = pkgs.linuxPackages_cachyos-server; - extraModulePackages = with config.boot.kernelPackages; [ - rtl8821ce - yt6801 - ]; - - kernelParams = [ - "intel_pstate=passive" - "udev.log_priority=3" - "quiet" - "splash" - "boot.shell_on_fail" - "loglevel=3" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - - "page_alloc.shuffle=1" - "page_poison=1" - "slab_nomerge" - - "kernel.watchdog=0" - "oops=panic" - ]; - - blacklistedKernelModules = [ - "ax25" - "netrom" - "rose" - "adfs" - "affs" - "bfs" - "befs" - "cramfs" - "efs" - "erofs" - "exofs" - "freevxfs" - "f2fs" - "hfs" - "hpfs" - "jfs" - "minix" - "nilfs2" - "ntfs" - "omfs" - "qnx4" - "qnx6" - "sysv" - "ufs" - "sp5100-tco" - "iTCO_wdt" - "rtw88_8821ce" - ]; - - supportedFilesystems = { - vfat = true; - btrfs = true; - zfs = lib.mkForce true; - }; - - consoleLogLevel = 0; + boot = { + kernel = { + sysctl = { + "vm.swappiness" = 100; + "vm.dirty_background_bytes" = 67108864; + "vm.dirty_bytes" = 268435456; + "vm.dirty_expire_centisecs" = 1500; + "vm.dirty_writeback_centisecs" = 100; + "vm.vfs_cache_pressure" = 50; + "vm.max_map_count" = 1048576; + }; }; + + kernelPackages = pkgs.linuxPackages_cachyos-server; + extraModulePackages = with config.boot.kernelPackages; [ + rtl8821ce + yt6801 + ]; + + kernelParams = [ + "intel_pstate=passive" + "udev.log_priority=3" + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + + "page_alloc.shuffle=1" + "page_poison=1" + "slab_nomerge" + + "kernel.watchdog=0" + "oops=panic" + ]; + + blacklistedKernelModules = [ + "ax25" + "netrom" + "rose" + "adfs" + "affs" + "bfs" + "befs" + "cramfs" + "efs" + "erofs" + "exofs" + "freevxfs" + "f2fs" + "hfs" + "hpfs" + "jfs" + "minix" + "nilfs2" + "ntfs" + "omfs" + "qnx4" + "qnx6" + "sysv" + "ufs" + "sp5100-tco" + "iTCO_wdt" + "rtw88_8821ce" + ]; + + supportedFilesystems = { + vfat = true; + btrfs = true; + zfs = lib.mkForce true; + }; + + consoleLogLevel = 0; + }; } diff --git a/s0meMiniPC-nix/boot/lanzaboote.nix b/s0meMiniPC-nix/boot/lanzaboote.nix index 33e4616..4a1320e 100644 --- a/s0meMiniPC-nix/boot/lanzaboote.nix +++ b/s0meMiniPC-nix/boot/lanzaboote.nix @@ -1,13 +1,13 @@ {...}: { - boot = { - lanzaboote = { - enable = false; - configurationLimit = 7; - pkiBundle = "/var/lib/sbctl"; - settings = { - timeout = 2; - sortKey = "lanza"; - }; - }; + boot = { + lanzaboote = { + enable = false; + configurationLimit = 7; + pkiBundle = "/var/lib/sbctl"; + settings = { + timeout = 2; + sortKey = "lanza"; + }; }; + }; } diff --git a/s0meMiniPC-nix/boot/loader/systemd-boot.nix b/s0meMiniPC-nix/boot/loader/systemd-boot.nix index de29935..8e2989c 100644 --- a/s0meMiniPC-nix/boot/loader/systemd-boot.nix +++ b/s0meMiniPC-nix/boot/loader/systemd-boot.nix @@ -1,19 +1,19 @@ {...}: { - boot = { - loader = { - systemd-boot = { - enable = false; - sortKey = "nixos"; - memtest86 = { - enable = true; - sortKey = "o_memtest86"; - }; - - netbootxyz = { - enable = false; - sortKey = "o_netbootxyz"; - }; - }; + boot = { + loader = { + systemd-boot = { + enable = false; + sortKey = "nixos"; + memtest86 = { + enable = true; + sortKey = "o_memtest86"; }; + + netbootxyz = { + enable = false; + sortKey = "o_netbootxyz"; + }; + }; }; + }; } diff --git a/s0meMiniPC-nix/boot/plymouth.nix b/s0meMiniPC-nix/boot/plymouth.nix index a20c64a..9ae36c6 100644 --- a/s0meMiniPC-nix/boot/plymouth.nix +++ b/s0meMiniPC-nix/boot/plymouth.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { - boot = { - plymouth = { - enable = true; - themePackages = with pkgs; [ - nixos-bgrt-plymouth - ]; - }; + boot = { + plymouth = { + enable = true; + themePackages = with pkgs; [ + nixos-bgrt-plymouth + ]; }; + }; } diff --git a/s0meMiniPC-nix/boot/tmp.nix b/s0meMiniPC-nix/boot/tmp.nix index 3c98c31..ac46b34 100644 --- a/s0meMiniPC-nix/boot/tmp.nix +++ b/s0meMiniPC-nix/boot/tmp.nix @@ -1,8 +1,8 @@ {...}: { - boot = { - tmp = { - useTmpfs = true; - cleanOnBoot = true; - }; + boot = { + tmp = { + useTmpfs = true; + cleanOnBoot = true; }; + }; } diff --git a/s0meMiniPC-nix/boot/zfs.nix b/s0meMiniPC-nix/boot/zfs.nix index 9e01510..f6d2f2d 100644 --- a/s0meMiniPC-nix/boot/zfs.nix +++ b/s0meMiniPC-nix/boot/zfs.nix @@ -1,9 +1,9 @@ {...}: { - boot = { - zfs = { - package = pkgs.zfs_cachyos; - allowHibernation = false; - removeLinuxDRM = false; - }; + boot = { + zfs = { + package = pkgs.zfs_cachyos; + allowHibernation = false; + removeLinuxDRM = false; }; + }; } diff --git a/s0meMiniPC-nix/console/console.nix b/s0meMiniPC-nix/console/console.nix index cb4672f..1e60d13 100644 --- a/s0meMiniPC-nix/console/console.nix +++ b/s0meMiniPC-nix/console/console.nix @@ -1,5 +1,5 @@ {...}: { - console = { - useXkbConfig = true; - }; + console = { + useXkbConfig = true; + }; } diff --git a/s0meMiniPC-nix/default.nix b/s0meMiniPC-nix/default.nix index 15f70de..767de1a 100644 --- a/s0meMiniPC-nix/default.nix +++ b/s0meMiniPC-nix/default.nix @@ -1,96 +1,96 @@ {self, ...}: { - imports = [ - "${self}/s0meMiniPC-nix/boot/initrd.nix" - "${self}/s0meMiniPC-nix/boot/kernel.nix" - "${self}/s0meMiniPC-nix/boot/lanzaboote.nix" - "${self}/s0meMiniPC-nix/boot/plymouth.nix" - "${self}/s0meMiniPC-nix/boot/tmp.nix" - "${self}/s0meMiniPC-nix/boot/loader/systemd-boot.nix" - "${self}/s0meMiniPC-nix/boot/zfs.nix" + imports = [ + "${self}/s0meMiniPC-nix/boot/initrd.nix" + "${self}/s0meMiniPC-nix/boot/kernel.nix" + "${self}/s0meMiniPC-nix/boot/lanzaboote.nix" + "${self}/s0meMiniPC-nix/boot/plymouth.nix" + "${self}/s0meMiniPC-nix/boot/tmp.nix" + "${self}/s0meMiniPC-nix/boot/loader/systemd-boot.nix" + "${self}/s0meMiniPC-nix/boot/zfs.nix" - "${self}/s0meMiniPC-nix/disko/disk.nix" - "${self}/s0meMiniPC-nix/disko/lvm_vg.nix" + "${self}/s0meMiniPC-nix/disko/disk.nix" + "${self}/s0meMiniPC-nix/disko/lvm_vg.nix" - "${self}/s0meMiniPC-nix/console/console.nix" + "${self}/s0meMiniPC-nix/console/console.nix" - "${self}/s0meMiniPC-nix/environment/systemPackages.nix" - "${self}/s0meMiniPC-nix/environment/variables.nix" + "${self}/s0meMiniPC-nix/environment/systemPackages.nix" + "${self}/s0meMiniPC-nix/environment/variables.nix" - "${self}/s0meMiniPC-nix/hardware/cpu.nix" - "${self}/s0meMiniPC-nix/hardware/graphics.nix" - "${self}/s0meMiniPC-nix/hardware/zram.nix" + "${self}/s0meMiniPC-nix/hardware/cpu.nix" + "${self}/s0meMiniPC-nix/hardware/graphics.nix" + "${self}/s0meMiniPC-nix/hardware/zram.nix" - "${self}/s0meMiniPC-nix/home-manager/users.nix" + "${self}/s0meMiniPC-nix/home-manager/users.nix" - "${self}/s0meMiniPC-nix/i18n/locales.nix" + "${self}/s0meMiniPC-nix/i18n/locales.nix" - "${self}/s0meMiniPC-nix/networking/dhcp.nix" - "${self}/s0meMiniPC-nix/networking/firewall.nix" - "${self}/s0meMiniPC-nix/networking/hostname.nix" - "${self}/s0meMiniPC-nix/networking/networkmanager.nix" - "${self}/s0meMiniPC-nix/networking/wireguard.nix" - "${self}/s0meMiniPC-nix/networking/nameservers.nix" - "${self}/s0meMiniPC-nix/networking/hosts.nix" - "${self}/s0meMiniPC-nix/networking/hostId.nix" - "${self}/s0meMiniPC-nix/networking/interfaces.nix" + "${self}/s0meMiniPC-nix/networking/dhcp.nix" + "${self}/s0meMiniPC-nix/networking/firewall.nix" + "${self}/s0meMiniPC-nix/networking/hostname.nix" + "${self}/s0meMiniPC-nix/networking/networkmanager.nix" + "${self}/s0meMiniPC-nix/networking/wireguard.nix" + "${self}/s0meMiniPC-nix/networking/nameservers.nix" + "${self}/s0meMiniPC-nix/networking/hosts.nix" + "${self}/s0meMiniPC-nix/networking/hostId.nix" + "${self}/s0meMiniPC-nix/networking/interfaces.nix" - "${self}/s0meMiniPC-nix/nix/package.nix" - "${self}/s0meMiniPC-nix/nix/settings/allowed-users.nix" - "${self}/s0meMiniPC-nix/nix/settings/experimental-features.nix" - "${self}/s0meMiniPC-nix/nix/settings/substituters.nix" - "${self}/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix" - "${self}/s0meMiniPC-nix/nix/settings/trusted-users.nix" - "${self}/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix" + "${self}/s0meMiniPC-nix/nix/package.nix" + "${self}/s0meMiniPC-nix/nix/settings/allowed-users.nix" + "${self}/s0meMiniPC-nix/nix/settings/experimental-features.nix" + "${self}/s0meMiniPC-nix/nix/settings/substituters.nix" + "${self}/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix" + "${self}/s0meMiniPC-nix/nix/settings/trusted-users.nix" + "${self}/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix" - "${self}/s0meMiniPC-nix/nixpkgs/config.nix" - "${self}/s0meMiniPC-nix/nixpkgs/system.nix" + "${self}/s0meMiniPC-nix/nixpkgs/config.nix" + "${self}/s0meMiniPC-nix/nixpkgs/system.nix" - "${self}/s0meMiniPC-nix/programs/nh.nix" - "${self}/s0meMiniPC-nix/programs/ssh.nix" + "${self}/s0meMiniPC-nix/programs/nh.nix" + "${self}/s0meMiniPC-nix/programs/ssh.nix" - "${self}/s0meMiniPC-nix/security/polkit.nix" - "${self}/s0meMiniPC-nix/security/rtkit.nix" - "${self}/s0meMiniPC-nix/security/sudo.nix" - "${self}/s0meMiniPC-nix/security/sudo-rs.nix" + "${self}/s0meMiniPC-nix/security/polkit.nix" + "${self}/s0meMiniPC-nix/security/rtkit.nix" + "${self}/s0meMiniPC-nix/security/sudo.nix" + "${self}/s0meMiniPC-nix/security/sudo-rs.nix" - "${self}/s0meMiniPC-nix/services/greetd.nix" - "${self}/s0meMiniPC-nix/services/libinput.nix" - "${self}/s0meMiniPC-nix/services/openssh.nix" - "${self}/s0meMiniPC-nix/services/pipewire.nix" - "${self}/s0meMiniPC-nix/services/netbird.nix" - "${self}/s0meMiniPC-nix/services/scx.nix" - "${self}/s0meMiniPC-nix/services/xserver.nix" - "${self}/s0meMiniPC-nix/services/zapret.nix" - "${self}/s0meMiniPC-nix/services/zerotier.nix" - "${self}/s0meMiniPC-nix/services/usbmuxd.nix" - "${self}/s0meMiniPC-nix/services/irqbalance.nix" - "${self}/s0meMiniPC-nix/services/forgejo.nix" - "${self}/s0meMiniPC-nix/services/privatebin.nix" - "${self}/s0meMiniPC-nix/services/homepage.nix" - "${self}/s0meMiniPC-nix/services/zitadel.nix" - "${self}/s0meMiniPC-nix/sops/defaults.nix" - "${self}/s0meMiniPC-nix/sops/secrets.nix" + "${self}/s0meMiniPC-nix/services/greetd.nix" + "${self}/s0meMiniPC-nix/services/libinput.nix" + "${self}/s0meMiniPC-nix/services/openssh.nix" + "${self}/s0meMiniPC-nix/services/pipewire.nix" + "${self}/s0meMiniPC-nix/services/netbird.nix" + "${self}/s0meMiniPC-nix/services/scx.nix" + "${self}/s0meMiniPC-nix/services/xserver.nix" + "${self}/s0meMiniPC-nix/services/zapret.nix" + "${self}/s0meMiniPC-nix/services/zerotier.nix" + "${self}/s0meMiniPC-nix/services/usbmuxd.nix" + "${self}/s0meMiniPC-nix/services/irqbalance.nix" + "${self}/s0meMiniPC-nix/services/forgejo.nix" + "${self}/s0meMiniPC-nix/services/privatebin.nix" + "${self}/s0meMiniPC-nix/services/homepage.nix" + "${self}/s0meMiniPC-nix/services/zitadel.nix" + "${self}/s0meMiniPC-nix/sops/defaults.nix" + "${self}/s0meMiniPC-nix/sops/secrets.nix" - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" - "${self}/s0meMiniPC-nix/system/name.nix" - "${self}/s0meMiniPC-nix/system/stateVersion.nix" + "${self}/s0meMiniPC-nix/system/name.nix" + "${self}/s0meMiniPC-nix/system/stateVersion.nix" - "${self}/s0meMiniPC-nix/systemd/oomd.nix" - "${self}/s0meMiniPC-nix/systemd/slices/system-slice.nix" - "${self}/s0meMiniPC-nix/systemd/slices/user-slice.nix" - "${self}/s0meMiniPC-nix/systemd/slices/root-slice.nix" + "${self}/s0meMiniPC-nix/systemd/oomd.nix" + "${self}/s0meMiniPC-nix/systemd/slices/system-slice.nix" + "${self}/s0meMiniPC-nix/systemd/slices/user-slice.nix" + "${self}/s0meMiniPC-nix/systemd/slices/root-slice.nix" - "${self}/s0meMiniPC-nix/time/timeZone.nix" + "${self}/s0meMiniPC-nix/time/timeZone.nix" - "${self}/s0meMiniPC-nix/users/users/hand7s.nix" - "${self}/s0meMiniPC-nix/users/users/root.nix" - "${self}/s0meMiniPC-nix/users/mutableUsers.nix" + "${self}/s0meMiniPC-nix/users/users/hand7s.nix" + "${self}/s0meMiniPC-nix/users/users/root.nix" + "${self}/s0meMiniPC-nix/users/mutableUsers.nix" - "${self}/s0meMiniPC-nix/virtualisation/docker.nix" - ]; + "${self}/s0meMiniPC-nix/virtualisation/docker.nix" + ]; } diff --git a/s0meMiniPC-nix/disko/disk.nix b/s0meMiniPC-nix/disko/disk.nix index 17f4f48..2eb4b2e 100644 --- a/s0meMiniPC-nix/disko/disk.nix +++ b/s0meMiniPC-nix/disko/disk.nix @@ -1,39 +1,39 @@ { - disko = { - devices = { - disk = { - main = { - device = "/dev/disk/by-id/ata-EAGET_SSD_256GB_EAGET20250505V00003"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "1024M"; - name = "boot"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "fmask=0022" - "dmask=0022" - ]; - }; - }; - - root = { - size = "100%"; - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; + disko = { + devices = { + disk = { + main = { + device = "/dev/disk/by-id/ata-EAGET_SSD_256GB_EAGET20250505V00003"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + type = "EF00"; + size = "1024M"; + name = "boot"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "fmask=0022" + "dmask=0022" + ]; }; + }; + + root = { + size = "100%"; + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; }; + }; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/disko/lvm_vg.nix b/s0meMiniPC-nix/disko/lvm_vg.nix index 581f0c0..9734719 100644 --- a/s0meMiniPC-nix/disko/lvm_vg.nix +++ b/s0meMiniPC-nix/disko/lvm_vg.nix @@ -1,51 +1,51 @@ { - disko = { - devices = { - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ - "-f" - ]; + disko = { + devices = { + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%"; + content = { + type = "btrfs"; + extraArgs = [ + "-f" + ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ - "compress=zstd" - "noatime" - "discard=async" - ]; - }; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = [ + "compress=zstd" + "noatime" + "discard=async" + ]; + }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ - "compress=zstd" - "noatime" - "discard=async" - ]; - }; + "/home" = { + mountpoint = "/home"; + mountOptions = [ + "compress=zstd" + "noatime" + "discard=async" + ]; + }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ - "compress=zstd" - "noatime" - "discard=async" - ]; - }; - }; - }; - }; - }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = [ + "compress=zstd" + "noatime" + "discard=async" + ]; + }; }; + }; }; + }; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/environment/systemPackages.nix b/s0meMiniPC-nix/environment/systemPackages.nix index 9c908cb..28deca2 100644 --- a/s0meMiniPC-nix/environment/systemPackages.nix +++ b/s0meMiniPC-nix/environment/systemPackages.nix @@ -1,14 +1,14 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - environment = { - systemPackages = with pkgs; [ - (lib.hiPrio uutils-coreutils-noprefix) - uutils-findutils - uutils-diffutils - home-manager - ]; - }; + environment = { + systemPackages = with pkgs; [ + (lib.hiPrio uutils-coreutils-noprefix) + uutils-findutils + uutils-diffutils + home-manager + ]; + }; } diff --git a/s0meMiniPC-nix/environment/variables.nix b/s0meMiniPC-nix/environment/variables.nix index a25cb89..52c5a9e 100644 --- a/s0meMiniPC-nix/environment/variables.nix +++ b/s0meMiniPC-nix/environment/variables.nix @@ -1,19 +1,19 @@ {config, ...}: { - environment = { - variables = { - AMD_VULKAN_ICD = "RADV"; - HOSTNAME = config.networking.hostName; - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - GDK_BACKEND = "wayland"; - NIXPKGS_ALLOW_UNFREE = "1"; - NIXPKGS_ALLOW_INSECURE = "1"; - NIXOS_OZONE_WL = "1"; - GRIMBLAST_HIDE_CURSOR = "0"; - TERM = "xterm-256color"; - }; - - enableAllTerminfo = true; + environment = { + variables = { + AMD_VULKAN_ICD = "RADV"; + HOSTNAME = config.networking.hostName; + QT_QPA_PLATFORM = "wayland"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + GDK_BACKEND = "wayland"; + NIXPKGS_ALLOW_UNFREE = "1"; + NIXPKGS_ALLOW_INSECURE = "1"; + NIXOS_OZONE_WL = "1"; + GRIMBLAST_HIDE_CURSOR = "0"; + TERM = "xterm-256color"; }; + + enableAllTerminfo = true; + }; } diff --git a/s0meMiniPC-nix/hardware/cpu.nix b/s0meMiniPC-nix/hardware/cpu.nix index 6df481d..e5746c6 100644 --- a/s0meMiniPC-nix/hardware/cpu.nix +++ b/s0meMiniPC-nix/hardware/cpu.nix @@ -1,10 +1,10 @@ {...}: { - hardware = { - enableRedistributableFirmware = true; - cpu = { - intel = { - updateMicrocode = true; - }; - }; + hardware = { + enableRedistributableFirmware = true; + cpu = { + intel = { + updateMicrocode = true; + }; }; + }; } diff --git a/s0meMiniPC-nix/hardware/graphics.nix b/s0meMiniPC-nix/hardware/graphics.nix index 25bb223..f81ccb7 100644 --- a/s0meMiniPC-nix/hardware/graphics.nix +++ b/s0meMiniPC-nix/hardware/graphics.nix @@ -1,8 +1,8 @@ {...}: { - hardware = { - graphics = { - enable = true; - enable32Bit = true; - }; + hardware = { + graphics = { + enable = true; + enable32Bit = true; }; + }; } diff --git a/s0meMiniPC-nix/hardware/zram.nix b/s0meMiniPC-nix/hardware/zram.nix index c6a41f1..b973787 100644 --- a/s0meMiniPC-nix/hardware/zram.nix +++ b/s0meMiniPC-nix/hardware/zram.nix @@ -1,8 +1,8 @@ {...}: { - zramSwap = { - enable = true; - algorithm = "zstd"; - priority = 100; - memoryPercent = 100; - }; + zramSwap = { + enable = true; + algorithm = "zstd"; + priority = 100; + memoryPercent = 100; + }; } diff --git a/s0meMiniPC-nix/home-manager/users.nix b/s0meMiniPC-nix/home-manager/users.nix index d2a3d80..04c47d9 100644 --- a/s0meMiniPC-nix/home-manager/users.nix +++ b/s0meMiniPC-nix/home-manager/users.nix @@ -1,30 +1,30 @@ { - inputs, - self, - ... + inputs, + self, + ... }: { - home-manager = { - users = { - hand7s = { - imports = [ - "${self}/hand7s/" - inputs.spicetify-nix.homeManagerModules.default - inputs.hyprland.homeManagerModules.default - inputs.chaotic.homeManagerModules.default - inputs.sops-nix.homeManagerModules.sops + home-manager = { + users = { + hand7s = { + imports = [ + "${self}/hand7s/" + inputs.spicetify-nix.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.chaotic.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops - inputs.nix-index-database.homeModules.nix-index - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - inputs - self - ; - }; + inputs.nix-index-database.homeModules.nix-index + ]; + }; }; + + backupFileExtension = "force"; + + extraSpecialArgs = { + inherit + inputs + self + ; + }; + }; } diff --git a/s0meMiniPC-nix/i18n/locales.nix b/s0meMiniPC-nix/i18n/locales.nix index 4524693..09234a5 100644 --- a/s0meMiniPC-nix/i18n/locales.nix +++ b/s0meMiniPC-nix/i18n/locales.nix @@ -1,9 +1,9 @@ {...}: { - i18n = { - defaultLocale = "en_US.UTF-8"; - supportedLocales = [ - "en_US.UTF-8/UTF-8" - "ru_RU.UTF-8/UTF-8" - ]; - }; + i18n = { + defaultLocale = "en_US.UTF-8"; + supportedLocales = [ + "en_US.UTF-8/UTF-8" + "ru_RU.UTF-8/UTF-8" + ]; + }; } diff --git a/s0meMiniPC-nix/networking/dhcp.nix b/s0meMiniPC-nix/networking/dhcp.nix index d24c2c2..0740ea3 100644 --- a/s0meMiniPC-nix/networking/dhcp.nix +++ b/s0meMiniPC-nix/networking/dhcp.nix @@ -1,10 +1,10 @@ {lib, ...}: { - networking = { - useDHCP = lib.mkDefault true; - dhcpcd = { - enable = true; - persistent = false; - wait = "any"; - }; + networking = { + useDHCP = lib.mkDefault true; + dhcpcd = { + enable = true; + persistent = false; + wait = "any"; }; + }; } diff --git a/s0meMiniPC-nix/networking/firewall.nix b/s0meMiniPC-nix/networking/firewall.nix index 9b09a3f..7023a46 100644 --- a/s0meMiniPC-nix/networking/firewall.nix +++ b/s0meMiniPC-nix/networking/firewall.nix @@ -1,26 +1,26 @@ {...}: { - networking = { - firewall = { - allowPing = true; - enable = true; - checkReversePath = false; - allowedUDPPorts = [ - 80 - 8080 - 8443 - 53350 - 53351 - 53353 - ]; + networking = { + firewall = { + allowPing = true; + enable = true; + checkReversePath = false; + allowedUDPPorts = [ + 80 + 8080 + 8443 + 53350 + 53351 + 53353 + ]; - allowedTCPPorts = [ - 80 - 8080 - 8443 - 53350 - 53351 - 53353 - ]; - }; + allowedTCPPorts = [ + 80 + 8080 + 8443 + 53350 + 53351 + 53353 + ]; }; + }; } diff --git a/s0meMiniPC-nix/networking/hostId.nix b/s0meMiniPC-nix/networking/hostId.nix index ad0e364..10b6b21 100644 --- a/s0meMiniPC-nix/networking/hostId.nix +++ b/s0meMiniPC-nix/networking/hostId.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostId = "5c79d46a"; - }; + networking = { + hostId = "5c79d46a"; + }; } diff --git a/s0meMiniPC-nix/networking/hostname.nix b/s0meMiniPC-nix/networking/hostname.nix index 2766273..ba82957 100644 --- a/s0meMiniPC-nix/networking/hostname.nix +++ b/s0meMiniPC-nix/networking/hostname.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostName = "s0meMiniPC-nix"; - }; + networking = { + hostName = "s0meMiniPC-nix"; + }; } diff --git a/s0meMiniPC-nix/networking/hosts.nix b/s0meMiniPC-nix/networking/hosts.nix index 872a53c..04747e5 100644 --- a/s0meMiniPC-nix/networking/hosts.nix +++ b/s0meMiniPC-nix/networking/hosts.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - hosts = { - # nope - }; + networking = { + hosts = { + # nope }; + }; } diff --git a/s0meMiniPC-nix/networking/interfaces.nix b/s0meMiniPC-nix/networking/interfaces.nix index 29f6fad..26f5eb8 100644 --- a/s0meMiniPC-nix/networking/interfaces.nix +++ b/s0meMiniPC-nix/networking/interfaces.nix @@ -1,29 +1,29 @@ {...}: { - networking = { - firewall = { - interfaces = { - wt0 = { - allowedUDPPorts = [ - 25 - 6969 - 8080 - 8443 - 53350 - 53351 - 53352 - ]; + networking = { + firewall = { + interfaces = { + wt0 = { + allowedUDPPorts = [ + 25 + 6969 + 8080 + 8443 + 53350 + 53351 + 53352 + ]; - allowedTCPPorts = [ - 25 - 6969 - 8080 - 8443 - 53350 - 53351 - 53352 - ]; - }; - }; + allowedTCPPorts = [ + 25 + 6969 + 8080 + 8443 + 53350 + 53351 + 53352 + ]; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/networking/nameservers.nix b/s0meMiniPC-nix/networking/nameservers.nix index 1b65035..a4d22c1 100644 --- a/s0meMiniPC-nix/networking/nameservers.nix +++ b/s0meMiniPC-nix/networking/nameservers.nix @@ -1,29 +1,29 @@ {...}: { - networking = { - nameservers = [ - # cf dns - "1.1.1.1" - "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" + networking = { + nameservers = [ + # cf dns + "1.1.1.1" + "1.0.0.1" + "2606:4700:4700::1111" + "2606:4700:4700::1001" - # google dns - "8.8.8.8" - "8.8.4.4" - "2001:4860:4860::8888" - "2001:4860:4860::8844" + # google dns + "8.8.8.8" + "8.8.4.4" + "2001:4860:4860::8888" + "2001:4860:4860::8844" - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" + # q9 dns + "9.9.9.9" + "149.112.112.112" + "2620:fe::fe" + "2620:fe::9" - # open dns - "208.67.222.222" - "208.67.220.220" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; + # open dns + "208.67.222.222" + "208.67.220.220" + "2620:119:35::35" + "2620:119:53::53" + ]; + }; } diff --git a/s0meMiniPC-nix/networking/networkmanager.nix b/s0meMiniPC-nix/networking/networkmanager.nix index 2ea464e..3d66f30 100644 --- a/s0meMiniPC-nix/networking/networkmanager.nix +++ b/s0meMiniPC-nix/networking/networkmanager.nix @@ -1,9 +1,9 @@ {...}: { - networking = { - networkmanager = { - enable = false; - }; - - useNetworkd = true; + networking = { + networkmanager = { + enable = false; }; + + useNetworkd = true; + }; } diff --git a/s0meMiniPC-nix/networking/timeServers.nix b/s0meMiniPC-nix/networking/timeServers.nix index 07f3b87..88e14c4 100644 --- a/s0meMiniPC-nix/networking/timeServers.nix +++ b/s0meMiniPC-nix/networking/timeServers.nix @@ -1,10 +1,10 @@ {...}: { - networking = { - timeServers = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; - }; + networking = { + timeServers = [ + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" + ]; + }; } diff --git a/s0meMiniPC-nix/networking/wireguard.nix b/s0meMiniPC-nix/networking/wireguard.nix index a618877..2ee5c02 100644 --- a/s0meMiniPC-nix/networking/wireguard.nix +++ b/s0meMiniPC-nix/networking/wireguard.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - wireguard = { - enable = true; - }; + networking = { + wireguard = { + enable = true; }; + }; } diff --git a/s0meMiniPC-nix/nix/package.nix b/s0meMiniPC-nix/nix/package.nix index c947a27..b2d6823 100644 --- a/s0meMiniPC-nix/nix/package.nix +++ b/s0meMiniPC-nix/nix/package.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - nix = { - package = pkgs.nixVersions.latest; - }; + nix = { + package = pkgs.nixVersions.latest; + }; } diff --git a/s0meMiniPC-nix/nix/settings/allowed-users.nix b/s0meMiniPC-nix/nix/settings/allowed-users.nix index d05c725..d483d0c 100644 --- a/s0meMiniPC-nix/nix/settings/allowed-users.nix +++ b/s0meMiniPC-nix/nix/settings/allowed-users.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - sandbox = true; - allowed-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + sandbox = true; + allowed-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix b/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix index 731bc0c..14f13c5 100644 --- a/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix +++ b/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix @@ -1,7 +1,7 @@ {...}: { - nix = { - settings = { - auto-optimise-store = true; - }; + nix = { + settings = { + auto-optimise-store = true; }; + }; } diff --git a/s0meMiniPC-nix/nix/settings/experimental-features.nix b/s0meMiniPC-nix/nix/settings/experimental-features.nix index f2161b9..7ce7e89 100644 --- a/s0meMiniPC-nix/nix/settings/experimental-features.nix +++ b/s0meMiniPC-nix/nix/settings/experimental-features.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + nix = { + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; }; + }; } diff --git a/s0meMiniPC-nix/nix/settings/substituters.nix b/s0meMiniPC-nix/nix/settings/substituters.nix index d8b7f80..762ec5c 100644 --- a/s0meMiniPC-nix/nix/settings/substituters.nix +++ b/s0meMiniPC-nix/nix/settings/substituters.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://ags.cachix.org" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - "https://colmena.cachix.org" - ]; - }; + nix = { + settings = { + substituters = [ + # cache.nixos.org + "https://cache.nixos.org" + # cache.garnix.org + "https://cache.garnix.io" + # cachix + "https://nix-community.cachix.org/" + "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" + "https://hyprland.cachix.org" + "https://chaotic-nyx.cachix.org/" + "https://colmena.cachix.org" + ]; }; + }; } diff --git a/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix b/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix index 7e9f894..e8710cb 100644 --- a/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix +++ b/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - trusted-public-keys = [ - # cache.nixos.org - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - # cache.garnix.io - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # cachix.org - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" - ]; - }; + nix = { + settings = { + trusted-public-keys = [ + # cache.nixos.org + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + # cache.garnix.io + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # cachix.org + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" + ]; }; + }; } diff --git a/s0meMiniPC-nix/nix/settings/trusted-users.nix b/s0meMiniPC-nix/nix/settings/trusted-users.nix index 93619a5..e4a9dae 100644 --- a/s0meMiniPC-nix/nix/settings/trusted-users.nix +++ b/s0meMiniPC-nix/nix/settings/trusted-users.nix @@ -1,9 +1,9 @@ {...}: { - nix = { - settings = { - trusted-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + trusted-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0meMiniPC-nix/nixpkgs/config.nix b/s0meMiniPC-nix/nixpkgs/config.nix index d8de016..27b79b0 100644 --- a/s0meMiniPC-nix/nixpkgs/config.nix +++ b/s0meMiniPC-nix/nixpkgs/config.nix @@ -1,8 +1,8 @@ {...}: { - nixpkgs = { - config = { - allowUnfree = true; - allowBroken = true; - }; + nixpkgs = { + config = { + allowUnfree = true; + allowBroken = true; }; + }; } diff --git a/s0meMiniPC-nix/nixpkgs/overlays.nix b/s0meMiniPC-nix/nixpkgs/overlays.nix index da060e9..2881eba 100644 --- a/s0meMiniPC-nix/nixpkgs/overlays.nix +++ b/s0meMiniPC-nix/nixpkgs/overlays.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - overlays = [ - ]; - }; + nixpkgs = { + overlays = [ + ]; + }; } diff --git a/s0meMiniPC-nix/nixpkgs/system.nix b/s0meMiniPC-nix/nixpkgs/system.nix index c8930f6..63fda3b 100644 --- a/s0meMiniPC-nix/nixpkgs/system.nix +++ b/s0meMiniPC-nix/nixpkgs/system.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - system = "x86_64-linux"; - hostPlatform = "x86_64-linux"; - }; + nixpkgs = { + system = "x86_64-linux"; + hostPlatform = "x86_64-linux"; + }; } diff --git a/s0meMiniPC-nix/programs/nh.nix b/s0meMiniPC-nix/programs/nh.nix index da214cc..f43fb06 100644 --- a/s0meMiniPC-nix/programs/nh.nix +++ b/s0meMiniPC-nix/programs/nh.nix @@ -1,12 +1,12 @@ {...}: { - programs = { - nh = { - enable = true; - clean = { - enable = true; - dates = "weekly"; - extraArgs = "--keep 2 --keep-since 2d"; - }; - }; + programs = { + nh = { + enable = true; + clean = { + enable = true; + dates = "weekly"; + extraArgs = "--keep 2 --keep-since 2d"; + }; }; + }; } diff --git a/s0meMiniPC-nix/programs/ssh.nix b/s0meMiniPC-nix/programs/ssh.nix index 241ba79..b7b9d20 100644 --- a/s0meMiniPC-nix/programs/ssh.nix +++ b/s0meMiniPC-nix/programs/ssh.nix @@ -1,7 +1,7 @@ {...}: { - programs = { - ssh = { - startAgent = true; - }; + programs = { + ssh = { + startAgent = true; }; + }; } diff --git a/s0meMiniPC-nix/security/polkit.nix b/s0meMiniPC-nix/security/polkit.nix index 712b489..7604e82 100644 --- a/s0meMiniPC-nix/security/polkit.nix +++ b/s0meMiniPC-nix/security/polkit.nix @@ -1,10 +1,10 @@ {...}: { - security = { - polkit = { - enable = true; - adminIdentities = [ - "unix-group:wheel" - ]; - }; + security = { + polkit = { + enable = true; + adminIdentities = [ + "unix-group:wheel" + ]; }; + }; } diff --git a/s0meMiniPC-nix/security/rtkit.nix b/s0meMiniPC-nix/security/rtkit.nix index 2cb5541..d3604df 100644 --- a/s0meMiniPC-nix/security/rtkit.nix +++ b/s0meMiniPC-nix/security/rtkit.nix @@ -1,7 +1,7 @@ {...}: { - security = { - rtkit = { - enable = true; - }; + security = { + rtkit = { + enable = true; }; + }; } diff --git a/s0meMiniPC-nix/security/sudo-rs.nix b/s0meMiniPC-nix/security/sudo-rs.nix index f428d59..772460d 100644 --- a/s0meMiniPC-nix/security/sudo-rs.nix +++ b/s0meMiniPC-nix/security/sudo-rs.nix @@ -1,9 +1,9 @@ {...}: { - security = { - sudo-rs = { - enable = true; - wheelNeedsPassword = true; - execWheelOnly = true; - }; + security = { + sudo-rs = { + enable = true; + wheelNeedsPassword = true; + execWheelOnly = true; }; + }; } diff --git a/s0meMiniPC-nix/security/sudo.nix b/s0meMiniPC-nix/security/sudo.nix index ed69b5e..393528d 100644 --- a/s0meMiniPC-nix/security/sudo.nix +++ b/s0meMiniPC-nix/security/sudo.nix @@ -1,7 +1,7 @@ {lib, ...}: { - security = { - sudo = { - enable = lib.mkDefault false; - }; + security = { + sudo = { + enable = lib.mkDefault false; }; + }; } diff --git a/s0meMiniPC-nix/services/forgejo.nix b/s0meMiniPC-nix/services/forgejo.nix index bbb42c2..84774ef 100644 --- a/s0meMiniPC-nix/services/forgejo.nix +++ b/s0meMiniPC-nix/services/forgejo.nix @@ -1,123 +1,123 @@ {...}: { - services = { - forgejo = { - enable = true; + services = { + forgejo = { + enable = true; - database = { - type = "postgres"; - port = "${dbport}"; - }; + database = { + type = "postgres"; + port = "${dbport}"; + }; - settings = { - DEFAULT = { - APP_NAME = "Forgejo"; - APP_SLOGAN = "hand7s'es instance"; - APP_DISPLAY_NAME_FORMAT = "{APP_NAME}: {APP_SLOGAN}."; - RUN_MODE = "prod"; - }; - - repository = { - DEFAULT_PRIVATE = "last"; - PREFERRED_LICENSES = "MIT"; - DISABLE_HTTP_GIT = true; - USE_COMPAT_SSH_URI = true; - GO_GET_CLONE_URL_PROTOCOL = "ssh"; - DEFAULT_BRANCH = "master"; - }; - - "repository.pull-request" = { - WORK_IN_PROGRESS_PREFIXES = "[WIP]:"; - }; - - "repository.issue" = { - MAX_PINNED = 2; - }; - - "repository.upload" = { - ENABLED = true; - FILE_MAX_SIZE = 25; - MAX_FILES = 10; - }; - - "repository.signing" = { - FORMAT = "openssh"; - INITIAL_COMMIT = "always"; - WIKI = "always"; - CRUD_ACTIONS = "always"; - MERGES = "always"; - }; - - badges = { - ENABLED = false; - }; - - cors = { - ENABLED = false; - }; - - actions = { - ENABLED = false; - }; - - mailer = { - ENABLED = false; - }; - - cron = { - ENABLED = false; - }; - - metrics = { - ENABLED = false; - }; - - federation = { - ENABLED = false; - }; - - ui = { - DEFAULT_THEME = "forgejo-auto-tritanopia"; - }; - - "ui.meta" = { - AUTHOR = "hand7s'es Forgejo instance"; - DESCRIPTION = "Forgejo - by Codeberg."; - }; - - log = { - LEVEL = "Warn"; - }; - - service = { - DISABLE_REGISTRATION = true; - }; - - "service.explore" = { - DISABLE_ORGANIZATIONS_PAGE = true; - }; - - server = { - DOMAIN = "git.hand7s.org"; - ROOT_URL = "https://git.hand7s.org"; - - HTTP_PORT = 53350; - - START_SSH_SERVER = false; - LFS_START_SERVER = false; - }; - - openid = { - ENABLE_OPENID_SIGNIN = true; - ENABLE_OPENID_SIGNUP = true; - }; - - cache = { - ADAPTER = "redis"; - INTERVAL = "900"; - HOST = ""; - ITEM_TTL = "1h"; - }; - }; + settings = { + DEFAULT = { + APP_NAME = "Forgejo"; + APP_SLOGAN = "hand7s'es instance"; + APP_DISPLAY_NAME_FORMAT = "{APP_NAME}: {APP_SLOGAN}."; + RUN_MODE = "prod"; }; + + repository = { + DEFAULT_PRIVATE = "last"; + PREFERRED_LICENSES = "MIT"; + DISABLE_HTTP_GIT = true; + USE_COMPAT_SSH_URI = true; + GO_GET_CLONE_URL_PROTOCOL = "ssh"; + DEFAULT_BRANCH = "master"; + }; + + "repository.pull-request" = { + WORK_IN_PROGRESS_PREFIXES = "[WIP]:"; + }; + + "repository.issue" = { + MAX_PINNED = 2; + }; + + "repository.upload" = { + ENABLED = true; + FILE_MAX_SIZE = 25; + MAX_FILES = 10; + }; + + "repository.signing" = { + FORMAT = "openssh"; + INITIAL_COMMIT = "always"; + WIKI = "always"; + CRUD_ACTIONS = "always"; + MERGES = "always"; + }; + + badges = { + ENABLED = false; + }; + + cors = { + ENABLED = false; + }; + + actions = { + ENABLED = false; + }; + + mailer = { + ENABLED = false; + }; + + cron = { + ENABLED = false; + }; + + metrics = { + ENABLED = false; + }; + + federation = { + ENABLED = false; + }; + + ui = { + DEFAULT_THEME = "forgejo-auto-tritanopia"; + }; + + "ui.meta" = { + AUTHOR = "hand7s'es Forgejo instance"; + DESCRIPTION = "Forgejo - by Codeberg."; + }; + + log = { + LEVEL = "Warn"; + }; + + service = { + DISABLE_REGISTRATION = true; + }; + + "service.explore" = { + DISABLE_ORGANIZATIONS_PAGE = true; + }; + + server = { + DOMAIN = "git.hand7s.org"; + ROOT_URL = "https://git.hand7s.org"; + + HTTP_PORT = 53350; + + START_SSH_SERVER = false; + LFS_START_SERVER = false; + }; + + openid = { + ENABLE_OPENID_SIGNIN = true; + ENABLE_OPENID_SIGNUP = true; + }; + + cache = { + ADAPTER = "redis"; + INTERVAL = "900"; + HOST = ""; + ITEM_TTL = "1h"; + }; + }; }; + }; } diff --git a/s0meMiniPC-nix/services/greetd.nix b/s0meMiniPC-nix/services/greetd.nix index 7589ded..2463dc1 100644 --- a/s0meMiniPC-nix/services/greetd.nix +++ b/s0meMiniPC-nix/services/greetd.nix @@ -1,18 +1,18 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - services = { - greetd = { - enable = true; - restart = false; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.fish}"; - user = "greeter"; - }; - }; + services = { + greetd = { + enable = true; + restart = false; + settings = { + default_session = { + command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.fish}"; + user = "greeter"; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/services/homepage.nix b/s0meMiniPC-nix/services/homepage.nix index 87c2a94..2999560 100644 --- a/s0meMiniPC-nix/services/homepage.nix +++ b/s0meMiniPC-nix/services/homepage.nix @@ -1,91 +1,91 @@ {...}: { - services = { - homepage-dashboard = { - enable = true; - listenPort = 8080; + services = { + homepage-dashboard = { + enable = true; + listenPort = 8080; - settings = { - title = "hand7s homepage"; - description = "duh"; - theme = "dark"; - background = "https://w.wallhaven.cc/full/1q/wallhaven-1q87xv.png"; - color = "violet"; - headerStyle = "boxed"; + settings = { + title = "hand7s homepage"; + description = "duh"; + theme = "dark"; + background = "https://w.wallhaven.cc/full/1q/wallhaven-1q87xv.png"; + color = "violet"; + headerStyle = "boxed"; - layout = [ - { - Dev = { - iconsOnly = true; - }; - } - ]; + layout = [ + { + Dev = { + iconsOnly = true; }; + } + ]; + }; - bookmarks = [ + bookmarks = [ + { + Dev = [ + { + GitHub = [ { - Dev = [ - { - GitHub = [ - { - abbr = "GH"; - href = "https://github.com/"; - } - ]; - } - - { - Forgejo = [ - { - abbr = "Forge"; - href = "https://git.hand7s.org/"; - } - ]; - } - - { - PivateBin = [ - { - abbr = "PB"; - href = "https://bin.hand7s.org/"; - } - ]; - } - ]; + abbr = "GH"; + href = "https://github.com/"; } - ]; + ]; + } - services = [ - ]; - - widgets = [ + { + Forgejo = [ { - greeting = { - text_size = "xl"; - text = "Hi, hand7s."; - }; + abbr = "Forge"; + href = "https://git.hand7s.org/"; } + ]; + } + { + PivateBin = [ { - search = { - provider = "google"; - target = "_blank"; - focus = true; - }; + abbr = "PB"; + href = "https://bin.hand7s.org/"; } + ]; + } + ]; + } + ]; - { - resources = { - cpu = true; - memory = true; - disk = "/"; - cputemp = true; - uptime = true; - units = "metric"; - refresh = 3000; - network = true; - }; - } - ]; - }; + services = [ + ]; + + widgets = [ + { + greeting = { + text_size = "xl"; + text = "Hi, hand7s."; + }; + } + + { + search = { + provider = "google"; + target = "_blank"; + focus = true; + }; + } + + { + resources = { + cpu = true; + memory = true; + disk = "/"; + cputemp = true; + uptime = true; + units = "metric"; + refresh = 3000; + network = true; + }; + } + ]; }; + }; } diff --git a/s0meMiniPC-nix/services/irqbalance.nix b/s0meMiniPC-nix/services/irqbalance.nix index c474ed2..2b3b1dd 100644 --- a/s0meMiniPC-nix/services/irqbalance.nix +++ b/s0meMiniPC-nix/services/irqbalance.nix @@ -1,7 +1,7 @@ {...}: { - services = { - irqbalance = { - enable = true; - }; + services = { + irqbalance = { + enable = true; }; + }; } diff --git a/s0meMiniPC-nix/services/libinput.nix b/s0meMiniPC-nix/services/libinput.nix index 673145b..d859d7f 100644 --- a/s0meMiniPC-nix/services/libinput.nix +++ b/s0meMiniPC-nix/services/libinput.nix @@ -1,15 +1,15 @@ {...}: { - services = { - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - accelSpeed = "-1.0"; - buttonMapping = "1 2 3 4 5 6 7 8 9"; - horizontalScrolling = true; - leftHanded = false; - naturalScrolling = true; - }; - }; + services = { + libinput = { + enable = true; + mouse = { + accelProfile = "flat"; + accelSpeed = "-1.0"; + buttonMapping = "1 2 3 4 5 6 7 8 9"; + horizontalScrolling = true; + leftHanded = false; + naturalScrolling = true; + }; }; + }; } diff --git a/s0meMiniPC-nix/services/netbird.nix b/s0meMiniPC-nix/services/netbird.nix index 71e3cd8..071330a 100644 --- a/s0meMiniPC-nix/services/netbird.nix +++ b/s0meMiniPC-nix/services/netbird.nix @@ -1,7 +1,7 @@ {...}: { - services = { - netbird = { - enable = true; - }; + services = { + netbird = { + enable = true; }; + }; } diff --git a/s0meMiniPC-nix/services/openssh.nix b/s0meMiniPC-nix/services/openssh.nix index 25d25af..0abb7bf 100644 --- a/s0meMiniPC-nix/services/openssh.nix +++ b/s0meMiniPC-nix/services/openssh.nix @@ -1,22 +1,22 @@ {config, ...}: { - services = { - openssh = { - enable = true; - allowSFTP = true; - openFirewall = true; - ports = [ - 47345 - ]; + services = { + openssh = { + enable = true; + allowSFTP = true; + openFirewall = true; + ports = [ + 47345 + ]; - settings = { - PrintMotd = false; - PermitRootLogin = "no"; - PasswordAuthentication = false; - }; + settings = { + PrintMotd = false; + PermitRootLogin = "no"; + PasswordAuthentication = false; + }; - authorizedKeysFiles = [ - config.sops.secrets.sshKey.path - ]; - }; + authorizedKeysFiles = [ + config.sops.secrets.sshKey.path + ]; }; + }; } diff --git a/s0meMiniPC-nix/services/pipewire.nix b/s0meMiniPC-nix/services/pipewire.nix index 7c94208..c4bad1e 100644 --- a/s0meMiniPC-nix/services/pipewire.nix +++ b/s0meMiniPC-nix/services/pipewire.nix @@ -1,65 +1,65 @@ {...}: { - services = { + services = { + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + + audio = { + enable = true; + }; + + pulse = { + enable = true; + }; + + jack = { + enable = true; + }; + + wireplumber = { + enable = true; + }; + + extraConfig = { pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; + "92-low-latency" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 88200 + 96000 + ]; + + "default.clock.min-quantum" = 512; + "default.clock.quantum" = 4096; + "default.clock.max-quantum" = 8192; }; + }; - audio = { - enable = true; + "93-no-resampling" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 96000 + 192000 + ]; }; + }; - pulse = { - enable = true; - }; - - jack = { - enable = true; - }; - - wireplumber = { - enable = true; - }; - - extraConfig = { - pipewire = { - "92-low-latency" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 88200 - 96000 - ]; - - "default.clock.min-quantum" = 512; - "default.clock.quantum" = 4096; - "default.clock.max-quantum" = 8192; - }; - }; - - "93-no-resampling" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 96000 - 192000 - ]; - }; - }; - - "94-no-upmixing" = { - "stream.properties" = { - "channelmix.upmix" = false; - }; - }; - }; + "94-no-upmixing" = { + "stream.properties" = { + "channelmix.upmix" = false; }; + }; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/services/privatebin.nix b/s0meMiniPC-nix/services/privatebin.nix index bec233f..0db50ad 100644 --- a/s0meMiniPC-nix/services/privatebin.nix +++ b/s0meMiniPC-nix/services/privatebin.nix @@ -1,43 +1,43 @@ {...}: { - services = { - privatebin = { - enable = true; - enableNginx = true; - virtualHost = "bin.hand7s.org"; - settings = { - main = { - name = "hand7s bin"; - discussion = false; - qrcode = false; - compression = "none"; - defaultformatter = "plaintext"; - fileupload = false; - languageselection = false; - password = true; - sizelimit = 10 * 1000 * 1000; - template = "bootstrap5"; - }; - - expire = { - default = "1week"; - clone = false; - }; - - formatter_options = { - markdown = "Markdown"; - plaintext = "Plain Text"; - syntaxhighlighting = "Source Code"; - }; - - traffic = { - limit = 5; - }; - - purge = { - limit = 0; - batchsize = 10; - }; - }; + services = { + privatebin = { + enable = true; + enableNginx = true; + virtualHost = "bin.hand7s.org"; + settings = { + main = { + name = "hand7s bin"; + discussion = false; + qrcode = false; + compression = "none"; + defaultformatter = "plaintext"; + fileupload = false; + languageselection = false; + password = true; + sizelimit = 10 * 1000 * 1000; + template = "bootstrap5"; }; + + expire = { + default = "1week"; + clone = false; + }; + + formatter_options = { + markdown = "Markdown"; + plaintext = "Plain Text"; + syntaxhighlighting = "Source Code"; + }; + + traffic = { + limit = 5; + }; + + purge = { + limit = 0; + batchsize = 10; + }; + }; }; + }; } diff --git a/s0meMiniPC-nix/services/scx.nix b/s0meMiniPC-nix/services/scx.nix index 133dcc1..a60071f 100644 --- a/s0meMiniPC-nix/services/scx.nix +++ b/s0meMiniPC-nix/services/scx.nix @@ -1,9 +1,9 @@ {...}: { - services = { - scx = { - enable = true; - # package = pkgs.scx_git.full; - scheduler = "scx_lavd"; - }; + services = { + scx = { + enable = true; + # package = pkgs.scx_git.full; + scheduler = "scx_lavd"; }; + }; } diff --git a/s0meMiniPC-nix/services/usbmuxd.nix b/s0meMiniPC-nix/services/usbmuxd.nix index aa3637a..34606ed 100644 --- a/s0meMiniPC-nix/services/usbmuxd.nix +++ b/s0meMiniPC-nix/services/usbmuxd.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - services = { - usbmuxd = { - enable = true; - package = pkgs.usbmuxd2; - }; + services = { + usbmuxd = { + enable = true; + package = pkgs.usbmuxd2; }; + }; } diff --git a/s0meMiniPC-nix/services/xserver.nix b/s0meMiniPC-nix/services/xserver.nix index 2147b3a..370a47d 100644 --- a/s0meMiniPC-nix/services/xserver.nix +++ b/s0meMiniPC-nix/services/xserver.nix @@ -1,26 +1,26 @@ { - lib, - pkgs, - ... + lib, + pkgs, + ... }: { - services = { - xserver = { - display = lib.mkForce 0; - enable = true; + services = { + xserver = { + display = lib.mkForce 0; + enable = true; - excludePackages = with pkgs; [ - xterm - ]; + excludePackages = with pkgs; [ + xterm + ]; - videoDrivers = [ - "modesetting" - ]; + videoDrivers = [ + "modesetting" + ]; - xkb = { - layout = "us, ru"; - variant = ""; - options = "grp:caps_toggle"; - }; - }; + xkb = { + layout = "us, ru"; + variant = ""; + options = "grp:caps_toggle"; + }; }; + }; } diff --git a/s0meMiniPC-nix/services/zapret.nix b/s0meMiniPC-nix/services/zapret.nix index fd082dd..ad671e1 100644 --- a/s0meMiniPC-nix/services/zapret.nix +++ b/s0meMiniPC-nix/services/zapret.nix @@ -1,145 +1,145 @@ {...}: { - services = { - zapret = { - enable = true; - configureFirewall = true; - qnum = 350; - params = [ - "--wssize 1:6" + services = { + zapret = { + enable = true; + configureFirewall = true; + qnum = 350; + params = [ + "--wssize 1:6" - "--filter-tcp=80" - "--dpi-desync=multisplit" - "--dpi-desync-split-pos=10" - "--dpi-desync-repeats=6" - "--new" + "--filter-tcp=80" + "--dpi-desync=multisplit" + "--dpi-desync-split-pos=10" + "--dpi-desync-repeats=6" + "--new" - "--filter-tcp=443" - "--dpi-desync=multidisorder" - "--dpi-desync-split-pos=1,midsld" - "--new" + "--filter-tcp=443" + "--dpi-desync=multidisorder" + "--dpi-desync-split-pos=1,midsld" + "--new" - "--filter-tcp=443" - "--dpi-desync=syndata" - "--dpi-desync-fake-syndata=0x00000000" - "--dpi-desync-ttl=10" - "--new" + "--filter-tcp=443" + "--dpi-desync=syndata" + "--dpi-desync-fake-syndata=0x00000000" + "--dpi-desync-ttl=10" + "--new" - "--filter-udp=443" - "--dpi-desync=fake" - "--dpi-desync-repeats=6" - "--dpi-desync-fake-quic=0x00000000" - "--new" + "--filter-udp=443" + "--dpi-desync=fake" + "--dpi-desync-repeats=6" + "--dpi-desync-fake-quic=0x00000000" + "--new" - "--filter-udp=443" - "--dpi-desync=fake,udplen" - "--dpi-desync-udplen-increment=5" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-cutoff=n3" - "--dpi-desync-repeats=2" - "--new" + "--filter-udp=443" + "--dpi-desync=fake,udplen" + "--dpi-desync-udplen-increment=5" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-cutoff=n3" + "--dpi-desync-repeats=2" + "--new" - "--filter-tcp=443" - "--dpi-desync=split" - "--dpi-desync-fooling=md5sig,badseq" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-pos=1" - "--dpi-desync-repeats=10" - "--new" + "--filter-tcp=443" + "--dpi-desync=split" + "--dpi-desync-fooling=md5sig,badseq" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync-repeats=10" + "--new" - "--filter-tcp=443" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-seqovl=2" - "--dpi-desync-split-pos=2" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" - "--dpi-desync-autottl" - "--new" - "--filter-tcp=443" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-seqovl=2" - "--dpi-desync-split-pos=2" - "--dpi-desync-autottl" - "--new" + "--dpi-desync-autottl" + "--new" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + "--dpi-desync-autottl" + "--new" - "--filter-tcp=80" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-autottl" - "--new" + "--filter-tcp=80" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-autottl" + "--new" - "--filter-tcp=80" - "--dpi-desync-ttl=1" - "--dpi-desync-autottl=2" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-pos=1" - "--dpi-desync=fake,split2" - "--dpi-desync-repeats=6" - "--dpi-desync-fooling=md5sig" - "--new" - ]; + "--filter-tcp=80" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync=fake,split2" + "--dpi-desync-repeats=6" + "--dpi-desync-fooling=md5sig" + "--new" + ]; - whitelist = [ - "googlevideo.com" - "youtu.be" - "youtube.com" - "youtubei.googleapis.com" - "googlevideo.com" - "youtu.be" - "youtube.com" - "youtubei.googleapis.com" - "youtubeembeddedplayer.googleapis.com" - "ytimg.l.google.com" - "ytimg.com" - "jnn-pa.googleapis.com" - "youtube-nocookie.com" - "youtube-ui.l.google.com" - "yt-video-upload.l.google.com" - "wide-youtube.l.google.com" - "youtubekids.com" - "ggpht.com" - "music.youtube.com" - "test.googlevideo.com" - "discord.com" - "gateway.discord.gg" - "cdn.discordapp.com" - "discordapp.net" - "discordapp.com" - "discord.gg" - "media.discordapp.net" - "images-ext-1.discordapp.net" - "discord.app" - "discord.media" - "discordcdn.com" - "discord.dev" - "discord.new" - "discord.gift" - "discordstatus.com" - "dis.gd" - "discord.co" - "discord-attachments-uploads-prd.storage.googleapis.com" - "7tv.app" - "7tv.io" - "10tv.app" - "x.com" - "t.co" - "ads-twitter.com" - "twimg.com" - "twitter.com" - "pscp.tv" - "twtrdns.net" - "twttr.com" - "periscope.tv" - "tweetdeck.com" - "twitpic.com" - "twitter.co" - "twitterinc.com" - "twitteroauth.com" - "twitterstat.us" - ]; - }; + whitelist = [ + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "youtubeembeddedplayer.googleapis.com" + "ytimg.l.google.com" + "ytimg.com" + "jnn-pa.googleapis.com" + "youtube-nocookie.com" + "youtube-ui.l.google.com" + "yt-video-upload.l.google.com" + "wide-youtube.l.google.com" + "youtubekids.com" + "ggpht.com" + "music.youtube.com" + "test.googlevideo.com" + "discord.com" + "gateway.discord.gg" + "cdn.discordapp.com" + "discordapp.net" + "discordapp.com" + "discord.gg" + "media.discordapp.net" + "images-ext-1.discordapp.net" + "discord.app" + "discord.media" + "discordcdn.com" + "discord.dev" + "discord.new" + "discord.gift" + "discordstatus.com" + "dis.gd" + "discord.co" + "discord-attachments-uploads-prd.storage.googleapis.com" + "7tv.app" + "7tv.io" + "10tv.app" + "x.com" + "t.co" + "ads-twitter.com" + "twimg.com" + "twitter.com" + "pscp.tv" + "twtrdns.net" + "twttr.com" + "periscope.tv" + "tweetdeck.com" + "twitpic.com" + "twitter.co" + "twitterinc.com" + "twitteroauth.com" + "twitterstat.us" + ]; }; + }; } diff --git a/s0meMiniPC-nix/services/zerotier.nix b/s0meMiniPC-nix/services/zerotier.nix index 0d1c328..4d032aa 100644 --- a/s0meMiniPC-nix/services/zerotier.nix +++ b/s0meMiniPC-nix/services/zerotier.nix @@ -1,10 +1,10 @@ {...}: { - services = { - zerotierone = { - enable = false; - joinNetworks = [ - # nope - ]; - }; + services = { + zerotierone = { + enable = false; + joinNetworks = [ + # nope + ]; }; + }; } diff --git a/s0meMiniPC-nix/services/zitadel.nix b/s0meMiniPC-nix/services/zitadel.nix index f15e821..9b1b65a 100644 --- a/s0meMiniPC-nix/services/zitadel.nix +++ b/s0meMiniPC-nix/services/zitadel.nix @@ -1,77 +1,77 @@ {config, ...}: { - services = { - zitadel = { - enable = true; - tlsMode = "external"; - masterKeyFile = config.sops.secrets.zitadelMasterKey; + services = { + zitadel = { + enable = true; + tlsMode = "external"; + masterKeyFile = config.sops.secrets.zitadelMasterKey; - steps = { - FirstInstance = { - InstanceName = "zitadel.hand7s.org"; - DefaultLanguage = "en"; - LoginPolicy = { - AllowRegister = false; - }; + steps = { + FirstInstance = { + InstanceName = "zitadel.hand7s.org"; + DefaultLanguage = "en"; + LoginPolicy = { + AllowRegister = false; + }; - Org = { - Name = "ZITADEL"; - Human = { - UserName = "admin"; - FirstName = "Bogdan"; - LastName = "Litvinov"; - DisplayName = "hand7s"; - PasswordChangeRequired = true; - PreferredLanguage = "en"; + Org = { + Name = "ZITADEL"; + Human = { + UserName = "admin"; + FirstName = "Bogdan"; + LastName = "Litvinov"; + DisplayName = "hand7s"; + PasswordChangeRequired = true; + PreferredLanguage = "en"; - Email = { - Address = "me@hand7s.org"; - Verified = true; - }; - }; - }; - }; - }; - - settings = { - Port = 8443; - ExternalPort = 8443; - ExternalDomain = "zitadel.hand7s.org"; - ExternalSecure = true; - - Log = { - Level = "debug"; - }; - - Telemetry = { - Enabled = false; - }; - - Database = { - postgres = { - Host = "${dbhost}"; - Port = "${dbport}"; - Database = "zitadel"; - User = { - Username = "zitadel"; - SSL = { - Mode = "disable"; - }; - }; - }; - }; - - Caches = { - Connectors = { - Redis = { - Enabled = true; - Addr = "${cahceaddress}"; - Password = "${cahcepass}"; - PoolSize = "900"; - PoolTimeout = "1800s"; - }; - }; - }; + Email = { + Address = "me@hand7s.org"; + Verified = true; + }; }; + }; }; + }; + + settings = { + Port = 8443; + ExternalPort = 8443; + ExternalDomain = "zitadel.hand7s.org"; + ExternalSecure = true; + + Log = { + Level = "debug"; + }; + + Telemetry = { + Enabled = false; + }; + + Database = { + postgres = { + Host = "${dbhost}"; + Port = "${dbport}"; + Database = "zitadel"; + User = { + Username = "zitadel"; + SSL = { + Mode = "disable"; + }; + }; + }; + }; + + Caches = { + Connectors = { + Redis = { + Enabled = true; + Addr = "${cahceaddress}"; + Password = "${cahcepass}"; + PoolSize = "900"; + PoolTimeout = "1800s"; + }; + }; + }; + }; }; + }; } diff --git a/s0meMiniPC-nix/system/name.nix b/s0meMiniPC-nix/system/name.nix index 585e4de..0b4488b 100644 --- a/s0meMiniPC-nix/system/name.nix +++ b/s0meMiniPC-nix/system/name.nix @@ -1,5 +1,5 @@ {config, ...}: { - system = { - name = config.networking.hostName; - }; + system = { + name = config.networking.hostName; + }; } diff --git a/s0meMiniPC-nix/system/stateVersion.nix b/s0meMiniPC-nix/system/stateVersion.nix index 2bb50db..9e437fe 100644 --- a/s0meMiniPC-nix/system/stateVersion.nix +++ b/s0meMiniPC-nix/system/stateVersion.nix @@ -1,5 +1,5 @@ {config, ...}: { - system = { - stateVersion = config.system.nixos.release; - }; + system = { + stateVersion = config.system.nixos.release; + }; } diff --git a/s0meMiniPC-nix/systemd/oomd.nix b/s0meMiniPC-nix/systemd/oomd.nix index c212515..cbd28f2 100644 --- a/s0meMiniPC-nix/systemd/oomd.nix +++ b/s0meMiniPC-nix/systemd/oomd.nix @@ -1,10 +1,10 @@ {...}: { - systemd = { - oomd = { - enable = true; - enableUserSlices = true; - enableSystemSlice = true; - enableRootSlice = true; - }; + systemd = { + oomd = { + enable = true; + enableUserSlices = true; + enableSystemSlice = true; + enableRootSlice = true; }; + }; } diff --git a/s0meMiniPC-nix/systemd/slices/root-slice.nix b/s0meMiniPC-nix/systemd/slices/root-slice.nix index 46e96bc..118ca0b 100644 --- a/s0meMiniPC-nix/systemd/slices/root-slice.nix +++ b/s0meMiniPC-nix/systemd/slices/root-slice.nix @@ -1,14 +1,14 @@ {...}: { - systemd = { - slices = { - root = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; + systemd = { + slices = { + root = { + sliceConfig = { + ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "40%"; + ManagedOOMMemoryPressureDurationSec = 0; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/systemd/slices/system-slice.nix b/s0meMiniPC-nix/systemd/slices/system-slice.nix index 66a0d0d..148f19b 100644 --- a/s0meMiniPC-nix/systemd/slices/system-slice.nix +++ b/s0meMiniPC-nix/systemd/slices/system-slice.nix @@ -1,14 +1,14 @@ {...}: { - systemd = { - slices = { - system = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; + systemd = { + slices = { + system = { + sliceConfig = { + ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "40%"; + ManagedOOMMemoryPressureDurationSec = 0; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/systemd/slices/user-slice.nix b/s0meMiniPC-nix/systemd/slices/user-slice.nix index ee610ef..21d74d8 100644 --- a/s0meMiniPC-nix/systemd/slices/user-slice.nix +++ b/s0meMiniPC-nix/systemd/slices/user-slice.nix @@ -1,14 +1,14 @@ {...}: { - systemd = { - slices = { - user = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; + systemd = { + slices = { + user = { + sliceConfig = { + ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "40%"; + ManagedOOMMemoryPressureDurationSec = 0; }; + }; }; + }; } diff --git a/s0meMiniPC-nix/time/timeZone.nix b/s0meMiniPC-nix/time/timeZone.nix index 837ddd7..57bca35 100644 --- a/s0meMiniPC-nix/time/timeZone.nix +++ b/s0meMiniPC-nix/time/timeZone.nix @@ -1,6 +1,6 @@ {...}: { - time = { - timeZone = "Europe/Moscow"; - hardwareClockInLocalTime = true; - }; + time = { + timeZone = "Europe/Moscow"; + hardwareClockInLocalTime = true; + }; } diff --git a/s0meMiniPC-nix/users/mutableUsers.nix b/s0meMiniPC-nix/users/mutableUsers.nix index 2c39188..54415f1 100644 --- a/s0meMiniPC-nix/users/mutableUsers.nix +++ b/s0meMiniPC-nix/users/mutableUsers.nix @@ -1,5 +1,5 @@ {...}: { - users = { - mutableUsers = false; - }; + users = { + mutableUsers = false; + }; } diff --git a/s0meMiniPC-nix/users/users/hand7s.nix b/s0meMiniPC-nix/users/users/hand7s.nix index 9a082f8..8c0df47 100644 --- a/s0meMiniPC-nix/users/users/hand7s.nix +++ b/s0meMiniPC-nix/users/users/hand7s.nix @@ -1,17 +1,17 @@ {...}: { + users = { users = { - users = { - hand7s = { - description = "me"; - isSystemUser = false; - isNormalUser = true; - initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; - extraGroups = [ - "wheel" - "networkmanager" - "docker" - ]; - }; - }; + hand7s = { + description = "me"; + isSystemUser = false; + isNormalUser = true; + initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; + extraGroups = [ + "wheel" + "networkmanager" + "docker" + ]; + }; }; + }; } diff --git a/s0meMiniPC-nix/users/users/root.nix b/s0meMiniPC-nix/users/users/root.nix index 9c18bc7..595a6f6 100644 --- a/s0meMiniPC-nix/users/users/root.nix +++ b/s0meMiniPC-nix/users/users/root.nix @@ -1,9 +1,9 @@ {...}: { + users = { users = { - users = { - root = { - initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; - }; - }; + root = { + initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; + }; }; + }; } diff --git a/s0meMiniPC-nix/virtualisation/docker.nix b/s0meMiniPC-nix/virtualisation/docker.nix index 50d0769..1edae88 100644 --- a/s0meMiniPC-nix/virtualisation/docker.nix +++ b/s0meMiniPC-nix/virtualisation/docker.nix @@ -1,10 +1,10 @@ {...}: { - virtualisation = { - docker = { - enable = true; - rootless = { - enable = true; - }; - }; + virtualisation = { + docker = { + enable = true; + rootless = { + enable = true; + }; }; + }; } diff --git a/s0mePC-nix/boot/initrd.nix b/s0mePC-nix/boot/initrd.nix index 64bef32..98d1980 100644 --- a/s0mePC-nix/boot/initrd.nix +++ b/s0mePC-nix/boot/initrd.nix @@ -1,46 +1,46 @@ {lib, ...}: { - boot = { - initrd = { - availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "btrfs" - "amneziawg" - "cryptd" - ]; + boot = { + initrd = { + availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + "btrfs" + "amneziawg" + "cryptd" + ]; - supportedFilesystems = { - vfat = true; - btrfs = true; - zfs = lib.mkForce true; - }; + supportedFilesystems = { + vfat = true; + btrfs = true; + zfs = lib.mkForce true; + }; - kernelModules = [ - "amdgpu" - "zenpower" - "amneziawg" - ]; + kernelModules = [ + "amdgpu" + "zenpower" + "amneziawg" + ]; - luks = { - devices = { - cryptroot = { - device = "/dev/disk/by-id/nvme-KINGSTON_SKC3000S_1024G_AA000000000000000013-part2"; - }; - }; - }; - - systemd = { - enable = true; - network = { - enable = true; - }; - }; - - verbose = false; + luks = { + devices = { + cryptroot = { + device = "/dev/disk/by-id/nvme-KINGSTON_SKC3000S_1024G_AA000000000000000013-part2"; + }; }; + }; + + systemd = { + enable = true; + network = { + enable = true; + }; + }; + + verbose = false; }; + }; } diff --git a/s0mePC-nix/boot/kernel.nix b/s0mePC-nix/boot/kernel.nix index 125813d..19888ed 100644 --- a/s0mePC-nix/boot/kernel.nix +++ b/s0mePC-nix/boot/kernel.nix @@ -1,91 +1,91 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - boot = { - kernel = { - sysctl = { - "vm.swappiness" = 100; - "vm.dirty_background_bytes" = 67108864; - "vm.dirty_bytes" = 268435456; - "vm.dirty_expire_centisecs" = 1500; - "vm.dirty_writeback_centisecs" = 100; - "vm.vfs_cache_pressure" = 50; - "vm.max_map_count" = 1048576; - }; - }; - - kernelPackages = pkgs.linuxPackages_cachyos-gcc; - extraModulePackages = with config.boot.kernelPackages; [ - zenpower - v4l2loopback - amneziawg - ]; - - kernelModules = [ - "amdgpu" - "zenpower" - "v4l2loopback" - "amneziawg" - ]; - - kernelParams = [ - "video=DP-1:2560x1440@165" - "amd_pstate=guided" - "udev.log_priority=3" - "quiet" - "splash" - "boot.shell_on_fail" - "loglevel=3" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - - "page_alloc.shuffle=1" - "page_poison=1" - "slab_nomerge" - - "kernel.watchdog=0" - "oops=panic" - ]; - - blacklistedKernelModules = [ - "k10temp" - "ax25" - "netrom" - "rose" - "adfs" - "affs" - "bfs" - "befs" - "cramfs" - "efs" - "erofs" - "exofs" - "freevxfs" - "f2fs" - "hfs" - "hpfs" - "jfs" - "minix" - "nilfs2" - "ntfs" - "omfs" - "qnx4" - "qnx6" - "sysv" - "ufs" - "sp5100-tco" - "iTCO_wdt" - ]; - - supportedFilesystems = { - vfat = true; - btrfs = true; - zfs = lib.mkForce true; - }; - - consoleLogLevel = 0; + boot = { + kernel = { + sysctl = { + "vm.swappiness" = 100; + "vm.dirty_background_bytes" = 67108864; + "vm.dirty_bytes" = 268435456; + "vm.dirty_expire_centisecs" = 1500; + "vm.dirty_writeback_centisecs" = 100; + "vm.vfs_cache_pressure" = 50; + "vm.max_map_count" = 1048576; + }; }; + + kernelPackages = pkgs.linuxPackages_cachyos-gcc; + extraModulePackages = with config.boot.kernelPackages; [ + zenpower + v4l2loopback + amneziawg + ]; + + kernelModules = [ + "amdgpu" + "zenpower" + "v4l2loopback" + "amneziawg" + ]; + + kernelParams = [ + "video=DP-1:2560x1440@165" + "amd_pstate=guided" + "udev.log_priority=3" + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + + "page_alloc.shuffle=1" + "page_poison=1" + "slab_nomerge" + + "kernel.watchdog=0" + "oops=panic" + ]; + + blacklistedKernelModules = [ + "k10temp" + "ax25" + "netrom" + "rose" + "adfs" + "affs" + "bfs" + "befs" + "cramfs" + "efs" + "erofs" + "exofs" + "freevxfs" + "f2fs" + "hfs" + "hpfs" + "jfs" + "minix" + "nilfs2" + "ntfs" + "omfs" + "qnx4" + "qnx6" + "sysv" + "ufs" + "sp5100-tco" + "iTCO_wdt" + ]; + + supportedFilesystems = { + vfat = true; + btrfs = true; + zfs = lib.mkForce true; + }; + + consoleLogLevel = 0; + }; } diff --git a/s0mePC-nix/boot/lanzaboote.nix b/s0mePC-nix/boot/lanzaboote.nix index a70c6d4..08d07df 100644 --- a/s0mePC-nix/boot/lanzaboote.nix +++ b/s0mePC-nix/boot/lanzaboote.nix @@ -1,13 +1,13 @@ {...}: { - boot = { - lanzaboote = { - enable = true; - configurationLimit = 7; - pkiBundle = "/var/lib/sbctl"; - settings = { - timeout = 2; - sortKey = "lanza"; - }; - }; + boot = { + lanzaboote = { + enable = true; + configurationLimit = 7; + pkiBundle = "/var/lib/sbctl"; + settings = { + timeout = 2; + sortKey = "lanza"; + }; }; + }; } diff --git a/s0mePC-nix/boot/loader/systemd-boot.nix b/s0mePC-nix/boot/loader/systemd-boot.nix index de29935..8e2989c 100644 --- a/s0mePC-nix/boot/loader/systemd-boot.nix +++ b/s0mePC-nix/boot/loader/systemd-boot.nix @@ -1,19 +1,19 @@ {...}: { - boot = { - loader = { - systemd-boot = { - enable = false; - sortKey = "nixos"; - memtest86 = { - enable = true; - sortKey = "o_memtest86"; - }; - - netbootxyz = { - enable = false; - sortKey = "o_netbootxyz"; - }; - }; + boot = { + loader = { + systemd-boot = { + enable = false; + sortKey = "nixos"; + memtest86 = { + enable = true; + sortKey = "o_memtest86"; }; + + netbootxyz = { + enable = false; + sortKey = "o_netbootxyz"; + }; + }; }; + }; } diff --git a/s0mePC-nix/boot/plymouth.nix b/s0mePC-nix/boot/plymouth.nix index a20c64a..9ae36c6 100644 --- a/s0mePC-nix/boot/plymouth.nix +++ b/s0mePC-nix/boot/plymouth.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { - boot = { - plymouth = { - enable = true; - themePackages = with pkgs; [ - nixos-bgrt-plymouth - ]; - }; + boot = { + plymouth = { + enable = true; + themePackages = with pkgs; [ + nixos-bgrt-plymouth + ]; }; + }; } diff --git a/s0mePC-nix/boot/tmp.nix b/s0mePC-nix/boot/tmp.nix index 3c98c31..ac46b34 100644 --- a/s0mePC-nix/boot/tmp.nix +++ b/s0mePC-nix/boot/tmp.nix @@ -1,8 +1,8 @@ {...}: { - boot = { - tmp = { - useTmpfs = true; - cleanOnBoot = true; - }; + boot = { + tmp = { + useTmpfs = true; + cleanOnBoot = true; }; + }; } diff --git a/s0mePC-nix/boot/zfs.nix b/s0mePC-nix/boot/zfs.nix index 2ce8b66..58db7ab 100644 --- a/s0mePC-nix/boot/zfs.nix +++ b/s0mePC-nix/boot/zfs.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { - boot = { - zfs = { - package = pkgs.zfs_cachyos; - allowHibernation = false; - removeLinuxDRM = false; - }; + boot = { + zfs = { + package = pkgs.zfs_cachyos; + allowHibernation = false; + removeLinuxDRM = false; }; + }; } diff --git a/s0mePC-nix/console/console.nix b/s0mePC-nix/console/console.nix index cb4672f..1e60d13 100644 --- a/s0mePC-nix/console/console.nix +++ b/s0mePC-nix/console/console.nix @@ -1,5 +1,5 @@ {...}: { - console = { - useXkbConfig = true; - }; + console = { + useXkbConfig = true; + }; } diff --git a/s0mePC-nix/default.nix b/s0mePC-nix/default.nix index 786fe64..e688038 100644 --- a/s0mePC-nix/default.nix +++ b/s0mePC-nix/default.nix @@ -1,111 +1,111 @@ {self, ...}: { - imports = [ - "${self}/s0mePC-nix/boot/initrd.nix" - "${self}/s0mePC-nix/boot/kernel.nix" - "${self}/s0mePC-nix/boot/lanzaboote.nix" - "${self}/s0mePC-nix/boot/plymouth.nix" - "${self}/s0mePC-nix/boot/tmp.nix" - "${self}/s0mePC-nix/boot/loader/systemd-boot.nix" - "${self}/s0mePC-nix/boot/zfs.nix" + imports = [ + "${self}/s0mePC-nix/boot/initrd.nix" + "${self}/s0mePC-nix/boot/kernel.nix" + "${self}/s0mePC-nix/boot/lanzaboote.nix" + "${self}/s0mePC-nix/boot/plymouth.nix" + "${self}/s0mePC-nix/boot/tmp.nix" + "${self}/s0mePC-nix/boot/loader/systemd-boot.nix" + "${self}/s0mePC-nix/boot/zfs.nix" - "${self}/s0mePC-nix/disko/disk.nix" - "${self}/s0mePC-nix/disko/lvm_vg.nix" + "${self}/s0mePC-nix/disko/disk.nix" + "${self}/s0mePC-nix/disko/lvm_vg.nix" - "${self}/s0mePC-nix/console/console.nix" + "${self}/s0mePC-nix/console/console.nix" - "${self}/s0mePC-nix/environment/systemPackages.nix" - "${self}/s0mePC-nix/environment/variables.nix" + "${self}/s0mePC-nix/environment/systemPackages.nix" + "${self}/s0mePC-nix/environment/variables.nix" - "${self}/s0mePC-nix/hardware/amdgpu.nix" - "${self}/s0mePC-nix/hardware/cpu.nix" - "${self}/s0mePC-nix/hardware/graphics.nix" - "${self}/s0mePC-nix/hardware/openrazer.nix" - "${self}/s0mePC-nix/hardware/qmk.nix" - "${self}/s0mePC-nix/hardware/zram.nix" + "${self}/s0mePC-nix/hardware/amdgpu.nix" + "${self}/s0mePC-nix/hardware/cpu.nix" + "${self}/s0mePC-nix/hardware/graphics.nix" + "${self}/s0mePC-nix/hardware/openrazer.nix" + "${self}/s0mePC-nix/hardware/qmk.nix" + "${self}/s0mePC-nix/hardware/zram.nix" - "${self}/s0mePC-nix/home-manager/users.nix" + "${self}/s0mePC-nix/home-manager/users.nix" - "${self}/s0mePC-nix/i18n/locales.nix" + "${self}/s0mePC-nix/i18n/locales.nix" - "${self}/s0mePC-nix/networking/dhcp.nix" - "${self}/s0mePC-nix/networking/firewall.nix" - "${self}/s0mePC-nix/networking/hostname.nix" - "${self}/s0mePC-nix/networking/networkmanager.nix" - "${self}/s0mePC-nix/networking/wireguard.nix" - "${self}/s0mePC-nix/networking/nameservers.nix" - "${self}/s0mePC-nix/networking/hosts.nix" - "${self}/s0mePC-nix/networking/hostId.nix" + "${self}/s0mePC-nix/networking/dhcp.nix" + "${self}/s0mePC-nix/networking/firewall.nix" + "${self}/s0mePC-nix/networking/hostname.nix" + "${self}/s0mePC-nix/networking/networkmanager.nix" + "${self}/s0mePC-nix/networking/wireguard.nix" + "${self}/s0mePC-nix/networking/nameservers.nix" + "${self}/s0mePC-nix/networking/hosts.nix" + "${self}/s0mePC-nix/networking/hostId.nix" - "${self}/s0mePC-nix/nix/package.nix" - "${self}/s0mePC-nix/nix/settings/allowed-users.nix" - "${self}/s0mePC-nix/nix/settings/experimental-features.nix" - "${self}/s0mePC-nix/nix/settings/substituters.nix" - "${self}/s0mePC-nix/nix/settings/trusted-public-keys.nix" - "${self}/s0mePC-nix/nix/settings/trusted-substituters.nix" - "${self}/s0mePC-nix/nix/settings/trusted-users.nix" - "${self}/s0mePC-nix/nix/settings/auto-optimise-store.nix" + "${self}/s0mePC-nix/nix/package.nix" + "${self}/s0mePC-nix/nix/settings/allowed-users.nix" + "${self}/s0mePC-nix/nix/settings/experimental-features.nix" + "${self}/s0mePC-nix/nix/settings/substituters.nix" + "${self}/s0mePC-nix/nix/settings/trusted-public-keys.nix" + "${self}/s0mePC-nix/nix/settings/trusted-substituters.nix" + "${self}/s0mePC-nix/nix/settings/trusted-users.nix" + "${self}/s0mePC-nix/nix/settings/auto-optimise-store.nix" - "${self}/s0mePC-nix/nixpkgs/config.nix" - "${self}/s0mePC-nix/nixpkgs/system.nix" + "${self}/s0mePC-nix/nixpkgs/config.nix" + "${self}/s0mePC-nix/nixpkgs/system.nix" - "${self}/s0mePC-nix/programs/gamescope.nix" - "${self}/s0mePC-nix/programs/gamemode.nix" - "${self}/s0mePC-nix/programs/nh.nix" - "${self}/s0mePC-nix/programs/steam.nix" - "${self}/s0mePC-nix/programs/ssh.nix" - "${self}/s0mePC-nix/programs/yubikey-touch-detector.nix" - "${self}/s0mePC-nix/programs/nekoray.nix" + "${self}/s0mePC-nix/programs/gamescope.nix" + "${self}/s0mePC-nix/programs/gamemode.nix" + "${self}/s0mePC-nix/programs/nh.nix" + "${self}/s0mePC-nix/programs/steam.nix" + "${self}/s0mePC-nix/programs/ssh.nix" + "${self}/s0mePC-nix/programs/yubikey-touch-detector.nix" + "${self}/s0mePC-nix/programs/nekoray.nix" - "${self}/s0mePC-nix/security/polkit.nix" - "${self}/s0mePC-nix/security/rtkit.nix" - "${self}/s0mePC-nix/security/sudo.nix" - "${self}/s0mePC-nix/security/sudo-rs.nix" - "${self}/s0mePC-nix/security/pam/yubico.nix" + "${self}/s0mePC-nix/security/polkit.nix" + "${self}/s0mePC-nix/security/rtkit.nix" + "${self}/s0mePC-nix/security/sudo.nix" + "${self}/s0mePC-nix/security/sudo-rs.nix" + "${self}/s0mePC-nix/security/pam/yubico.nix" - "${self}/s0mePC-nix/services/greetd.nix" - "${self}/s0mePC-nix/services/libinput.nix" - "${self}/s0mePC-nix/services/openssh.nix" - "${self}/s0mePC-nix/services/pipewire.nix" - "${self}/s0mePC-nix/services/netbird.nix" - "${self}/s0mePC-nix/services/qmk.nix" - "${self}/s0mePC-nix/services/scx.nix" - "${self}/s0mePC-nix/services/xserver.nix" - "${self}/s0mePC-nix/services/zapret.nix" - "${self}/s0mePC-nix/services/zerotier.nix" - "${self}/s0mePC-nix/services/yggdrasil.nix" - "${self}/s0mePC-nix/services/sunshine.nix" - "${self}/s0mePC-nix/services/usbmuxd.nix" - "${self}/s0mePC-nix/services/irqbalance.nix" - "${self}/s0mePC-nix/services/yubikey-agent.nix" - "${self}/s0mePC-nix/services/resolved.nix" + "${self}/s0mePC-nix/services/greetd.nix" + "${self}/s0mePC-nix/services/libinput.nix" + "${self}/s0mePC-nix/services/openssh.nix" + "${self}/s0mePC-nix/services/pipewire.nix" + "${self}/s0mePC-nix/services/netbird.nix" + "${self}/s0mePC-nix/services/qmk.nix" + "${self}/s0mePC-nix/services/scx.nix" + "${self}/s0mePC-nix/services/xserver.nix" + "${self}/s0mePC-nix/services/zapret.nix" + "${self}/s0mePC-nix/services/zerotier.nix" + "${self}/s0mePC-nix/services/yggdrasil.nix" + "${self}/s0mePC-nix/services/sunshine.nix" + "${self}/s0mePC-nix/services/usbmuxd.nix" + "${self}/s0mePC-nix/services/irqbalance.nix" + "${self}/s0mePC-nix/services/yubikey-agent.nix" + "${self}/s0mePC-nix/services/resolved.nix" - "${self}/s0mePC-nix/sops/defaults.nix" - "${self}/s0mePC-nix/sops/secrets.nix" + "${self}/s0mePC-nix/sops/defaults.nix" + "${self}/s0mePC-nix/sops/secrets.nix" - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" - "${self}/s0mePC-nix/system/name.nix" - "${self}/s0mePC-nix/system/stateVersion.nix" + "${self}/s0mePC-nix/system/name.nix" + "${self}/s0mePC-nix/system/stateVersion.nix" - "${self}/s0mePC-nix/systemd/oomd.nix" - "${self}/s0mePC-nix/systemd/slices/system-slice.nix" - "${self}/s0mePC-nix/systemd/slices/user-slice.nix" - "${self}/s0mePC-nix/systemd/slices/root-slice.nix" + "${self}/s0mePC-nix/systemd/oomd.nix" + "${self}/s0mePC-nix/systemd/slices/system-slice.nix" + "${self}/s0mePC-nix/systemd/slices/user-slice.nix" + "${self}/s0mePC-nix/systemd/slices/root-slice.nix" - "${self}/s0mePC-nix/time/timeZone.nix" + "${self}/s0mePC-nix/time/timeZone.nix" - "${self}/s0mePC-nix/users/users/hand7s.nix" - "${self}/s0mePC-nix/users/users/root.nix" - "${self}/s0mePC-nix/users/mutableUsers.nix" + "${self}/s0mePC-nix/users/users/hand7s.nix" + "${self}/s0mePC-nix/users/users/root.nix" + "${self}/s0mePC-nix/users/mutableUsers.nix" - "${self}/s0mePC-nix/virtualisation/docker.nix" + "${self}/s0mePC-nix/virtualisation/docker.nix" - "${self}/s0mePC-nix/xdg/icons.nix" - "${self}/s0mePC-nix/xdg/mime.nix" - "${self}/s0mePC-nix/xdg/portal.nix" - ]; + "${self}/s0mePC-nix/xdg/icons.nix" + "${self}/s0mePC-nix/xdg/mime.nix" + "${self}/s0mePC-nix/xdg/portal.nix" + ]; } diff --git a/s0mePC-nix/disko/disk.nix b/s0mePC-nix/disko/disk.nix index 3764e30..63762ae 100644 --- a/s0mePC-nix/disko/disk.nix +++ b/s0mePC-nix/disko/disk.nix @@ -1,46 +1,46 @@ { - disko = { - devices = { - disk = { - main = { - device = "/dev/disk/by-id/nvme-KINGSTON_SKC3000S_1024G_AA000000000000000013"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "1024M"; - name = "boot"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "fmask=0022" - "dmask=0022" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "lvm-crypted"; - settings = { - allowDiscards = true; - }; - - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; + disko = { + devices = { + disk = { + main = { + device = "/dev/disk/by-id/nvme-KINGSTON_SKC3000S_1024G_AA000000000000000013"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + type = "EF00"; + size = "1024M"; + name = "boot"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "fmask=0022" + "dmask=0022" + ]; }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "lvm-crypted"; + settings = { + allowDiscards = true; + }; + + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; + }; }; + }; }; + }; }; + }; } diff --git a/s0mePC-nix/disko/lvm_vg.nix b/s0mePC-nix/disko/lvm_vg.nix index 581f0c0..9734719 100644 --- a/s0mePC-nix/disko/lvm_vg.nix +++ b/s0mePC-nix/disko/lvm_vg.nix @@ -1,51 +1,51 @@ { - disko = { - devices = { - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ - "-f" - ]; + disko = { + devices = { + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%"; + content = { + type = "btrfs"; + extraArgs = [ + "-f" + ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ - "compress=zstd" - "noatime" - "discard=async" - ]; - }; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = [ + "compress=zstd" + "noatime" + "discard=async" + ]; + }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ - "compress=zstd" - "noatime" - "discard=async" - ]; - }; + "/home" = { + mountpoint = "/home"; + mountOptions = [ + "compress=zstd" + "noatime" + "discard=async" + ]; + }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ - "compress=zstd" - "noatime" - "discard=async" - ]; - }; - }; - }; - }; - }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = [ + "compress=zstd" + "noatime" + "discard=async" + ]; + }; }; + }; }; + }; }; + }; }; + }; } diff --git a/s0mePC-nix/environment/systemPackages.nix b/s0mePC-nix/environment/systemPackages.nix index d2e71ce..d508dd5 100644 --- a/s0mePC-nix/environment/systemPackages.nix +++ b/s0mePC-nix/environment/systemPackages.nix @@ -1,17 +1,17 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - environment = { - systemPackages = with pkgs; [ - (lib.hiPrio uutils-coreutils-noprefix) - uutils-findutils - uutils-diffutils - xdg-desktop-portal - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - home-manager - ]; - }; + environment = { + systemPackages = with pkgs; [ + (lib.hiPrio uutils-coreutils-noprefix) + uutils-findutils + uutils-diffutils + xdg-desktop-portal + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + home-manager + ]; + }; } diff --git a/s0mePC-nix/environment/variables.nix b/s0mePC-nix/environment/variables.nix index 20b3b69..2cd14c2 100644 --- a/s0mePC-nix/environment/variables.nix +++ b/s0mePC-nix/environment/variables.nix @@ -1,17 +1,17 @@ {config, ...}: { - environment = { - variables = { - AMD_VULKAN_ICD = "RADV"; - HOSTNAME = config.networking.hostName; - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - GDK_BACKEND = "wayland"; - NIXPKGS_ALLOW_UNFREE = "1"; - NIXPKGS_ALLOW_INSECURE = "1"; - NIXOS_OZONE_WL = "1"; - GRIMBLAST_HIDE_CURSOR = "0"; - TERM = "xterm-256color"; - }; + environment = { + variables = { + AMD_VULKAN_ICD = "RADV"; + HOSTNAME = config.networking.hostName; + QT_QPA_PLATFORM = "wayland"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + GDK_BACKEND = "wayland"; + NIXPKGS_ALLOW_UNFREE = "1"; + NIXPKGS_ALLOW_INSECURE = "1"; + NIXOS_OZONE_WL = "1"; + GRIMBLAST_HIDE_CURSOR = "0"; + TERM = "xterm-256color"; }; + }; } diff --git a/s0mePC-nix/hardware/amdgpu.nix b/s0mePC-nix/hardware/amdgpu.nix index b44fb72..dce6d88 100644 --- a/s0mePC-nix/hardware/amdgpu.nix +++ b/s0mePC-nix/hardware/amdgpu.nix @@ -1,9 +1,9 @@ {...}: { - hardware = { - amdgpu = { - initrd = { - enable = true; - }; - }; + hardware = { + amdgpu = { + initrd = { + enable = true; + }; }; + }; } diff --git a/s0mePC-nix/hardware/cpu.nix b/s0mePC-nix/hardware/cpu.nix index a1dc714..dc5fd00 100644 --- a/s0mePC-nix/hardware/cpu.nix +++ b/s0mePC-nix/hardware/cpu.nix @@ -1,10 +1,10 @@ {...}: { - hardware = { - enableRedistributableFirmware = true; - cpu = { - amd = { - updateMicrocode = true; - }; - }; + hardware = { + enableRedistributableFirmware = true; + cpu = { + amd = { + updateMicrocode = true; + }; }; + }; } diff --git a/s0mePC-nix/hardware/graphics.nix b/s0mePC-nix/hardware/graphics.nix index 25bb223..f81ccb7 100644 --- a/s0mePC-nix/hardware/graphics.nix +++ b/s0mePC-nix/hardware/graphics.nix @@ -1,8 +1,8 @@ {...}: { - hardware = { - graphics = { - enable = true; - enable32Bit = true; - }; + hardware = { + graphics = { + enable = true; + enable32Bit = true; }; + }; } diff --git a/s0mePC-nix/hardware/openrazer.nix b/s0mePC-nix/hardware/openrazer.nix index 920a365..af74569 100644 --- a/s0mePC-nix/hardware/openrazer.nix +++ b/s0mePC-nix/hardware/openrazer.nix @@ -1,15 +1,15 @@ {...}: { - hardware = { - openrazer = { - enable = false; - users = [ - "hand7s" - ]; + hardware = { + openrazer = { + enable = false; + users = [ + "hand7s" + ]; - batteryNotifier = { - enable = true; - percentage = 15; - }; - }; + batteryNotifier = { + enable = true; + percentage = 15; + }; }; + }; } diff --git a/s0mePC-nix/hardware/qmk.nix b/s0mePC-nix/hardware/qmk.nix index 95c4383..543ece2 100644 --- a/s0mePC-nix/hardware/qmk.nix +++ b/s0mePC-nix/hardware/qmk.nix @@ -1,9 +1,9 @@ {...}: { - hardware = { - keyboard = { - qmk = { - enable = true; - }; - }; + hardware = { + keyboard = { + qmk = { + enable = true; + }; }; + }; } diff --git a/s0mePC-nix/hardware/zram.nix b/s0mePC-nix/hardware/zram.nix index c6a41f1..b973787 100644 --- a/s0mePC-nix/hardware/zram.nix +++ b/s0mePC-nix/hardware/zram.nix @@ -1,8 +1,8 @@ {...}: { - zramSwap = { - enable = true; - algorithm = "zstd"; - priority = 100; - memoryPercent = 100; - }; + zramSwap = { + enable = true; + algorithm = "zstd"; + priority = 100; + memoryPercent = 100; + }; } diff --git a/s0mePC-nix/home-manager/users.nix b/s0mePC-nix/home-manager/users.nix index ef7ea68..be5338e 100644 --- a/s0mePC-nix/home-manager/users.nix +++ b/s0mePC-nix/home-manager/users.nix @@ -1,31 +1,31 @@ { - inputs, - self, - ... + inputs, + self, + ... }: { - home-manager = { - users = { - hand7s = { - imports = [ - "${self}/hand7s/" - inputs.spicetify-nix.homeManagerModules.default - inputs.hyprland.homeManagerModules.default - inputs.chaotic.homeManagerModules.default - inputs.sops-nix.homeManagerModules.sops + home-manager = { + users = { + hand7s = { + imports = [ + "${self}/hand7s/" + inputs.spicetify-nix.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.chaotic.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops - inputs.nix-index-database.homeModules.nix-index - inputs.noctalia.homeModules.default - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - inputs - self - ; - }; + inputs.nix-index-database.homeModules.nix-index + inputs.noctalia.homeModules.default + ]; + }; }; + + backupFileExtension = "force"; + + extraSpecialArgs = { + inherit + inputs + self + ; + }; + }; } diff --git a/s0mePC-nix/i18n/locales.nix b/s0mePC-nix/i18n/locales.nix index 4524693..09234a5 100644 --- a/s0mePC-nix/i18n/locales.nix +++ b/s0mePC-nix/i18n/locales.nix @@ -1,9 +1,9 @@ {...}: { - i18n = { - defaultLocale = "en_US.UTF-8"; - supportedLocales = [ - "en_US.UTF-8/UTF-8" - "ru_RU.UTF-8/UTF-8" - ]; - }; + i18n = { + defaultLocale = "en_US.UTF-8"; + supportedLocales = [ + "en_US.UTF-8/UTF-8" + "ru_RU.UTF-8/UTF-8" + ]; + }; } diff --git a/s0mePC-nix/networking/dhcp.nix b/s0mePC-nix/networking/dhcp.nix index d24c2c2..0740ea3 100644 --- a/s0mePC-nix/networking/dhcp.nix +++ b/s0mePC-nix/networking/dhcp.nix @@ -1,10 +1,10 @@ {lib, ...}: { - networking = { - useDHCP = lib.mkDefault true; - dhcpcd = { - enable = true; - persistent = false; - wait = "any"; - }; + networking = { + useDHCP = lib.mkDefault true; + dhcpcd = { + enable = true; + persistent = false; + wait = "any"; }; + }; } diff --git a/s0mePC-nix/networking/firewall.nix b/s0mePC-nix/networking/firewall.nix index a70c67c..17f2917 100644 --- a/s0mePC-nix/networking/firewall.nix +++ b/s0mePC-nix/networking/firewall.nix @@ -1,30 +1,30 @@ {...}: { - networking = { - firewall = { - allowPing = true; - enable = true; - checkReversePath = false; + networking = { + firewall = { + allowPing = true; + enable = true; + checkReversePath = false; - interfaces = { - eno1 = rec { - allowedTCPPortRanges = [ - { - from = 1714; - to = 1764; - } - ]; + interfaces = { + eno1 = rec { + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; - allowedUDPPortRanges = allowedTCPPortRanges; - }; - - salt-hand7s-pc = rec { - allowedTCPPorts = [ - 6567 - ]; - - allowedUDPPorts = allowedTCPPorts; - }; - }; + allowedUDPPortRanges = allowedTCPPortRanges; }; + + salt-hand7s-pc = rec { + allowedTCPPorts = [ + 6567 + ]; + + allowedUDPPorts = allowedTCPPorts; + }; + }; }; + }; } diff --git a/s0mePC-nix/networking/hostId.nix b/s0mePC-nix/networking/hostId.nix index df8d185..a771b6b 100644 --- a/s0mePC-nix/networking/hostId.nix +++ b/s0mePC-nix/networking/hostId.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostId = "5c79d468"; - }; + networking = { + hostId = "5c79d468"; + }; } diff --git a/s0mePC-nix/networking/hostname.nix b/s0mePC-nix/networking/hostname.nix index 26dca5b..95bc424 100644 --- a/s0mePC-nix/networking/hostname.nix +++ b/s0mePC-nix/networking/hostname.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostName = "s0mePC-nix"; - }; + networking = { + hostName = "s0mePC-nix"; + }; } diff --git a/s0mePC-nix/networking/hosts.nix b/s0mePC-nix/networking/hosts.nix index 872a53c..04747e5 100644 --- a/s0mePC-nix/networking/hosts.nix +++ b/s0mePC-nix/networking/hosts.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - hosts = { - # nope - }; + networking = { + hosts = { + # nope }; + }; } diff --git a/s0mePC-nix/networking/nameservers.nix b/s0mePC-nix/networking/nameservers.nix index 1b65035..a4d22c1 100644 --- a/s0mePC-nix/networking/nameservers.nix +++ b/s0mePC-nix/networking/nameservers.nix @@ -1,29 +1,29 @@ {...}: { - networking = { - nameservers = [ - # cf dns - "1.1.1.1" - "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" + networking = { + nameservers = [ + # cf dns + "1.1.1.1" + "1.0.0.1" + "2606:4700:4700::1111" + "2606:4700:4700::1001" - # google dns - "8.8.8.8" - "8.8.4.4" - "2001:4860:4860::8888" - "2001:4860:4860::8844" + # google dns + "8.8.8.8" + "8.8.4.4" + "2001:4860:4860::8888" + "2001:4860:4860::8844" - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" + # q9 dns + "9.9.9.9" + "149.112.112.112" + "2620:fe::fe" + "2620:fe::9" - # open dns - "208.67.222.222" - "208.67.220.220" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; + # open dns + "208.67.222.222" + "208.67.220.220" + "2620:119:35::35" + "2620:119:53::53" + ]; + }; } diff --git a/s0mePC-nix/networking/networkmanager.nix b/s0mePC-nix/networking/networkmanager.nix index 2ea464e..3d66f30 100644 --- a/s0mePC-nix/networking/networkmanager.nix +++ b/s0mePC-nix/networking/networkmanager.nix @@ -1,9 +1,9 @@ {...}: { - networking = { - networkmanager = { - enable = false; - }; - - useNetworkd = true; + networking = { + networkmanager = { + enable = false; }; + + useNetworkd = true; + }; } diff --git a/s0mePC-nix/networking/timeServers.nix b/s0mePC-nix/networking/timeServers.nix index 07f3b87..88e14c4 100644 --- a/s0mePC-nix/networking/timeServers.nix +++ b/s0mePC-nix/networking/timeServers.nix @@ -1,10 +1,10 @@ {...}: { - networking = { - timeServers = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; - }; + networking = { + timeServers = [ + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" + ]; + }; } diff --git a/s0mePC-nix/networking/wireguard.nix b/s0mePC-nix/networking/wireguard.nix index a618877..2ee5c02 100644 --- a/s0mePC-nix/networking/wireguard.nix +++ b/s0mePC-nix/networking/wireguard.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - wireguard = { - enable = true; - }; + networking = { + wireguard = { + enable = true; }; + }; } diff --git a/s0mePC-nix/nix/package.nix b/s0mePC-nix/nix/package.nix index c947a27..b2d6823 100644 --- a/s0mePC-nix/nix/package.nix +++ b/s0mePC-nix/nix/package.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - nix = { - package = pkgs.nixVersions.latest; - }; + nix = { + package = pkgs.nixVersions.latest; + }; } diff --git a/s0mePC-nix/nix/settings/allowed-users.nix b/s0mePC-nix/nix/settings/allowed-users.nix index d05c725..d483d0c 100644 --- a/s0mePC-nix/nix/settings/allowed-users.nix +++ b/s0mePC-nix/nix/settings/allowed-users.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - sandbox = true; - allowed-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + sandbox = true; + allowed-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0mePC-nix/nix/settings/auto-optimise-store.nix b/s0mePC-nix/nix/settings/auto-optimise-store.nix index 731bc0c..14f13c5 100644 --- a/s0mePC-nix/nix/settings/auto-optimise-store.nix +++ b/s0mePC-nix/nix/settings/auto-optimise-store.nix @@ -1,7 +1,7 @@ {...}: { - nix = { - settings = { - auto-optimise-store = true; - }; + nix = { + settings = { + auto-optimise-store = true; }; + }; } diff --git a/s0mePC-nix/nix/settings/experimental-features.nix b/s0mePC-nix/nix/settings/experimental-features.nix index f2161b9..7ce7e89 100644 --- a/s0mePC-nix/nix/settings/experimental-features.nix +++ b/s0mePC-nix/nix/settings/experimental-features.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + nix = { + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; }; + }; } diff --git a/s0mePC-nix/nix/settings/substituters.nix b/s0mePC-nix/nix/settings/substituters.nix index d8b7f80..762ec5c 100644 --- a/s0mePC-nix/nix/settings/substituters.nix +++ b/s0mePC-nix/nix/settings/substituters.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://ags.cachix.org" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - "https://colmena.cachix.org" - ]; - }; + nix = { + settings = { + substituters = [ + # cache.nixos.org + "https://cache.nixos.org" + # cache.garnix.org + "https://cache.garnix.io" + # cachix + "https://nix-community.cachix.org/" + "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" + "https://hyprland.cachix.org" + "https://chaotic-nyx.cachix.org/" + "https://colmena.cachix.org" + ]; }; + }; } diff --git a/s0mePC-nix/nix/settings/trusted-public-keys.nix b/s0mePC-nix/nix/settings/trusted-public-keys.nix index 7e9f894..e8710cb 100644 --- a/s0mePC-nix/nix/settings/trusted-public-keys.nix +++ b/s0mePC-nix/nix/settings/trusted-public-keys.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - trusted-public-keys = [ - # cache.nixos.org - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - # cache.garnix.io - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # cachix.org - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" - ]; - }; + nix = { + settings = { + trusted-public-keys = [ + # cache.nixos.org + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + # cache.garnix.io + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # cachix.org + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" + ]; }; + }; } diff --git a/s0mePC-nix/nix/settings/trusted-substituters.nix b/s0mePC-nix/nix/settings/trusted-substituters.nix index b81663f..a5927a2 100644 --- a/s0mePC-nix/nix/settings/trusted-substituters.nix +++ b/s0mePC-nix/nix/settings/trusted-substituters.nix @@ -1,20 +1,20 @@ {...}: { - nix = { - settings = { - trusted-substituters = [ - # cache.nixos.org - "https://nixos-cache-proxy.cofob.dev" - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://ags.cachix.org" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - "https://colmena.cachix.org" - ]; - }; + nix = { + settings = { + trusted-substituters = [ + # cache.nixos.org + "https://nixos-cache-proxy.cofob.dev" + "https://cache.nixos.org" + # cache.garnix.org + "https://cache.garnix.io" + # cachix + "https://nix-community.cachix.org/" + "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" + "https://hyprland.cachix.org" + "https://chaotic-nyx.cachix.org/" + "https://colmena.cachix.org" + ]; }; + }; } diff --git a/s0mePC-nix/nix/settings/trusted-users.nix b/s0mePC-nix/nix/settings/trusted-users.nix index 93619a5..e4a9dae 100644 --- a/s0mePC-nix/nix/settings/trusted-users.nix +++ b/s0mePC-nix/nix/settings/trusted-users.nix @@ -1,9 +1,9 @@ {...}: { - nix = { - settings = { - trusted-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + trusted-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0mePC-nix/nixpkgs/config.nix b/s0mePC-nix/nixpkgs/config.nix index d8de016..27b79b0 100644 --- a/s0mePC-nix/nixpkgs/config.nix +++ b/s0mePC-nix/nixpkgs/config.nix @@ -1,8 +1,8 @@ {...}: { - nixpkgs = { - config = { - allowUnfree = true; - allowBroken = true; - }; + nixpkgs = { + config = { + allowUnfree = true; + allowBroken = true; }; + }; } diff --git a/s0mePC-nix/nixpkgs/overlays.nix b/s0mePC-nix/nixpkgs/overlays.nix index da060e9..2881eba 100644 --- a/s0mePC-nix/nixpkgs/overlays.nix +++ b/s0mePC-nix/nixpkgs/overlays.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - overlays = [ - ]; - }; + nixpkgs = { + overlays = [ + ]; + }; } diff --git a/s0mePC-nix/nixpkgs/system.nix b/s0mePC-nix/nixpkgs/system.nix index c8930f6..63fda3b 100644 --- a/s0mePC-nix/nixpkgs/system.nix +++ b/s0mePC-nix/nixpkgs/system.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - system = "x86_64-linux"; - hostPlatform = "x86_64-linux"; - }; + nixpkgs = { + system = "x86_64-linux"; + hostPlatform = "x86_64-linux"; + }; } diff --git a/s0mePC-nix/programs/gamemode.nix b/s0mePC-nix/programs/gamemode.nix index 53a6051..3a6acb9 100644 --- a/s0mePC-nix/programs/gamemode.nix +++ b/s0mePC-nix/programs/gamemode.nix @@ -1,8 +1,8 @@ {...}: { - programs = { - gamemode = { - enable = true; - enableRenice = true; - }; + programs = { + gamemode = { + enable = true; + enableRenice = true; }; + }; } diff --git a/s0mePC-nix/programs/gamescope.nix b/s0mePC-nix/programs/gamescope.nix index 76103ce..7e6c94c 100644 --- a/s0mePC-nix/programs/gamescope.nix +++ b/s0mePC-nix/programs/gamescope.nix @@ -1,11 +1,11 @@ {pkgs, ...}: { - programs = { - gamescope = { - enable = true; - package = pkgs.gamescope_git; - args = [ - "-e" - ]; - }; + programs = { + gamescope = { + enable = true; + package = pkgs.gamescope_git; + args = [ + "-e" + ]; }; + }; } diff --git a/s0mePC-nix/programs/nekoray.nix b/s0mePC-nix/programs/nekoray.nix index f4f0b44..b5cfb36 100644 --- a/s0mePC-nix/programs/nekoray.nix +++ b/s0mePC-nix/programs/nekoray.nix @@ -1,11 +1,11 @@ {...}: { - programs = { - nekoray = { - enable = true; - tunMode = { - enable = true; - setuid = true; - }; - }; + programs = { + nekoray = { + enable = true; + tunMode = { + enable = true; + setuid = true; + }; }; + }; } diff --git a/s0mePC-nix/programs/nh.nix b/s0mePC-nix/programs/nh.nix index da214cc..f43fb06 100644 --- a/s0mePC-nix/programs/nh.nix +++ b/s0mePC-nix/programs/nh.nix @@ -1,12 +1,12 @@ {...}: { - programs = { - nh = { - enable = true; - clean = { - enable = true; - dates = "weekly"; - extraArgs = "--keep 2 --keep-since 2d"; - }; - }; + programs = { + nh = { + enable = true; + clean = { + enable = true; + dates = "weekly"; + extraArgs = "--keep 2 --keep-since 2d"; + }; }; + }; } diff --git a/s0mePC-nix/programs/ssh.nix b/s0mePC-nix/programs/ssh.nix index 1d692c0..0f8bd7b 100644 --- a/s0mePC-nix/programs/ssh.nix +++ b/s0mePC-nix/programs/ssh.nix @@ -1,8 +1,8 @@ {...}: { - programs = { - ssh = { - startAgent = true; - agentTimeout = "12h"; - }; + programs = { + ssh = { + startAgent = true; + agentTimeout = "12h"; }; + }; } diff --git a/s0mePC-nix/programs/steam.nix b/s0mePC-nix/programs/steam.nix index 2cd919e..084269a 100644 --- a/s0mePC-nix/programs/steam.nix +++ b/s0mePC-nix/programs/steam.nix @@ -1,22 +1,22 @@ {pkgs, ...}: { - programs = { - steam = { - enable = true; - extraCompatPackages = [ - pkgs.proton-ge-bin - ]; + programs = { + steam = { + enable = true; + extraCompatPackages = [ + pkgs.proton-ge-bin + ]; - remotePlay = { - openFirewall = true; - }; + remotePlay = { + openFirewall = true; + }; - localNetworkGameTransfers = { - openFirewall = true; - }; + localNetworkGameTransfers = { + openFirewall = true; + }; - protontricks = { - enable = true; - }; - }; + protontricks = { + enable = true; + }; }; + }; } diff --git a/s0mePC-nix/programs/yubikey-touch-detector.nix b/s0mePC-nix/programs/yubikey-touch-detector.nix index 0bdc928..c9815c5 100644 --- a/s0mePC-nix/programs/yubikey-touch-detector.nix +++ b/s0mePC-nix/programs/yubikey-touch-detector.nix @@ -1,9 +1,9 @@ {...}: { - programs = { - yubikey-touch-detector = { - enable = true; - libnotify = true; - unixSocket = true; - }; + programs = { + yubikey-touch-detector = { + enable = true; + libnotify = true; + unixSocket = true; }; + }; } diff --git a/s0mePC-nix/security/pam/yubico.nix b/s0mePC-nix/security/pam/yubico.nix index 0e5bd55..a17999d 100644 --- a/s0mePC-nix/security/pam/yubico.nix +++ b/s0mePC-nix/security/pam/yubico.nix @@ -1,15 +1,15 @@ {...}: { - security = { - pam = { - yubico = { - enable = false; - debug = true; - mode = "challenge-response"; - control = "sufficient"; - id = [ - "1873055870" - ]; - }; - }; + security = { + pam = { + yubico = { + enable = false; + debug = true; + mode = "challenge-response"; + control = "sufficient"; + id = [ + "1873055870" + ]; + }; }; + }; } diff --git a/s0mePC-nix/security/polkit.nix b/s0mePC-nix/security/polkit.nix index 712b489..7604e82 100644 --- a/s0mePC-nix/security/polkit.nix +++ b/s0mePC-nix/security/polkit.nix @@ -1,10 +1,10 @@ {...}: { - security = { - polkit = { - enable = true; - adminIdentities = [ - "unix-group:wheel" - ]; - }; + security = { + polkit = { + enable = true; + adminIdentities = [ + "unix-group:wheel" + ]; }; + }; } diff --git a/s0mePC-nix/security/rtkit.nix b/s0mePC-nix/security/rtkit.nix index 2cb5541..d3604df 100644 --- a/s0mePC-nix/security/rtkit.nix +++ b/s0mePC-nix/security/rtkit.nix @@ -1,7 +1,7 @@ {...}: { - security = { - rtkit = { - enable = true; - }; + security = { + rtkit = { + enable = true; }; + }; } diff --git a/s0mePC-nix/security/sudo-rs.nix b/s0mePC-nix/security/sudo-rs.nix index f428d59..772460d 100644 --- a/s0mePC-nix/security/sudo-rs.nix +++ b/s0mePC-nix/security/sudo-rs.nix @@ -1,9 +1,9 @@ {...}: { - security = { - sudo-rs = { - enable = true; - wheelNeedsPassword = true; - execWheelOnly = true; - }; + security = { + sudo-rs = { + enable = true; + wheelNeedsPassword = true; + execWheelOnly = true; }; + }; } diff --git a/s0mePC-nix/security/sudo.nix b/s0mePC-nix/security/sudo.nix index ed69b5e..393528d 100644 --- a/s0mePC-nix/security/sudo.nix +++ b/s0mePC-nix/security/sudo.nix @@ -1,7 +1,7 @@ {lib, ...}: { - security = { - sudo = { - enable = lib.mkDefault false; - }; + security = { + sudo = { + enable = lib.mkDefault false; }; + }; } diff --git a/s0mePC-nix/services/greetd.nix b/s0mePC-nix/services/greetd.nix index 4ecda9e..812845d 100644 --- a/s0mePC-nix/services/greetd.nix +++ b/s0mePC-nix/services/greetd.nix @@ -1,18 +1,18 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - services = { - greetd = { - enable = true; - restart = false; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.hyprland} --greet-align center"; - user = "greeter"; - }; - }; + services = { + greetd = { + enable = true; + restart = false; + settings = { + default_session = { + command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.hyprland} --greet-align center"; + user = "greeter"; }; + }; }; + }; } diff --git a/s0mePC-nix/services/irqbalance.nix b/s0mePC-nix/services/irqbalance.nix index c474ed2..2b3b1dd 100644 --- a/s0mePC-nix/services/irqbalance.nix +++ b/s0mePC-nix/services/irqbalance.nix @@ -1,7 +1,7 @@ {...}: { - services = { - irqbalance = { - enable = true; - }; + services = { + irqbalance = { + enable = true; }; + }; } diff --git a/s0mePC-nix/services/libinput.nix b/s0mePC-nix/services/libinput.nix index 673145b..d859d7f 100644 --- a/s0mePC-nix/services/libinput.nix +++ b/s0mePC-nix/services/libinput.nix @@ -1,15 +1,15 @@ {...}: { - services = { - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - accelSpeed = "-1.0"; - buttonMapping = "1 2 3 4 5 6 7 8 9"; - horizontalScrolling = true; - leftHanded = false; - naturalScrolling = true; - }; - }; + services = { + libinput = { + enable = true; + mouse = { + accelProfile = "flat"; + accelSpeed = "-1.0"; + buttonMapping = "1 2 3 4 5 6 7 8 9"; + horizontalScrolling = true; + leftHanded = false; + naturalScrolling = true; + }; }; + }; } diff --git a/s0mePC-nix/services/netbird.nix b/s0mePC-nix/services/netbird.nix index 71e3cd8..071330a 100644 --- a/s0mePC-nix/services/netbird.nix +++ b/s0mePC-nix/services/netbird.nix @@ -1,7 +1,7 @@ {...}: { - services = { - netbird = { - enable = true; - }; + services = { + netbird = { + enable = true; }; + }; } diff --git a/s0mePC-nix/services/openssh.nix b/s0mePC-nix/services/openssh.nix index a38b26b..eecdb2e 100644 --- a/s0mePC-nix/services/openssh.nix +++ b/s0mePC-nix/services/openssh.nix @@ -1,22 +1,22 @@ {config, ...}: { - services = { - openssh = { - enable = true; - allowSFTP = true; - openFirewall = true; - ports = [ - 45734 - ]; + services = { + openssh = { + enable = true; + allowSFTP = true; + openFirewall = true; + ports = [ + 45734 + ]; - settings = { - PrintMotd = false; - PermitRootLogin = "no"; - PasswordAuthentication = false; - }; + settings = { + PrintMotd = false; + PermitRootLogin = "no"; + PasswordAuthentication = false; + }; - authorizedKeysFiles = [ - config.sops.secrets.sshKey.path - ]; - }; + authorizedKeysFiles = [ + config.sops.secrets.sshKey.path + ]; }; + }; } diff --git a/s0mePC-nix/services/pipewire.nix b/s0mePC-nix/services/pipewire.nix index 7c94208..c4bad1e 100644 --- a/s0mePC-nix/services/pipewire.nix +++ b/s0mePC-nix/services/pipewire.nix @@ -1,65 +1,65 @@ {...}: { - services = { + services = { + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + + audio = { + enable = true; + }; + + pulse = { + enable = true; + }; + + jack = { + enable = true; + }; + + wireplumber = { + enable = true; + }; + + extraConfig = { pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; + "92-low-latency" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 88200 + 96000 + ]; + + "default.clock.min-quantum" = 512; + "default.clock.quantum" = 4096; + "default.clock.max-quantum" = 8192; }; + }; - audio = { - enable = true; + "93-no-resampling" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 96000 + 192000 + ]; }; + }; - pulse = { - enable = true; - }; - - jack = { - enable = true; - }; - - wireplumber = { - enable = true; - }; - - extraConfig = { - pipewire = { - "92-low-latency" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 88200 - 96000 - ]; - - "default.clock.min-quantum" = 512; - "default.clock.quantum" = 4096; - "default.clock.max-quantum" = 8192; - }; - }; - - "93-no-resampling" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 96000 - 192000 - ]; - }; - }; - - "94-no-upmixing" = { - "stream.properties" = { - "channelmix.upmix" = false; - }; - }; - }; + "94-no-upmixing" = { + "stream.properties" = { + "channelmix.upmix" = false; }; + }; }; + }; }; + }; } diff --git a/s0mePC-nix/services/qmk.nix b/s0mePC-nix/services/qmk.nix index 172ee30..d193c5d 100644 --- a/s0mePC-nix/services/qmk.nix +++ b/s0mePC-nix/services/qmk.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { - services = { - udev = { - packages = with pkgs; [ - qmk-udev-rules - ]; - }; + services = { + udev = { + packages = with pkgs; [ + qmk-udev-rules + ]; }; + }; } diff --git a/s0mePC-nix/services/resolved.nix b/s0mePC-nix/services/resolved.nix index dc54c1a..90df2ad 100644 --- a/s0mePC-nix/services/resolved.nix +++ b/s0mePC-nix/services/resolved.nix @@ -1,39 +1,39 @@ {...}: { - services = { - resolved = { - enable = true; - dnsovertls = "true"; - dnssec = "true"; - llmnr = "true"; - domains = [ - "~." - ]; + services = { + resolved = { + enable = true; + dnsovertls = "true"; + dnssec = "true"; + llmnr = "true"; + domains = [ + "~." + ]; - fallbackDns = [ - # cf dns - "1.1.1.1" - "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" + fallbackDns = [ + # cf dns + "1.1.1.1" + "1.0.0.1" + "2606:4700:4700::1111" + "2606:4700:4700::1001" - # google dns - "8.8.8.8" - "8.8.4.4" - "2001:4860:4860::8888" - "2001:4860:4860::8844" + # google dns + "8.8.8.8" + "8.8.4.4" + "2001:4860:4860::8888" + "2001:4860:4860::8844" - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" + # q9 dns + "9.9.9.9" + "149.112.112.112" + "2620:fe::fe" + "2620:fe::9" - # open dns - "208.67.222.222" - "208.67.220.220" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; + # open dns + "208.67.222.222" + "208.67.220.220" + "2620:119:35::35" + "2620:119:53::53" + ]; }; + }; } diff --git a/s0mePC-nix/services/scx.nix b/s0mePC-nix/services/scx.nix index 79dd786..2500bba 100644 --- a/s0mePC-nix/services/scx.nix +++ b/s0mePC-nix/services/scx.nix @@ -1,9 +1,9 @@ {...}: { - services = { - scx = { - enable = true; - # package = pkgs.scx_git.full; - scheduler = "scx_cosmos"; - }; + services = { + scx = { + enable = true; + # package = pkgs.scx_git.full; + scheduler = "scx_cosmos"; }; + }; } diff --git a/s0mePC-nix/services/sunshine.nix b/s0mePC-nix/services/sunshine.nix index 2fda308..ae9299a 100644 --- a/s0mePC-nix/services/sunshine.nix +++ b/s0mePC-nix/services/sunshine.nix @@ -1,10 +1,10 @@ {...}: { - services = { - sunshine = { - enable = true; - capSysAdmin = true; - openFirewall = true; - autoStart = true; - }; + services = { + sunshine = { + enable = true; + capSysAdmin = true; + openFirewall = true; + autoStart = true; }; + }; } diff --git a/s0mePC-nix/services/usbmuxd.nix b/s0mePC-nix/services/usbmuxd.nix index aa3637a..34606ed 100644 --- a/s0mePC-nix/services/usbmuxd.nix +++ b/s0mePC-nix/services/usbmuxd.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - services = { - usbmuxd = { - enable = true; - package = pkgs.usbmuxd2; - }; + services = { + usbmuxd = { + enable = true; + package = pkgs.usbmuxd2; }; + }; } diff --git a/s0mePC-nix/services/xserver.nix b/s0mePC-nix/services/xserver.nix index c6778b6..507984a 100644 --- a/s0mePC-nix/services/xserver.nix +++ b/s0mePC-nix/services/xserver.nix @@ -1,26 +1,26 @@ { - lib, - pkgs, - ... + lib, + pkgs, + ... }: { - services = { - xserver = { - display = lib.mkForce 0; - enable = true; + services = { + xserver = { + display = lib.mkForce 0; + enable = true; - excludePackages = with pkgs; [ - xterm - ]; + excludePackages = with pkgs; [ + xterm + ]; - videoDrivers = [ - "amdgpu" - ]; + videoDrivers = [ + "amdgpu" + ]; - xkb = { - layout = "us, ru"; - variant = ""; - options = "grp:caps_toggle"; - }; - }; + xkb = { + layout = "us, ru"; + variant = ""; + options = "grp:caps_toggle"; + }; }; + }; } diff --git a/s0mePC-nix/services/yggdrasil.nix b/s0mePC-nix/services/yggdrasil.nix index 3948752..c7fc99d 100644 --- a/s0mePC-nix/services/yggdrasil.nix +++ b/s0mePC-nix/services/yggdrasil.nix @@ -1,64 +1,64 @@ {...}: { - services = { - yggdrasil = { - enable = true; - persistentKeys = false; - settings = { - PrivateKey = "${yggKeyPC}"; + services = { + yggdrasil = { + enable = true; + persistentKeys = false; + settings = { + PrivateKey = "${yggKeyPC}"; - Peers = [ - # Germany :Erm: - "tcp://s-fra-0.sergeysedoy97.ru:65533" - "tls://s-fra-0.sergeysedoy97.ru:65534" - "tcp://x-fra-0.sergeysedoy97.ru:65533" - "tls://x-fra-0.sergeysedoy97.ru:65534" - "quic://x-fra-0.sergeysedoy97.ru:65535" - "tls://helium.avevad.com:13378" - "tcp://bode.theender.net:42069" - "tls://bode.theender.net:42169?key=f91b909f43829f8b20732b3bcf80cbc4bb078dd47b41638379a078e35984c9a4" + Peers = [ + # Germany :Erm: + "tcp://s-fra-0.sergeysedoy97.ru:65533" + "tls://s-fra-0.sergeysedoy97.ru:65534" + "tcp://x-fra-0.sergeysedoy97.ru:65533" + "tls://x-fra-0.sergeysedoy97.ru:65534" + "quic://x-fra-0.sergeysedoy97.ru:65535" + "tls://helium.avevad.com:13378" + "tcp://bode.theender.net:42069" + "tls://bode.theender.net:42169?key=f91b909f43829f8b20732b3bcf80cbc4bb078dd47b41638379a078e35984c9a4" - # Russia - "tcp://s-mow-0.sergeysedoy97.ru:65533" - "tls://s-mow-0.sergeysedoy97.ru:65534" - "tcp://x-mow-0.sergeysedoy97.ru:65533" - "tls://x-mow-0.sergeysedoy97.ru:65534" - "quic://x-mow-0.sergeysedoy97.ru:65535" - "tcp://s-mow-1.sergeysedoy97.ru:65533" - "tls://s-mow-1.sergeysedoy97.ru:65534" - "tcp://x-mow-1.sergeysedoy97.ru:65533" - "tls://x-mow-1.sergeysedoy97.ru:65534" - "quic://x-mow-1.sergeysedoy97.ru:65535" - "quic://kursk.cleverfox.org:15015" - "tls://kursk.cleverfox.org:15015" - "ws://kursk.cleverfox.org:15016" - "tcp://kzn1.neonxp.ru:7991" - "tls://kzn1.neonxp.ru:7992" - "ws://kzn1.neonxp.ru:7993" - "quic://kzn1.neonxp.ru:7994" - ]; + # Russia + "tcp://s-mow-0.sergeysedoy97.ru:65533" + "tls://s-mow-0.sergeysedoy97.ru:65534" + "tcp://x-mow-0.sergeysedoy97.ru:65533" + "tls://x-mow-0.sergeysedoy97.ru:65534" + "quic://x-mow-0.sergeysedoy97.ru:65535" + "tcp://s-mow-1.sergeysedoy97.ru:65533" + "tls://s-mow-1.sergeysedoy97.ru:65534" + "tcp://x-mow-1.sergeysedoy97.ru:65533" + "tls://x-mow-1.sergeysedoy97.ru:65534" + "quic://x-mow-1.sergeysedoy97.ru:65535" + "quic://kursk.cleverfox.org:15015" + "tls://kursk.cleverfox.org:15015" + "ws://kursk.cleverfox.org:15016" + "tcp://kzn1.neonxp.ru:7991" + "tls://kzn1.neonxp.ru:7992" + "ws://kzn1.neonxp.ru:7993" + "quic://kzn1.neonxp.ru:7994" + ]; - Listen = [ - # - ]; + Listen = [ + # + ]; - MulticastInterfaces = [ - { - Regex = ".*"; - Beacon = true; - Listen = false; - Password = ""; - } - ]; + MulticastInterfaces = [ + { + Regex = ".*"; + Beacon = true; + Listen = false; + Password = ""; + } + ]; - AllowedPublicKeys = [ - # - ]; + AllowedPublicKeys = [ + # + ]; - IfName = "auto"; + IfName = "auto"; - IfMTU = 65535; - NodeInfoPrivacy = false; - }; - }; + IfMTU = 65535; + NodeInfoPrivacy = false; + }; }; + }; } diff --git a/s0mePC-nix/services/yubikey-agent.nix b/s0mePC-nix/services/yubikey-agent.nix index eec1187..4fcfbc2 100644 --- a/s0mePC-nix/services/yubikey-agent.nix +++ b/s0mePC-nix/services/yubikey-agent.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - services = { - yubikey-agent = { - package = pkgs.yubikey-agent; - enable = false; - }; + services = { + yubikey-agent = { + package = pkgs.yubikey-agent; + enable = false; }; + }; } diff --git a/s0mePC-nix/services/zapret.nix b/s0mePC-nix/services/zapret.nix index fd082dd..ad671e1 100644 --- a/s0mePC-nix/services/zapret.nix +++ b/s0mePC-nix/services/zapret.nix @@ -1,145 +1,145 @@ {...}: { - services = { - zapret = { - enable = true; - configureFirewall = true; - qnum = 350; - params = [ - "--wssize 1:6" + services = { + zapret = { + enable = true; + configureFirewall = true; + qnum = 350; + params = [ + "--wssize 1:6" - "--filter-tcp=80" - "--dpi-desync=multisplit" - "--dpi-desync-split-pos=10" - "--dpi-desync-repeats=6" - "--new" + "--filter-tcp=80" + "--dpi-desync=multisplit" + "--dpi-desync-split-pos=10" + "--dpi-desync-repeats=6" + "--new" - "--filter-tcp=443" - "--dpi-desync=multidisorder" - "--dpi-desync-split-pos=1,midsld" - "--new" + "--filter-tcp=443" + "--dpi-desync=multidisorder" + "--dpi-desync-split-pos=1,midsld" + "--new" - "--filter-tcp=443" - "--dpi-desync=syndata" - "--dpi-desync-fake-syndata=0x00000000" - "--dpi-desync-ttl=10" - "--new" + "--filter-tcp=443" + "--dpi-desync=syndata" + "--dpi-desync-fake-syndata=0x00000000" + "--dpi-desync-ttl=10" + "--new" - "--filter-udp=443" - "--dpi-desync=fake" - "--dpi-desync-repeats=6" - "--dpi-desync-fake-quic=0x00000000" - "--new" + "--filter-udp=443" + "--dpi-desync=fake" + "--dpi-desync-repeats=6" + "--dpi-desync-fake-quic=0x00000000" + "--new" - "--filter-udp=443" - "--dpi-desync=fake,udplen" - "--dpi-desync-udplen-increment=5" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-cutoff=n3" - "--dpi-desync-repeats=2" - "--new" + "--filter-udp=443" + "--dpi-desync=fake,udplen" + "--dpi-desync-udplen-increment=5" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-cutoff=n3" + "--dpi-desync-repeats=2" + "--new" - "--filter-tcp=443" - "--dpi-desync=split" - "--dpi-desync-fooling=md5sig,badseq" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-pos=1" - "--dpi-desync-repeats=10" - "--new" + "--filter-tcp=443" + "--dpi-desync=split" + "--dpi-desync-fooling=md5sig,badseq" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync-repeats=10" + "--new" - "--filter-tcp=443" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-seqovl=2" - "--dpi-desync-split-pos=2" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" - "--dpi-desync-autottl" - "--new" - "--filter-tcp=443" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-seqovl=2" - "--dpi-desync-split-pos=2" - "--dpi-desync-autottl" - "--new" + "--dpi-desync-autottl" + "--new" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + "--dpi-desync-autottl" + "--new" - "--filter-tcp=80" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-autottl" - "--new" + "--filter-tcp=80" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-autottl" + "--new" - "--filter-tcp=80" - "--dpi-desync-ttl=1" - "--dpi-desync-autottl=2" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-pos=1" - "--dpi-desync=fake,split2" - "--dpi-desync-repeats=6" - "--dpi-desync-fooling=md5sig" - "--new" - ]; + "--filter-tcp=80" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync=fake,split2" + "--dpi-desync-repeats=6" + "--dpi-desync-fooling=md5sig" + "--new" + ]; - whitelist = [ - "googlevideo.com" - "youtu.be" - "youtube.com" - "youtubei.googleapis.com" - "googlevideo.com" - "youtu.be" - "youtube.com" - "youtubei.googleapis.com" - "youtubeembeddedplayer.googleapis.com" - "ytimg.l.google.com" - "ytimg.com" - "jnn-pa.googleapis.com" - "youtube-nocookie.com" - "youtube-ui.l.google.com" - "yt-video-upload.l.google.com" - "wide-youtube.l.google.com" - "youtubekids.com" - "ggpht.com" - "music.youtube.com" - "test.googlevideo.com" - "discord.com" - "gateway.discord.gg" - "cdn.discordapp.com" - "discordapp.net" - "discordapp.com" - "discord.gg" - "media.discordapp.net" - "images-ext-1.discordapp.net" - "discord.app" - "discord.media" - "discordcdn.com" - "discord.dev" - "discord.new" - "discord.gift" - "discordstatus.com" - "dis.gd" - "discord.co" - "discord-attachments-uploads-prd.storage.googleapis.com" - "7tv.app" - "7tv.io" - "10tv.app" - "x.com" - "t.co" - "ads-twitter.com" - "twimg.com" - "twitter.com" - "pscp.tv" - "twtrdns.net" - "twttr.com" - "periscope.tv" - "tweetdeck.com" - "twitpic.com" - "twitter.co" - "twitterinc.com" - "twitteroauth.com" - "twitterstat.us" - ]; - }; + whitelist = [ + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "youtubeembeddedplayer.googleapis.com" + "ytimg.l.google.com" + "ytimg.com" + "jnn-pa.googleapis.com" + "youtube-nocookie.com" + "youtube-ui.l.google.com" + "yt-video-upload.l.google.com" + "wide-youtube.l.google.com" + "youtubekids.com" + "ggpht.com" + "music.youtube.com" + "test.googlevideo.com" + "discord.com" + "gateway.discord.gg" + "cdn.discordapp.com" + "discordapp.net" + "discordapp.com" + "discord.gg" + "media.discordapp.net" + "images-ext-1.discordapp.net" + "discord.app" + "discord.media" + "discordcdn.com" + "discord.dev" + "discord.new" + "discord.gift" + "discordstatus.com" + "dis.gd" + "discord.co" + "discord-attachments-uploads-prd.storage.googleapis.com" + "7tv.app" + "7tv.io" + "10tv.app" + "x.com" + "t.co" + "ads-twitter.com" + "twimg.com" + "twitter.com" + "pscp.tv" + "twtrdns.net" + "twttr.com" + "periscope.tv" + "tweetdeck.com" + "twitpic.com" + "twitter.co" + "twitterinc.com" + "twitteroauth.com" + "twitterstat.us" + ]; }; + }; } diff --git a/s0mePC-nix/services/zerotier.nix b/s0mePC-nix/services/zerotier.nix index 96e1cb7..f58210f 100644 --- a/s0mePC-nix/services/zerotier.nix +++ b/s0mePC-nix/services/zerotier.nix @@ -1,10 +1,10 @@ {...}: { - services = { - zerotierone = { - enable = true; - joinNetworks = [ - # nope - ]; - }; + services = { + zerotierone = { + enable = true; + joinNetworks = [ + # nope + ]; }; + }; } diff --git a/s0mePC-nix/system/name.nix b/s0mePC-nix/system/name.nix index 585e4de..0b4488b 100644 --- a/s0mePC-nix/system/name.nix +++ b/s0mePC-nix/system/name.nix @@ -1,5 +1,5 @@ {config, ...}: { - system = { - name = config.networking.hostName; - }; + system = { + name = config.networking.hostName; + }; } diff --git a/s0mePC-nix/system/stateVersion.nix b/s0mePC-nix/system/stateVersion.nix index 2bb50db..9e437fe 100644 --- a/s0mePC-nix/system/stateVersion.nix +++ b/s0mePC-nix/system/stateVersion.nix @@ -1,5 +1,5 @@ {config, ...}: { - system = { - stateVersion = config.system.nixos.release; - }; + system = { + stateVersion = config.system.nixos.release; + }; } diff --git a/s0mePC-nix/systemd/oomd.nix b/s0mePC-nix/systemd/oomd.nix index c212515..cbd28f2 100644 --- a/s0mePC-nix/systemd/oomd.nix +++ b/s0mePC-nix/systemd/oomd.nix @@ -1,10 +1,10 @@ {...}: { - systemd = { - oomd = { - enable = true; - enableUserSlices = true; - enableSystemSlice = true; - enableRootSlice = true; - }; + systemd = { + oomd = { + enable = true; + enableUserSlices = true; + enableSystemSlice = true; + enableRootSlice = true; }; + }; } diff --git a/s0mePC-nix/systemd/slices/root-slice.nix b/s0mePC-nix/systemd/slices/root-slice.nix index 46e96bc..118ca0b 100644 --- a/s0mePC-nix/systemd/slices/root-slice.nix +++ b/s0mePC-nix/systemd/slices/root-slice.nix @@ -1,14 +1,14 @@ {...}: { - systemd = { - slices = { - root = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; + systemd = { + slices = { + root = { + sliceConfig = { + ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "40%"; + ManagedOOMMemoryPressureDurationSec = 0; }; + }; }; + }; } diff --git a/s0mePC-nix/systemd/slices/system-slice.nix b/s0mePC-nix/systemd/slices/system-slice.nix index 66a0d0d..148f19b 100644 --- a/s0mePC-nix/systemd/slices/system-slice.nix +++ b/s0mePC-nix/systemd/slices/system-slice.nix @@ -1,14 +1,14 @@ {...}: { - systemd = { - slices = { - system = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; + systemd = { + slices = { + system = { + sliceConfig = { + ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "40%"; + ManagedOOMMemoryPressureDurationSec = 0; }; + }; }; + }; } diff --git a/s0mePC-nix/systemd/slices/user-slice.nix b/s0mePC-nix/systemd/slices/user-slice.nix index ee610ef..21d74d8 100644 --- a/s0mePC-nix/systemd/slices/user-slice.nix +++ b/s0mePC-nix/systemd/slices/user-slice.nix @@ -1,14 +1,14 @@ {...}: { - systemd = { - slices = { - user = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; + systemd = { + slices = { + user = { + sliceConfig = { + ManagedOOMSwap = "kill"; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "40%"; + ManagedOOMMemoryPressureDurationSec = 0; }; + }; }; + }; } diff --git a/s0mePC-nix/time/timeZone.nix b/s0mePC-nix/time/timeZone.nix index 837ddd7..57bca35 100644 --- a/s0mePC-nix/time/timeZone.nix +++ b/s0mePC-nix/time/timeZone.nix @@ -1,6 +1,6 @@ {...}: { - time = { - timeZone = "Europe/Moscow"; - hardwareClockInLocalTime = true; - }; + time = { + timeZone = "Europe/Moscow"; + hardwareClockInLocalTime = true; + }; } diff --git a/s0mePC-nix/users/mutableUsers.nix b/s0mePC-nix/users/mutableUsers.nix index 2c39188..54415f1 100644 --- a/s0mePC-nix/users/mutableUsers.nix +++ b/s0mePC-nix/users/mutableUsers.nix @@ -1,5 +1,5 @@ {...}: { - users = { - mutableUsers = false; - }; + users = { + mutableUsers = false; + }; } diff --git a/s0mePC-nix/users/users/hand7s.nix b/s0mePC-nix/users/users/hand7s.nix index 9a082f8..8c0df47 100644 --- a/s0mePC-nix/users/users/hand7s.nix +++ b/s0mePC-nix/users/users/hand7s.nix @@ -1,17 +1,17 @@ {...}: { + users = { users = { - users = { - hand7s = { - description = "me"; - isSystemUser = false; - isNormalUser = true; - initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; - extraGroups = [ - "wheel" - "networkmanager" - "docker" - ]; - }; - }; + hand7s = { + description = "me"; + isSystemUser = false; + isNormalUser = true; + initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; + extraGroups = [ + "wheel" + "networkmanager" + "docker" + ]; + }; }; + }; } diff --git a/s0mePC-nix/users/users/root.nix b/s0mePC-nix/users/users/root.nix index 9c18bc7..595a6f6 100644 --- a/s0mePC-nix/users/users/root.nix +++ b/s0mePC-nix/users/users/root.nix @@ -1,9 +1,9 @@ {...}: { + users = { users = { - users = { - root = { - initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; - }; - }; + root = { + initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; + }; }; + }; } diff --git a/s0mePC-nix/virtualisation/docker.nix b/s0mePC-nix/virtualisation/docker.nix index 50d0769..1edae88 100644 --- a/s0mePC-nix/virtualisation/docker.nix +++ b/s0mePC-nix/virtualisation/docker.nix @@ -1,10 +1,10 @@ {...}: { - virtualisation = { - docker = { - enable = true; - rootless = { - enable = true; - }; - }; + virtualisation = { + docker = { + enable = true; + rootless = { + enable = true; + }; }; + }; } diff --git a/s0mePC-nix/xdg/icons.nix b/s0mePC-nix/xdg/icons.nix index 0ce5633..53ccd0b 100644 --- a/s0mePC-nix/xdg/icons.nix +++ b/s0mePC-nix/xdg/icons.nix @@ -1,7 +1,7 @@ {...}: { - xdg = { - icons = { - enable = true; - }; + xdg = { + icons = { + enable = true; }; + }; } diff --git a/s0mePC-nix/xdg/mime.nix b/s0mePC-nix/xdg/mime.nix index d9265ae..4b6af20 100644 --- a/s0mePC-nix/xdg/mime.nix +++ b/s0mePC-nix/xdg/mime.nix @@ -1,11 +1,11 @@ {...}: { - xdg = { - mime = { - enable = true; - defaultApplications = { - "x-scheme-handler/http" = "google-chrome.desktop"; - "x-scheme-handler/https" = "google-chrome.desktop"; - }; - }; + xdg = { + mime = { + enable = true; + defaultApplications = { + "x-scheme-handler/http" = "google-chrome.desktop"; + "x-scheme-handler/https" = "google-chrome.desktop"; + }; }; + }; } diff --git a/s0mePC-nix/xdg/portal.nix b/s0mePC-nix/xdg/portal.nix index c6abcd3..da6b70a 100644 --- a/s0mePC-nix/xdg/portal.nix +++ b/s0mePC-nix/xdg/portal.nix @@ -1,28 +1,28 @@ {pkgs, ...}: { - xdg = { - portal = { - enable = true; + xdg = { + portal = { + enable = true; - config = { - common = { - default = [ - "gtk" - ]; - }; - - hyprland = { - preferred = [ - "gtk" - "hyprland" - ]; - }; - }; - - extraPortals = with pkgs; [ - xdg-desktop-portal - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - ]; + config = { + common = { + default = [ + "gtk" + ]; }; + + hyprland = { + preferred = [ + "gtk" + "hyprland" + ]; + }; + }; + + extraPortals = with pkgs; [ + xdg-desktop-portal + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + ]; }; + }; } diff --git a/s0melapt0p-nix/boot/initrd.nix b/s0melapt0p-nix/boot/initrd.nix index 0dbfb70..4f1ef31 100644 --- a/s0melapt0p-nix/boot/initrd.nix +++ b/s0melapt0p-nix/boot/initrd.nix @@ -1,42 +1,42 @@ {lib, ...}: { - boot = { - initrd = { - availableKernelModules = [ - "ehci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "sdhci_pci" - "btrfs" - "battery" - "thinkpad_acpi" - "cryptd" - ]; + boot = { + initrd = { + availableKernelModules = [ + "ehci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + "sdhci_pci" + "btrfs" + "battery" + "thinkpad_acpi" + "cryptd" + ]; - supportedFilesystems = { - vfat = true; - btrfs = true; - zfs = lib.mkForce false; - }; + supportedFilesystems = { + vfat = true; + btrfs = true; + zfs = lib.mkForce false; + }; - kernelModules = [ - "i915" - ]; + kernelModules = [ + "i915" + ]; - luks = { - devices = { - cryptroot = { - device = "/dev/disk/by-id/ata-ST92503010AS_5YH0CJFL-part2"; - }; - }; - }; - - systemd = { - enable = true; - }; - - verbose = false; + luks = { + devices = { + cryptroot = { + device = "/dev/disk/by-id/ata-ST92503010AS_5YH0CJFL-part2"; + }; }; + }; + + systemd = { + enable = true; + }; + + verbose = false; }; + }; } diff --git a/s0melapt0p-nix/boot/kernel.nix b/s0melapt0p-nix/boot/kernel.nix index 1b7f32f..0931dbc 100644 --- a/s0melapt0p-nix/boot/kernel.nix +++ b/s0melapt0p-nix/boot/kernel.nix @@ -1,85 +1,85 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - boot = { - kernel = { - sysctl = { - "vm.swappiness" = 100; - "vm.dirty_background_bytes" = 67108864; - "vm.dirty_bytes" = 268435456; - "vm.dirty_expire_centisecs" = 1500; - "vm.dirty_writeback_centisecs" = 100; - "vm.vfs_cache_pressure" = 50; - "vm.max_map_count" = 1048576; - }; - }; - - kernelPackages = pkgs.linuxPackages_zen; - extraModprobeConfig = '' - options thinkpad_acpi fan_control=1 - ''; - - kernelParams = [ - "i915.enable_rc6=7" - "udev.log_priority=3" - "quiet" - "splash" - "boot.shell_on_fail" - "loglevel=3" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - - "debugfs=off" - "page_alloc.shuffle=1" - "page_poison=1" - "slab_nomerge" - - "kernel.watchdog=0" - "oops=panic" - ]; - - kernelModules = [ - "tp_smapi" - ]; - - blacklistedKernelModules = [ - "k10temp" - "ax25" - "netrom" - "rose" - "adfs" - "affs" - "bfs" - "befs" - "cramfs" - "efs" - "erofs" - "exofs" - "freevxfs" - "f2fs" - "hfs" - "hpfs" - "jfs" - "minix" - "nilfs2" - "ntfs" - "omfs" - "qnx4" - "qnx6" - "sysv" - "ufs" - "sp5100-tco" - "iTCO_wdt" - ]; - - supportedFilesystems = { - vfat = true; - btrfs = true; - zfs = lib.mkForce false; - }; - - # consoleLogLevel = 0; + boot = { + kernel = { + sysctl = { + "vm.swappiness" = 100; + "vm.dirty_background_bytes" = 67108864; + "vm.dirty_bytes" = 268435456; + "vm.dirty_expire_centisecs" = 1500; + "vm.dirty_writeback_centisecs" = 100; + "vm.vfs_cache_pressure" = 50; + "vm.max_map_count" = 1048576; + }; }; + + kernelPackages = pkgs.linuxPackages_zen; + extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 + ''; + + kernelParams = [ + "i915.enable_rc6=7" + "udev.log_priority=3" + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + + "debugfs=off" + "page_alloc.shuffle=1" + "page_poison=1" + "slab_nomerge" + + "kernel.watchdog=0" + "oops=panic" + ]; + + kernelModules = [ + "tp_smapi" + ]; + + blacklistedKernelModules = [ + "k10temp" + "ax25" + "netrom" + "rose" + "adfs" + "affs" + "bfs" + "befs" + "cramfs" + "efs" + "erofs" + "exofs" + "freevxfs" + "f2fs" + "hfs" + "hpfs" + "jfs" + "minix" + "nilfs2" + "ntfs" + "omfs" + "qnx4" + "qnx6" + "sysv" + "ufs" + "sp5100-tco" + "iTCO_wdt" + ]; + + supportedFilesystems = { + vfat = true; + btrfs = true; + zfs = lib.mkForce false; + }; + + # consoleLogLevel = 0; + }; } diff --git a/s0melapt0p-nix/boot/lanzaboote.nix b/s0melapt0p-nix/boot/lanzaboote.nix index a70c6d4..08d07df 100644 --- a/s0melapt0p-nix/boot/lanzaboote.nix +++ b/s0melapt0p-nix/boot/lanzaboote.nix @@ -1,13 +1,13 @@ {...}: { - boot = { - lanzaboote = { - enable = true; - configurationLimit = 7; - pkiBundle = "/var/lib/sbctl"; - settings = { - timeout = 2; - sortKey = "lanza"; - }; - }; + boot = { + lanzaboote = { + enable = true; + configurationLimit = 7; + pkiBundle = "/var/lib/sbctl"; + settings = { + timeout = 2; + sortKey = "lanza"; + }; }; + }; } diff --git a/s0melapt0p-nix/boot/loader/systemd-boot.nix b/s0melapt0p-nix/boot/loader/systemd-boot.nix index a126bfb..01468a8 100644 --- a/s0melapt0p-nix/boot/loader/systemd-boot.nix +++ b/s0melapt0p-nix/boot/loader/systemd-boot.nix @@ -1,19 +1,19 @@ {lib, ...}: { - boot = { - loader = { - systemd-boot = { - enable = lib.mkDefault false; - sortKey = "nixos"; - memtest86 = { - enable = true; - sortKey = "o_memtest86"; - }; - - netbootxyz = { - enable = false; - sortKey = "o_netbootxyz"; - }; - }; + boot = { + loader = { + systemd-boot = { + enable = lib.mkDefault false; + sortKey = "nixos"; + memtest86 = { + enable = true; + sortKey = "o_memtest86"; }; + + netbootxyz = { + enable = false; + sortKey = "o_netbootxyz"; + }; + }; }; + }; } diff --git a/s0melapt0p-nix/boot/plymouth.nix b/s0melapt0p-nix/boot/plymouth.nix index a20c64a..9ae36c6 100644 --- a/s0melapt0p-nix/boot/plymouth.nix +++ b/s0melapt0p-nix/boot/plymouth.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { - boot = { - plymouth = { - enable = true; - themePackages = with pkgs; [ - nixos-bgrt-plymouth - ]; - }; + boot = { + plymouth = { + enable = true; + themePackages = with pkgs; [ + nixos-bgrt-plymouth + ]; }; + }; } diff --git a/s0melapt0p-nix/boot/tmp.nix b/s0melapt0p-nix/boot/tmp.nix index 3c98c31..ac46b34 100644 --- a/s0melapt0p-nix/boot/tmp.nix +++ b/s0melapt0p-nix/boot/tmp.nix @@ -1,8 +1,8 @@ {...}: { - boot = { - tmp = { - useTmpfs = true; - cleanOnBoot = true; - }; + boot = { + tmp = { + useTmpfs = true; + cleanOnBoot = true; }; + }; } diff --git a/s0melapt0p-nix/console/console.nix b/s0melapt0p-nix/console/console.nix index cb4672f..1e60d13 100644 --- a/s0melapt0p-nix/console/console.nix +++ b/s0melapt0p-nix/console/console.nix @@ -1,5 +1,5 @@ {...}: { - console = { - useXkbConfig = true; - }; + console = { + useXkbConfig = true; + }; } diff --git a/s0melapt0p-nix/default.nix b/s0melapt0p-nix/default.nix index 5aac8aa..f00904e 100644 --- a/s0melapt0p-nix/default.nix +++ b/s0melapt0p-nix/default.nix @@ -1,99 +1,99 @@ {self, ...}: { - imports = [ - ./disko/disk.nix - ./disko/lvm_vg.nix + imports = [ + "${self}/s0melapt0p-nix/disko/disk.nix" + "${self}/s0melapt0p-nix/disko/lvm_vg.nix" - ./boot/loader/systemd-boot.nix - ./boot/lanzaboote.nix - ./boot/initrd.nix - ./boot/kernel.nix - ./boot/plymouth.nix - ./boot/tmp.nix + "${self}/s0melapt0p-nix/boot/loader/system-boot.nix" + "${self}/s0melapt0p-nix/boot/lanzaboote.nix" + "${self}/s0melapt0p-nix/boot/initrd.nix" + "${self}/s0melapt0p-nix/boot/kernel.nix" + "${self}/s0melapt0p-nix/boot/plymouth.nix" + "${self}/s0melapt0p-nix/boot/tmp.nix" - ./console/console.nix + "${self}/s0melapt0p-nix/console/console.nix" - ./environment/systemPackages.nix - ./environment/variables.nix + "${self}/s0melapt0p-nix/environment/systemPackages.nix" + "${self}/s0melapt0p-nix/environment/variables.nix" - ./hardware/cpu.nix - ./hardware/graphics.nix - ./hardware/qmk.nix - ./hardware/zram.nix + "${self}/s0melapt0p-nix/hardware/cpu.nix" + "${self}/s0melapt0p-nix/hardware/graphics.nix" + "${self}/s0melapt0p-nix/hardware/qmk.nix" + "${self}/s0melapt0p-nix/hardware/zram.nix" - ./home-manager/users.nix + "${self}/s0melapt0p-nix/home-manager/users.nix" - ./i18n/locales.nix + "${self}/s0melapt0p-nix/i18n/locales.nix" - ./networking/dhcp.nix - ./networking/firewall.nix - ./networking/hostname.nix - ./networking/networkmanager.nix - ./networking/wireguard.nix - ./networking/nameservers.nix - ./networking/hosts.nix - ./networking/hostId.nix + "${self}/s0melapt0p-nix/networking/dhcp.nix" + "${self}/s0melapt0p-nix/networking/firewall.nix" + "${self}/s0melapt0p-nix/networking/hostname.nix" + "${self}/s0melapt0p-nix/networking/networkmanager.nix" + "${self}/s0melapt0p-nix/networking/wireguard.nix" + "${self}/s0melapt0p-nix/networking/nameservers.nix" + "${self}/s0melapt0p-nix/networking/hosts.nix" + "${self}/s0melapt0p-nix/networking/hostId.nix" - ./nix/package.nix - ./nix/settings/allowed-users.nix - ./nix/settings/experimental-features.nix - ./nix/settings/substituters.nix - ./nix/settings/trusted-public-keys.nix - ./nix/settings/trusted-users.nix + "${self}/s0melapt0p-nix/nix/package.nix" + "${self}/s0melapt0p-nix/nix/settings/allowed-users.nix" + "${self}/s0melapt0p-nix/nix/settings/experimental-features.nix" + "${self}/s0melapt0p-nix/nix/settings/substituters.nix" + "${self}/s0melapt0p-nix/nix/settings/trusted-public-keys.nix" + "${self}/s0melapt0p-nix/nix/settings/trusted-users.nix" - ./nixpkgs/config.nix - ./nixpkgs/system.nix + "${self}/s0melapt0p-nix/nixpkgs/config.nix" + "${self}/s0melapt0p-nix/nixpkgs/system.nix" - ./programs/gamemode.nix - ./programs/nh.nix - ./programs/steam.nix - ./programs/ssh.nix - ./programs/yubikey-touch-detector.nix + "${self}/s0melapt0p-nix/programs/gamemode.nix" + "${self}/s0melapt0p-nix/programs/nh.nix" + "${self}/s0melapt0p-nix/programs/steam.nix" + "${self}/s0melapt0p-nix/programs/ssh.nix" + "${self}/s0melapt0p-nix/programs/yubikey-touch-detector.nix" - ./security/polkit.nix - ./security/rtkit.nix - ./security/sudo.nix - ./security/sudo-rs.nix - ./security/pam/services.nix + "${self}/s0melapt0p-nix/security/polkit.nix" + "${self}/s0melapt0p-nix/security/rtkit.nix" + "${self}/s0melapt0p-nix/security/sudo.nix" + "${self}/s0melapt0p-nix/security/sudo-rs.nix" + "${self}/s0melapt0p-nix/security/pam/services.nix" - ./services/fprintd.nix - ./services/greetd.nix - ./services/libinput.nix - ./services/openssh.nix - ./services/pipewire.nix - ./services/qmk.nix - ./services/thinkfan.nix - ./services/usbmuxd.nix - ./services/xserver.nix - ./services/zapret.nix - ./services/zerotier.nix - ./services/yggdrasil.nix - ./services/netbird.nix - ./services/yubikey-agent.nix + "${self}/s0melapt0p-nix/services/fprintd.nix" + "${self}/s0melapt0p-nix/services/greetd.nix" + "${self}/s0melapt0p-nix/services/libinput.nix" + "${self}/s0melapt0p-nix/services/openssh.nix" + "${self}/s0melapt0p-nix/services/pipewire.nix" + "${self}/s0melapt0p-nix/services/qmk.nix" + "${self}/s0melapt0p-nix/services/thinkfan.nix" + "${self}/s0melapt0p-nix/services/usbmuxd.nix" + "${self}/s0melapt0p-nix/services/xserver.nix" + "${self}/s0melapt0p-nix/services/zapret.nix" + "${self}/s0melapt0p-nix/services/zerotier.nix" + "${self}/s0melapt0p-nix/services/yggdrasil.nix" + "${self}/s0melapt0p-nix/services/netbird.nix" + "${self}/s0melapt0p-nix/services/yubikey-agent.nix" - ./sops/defaults.nix - ./sops/secrets.nix + "${self}/s0melapt0p-nix/sops/defaults.nix" + "${self}/s0melapt0p-nix/sops/secrets.nix" - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" - ./system/name.nix - ./system/stateVersion.nix + "${self}/s0melapt0p-nix/system/name.nix" + "${self}/s0melapt0p-nix/system/stateVersion.nix" - ./systemd/oomd.nix + "${self}/s0melapt0p-nix/systemd/oomd.nix" - ./time/timeZone.nix + "${self}/s0melapt0p-nix/time/timeZone.nix" - ./users/users/hand7s.nix - ./users/users/root.nix - ./users/mutableUsers.nix + "${self}/s0melapt0p-nix/users/users/hand7s.nix" + "${self}/s0melapt0p-nix/users/users/root.nix" + "${self}/s0melapt0p-nix/users/mutableUsers.nix" - ./virtualisation/docker.nix + "${self}/s0melapt0p-nix/virtualisation/docker.nix" - ./xdg/icons.nix - ./xdg/mime.nix - ./xdg/portal.nix - ]; + "${self}/s0melapt0p-nix/xdg/icons.nix" + "${self}/s0melapt0p-nix/xdg/mime.nix" + "${self}/s0melapt0p-nix/xdg/portal.nix" + ]; } diff --git a/s0melapt0p-nix/disko/disk.nix b/s0melapt0p-nix/disko/disk.nix index 4214674..221caa2 100644 --- a/s0melapt0p-nix/disko/disk.nix +++ b/s0melapt0p-nix/disko/disk.nix @@ -1,47 +1,47 @@ {...}: { - disko = { - devices = { - disk = { - main = { - device = "/dev/disk/by-id/ata-ST92503010AS_5YH0CJFL"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "1024M"; - name = "boot"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "fmask=0022" - "dmask=0022" - ]; - }; - }; - - luks = { - size = "100%"; - content = { - type = "luks"; - name = "lvm-crypted"; - settings = { - allowDiscards = true; - }; - - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; + disko = { + devices = { + disk = { + main = { + device = "/dev/disk/by-id/ata-ST92503010AS_5YH0CJFL"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + type = "EF00"; + size = "1024M"; + name = "boot"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "fmask=0022" + "dmask=0022" + ]; }; + }; + + luks = { + size = "100%"; + content = { + type = "luks"; + name = "lvm-crypted"; + settings = { + allowDiscards = true; + }; + + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; + }; }; + }; }; + }; }; + }; } diff --git a/s0melapt0p-nix/disko/lvm_vg.nix b/s0melapt0p-nix/disko/lvm_vg.nix index b6ac8c6..8e108be 100644 --- a/s0melapt0p-nix/disko/lvm_vg.nix +++ b/s0melapt0p-nix/disko/lvm_vg.nix @@ -1,57 +1,57 @@ {...}: { - disko = { - devices = { - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ - "-f" - ]; + disko = { + devices = { + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%"; + content = { + type = "btrfs"; + extraArgs = [ + "-f" + ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ - "compress=zstd" - "commit=100" - "max_inline=256" - "ssd_spread" - "noatime" - ]; - }; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = [ + "compress=zstd" + "commit=100" + "max_inline=256" + "ssd_spread" + "noatime" + ]; + }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ - "compress=zstd" - "max_inline=256" - "commit=100" - "ssd_spread" - "noatime" - ]; - }; + "/home" = { + mountpoint = "/home"; + mountOptions = [ + "compress=zstd" + "max_inline=256" + "commit=100" + "ssd_spread" + "noatime" + ]; + }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ - "compress=zstd" - "commit=100" - "max_inline=256" - "ssd_spread" - "noatime" - ]; - }; - }; - }; - }; - }; + "/nix" = { + mountpoint = "/nix"; + mountOptions = [ + "compress=zstd" + "commit=100" + "max_inline=256" + "ssd_spread" + "noatime" + ]; + }; }; + }; }; + }; }; + }; }; + }; } diff --git a/s0melapt0p-nix/environment/systemPackages.nix b/s0melapt0p-nix/environment/systemPackages.nix index c1cd253..6f08640 100644 --- a/s0melapt0p-nix/environment/systemPackages.nix +++ b/s0melapt0p-nix/environment/systemPackages.nix @@ -1,17 +1,17 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - environment = { - systemPackages = with pkgs; [ - (lib.hiPrio uutils-coreutils-noprefix) - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - xdg-desktop-portal - uutils-findutils - uutils-diffutils - home-manager - ]; - }; + environment = { + systemPackages = with pkgs; [ + (lib.hiPrio uutils-coreutils-noprefix) + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + xdg-desktop-portal + uutils-findutils + uutils-diffutils + home-manager + ]; + }; } diff --git a/s0melapt0p-nix/environment/variables.nix b/s0melapt0p-nix/environment/variables.nix index ee9ce2e..2c3cda9 100644 --- a/s0melapt0p-nix/environment/variables.nix +++ b/s0melapt0p-nix/environment/variables.nix @@ -1,15 +1,15 @@ {config, ...}: { - environment = { - variables = { - HOSTNAME = config.networking.hostName; - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - GDK_BACKEND = "wayland"; - NIXPKGS_ALLOW_UNFREE = "1"; - NIXPKGS_ALLOW_INSECURE = "1"; - NIXOS_OZONE_WL = "1"; - TERM = "xterm-256color"; - }; + environment = { + variables = { + HOSTNAME = config.networking.hostName; + QT_QPA_PLATFORM = "wayland"; + SDL_VIDEODRIVER = "wayland"; + CLUTTER_BACKEND = "wayland"; + GDK_BACKEND = "wayland"; + NIXPKGS_ALLOW_UNFREE = "1"; + NIXPKGS_ALLOW_INSECURE = "1"; + NIXOS_OZONE_WL = "1"; + TERM = "xterm-256color"; }; + }; } diff --git a/s0melapt0p-nix/hardware/cpu.nix b/s0melapt0p-nix/hardware/cpu.nix index 6df481d..e5746c6 100644 --- a/s0melapt0p-nix/hardware/cpu.nix +++ b/s0melapt0p-nix/hardware/cpu.nix @@ -1,10 +1,10 @@ {...}: { - hardware = { - enableRedistributableFirmware = true; - cpu = { - intel = { - updateMicrocode = true; - }; - }; + hardware = { + enableRedistributableFirmware = true; + cpu = { + intel = { + updateMicrocode = true; + }; }; + }; } diff --git a/s0melapt0p-nix/hardware/graphics.nix b/s0melapt0p-nix/hardware/graphics.nix index 49dbc82..60491b4 100644 --- a/s0melapt0p-nix/hardware/graphics.nix +++ b/s0melapt0p-nix/hardware/graphics.nix @@ -1,15 +1,15 @@ {pkgs, ...}: { - hardware = { - graphics = { - enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ - intel-vaapi-driver - ]; + hardware = { + graphics = { + enable = true; + enable32Bit = true; + extraPackages = with pkgs; [ + intel-vaapi-driver + ]; - extraPackages32 = with pkgs; [ - intel-vaapi-driver - ]; - }; + extraPackages32 = with pkgs; [ + intel-vaapi-driver + ]; }; + }; } diff --git a/s0melapt0p-nix/hardware/qmk.nix b/s0melapt0p-nix/hardware/qmk.nix index 95c4383..543ece2 100644 --- a/s0melapt0p-nix/hardware/qmk.nix +++ b/s0melapt0p-nix/hardware/qmk.nix @@ -1,9 +1,9 @@ {...}: { - hardware = { - keyboard = { - qmk = { - enable = true; - }; - }; + hardware = { + keyboard = { + qmk = { + enable = true; + }; }; + }; } diff --git a/s0melapt0p-nix/hardware/zram.nix b/s0melapt0p-nix/hardware/zram.nix index c6a41f1..b973787 100644 --- a/s0melapt0p-nix/hardware/zram.nix +++ b/s0melapt0p-nix/hardware/zram.nix @@ -1,8 +1,8 @@ {...}: { - zramSwap = { - enable = true; - algorithm = "zstd"; - priority = 100; - memoryPercent = 100; - }; + zramSwap = { + enable = true; + algorithm = "zstd"; + priority = 100; + memoryPercent = 100; + }; } diff --git a/s0melapt0p-nix/home-manager/users.nix b/s0melapt0p-nix/home-manager/users.nix index d2a3d80..04c47d9 100644 --- a/s0melapt0p-nix/home-manager/users.nix +++ b/s0melapt0p-nix/home-manager/users.nix @@ -1,30 +1,30 @@ { - inputs, - self, - ... + inputs, + self, + ... }: { - home-manager = { - users = { - hand7s = { - imports = [ - "${self}/hand7s/" - inputs.spicetify-nix.homeManagerModules.default - inputs.hyprland.homeManagerModules.default - inputs.chaotic.homeManagerModules.default - inputs.sops-nix.homeManagerModules.sops + home-manager = { + users = { + hand7s = { + imports = [ + "${self}/hand7s/" + inputs.spicetify-nix.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.chaotic.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops - inputs.nix-index-database.homeModules.nix-index - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - inputs - self - ; - }; + inputs.nix-index-database.homeModules.nix-index + ]; + }; }; + + backupFileExtension = "force"; + + extraSpecialArgs = { + inherit + inputs + self + ; + }; + }; } diff --git a/s0melapt0p-nix/i18n/locales.nix b/s0melapt0p-nix/i18n/locales.nix index 4524693..09234a5 100644 --- a/s0melapt0p-nix/i18n/locales.nix +++ b/s0melapt0p-nix/i18n/locales.nix @@ -1,9 +1,9 @@ {...}: { - i18n = { - defaultLocale = "en_US.UTF-8"; - supportedLocales = [ - "en_US.UTF-8/UTF-8" - "ru_RU.UTF-8/UTF-8" - ]; - }; + i18n = { + defaultLocale = "en_US.UTF-8"; + supportedLocales = [ + "en_US.UTF-8/UTF-8" + "ru_RU.UTF-8/UTF-8" + ]; + }; } diff --git a/s0melapt0p-nix/networking/dhcp.nix b/s0melapt0p-nix/networking/dhcp.nix index d24c2c2..0740ea3 100644 --- a/s0melapt0p-nix/networking/dhcp.nix +++ b/s0melapt0p-nix/networking/dhcp.nix @@ -1,10 +1,10 @@ {lib, ...}: { - networking = { - useDHCP = lib.mkDefault true; - dhcpcd = { - enable = true; - persistent = false; - wait = "any"; - }; + networking = { + useDHCP = lib.mkDefault true; + dhcpcd = { + enable = true; + persistent = false; + wait = "any"; }; + }; } diff --git a/s0melapt0p-nix/networking/firewall.nix b/s0melapt0p-nix/networking/firewall.nix index c4170ee..c1d1150 100644 --- a/s0melapt0p-nix/networking/firewall.nix +++ b/s0melapt0p-nix/networking/firewall.nix @@ -1,9 +1,9 @@ {...}: { - networking = { - firewall = { - allowPing = true; - enable = true; - checkReversePath = false; - }; + networking = { + firewall = { + allowPing = true; + enable = true; + checkReversePath = false; }; + }; } diff --git a/s0melapt0p-nix/networking/hostId.nix b/s0melapt0p-nix/networking/hostId.nix index 837b704..4e2bb58 100644 --- a/s0melapt0p-nix/networking/hostId.nix +++ b/s0melapt0p-nix/networking/hostId.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostId = "3c4734c8"; - }; + networking = { + hostId = "3c4734c8"; + }; } diff --git a/s0melapt0p-nix/networking/hostname.nix b/s0melapt0p-nix/networking/hostname.nix index 8cbaeeb..ef6faab 100644 --- a/s0melapt0p-nix/networking/hostname.nix +++ b/s0melapt0p-nix/networking/hostname.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostName = "s0melapt0p-nix"; - }; + networking = { + hostName = "s0melapt0p-nix"; + }; } diff --git a/s0melapt0p-nix/networking/hosts.nix b/s0melapt0p-nix/networking/hosts.nix index 8f7c69d..10e63c8 100644 --- a/s0melapt0p-nix/networking/hosts.nix +++ b/s0melapt0p-nix/networking/hosts.nix @@ -1,64 +1,64 @@ {...}: { - networking = { - hosts = { - # EVA00 - "100.109.169.141" = [ - "eva00-nix.netbird.cloud" - "eva00-nix" - ]; + networking = { + hosts = { + # EVA00 + "100.109.169.141" = [ + "eva00-nix.netbird.cloud" + "eva00-nix" + ]; - "90.156.226.152" = [ - "eva00-nix.lan" - "eva00-nix" - ]; + "90.156.226.152" = [ + "eva00-nix.lan" + "eva00-nix" + ]; - "200:deb2:ed25:a9e5:e30:4900:f88f:cb87" = [ - "eva00-nix.ygg" - "eva00-nix" - ]; + "200:deb2:ed25:a9e5:e30:4900:f88f:cb87" = [ + "eva00-nix.ygg" + "eva00-nix" + ]; - # EVA01 - "100.109.107.176" = [ - "eva01-nix.netbird.cloud" - "eva01-nix" - ]; + # EVA01 + "100.109.107.176" = [ + "eva01-nix.netbird.cloud" + "eva01-nix" + ]; - "37.114.50.235" = [ - "eva01-nix.lan" - "eva01-nix" - ]; + "37.114.50.235" = [ + "eva01-nix.lan" + "eva01-nix" + ]; - "200:6ef:a61f:2f01:71d4:196:ab70:2103" = [ - "eva01-nix.ygg" - "eva01-nix" - ]; + "200:6ef:a61f:2f01:71d4:196:ab70:2103" = [ + "eva01-nix.ygg" + "eva01-nix" + ]; - # EVA02 - "100.109.178.135" = [ - "eva02-nix.netbird.cloud" - "eva02-nix" - ]; + # EVA02 + "100.109.178.135" = [ + "eva02-nix.netbird.cloud" + "eva02-nix" + ]; - "51.195.222.85" = [ - "eva02-nix.lan" - "eva02-nix" - ]; + "51.195.222.85" = [ + "eva02-nix.lan" + "eva02-nix" + ]; - "201:52d6:c753:c1fd:f8b6:5897:cc6a:e1be" = [ - "eva02-nix.ygg" - "eva02-nix" - ]; + "201:52d6:c753:c1fd:f8b6:5897:cc6a:e1be" = [ + "eva02-nix.ygg" + "eva02-nix" + ]; - # nerv-nix - "100.109.7.114" = [ - "nerv-nix.netbird.cloud" - "nerv-nix" - ]; + # nerv-nix + "100.109.7.114" = [ + "nerv-nix.netbird.cloud" + "nerv-nix" + ]; - "200:7abc:53c9:be8a:9941:96d:221b:cc76" = [ - "nerv-nix.ygg" - "nerv-nix" - ]; - }; + "200:7abc:53c9:be8a:9941:96d:221b:cc76" = [ + "nerv-nix.ygg" + "nerv-nix" + ]; }; + }; } diff --git a/s0melapt0p-nix/networking/nameservers.nix b/s0melapt0p-nix/networking/nameservers.nix index 1b65035..a4d22c1 100644 --- a/s0melapt0p-nix/networking/nameservers.nix +++ b/s0melapt0p-nix/networking/nameservers.nix @@ -1,29 +1,29 @@ {...}: { - networking = { - nameservers = [ - # cf dns - "1.1.1.1" - "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" + networking = { + nameservers = [ + # cf dns + "1.1.1.1" + "1.0.0.1" + "2606:4700:4700::1111" + "2606:4700:4700::1001" - # google dns - "8.8.8.8" - "8.8.4.4" - "2001:4860:4860::8888" - "2001:4860:4860::8844" + # google dns + "8.8.8.8" + "8.8.4.4" + "2001:4860:4860::8888" + "2001:4860:4860::8844" - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" + # q9 dns + "9.9.9.9" + "149.112.112.112" + "2620:fe::fe" + "2620:fe::9" - # open dns - "208.67.222.222" - "208.67.220.220" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; + # open dns + "208.67.222.222" + "208.67.220.220" + "2620:119:35::35" + "2620:119:53::53" + ]; + }; } diff --git a/s0melapt0p-nix/networking/networkmanager.nix b/s0melapt0p-nix/networking/networkmanager.nix index 512980b..278a693 100644 --- a/s0melapt0p-nix/networking/networkmanager.nix +++ b/s0melapt0p-nix/networking/networkmanager.nix @@ -1,13 +1,13 @@ {...}: { - networking = { - networkmanager = { - enable = true; - dns = "default"; - dhcp = "internal"; - wifi = { - backend = "iwd"; - macAddress = "preserve"; - }; - }; + networking = { + networkmanager = { + enable = true; + dns = "default"; + dhcp = "internal"; + wifi = { + backend = "iwd"; + macAddress = "preserve"; + }; }; + }; } diff --git a/s0melapt0p-nix/networking/timeServers.nix b/s0melapt0p-nix/networking/timeServers.nix index 07f3b87..88e14c4 100644 --- a/s0melapt0p-nix/networking/timeServers.nix +++ b/s0melapt0p-nix/networking/timeServers.nix @@ -1,10 +1,10 @@ {...}: { - networking = { - timeServers = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; - }; + networking = { + timeServers = [ + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" + ]; + }; } diff --git a/s0melapt0p-nix/networking/wireguard.nix b/s0melapt0p-nix/networking/wireguard.nix index a618877..2ee5c02 100644 --- a/s0melapt0p-nix/networking/wireguard.nix +++ b/s0melapt0p-nix/networking/wireguard.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - wireguard = { - enable = true; - }; + networking = { + wireguard = { + enable = true; }; + }; } diff --git a/s0melapt0p-nix/nix/package.nix b/s0melapt0p-nix/nix/package.nix index c947a27..b2d6823 100644 --- a/s0melapt0p-nix/nix/package.nix +++ b/s0melapt0p-nix/nix/package.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - nix = { - package = pkgs.nixVersions.latest; - }; + nix = { + package = pkgs.nixVersions.latest; + }; } diff --git a/s0melapt0p-nix/nix/settings/allowed-users.nix b/s0melapt0p-nix/nix/settings/allowed-users.nix index d05c725..d483d0c 100644 --- a/s0melapt0p-nix/nix/settings/allowed-users.nix +++ b/s0melapt0p-nix/nix/settings/allowed-users.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - sandbox = true; - allowed-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + sandbox = true; + allowed-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0melapt0p-nix/nix/settings/auto-optimise-store.nix b/s0melapt0p-nix/nix/settings/auto-optimise-store.nix index 731bc0c..14f13c5 100644 --- a/s0melapt0p-nix/nix/settings/auto-optimise-store.nix +++ b/s0melapt0p-nix/nix/settings/auto-optimise-store.nix @@ -1,7 +1,7 @@ {...}: { - nix = { - settings = { - auto-optimise-store = true; - }; + nix = { + settings = { + auto-optimise-store = true; }; + }; } diff --git a/s0melapt0p-nix/nix/settings/experimental-features.nix b/s0melapt0p-nix/nix/settings/experimental-features.nix index f2161b9..7ce7e89 100644 --- a/s0melapt0p-nix/nix/settings/experimental-features.nix +++ b/s0melapt0p-nix/nix/settings/experimental-features.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + nix = { + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; }; + }; } diff --git a/s0melapt0p-nix/nix/settings/substituters.nix b/s0melapt0p-nix/nix/settings/substituters.nix index d8b7f80..762ec5c 100644 --- a/s0melapt0p-nix/nix/settings/substituters.nix +++ b/s0melapt0p-nix/nix/settings/substituters.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://ags.cachix.org" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - "https://colmena.cachix.org" - ]; - }; + nix = { + settings = { + substituters = [ + # cache.nixos.org + "https://cache.nixos.org" + # cache.garnix.org + "https://cache.garnix.io" + # cachix + "https://nix-community.cachix.org/" + "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" + "https://hyprland.cachix.org" + "https://chaotic-nyx.cachix.org/" + "https://colmena.cachix.org" + ]; }; + }; } diff --git a/s0melapt0p-nix/nix/settings/trusted-public-keys.nix b/s0melapt0p-nix/nix/settings/trusted-public-keys.nix index 7e9f894..e8710cb 100644 --- a/s0melapt0p-nix/nix/settings/trusted-public-keys.nix +++ b/s0melapt0p-nix/nix/settings/trusted-public-keys.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - trusted-public-keys = [ - # cache.nixos.org - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - # cache.garnix.io - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # cachix.org - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" - ]; - }; + nix = { + settings = { + trusted-public-keys = [ + # cache.nixos.org + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + # cache.garnix.io + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # cachix.org + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" + ]; }; + }; } diff --git a/s0melapt0p-nix/nix/settings/trusted-users.nix b/s0melapt0p-nix/nix/settings/trusted-users.nix index 93619a5..e4a9dae 100644 --- a/s0melapt0p-nix/nix/settings/trusted-users.nix +++ b/s0melapt0p-nix/nix/settings/trusted-users.nix @@ -1,9 +1,9 @@ {...}: { - nix = { - settings = { - trusted-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + trusted-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0melapt0p-nix/nixpkgs/config.nix b/s0melapt0p-nix/nixpkgs/config.nix index d8de016..27b79b0 100644 --- a/s0melapt0p-nix/nixpkgs/config.nix +++ b/s0melapt0p-nix/nixpkgs/config.nix @@ -1,8 +1,8 @@ {...}: { - nixpkgs = { - config = { - allowUnfree = true; - allowBroken = true; - }; + nixpkgs = { + config = { + allowUnfree = true; + allowBroken = true; }; + }; } diff --git a/s0melapt0p-nix/nixpkgs/overlays.nix b/s0melapt0p-nix/nixpkgs/overlays.nix index da060e9..2881eba 100644 --- a/s0melapt0p-nix/nixpkgs/overlays.nix +++ b/s0melapt0p-nix/nixpkgs/overlays.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - overlays = [ - ]; - }; + nixpkgs = { + overlays = [ + ]; + }; } diff --git a/s0melapt0p-nix/nixpkgs/system.nix b/s0melapt0p-nix/nixpkgs/system.nix index c8930f6..63fda3b 100644 --- a/s0melapt0p-nix/nixpkgs/system.nix +++ b/s0melapt0p-nix/nixpkgs/system.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - system = "x86_64-linux"; - hostPlatform = "x86_64-linux"; - }; + nixpkgs = { + system = "x86_64-linux"; + hostPlatform = "x86_64-linux"; + }; } diff --git a/s0melapt0p-nix/programs/gamemode.nix b/s0melapt0p-nix/programs/gamemode.nix index da823a4..5fd437b 100644 --- a/s0melapt0p-nix/programs/gamemode.nix +++ b/s0melapt0p-nix/programs/gamemode.nix @@ -1,7 +1,7 @@ {...}: { - programs = { - gamemode = { - enable = true; - }; + programs = { + gamemode = { + enable = true; }; + }; } diff --git a/s0melapt0p-nix/programs/nh.nix b/s0melapt0p-nix/programs/nh.nix index da214cc..f43fb06 100644 --- a/s0melapt0p-nix/programs/nh.nix +++ b/s0melapt0p-nix/programs/nh.nix @@ -1,12 +1,12 @@ {...}: { - programs = { - nh = { - enable = true; - clean = { - enable = true; - dates = "weekly"; - extraArgs = "--keep 2 --keep-since 2d"; - }; - }; + programs = { + nh = { + enable = true; + clean = { + enable = true; + dates = "weekly"; + extraArgs = "--keep 2 --keep-since 2d"; + }; }; + }; } diff --git a/s0melapt0p-nix/programs/ssh.nix b/s0melapt0p-nix/programs/ssh.nix index 241ba79..b7b9d20 100644 --- a/s0melapt0p-nix/programs/ssh.nix +++ b/s0melapt0p-nix/programs/ssh.nix @@ -1,7 +1,7 @@ {...}: { - programs = { - ssh = { - startAgent = true; - }; + programs = { + ssh = { + startAgent = true; }; + }; } diff --git a/s0melapt0p-nix/programs/steam.nix b/s0melapt0p-nix/programs/steam.nix index 2cd919e..084269a 100644 --- a/s0melapt0p-nix/programs/steam.nix +++ b/s0melapt0p-nix/programs/steam.nix @@ -1,22 +1,22 @@ {pkgs, ...}: { - programs = { - steam = { - enable = true; - extraCompatPackages = [ - pkgs.proton-ge-bin - ]; + programs = { + steam = { + enable = true; + extraCompatPackages = [ + pkgs.proton-ge-bin + ]; - remotePlay = { - openFirewall = true; - }; + remotePlay = { + openFirewall = true; + }; - localNetworkGameTransfers = { - openFirewall = true; - }; + localNetworkGameTransfers = { + openFirewall = true; + }; - protontricks = { - enable = true; - }; - }; + protontricks = { + enable = true; + }; }; + }; } diff --git a/s0melapt0p-nix/programs/yubikey-touch-detector.nix b/s0melapt0p-nix/programs/yubikey-touch-detector.nix index 0bdc928..c9815c5 100644 --- a/s0melapt0p-nix/programs/yubikey-touch-detector.nix +++ b/s0melapt0p-nix/programs/yubikey-touch-detector.nix @@ -1,9 +1,9 @@ {...}: { - programs = { - yubikey-touch-detector = { - enable = true; - libnotify = true; - unixSocket = true; - }; + programs = { + yubikey-touch-detector = { + enable = true; + libnotify = true; + unixSocket = true; }; + }; } diff --git a/s0melapt0p-nix/security/pam/services.nix b/s0melapt0p-nix/security/pam/services.nix index eb1dc27..565ef37 100644 --- a/s0melapt0p-nix/security/pam/services.nix +++ b/s0melapt0p-nix/security/pam/services.nix @@ -1,14 +1,14 @@ {...}: { - security = { - pam = { - services = { - swaylock = { - text = '' - auth include login - ''; - fprintAuth = false; - }; - }; + security = { + pam = { + services = { + swaylock = { + text = '' + auth include login + ''; + fprintAuth = false; }; + }; }; + }; } diff --git a/s0melapt0p-nix/security/polkit.nix b/s0melapt0p-nix/security/polkit.nix index 712b489..7604e82 100644 --- a/s0melapt0p-nix/security/polkit.nix +++ b/s0melapt0p-nix/security/polkit.nix @@ -1,10 +1,10 @@ {...}: { - security = { - polkit = { - enable = true; - adminIdentities = [ - "unix-group:wheel" - ]; - }; + security = { + polkit = { + enable = true; + adminIdentities = [ + "unix-group:wheel" + ]; }; + }; } diff --git a/s0melapt0p-nix/security/rtkit.nix b/s0melapt0p-nix/security/rtkit.nix index 2cb5541..d3604df 100644 --- a/s0melapt0p-nix/security/rtkit.nix +++ b/s0melapt0p-nix/security/rtkit.nix @@ -1,7 +1,7 @@ {...}: { - security = { - rtkit = { - enable = true; - }; + security = { + rtkit = { + enable = true; }; + }; } diff --git a/s0melapt0p-nix/security/sudo-rs.nix b/s0melapt0p-nix/security/sudo-rs.nix index f428d59..772460d 100644 --- a/s0melapt0p-nix/security/sudo-rs.nix +++ b/s0melapt0p-nix/security/sudo-rs.nix @@ -1,9 +1,9 @@ {...}: { - security = { - sudo-rs = { - enable = true; - wheelNeedsPassword = true; - execWheelOnly = true; - }; + security = { + sudo-rs = { + enable = true; + wheelNeedsPassword = true; + execWheelOnly = true; }; + }; } diff --git a/s0melapt0p-nix/security/sudo.nix b/s0melapt0p-nix/security/sudo.nix index ed69b5e..393528d 100644 --- a/s0melapt0p-nix/security/sudo.nix +++ b/s0melapt0p-nix/security/sudo.nix @@ -1,7 +1,7 @@ {lib, ...}: { - security = { - sudo = { - enable = lib.mkDefault false; - }; + security = { + sudo = { + enable = lib.mkDefault false; }; + }; } diff --git a/s0melapt0p-nix/services/fprintd.nix b/s0melapt0p-nix/services/fprintd.nix index 5623f15..47c72bc 100644 --- a/s0melapt0p-nix/services/fprintd.nix +++ b/s0melapt0p-nix/services/fprintd.nix @@ -1,11 +1,11 @@ {...}: { - services = { - fprintd = { - enable = true; - tod = { - enable = false; - # driver = pkgs. - }; - }; + services = { + fprintd = { + enable = true; + tod = { + enable = false; + # driver = pkgs. + }; }; + }; } diff --git a/s0melapt0p-nix/services/greetd.nix b/s0melapt0p-nix/services/greetd.nix index 3eeb811..8fd4ee4 100644 --- a/s0melapt0p-nix/services/greetd.nix +++ b/s0melapt0p-nix/services/greetd.nix @@ -1,18 +1,18 @@ { - pkgs, - lib, - ... + pkgs, + lib, + ... }: { - services = { - greetd = { - enable = true; - restart = false; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.sway}"; - user = "greeter"; - }; - }; + services = { + greetd = { + enable = true; + restart = false; + settings = { + default_session = { + command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.sway}"; + user = "greeter"; }; + }; }; + }; } diff --git a/s0melapt0p-nix/services/libinput.nix b/s0melapt0p-nix/services/libinput.nix index 88ac6e8..111040e 100644 --- a/s0melapt0p-nix/services/libinput.nix +++ b/s0melapt0p-nix/services/libinput.nix @@ -1,23 +1,23 @@ {...}: { - services = { - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - accelSpeed = "-1.0"; - buttonMapping = "1 2 3 4 5 6 7 8 9"; - horizontalScrolling = true; - leftHanded = false; - naturalScrolling = true; - }; + services = { + libinput = { + enable = true; + mouse = { + accelProfile = "flat"; + accelSpeed = "-1.0"; + buttonMapping = "1 2 3 4 5 6 7 8 9"; + horizontalScrolling = true; + leftHanded = false; + naturalScrolling = true; + }; - touchpad = { - accelProfile = "adaptive"; - accelSpeed = "-1.0"; - buttonMapping = "1 2 3 4 5 6 7 8 9"; - clickMethod = "clickfinger"; - leftHanded = false; - }; - }; + touchpad = { + accelProfile = "adaptive"; + accelSpeed = "-1.0"; + buttonMapping = "1 2 3 4 5 6 7 8 9"; + clickMethod = "clickfinger"; + leftHanded = false; + }; }; + }; } diff --git a/s0melapt0p-nix/services/netbird.nix b/s0melapt0p-nix/services/netbird.nix index 71e3cd8..071330a 100644 --- a/s0melapt0p-nix/services/netbird.nix +++ b/s0melapt0p-nix/services/netbird.nix @@ -1,7 +1,7 @@ {...}: { - services = { - netbird = { - enable = true; - }; + services = { + netbird = { + enable = true; }; + }; } diff --git a/s0melapt0p-nix/services/openssh.nix b/s0melapt0p-nix/services/openssh.nix index e513e95..e136f96 100644 --- a/s0melapt0p-nix/services/openssh.nix +++ b/s0melapt0p-nix/services/openssh.nix @@ -1,22 +1,22 @@ {config, ...}: { - services = { - openssh = { - enable = true; - allowSFTP = true; - openFirewall = true; - ports = [ - 6969 - ]; + services = { + openssh = { + enable = true; + allowSFTP = true; + openFirewall = true; + ports = [ + 6969 + ]; - settings = { - PrintMotd = false; - PermitRootLogin = "no"; - PasswordAuthentication = false; - }; + settings = { + PrintMotd = false; + PermitRootLogin = "no"; + PasswordAuthentication = false; + }; - authorizedKeysFiles = [ - config.sops.secrets.sshKey.path - ]; - }; + authorizedKeysFiles = [ + config.sops.secrets.sshKey.path + ]; }; + }; } diff --git a/s0melapt0p-nix/services/pipewire.nix b/s0melapt0p-nix/services/pipewire.nix index 7c94208..c4bad1e 100644 --- a/s0melapt0p-nix/services/pipewire.nix +++ b/s0melapt0p-nix/services/pipewire.nix @@ -1,65 +1,65 @@ {...}: { - services = { + services = { + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + + audio = { + enable = true; + }; + + pulse = { + enable = true; + }; + + jack = { + enable = true; + }; + + wireplumber = { + enable = true; + }; + + extraConfig = { pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; + "92-low-latency" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 88200 + 96000 + ]; + + "default.clock.min-quantum" = 512; + "default.clock.quantum" = 4096; + "default.clock.max-quantum" = 8192; }; + }; - audio = { - enable = true; + "93-no-resampling" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.allowed-rates" = [ + 44100 + 48000 + 96000 + 192000 + ]; }; + }; - pulse = { - enable = true; - }; - - jack = { - enable = true; - }; - - wireplumber = { - enable = true; - }; - - extraConfig = { - pipewire = { - "92-low-latency" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 88200 - 96000 - ]; - - "default.clock.min-quantum" = 512; - "default.clock.quantum" = 4096; - "default.clock.max-quantum" = 8192; - }; - }; - - "93-no-resampling" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 96000 - 192000 - ]; - }; - }; - - "94-no-upmixing" = { - "stream.properties" = { - "channelmix.upmix" = false; - }; - }; - }; + "94-no-upmixing" = { + "stream.properties" = { + "channelmix.upmix" = false; }; + }; }; + }; }; + }; } diff --git a/s0melapt0p-nix/services/qmk.nix b/s0melapt0p-nix/services/qmk.nix index 172ee30..d193c5d 100644 --- a/s0melapt0p-nix/services/qmk.nix +++ b/s0melapt0p-nix/services/qmk.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { - services = { - udev = { - packages = with pkgs; [ - qmk-udev-rules - ]; - }; + services = { + udev = { + packages = with pkgs; [ + qmk-udev-rules + ]; }; + }; } diff --git a/s0melapt0p-nix/services/thinkfan.nix b/s0melapt0p-nix/services/thinkfan.nix index c3fe87c..78a42e4 100644 --- a/s0melapt0p-nix/services/thinkfan.nix +++ b/s0melapt0p-nix/services/thinkfan.nix @@ -1,8 +1,8 @@ {...}: { - services = { - thinkfan = { - enable = true; - smartSupport = true; - }; + services = { + thinkfan = { + enable = true; + smartSupport = true; }; + }; } diff --git a/s0melapt0p-nix/services/usbmuxd.nix b/s0melapt0p-nix/services/usbmuxd.nix index aa3637a..34606ed 100644 --- a/s0melapt0p-nix/services/usbmuxd.nix +++ b/s0melapt0p-nix/services/usbmuxd.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - services = { - usbmuxd = { - enable = true; - package = pkgs.usbmuxd2; - }; + services = { + usbmuxd = { + enable = true; + package = pkgs.usbmuxd2; }; + }; } diff --git a/s0melapt0p-nix/services/xserver.nix b/s0melapt0p-nix/services/xserver.nix index 9e6ce19..a27f2a0 100644 --- a/s0melapt0p-nix/services/xserver.nix +++ b/s0melapt0p-nix/services/xserver.nix @@ -1,26 +1,26 @@ { - lib, - pkgs, - ... + lib, + pkgs, + ... }: { - services = { - xserver = { - display = lib.mkForce 0; - enable = true; + services = { + xserver = { + display = lib.mkForce 0; + enable = true; - excludePackages = with pkgs; [ - xterm - ]; + excludePackages = with pkgs; [ + xterm + ]; - videoDrivers = [ - "i915" - ]; + videoDrivers = [ + "i915" + ]; - xkb = { - layout = "us, ru"; - variant = ""; - options = "grp:caps_toggle"; - }; - }; + xkb = { + layout = "us, ru"; + variant = ""; + options = "grp:caps_toggle"; + }; }; + }; } diff --git a/s0melapt0p-nix/services/yggdrasil.nix b/s0melapt0p-nix/services/yggdrasil.nix index fc734db..faf7afb 100644 --- a/s0melapt0p-nix/services/yggdrasil.nix +++ b/s0melapt0p-nix/services/yggdrasil.nix @@ -1,46 +1,46 @@ {config, ...}: { - services = { - yggdrasil = { - enable = true; - persistentKeys = false; - settings = { - PrivateKey = config.sops.secrets.yggKeyLT.path; + services = { + yggdrasil = { + enable = true; + persistentKeys = false; + settings = { + PrivateKey = config.sops.secrets.yggKeyLT.path; - Peers = [ - # only 1W+ peers (some exeptions are possible) + Peers = [ + # only 1W+ peers (some exeptions are possible) - # Russia - "tls://yggno.de:18227" - "tcp://yggno.de:18226" + # Russia + "tls://yggno.de:18227" + "tcp://yggno.de:18226" - "tcp://kzn1.neonxp.ru:7991" - "tls://kzn1.neonxp.ru:7992" - "ws://kzn1.neonxp.ru:7993" - "quic://kzn1.neonxp.ru:7994" - ]; + "tcp://kzn1.neonxp.ru:7991" + "tls://kzn1.neonxp.ru:7992" + "ws://kzn1.neonxp.ru:7993" + "quic://kzn1.neonxp.ru:7994" + ]; - Listen = [ - # - ]; + Listen = [ + # + ]; - MulticastInterfaces = [ - { - Regex = ".*"; - Beacon = true; - Listen = false; - Password = ""; - } - ]; + MulticastInterfaces = [ + { + Regex = ".*"; + Beacon = true; + Listen = false; + Password = ""; + } + ]; - AllowedPublicKeys = [ - # - ]; + AllowedPublicKeys = [ + # + ]; - IfName = "auto"; + IfName = "auto"; - IfMTU = 65535; - NodeInfoPrivacy = false; - }; - }; + IfMTU = 65535; + NodeInfoPrivacy = false; + }; }; + }; } diff --git a/s0melapt0p-nix/services/yubikey-agent.nix b/s0melapt0p-nix/services/yubikey-agent.nix index ec1cb2d..49f1b69 100644 --- a/s0melapt0p-nix/services/yubikey-agent.nix +++ b/s0melapt0p-nix/services/yubikey-agent.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { - services = { - yubikey-agent = { - package = pkgs.yubikey-agent; - enable = true; - }; + services = { + yubikey-agent = { + package = pkgs.yubikey-agent; + enable = true; }; + }; } diff --git a/s0melapt0p-nix/services/zapret.nix b/s0melapt0p-nix/services/zapret.nix index fd082dd..ad671e1 100644 --- a/s0melapt0p-nix/services/zapret.nix +++ b/s0melapt0p-nix/services/zapret.nix @@ -1,145 +1,145 @@ {...}: { - services = { - zapret = { - enable = true; - configureFirewall = true; - qnum = 350; - params = [ - "--wssize 1:6" + services = { + zapret = { + enable = true; + configureFirewall = true; + qnum = 350; + params = [ + "--wssize 1:6" - "--filter-tcp=80" - "--dpi-desync=multisplit" - "--dpi-desync-split-pos=10" - "--dpi-desync-repeats=6" - "--new" + "--filter-tcp=80" + "--dpi-desync=multisplit" + "--dpi-desync-split-pos=10" + "--dpi-desync-repeats=6" + "--new" - "--filter-tcp=443" - "--dpi-desync=multidisorder" - "--dpi-desync-split-pos=1,midsld" - "--new" + "--filter-tcp=443" + "--dpi-desync=multidisorder" + "--dpi-desync-split-pos=1,midsld" + "--new" - "--filter-tcp=443" - "--dpi-desync=syndata" - "--dpi-desync-fake-syndata=0x00000000" - "--dpi-desync-ttl=10" - "--new" + "--filter-tcp=443" + "--dpi-desync=syndata" + "--dpi-desync-fake-syndata=0x00000000" + "--dpi-desync-ttl=10" + "--new" - "--filter-udp=443" - "--dpi-desync=fake" - "--dpi-desync-repeats=6" - "--dpi-desync-fake-quic=0x00000000" - "--new" + "--filter-udp=443" + "--dpi-desync=fake" + "--dpi-desync-repeats=6" + "--dpi-desync-fake-quic=0x00000000" + "--new" - "--filter-udp=443" - "--dpi-desync=fake,udplen" - "--dpi-desync-udplen-increment=5" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-cutoff=n3" - "--dpi-desync-repeats=2" - "--new" + "--filter-udp=443" + "--dpi-desync=fake,udplen" + "--dpi-desync-udplen-increment=5" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-cutoff=n3" + "--dpi-desync-repeats=2" + "--new" - "--filter-tcp=443" - "--dpi-desync=split" - "--dpi-desync-fooling=md5sig,badseq" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-pos=1" - "--dpi-desync-repeats=10" - "--new" + "--filter-tcp=443" + "--dpi-desync=split" + "--dpi-desync-fooling=md5sig,badseq" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync-repeats=10" + "--new" - "--filter-tcp=443" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-seqovl=2" - "--dpi-desync-split-pos=2" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" - "--dpi-desync-autottl" - "--new" - "--filter-tcp=443" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-seqovl=2" - "--dpi-desync-split-pos=2" - "--dpi-desync-autottl" - "--new" + "--dpi-desync-autottl" + "--new" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + "--dpi-desync-autottl" + "--new" - "--filter-tcp=80" - "--dpi-desync=fake,split2" - "--dpi-desync-fooling=md5sig" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-autottl" - "--new" + "--filter-tcp=80" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-autottl" + "--new" - "--filter-tcp=80" - "--dpi-desync-ttl=1" - "--dpi-desync-autottl=2" - "--dpi-desync-fake-tls=0x00000000" - "--dpi-desync-split-pos=1" - "--dpi-desync=fake,split2" - "--dpi-desync-repeats=6" - "--dpi-desync-fooling=md5sig" - "--new" - ]; + "--filter-tcp=80" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync=fake,split2" + "--dpi-desync-repeats=6" + "--dpi-desync-fooling=md5sig" + "--new" + ]; - whitelist = [ - "googlevideo.com" - "youtu.be" - "youtube.com" - "youtubei.googleapis.com" - "googlevideo.com" - "youtu.be" - "youtube.com" - "youtubei.googleapis.com" - "youtubeembeddedplayer.googleapis.com" - "ytimg.l.google.com" - "ytimg.com" - "jnn-pa.googleapis.com" - "youtube-nocookie.com" - "youtube-ui.l.google.com" - "yt-video-upload.l.google.com" - "wide-youtube.l.google.com" - "youtubekids.com" - "ggpht.com" - "music.youtube.com" - "test.googlevideo.com" - "discord.com" - "gateway.discord.gg" - "cdn.discordapp.com" - "discordapp.net" - "discordapp.com" - "discord.gg" - "media.discordapp.net" - "images-ext-1.discordapp.net" - "discord.app" - "discord.media" - "discordcdn.com" - "discord.dev" - "discord.new" - "discord.gift" - "discordstatus.com" - "dis.gd" - "discord.co" - "discord-attachments-uploads-prd.storage.googleapis.com" - "7tv.app" - "7tv.io" - "10tv.app" - "x.com" - "t.co" - "ads-twitter.com" - "twimg.com" - "twitter.com" - "pscp.tv" - "twtrdns.net" - "twttr.com" - "periscope.tv" - "tweetdeck.com" - "twitpic.com" - "twitter.co" - "twitterinc.com" - "twitteroauth.com" - "twitterstat.us" - ]; - }; + whitelist = [ + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "youtubeembeddedplayer.googleapis.com" + "ytimg.l.google.com" + "ytimg.com" + "jnn-pa.googleapis.com" + "youtube-nocookie.com" + "youtube-ui.l.google.com" + "yt-video-upload.l.google.com" + "wide-youtube.l.google.com" + "youtubekids.com" + "ggpht.com" + "music.youtube.com" + "test.googlevideo.com" + "discord.com" + "gateway.discord.gg" + "cdn.discordapp.com" + "discordapp.net" + "discordapp.com" + "discord.gg" + "media.discordapp.net" + "images-ext-1.discordapp.net" + "discord.app" + "discord.media" + "discordcdn.com" + "discord.dev" + "discord.new" + "discord.gift" + "discordstatus.com" + "dis.gd" + "discord.co" + "discord-attachments-uploads-prd.storage.googleapis.com" + "7tv.app" + "7tv.io" + "10tv.app" + "x.com" + "t.co" + "ads-twitter.com" + "twimg.com" + "twitter.com" + "pscp.tv" + "twtrdns.net" + "twttr.com" + "periscope.tv" + "tweetdeck.com" + "twitpic.com" + "twitter.co" + "twitterinc.com" + "twitteroauth.com" + "twitterstat.us" + ]; }; + }; } diff --git a/s0melapt0p-nix/services/zerotier.nix b/s0melapt0p-nix/services/zerotier.nix index 96e1cb7..f58210f 100644 --- a/s0melapt0p-nix/services/zerotier.nix +++ b/s0melapt0p-nix/services/zerotier.nix @@ -1,10 +1,10 @@ {...}: { - services = { - zerotierone = { - enable = true; - joinNetworks = [ - # nope - ]; - }; + services = { + zerotierone = { + enable = true; + joinNetworks = [ + # nope + ]; }; + }; } diff --git a/s0melapt0p-nix/system/name.nix b/s0melapt0p-nix/system/name.nix index 585e4de..0b4488b 100644 --- a/s0melapt0p-nix/system/name.nix +++ b/s0melapt0p-nix/system/name.nix @@ -1,5 +1,5 @@ {config, ...}: { - system = { - name = config.networking.hostName; - }; + system = { + name = config.networking.hostName; + }; } diff --git a/s0melapt0p-nix/system/stateVersion.nix b/s0melapt0p-nix/system/stateVersion.nix index 2bb50db..9e437fe 100644 --- a/s0melapt0p-nix/system/stateVersion.nix +++ b/s0melapt0p-nix/system/stateVersion.nix @@ -1,5 +1,5 @@ {config, ...}: { - system = { - stateVersion = config.system.nixos.release; - }; + system = { + stateVersion = config.system.nixos.release; + }; } diff --git a/s0melapt0p-nix/systemd/oomd.nix b/s0melapt0p-nix/systemd/oomd.nix index c212515..cbd28f2 100644 --- a/s0melapt0p-nix/systemd/oomd.nix +++ b/s0melapt0p-nix/systemd/oomd.nix @@ -1,10 +1,10 @@ {...}: { - systemd = { - oomd = { - enable = true; - enableUserSlices = true; - enableSystemSlice = true; - enableRootSlice = true; - }; + systemd = { + oomd = { + enable = true; + enableUserSlices = true; + enableSystemSlice = true; + enableRootSlice = true; }; + }; } diff --git a/s0melapt0p-nix/time/timeZone.nix b/s0melapt0p-nix/time/timeZone.nix index 837ddd7..57bca35 100644 --- a/s0melapt0p-nix/time/timeZone.nix +++ b/s0melapt0p-nix/time/timeZone.nix @@ -1,6 +1,6 @@ {...}: { - time = { - timeZone = "Europe/Moscow"; - hardwareClockInLocalTime = true; - }; + time = { + timeZone = "Europe/Moscow"; + hardwareClockInLocalTime = true; + }; } diff --git a/s0melapt0p-nix/users/mutableUsers.nix b/s0melapt0p-nix/users/mutableUsers.nix index 2c39188..54415f1 100644 --- a/s0melapt0p-nix/users/mutableUsers.nix +++ b/s0melapt0p-nix/users/mutableUsers.nix @@ -1,5 +1,5 @@ {...}: { - users = { - mutableUsers = false; - }; + users = { + mutableUsers = false; + }; } diff --git a/s0melapt0p-nix/users/users/hand7s.nix b/s0melapt0p-nix/users/users/hand7s.nix index 9a082f8..8c0df47 100644 --- a/s0melapt0p-nix/users/users/hand7s.nix +++ b/s0melapt0p-nix/users/users/hand7s.nix @@ -1,17 +1,17 @@ {...}: { + users = { users = { - users = { - hand7s = { - description = "me"; - isSystemUser = false; - isNormalUser = true; - initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; - extraGroups = [ - "wheel" - "networkmanager" - "docker" - ]; - }; - }; + hand7s = { + description = "me"; + isSystemUser = false; + isNormalUser = true; + initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; + extraGroups = [ + "wheel" + "networkmanager" + "docker" + ]; + }; }; + }; } diff --git a/s0melapt0p-nix/users/users/root.nix b/s0melapt0p-nix/users/users/root.nix index 9c18bc7..595a6f6 100644 --- a/s0melapt0p-nix/users/users/root.nix +++ b/s0melapt0p-nix/users/users/root.nix @@ -1,9 +1,9 @@ {...}: { + users = { users = { - users = { - root = { - initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; - }; - }; + root = { + initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; + }; }; + }; } diff --git a/s0melapt0p-nix/virtualisation/docker.nix b/s0melapt0p-nix/virtualisation/docker.nix index 50d0769..1edae88 100644 --- a/s0melapt0p-nix/virtualisation/docker.nix +++ b/s0melapt0p-nix/virtualisation/docker.nix @@ -1,10 +1,10 @@ {...}: { - virtualisation = { - docker = { - enable = true; - rootless = { - enable = true; - }; - }; + virtualisation = { + docker = { + enable = true; + rootless = { + enable = true; + }; }; + }; } diff --git a/s0melapt0p-nix/xdg/icons.nix b/s0melapt0p-nix/xdg/icons.nix index 0ce5633..53ccd0b 100644 --- a/s0melapt0p-nix/xdg/icons.nix +++ b/s0melapt0p-nix/xdg/icons.nix @@ -1,7 +1,7 @@ {...}: { - xdg = { - icons = { - enable = true; - }; + xdg = { + icons = { + enable = true; }; + }; } diff --git a/s0melapt0p-nix/xdg/mime.nix b/s0melapt0p-nix/xdg/mime.nix index d9265ae..4b6af20 100644 --- a/s0melapt0p-nix/xdg/mime.nix +++ b/s0melapt0p-nix/xdg/mime.nix @@ -1,11 +1,11 @@ {...}: { - xdg = { - mime = { - enable = true; - defaultApplications = { - "x-scheme-handler/http" = "google-chrome.desktop"; - "x-scheme-handler/https" = "google-chrome.desktop"; - }; - }; + xdg = { + mime = { + enable = true; + defaultApplications = { + "x-scheme-handler/http" = "google-chrome.desktop"; + "x-scheme-handler/https" = "google-chrome.desktop"; + }; }; + }; } diff --git a/s0melapt0p-nix/xdg/portal.nix b/s0melapt0p-nix/xdg/portal.nix index 42ba880..80146ce 100644 --- a/s0melapt0p-nix/xdg/portal.nix +++ b/s0melapt0p-nix/xdg/portal.nix @@ -1,28 +1,28 @@ {pkgs, ...}: { - xdg = { - portal = { - enable = true; + xdg = { + portal = { + enable = true; - config = { - common = { - default = [ - "gtk" - "wlr" - ]; - }; - - sway = { - preferred = [ - "gtk" - "wlr" - ]; - }; - }; - - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - xdg-desktop-portal-wlr - ]; + config = { + common = { + default = [ + "gtk" + "wlr" + ]; }; + + sway = { + preferred = [ + "gtk" + "wlr" + ]; + }; + }; + + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix b/s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix index 8072e91..271f217 100644 --- a/s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix +++ b/s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix @@ -1,19 +1,19 @@ {...}: { - boot = { - initrd = { - availableKernelModules = [ - "ata_piix" - "uhci_hcd" - "xen_blkfront" - "vmw_pvscsi" - "virtio_net" - "virtio_pci" - "virtio_mmio" - "virtio_blk" - "virtio_scsi" - "9p" - "9pnet_virtio" - ]; - }; + boot = { + initrd = { + availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "xen_blkfront" + "vmw_pvscsi" + "virtio_net" + "virtio_pci" + "virtio_mmio" + "virtio_blk" + "virtio_scsi" + "9p" + "9pnet_virtio" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/boot/initrd/kernelModules.nix b/s0mev1rtn0de-nix/boot/initrd/kernelModules.nix index f67367e..bb2e6e4 100644 --- a/s0mev1rtn0de-nix/boot/initrd/kernelModules.nix +++ b/s0mev1rtn0de-nix/boot/initrd/kernelModules.nix @@ -1,14 +1,14 @@ {...}: { - boot = { - initrd = { - kernelModules = [ - "virtio_balloon" - "virtio_console" - "virtio_rng" - "virtio_gpu" - "nvme" - "kvm-amd" - ]; - }; + boot = { + initrd = { + kernelModules = [ + "virtio_balloon" + "virtio_console" + "virtio_rng" + "virtio_gpu" + "nvme" + "kvm-amd" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/boot/kernel.nix b/s0mev1rtn0de-nix/boot/kernel.nix index 238cbd3..4738412 100644 --- a/s0mev1rtn0de-nix/boot/kernel.nix +++ b/s0mev1rtn0de-nix/boot/kernel.nix @@ -1,10 +1,10 @@ {...}: { - boot = { - kernel = { - sysctl = { - "net.ipv4.ip_forward" = 1; - "net.ipv6.conf.all.forwarding" = 1; - }; - }; + boot = { + kernel = { + sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/boot/loader/grub.nix b/s0mev1rtn0de-nix/boot/loader/grub.nix index ab974fb..b29ade0 100644 --- a/s0mev1rtn0de-nix/boot/loader/grub.nix +++ b/s0mev1rtn0de-nix/boot/loader/grub.nix @@ -1,11 +1,11 @@ {...}: { - boot = { - loader = { - grub = { - enable = true; - efiSupport = true; - efiInstallAsRemovable = true; - }; - }; + boot = { + loader = { + grub = { + enable = true; + efiSupport = true; + efiInstallAsRemovable = true; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/boot/tmp.nix b/s0mev1rtn0de-nix/boot/tmp.nix index ebf2e54..98694f7 100644 --- a/s0mev1rtn0de-nix/boot/tmp.nix +++ b/s0mev1rtn0de-nix/boot/tmp.nix @@ -1,7 +1,7 @@ {...}: { - boot = { - tmp = { - cleanOnBoot = true; - }; + boot = { + tmp = { + cleanOnBoot = true; }; + }; } diff --git a/s0mev1rtn0de-nix/default.nix b/s0mev1rtn0de-nix/default.nix index 4d33acf..9962459 100644 --- a/s0mev1rtn0de-nix/default.nix +++ b/s0mev1rtn0de-nix/default.nix @@ -1,58 +1,58 @@ {...}: { - imports = [ - ./disko/disk.nix - ./disko/lvm_vg.nix + imports = [ + "${self}/s0mev1rtn0de/disko/disk.nix" + "${self}/s0mev1rtn0de/disko/lvm_vg.nix" - ./boot/initrd/availableKernelModules.nix - ./boot/initrd/kernelModules.nix - ./boot/loader/grub.nix - ./boot/kernel.nix - ./boot/tmp.nix + "${self}/s0mev1rtn0de/boot/initrd/availableKernelModules.nix" + "${self}/s0mev1rtn0de/boot/initrd/kernelModules.nix" + "${self}/s0mev1rtn0de/boot/loader/grub.nix" + "${self}/s0mev1rtn0de/boot/kernel.nix" + "${self}/s0mev1rtn0de/boot/tmp.nix" - ./environment/systemPackages.nix + "${self}/s0mev1rtn0de/environment/systemPackages.nix" - ./hardware/zram.nix + "${self}/s0mev1rtn0de/hardware/zram.nix" - ./networking/firewall/ens3.nix - ./networking/firewall/wt0.nix - ./networking/firewall.nix - ./networking/hostname.nix - ./networking/dns.nix - ./networking/nftables.nix - ./networking/wireguard.nix - ./networking/wg-quick.nix - ./networking/nat.nix + "${self}/s0mev1rtn0de/networking/firewall/ens3.nix" + "${self}/s0mev1rtn0de/networking/firewall/wt0.nix" + "${self}/s0mev1rtn0de/networking/firewall.nix" + "${self}/s0mev1rtn0de/networking/hostname.nix" + "${self}/s0mev1rtn0de/networking/dns.nix" + "${self}/s0mev1rtn0de/networking/nftables.nix" + "${self}/s0mev1rtn0de/networking/wireguard.nix" + "${self}/s0mev1rtn0de/networking/wg-quick.nix" + "${self}/s0mev1rtn0de/networking/nat.nix" - ./nix/settings/allowed-users.nix - ./nix/settings/experimental-features.nix - ./nix/settings/substituters.nix - ./nix/settings/trusted-public-keys.nix - ./nix/settings/trusted-users.nix - ./nix/settings/auto-optimise-store.nix + "${self}/s0mev1rtn0de/nix/settings/allowed-users.nix" + "${self}/s0mev1rtn0de/nix/settings/experimental-features.nix" + "${self}/s0mev1rtn0de/nix/settings/substituters.nix" + "${self}/s0mev1rtn0de/nix/settings/trusted-public-keys.nix" + "${self}/s0mev1rtn0de/nix/settings/trusted-users.nix" + "${self}/s0mev1rtn0de/nix/settings/auto-optimise-store.nix" - ./nixpkgs/config.nix - ./nixpkgs/platform.nix + "${self}/s0mev1rtn0de/nixpkgs/config.nix" + "${self}/s0mev1rtn0de/nixpkgs/platform.nix" - ./programs/nh.nix + "${self}/s0mev1rtn0de/programs/nh.nix" - ./services/openssh.nix - ./services/fail2ban.nix - ./services/netbird.nix - ./services/qemuGuest.nix - ./services/caddy.nix - ./services/sing-box.nix + "${self}/s0mev1rtn0de/services/openssh.nix" + "${self}/s0mev1rtn0de/services/fail2ban.nix" + "${self}/s0mev1rtn0de/services/netbird.nix" + "${self}/s0mev1rtn0de/services/qemuGuest.nix" + "${self}/s0mev1rtn0de/services/caddy.nix" + "${self}/s0mev1rtn0de/services/sing-box.nix" - ./sops/age.nix - ./sops/defaults.nix - ./sops/secrets.nix + "${self}/s0mev1rtn0de/sops/age.nix" + "${self}/s0mev1rtn0de/sops/defaults.nix" + "${self}/s0mev1rtn0de/sops/secrets.nix" - ./system/stateVersion.nix + "${self}/s0mev1rtn0de/system/stateVersion.nix" - ./users/users.nix - ./users/users/askhat.nix - ./users/users/hand7s.nix - ./users/users/root.nix + "${self}/s0mev1rtn0de/users/users.nix" + "${self}/s0mev1rtn0de/users/users/askhat.nix" + "${self}/s0mev1rtn0de/users/users/hand7s.nix" + "${self}/s0mev1rtn0de/users/users/root.nix" - ./virtualisation/docker.nix - ]; + "${self}/s0mev1rtn0de/virtualisation/docker.nix" + ]; } diff --git a/s0mev1rtn0de-nix/disko/disk.nix b/s0mev1rtn0de-nix/disko/disk.nix index 4d09d91..c0c6cc7 100644 --- a/s0mev1rtn0de-nix/disko/disk.nix +++ b/s0mev1rtn0de-nix/disko/disk.nix @@ -1,44 +1,44 @@ { - disko = { - devices = { - disk = { - virt_main = { - device = "/dev/sda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; + disko = { + devices = { + disk = { + virt_main = { + device = "/dev/sda"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + boot = { + name = "boot"; + size = "1M"; + type = "EF02"; + }; - ESP = { - name = "ESP"; - size = "1024M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "umask=0077" - ]; - }; - }; - - root = { - size = "100%"; - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; + ESP = { + name = "ESP"; + size = "1024M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "umask=0077" + ]; }; + }; + + root = { + size = "100%"; + content = { + type = "lvm_pv"; + vg = "pool"; + }; + }; }; + }; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/disko/lvm_vg.nix b/s0mev1rtn0de-nix/disko/lvm_vg.nix index ff1012d..e23c049 100644 --- a/s0mev1rtn0de-nix/disko/lvm_vg.nix +++ b/s0mev1rtn0de-nix/disko/lvm_vg.nix @@ -1,27 +1,27 @@ { - disko = { - devices = { - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%FREE"; - content = { - type = "btrfs"; - mountpoint = "/"; - extraArgs = [ - "-f" - ]; + disko = { + devices = { + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%FREE"; + content = { + type = "btrfs"; + mountpoint = "/"; + extraArgs = [ + "-f" + ]; - mountOptions = [ - "compress=zstd" - ]; - }; - }; - }; - }; + mountOptions = [ + "compress=zstd" + ]; + }; }; + }; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/environment/systemPackages.nix b/s0mev1rtn0de-nix/environment/systemPackages.nix index 1fe32f6..4aa3b17 100644 --- a/s0mev1rtn0de-nix/environment/systemPackages.nix +++ b/s0mev1rtn0de-nix/environment/systemPackages.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { - environment = { - systemPackages = [ - pkgs.helix - pkgs.comma - ]; + environment = { + systemPackages = [ + pkgs.helix + pkgs.comma + ]; - enableAllTerminfo = true; - }; + enableAllTerminfo = true; + }; } diff --git a/s0mev1rtn0de-nix/hardware/zram.nix b/s0mev1rtn0de-nix/hardware/zram.nix index c6a41f1..b973787 100644 --- a/s0mev1rtn0de-nix/hardware/zram.nix +++ b/s0mev1rtn0de-nix/hardware/zram.nix @@ -1,8 +1,8 @@ {...}: { - zramSwap = { - enable = true; - algorithm = "zstd"; - priority = 100; - memoryPercent = 100; - }; + zramSwap = { + enable = true; + algorithm = "zstd"; + priority = 100; + memoryPercent = 100; + }; } diff --git a/s0mev1rtn0de-nix/networking/dns.nix b/s0mev1rtn0de-nix/networking/dns.nix index 2c09e08..6c66cc5 100644 --- a/s0mev1rtn0de-nix/networking/dns.nix +++ b/s0mev1rtn0de-nix/networking/dns.nix @@ -1,16 +1,16 @@ {...}: { - networking = { - nameservers = [ - "1.1.1.1" - "1.0.0.1" - "8.8.8.8" - "8.8.4.4" - "2606:4700:4700::1111" - "2606:4700:4700::1001" - "2001:4860:4860::8888" - "2001:4860:4860::8844" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; + networking = { + nameservers = [ + "1.1.1.1" + "1.0.0.1" + "8.8.8.8" + "8.8.4.4" + "2606:4700:4700::1111" + "2606:4700:4700::1001" + "2001:4860:4860::8888" + "2001:4860:4860::8844" + "2620:119:35::35" + "2620:119:53::53" + ]; + }; } diff --git a/s0mev1rtn0de-nix/networking/firewall.nix b/s0mev1rtn0de-nix/networking/firewall.nix index 1bf3ca7..b7f2db8 100644 --- a/s0mev1rtn0de-nix/networking/firewall.nix +++ b/s0mev1rtn0de-nix/networking/firewall.nix @@ -1,11 +1,11 @@ {...}: { - networking = { - firewall = { - enable = true; - allowPing = true; - checkReversePath = false; - }; - - useNetworkd = true; + networking = { + firewall = { + enable = true; + allowPing = true; + checkReversePath = false; }; + + useNetworkd = true; + }; } diff --git a/s0mev1rtn0de-nix/networking/firewall/ens3.nix b/s0mev1rtn0de-nix/networking/firewall/ens3.nix index 1890f92..fc74f60 100644 --- a/s0mev1rtn0de-nix/networking/firewall/ens3.nix +++ b/s0mev1rtn0de-nix/networking/firewall/ens3.nix @@ -1,21 +1,21 @@ {...}: { - networking = { - firewall = { - interfaces = { - ens3 = { - allowedUDPPorts = [ - 443 - 53590 - 53570 - ]; + networking = { + firewall = { + interfaces = { + ens3 = { + allowedUDPPorts = [ + 443 + 53590 + 53570 + ]; - allowedTCPPorts = [ - 443 - 53590 - 53570 - ]; - }; - }; + allowedTCPPorts = [ + 443 + 53590 + 53570 + ]; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/networking/firewall/wt0.nix b/s0mev1rtn0de-nix/networking/firewall/wt0.nix index 755ba9d..564d82d 100644 --- a/s0mev1rtn0de-nix/networking/firewall/wt0.nix +++ b/s0mev1rtn0de-nix/networking/firewall/wt0.nix @@ -1,17 +1,17 @@ {...}: { - networking = { - firewall = { - interfaces = { - wt0 = { - allowedUDPPorts = [ - 39856 - ]; + networking = { + firewall = { + interfaces = { + wt0 = { + allowedUDPPorts = [ + 39856 + ]; - allowedTCPPorts = [ - 39856 - ]; - }; - }; + allowedTCPPorts = [ + 39856 + ]; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/networking/hostname.nix b/s0mev1rtn0de-nix/networking/hostname.nix index 67c2a56..1781f05 100644 --- a/s0mev1rtn0de-nix/networking/hostname.nix +++ b/s0mev1rtn0de-nix/networking/hostname.nix @@ -1,5 +1,5 @@ {...}: { - networking = { - hostName = "s0mev1rtn0de-nix"; - }; + networking = { + hostName = "s0mev1rtn0de-nix"; + }; } diff --git a/s0mev1rtn0de-nix/networking/interfaces/ens3.nix b/s0mev1rtn0de-nix/networking/interfaces/ens3.nix index 829f7de..7bebc8a 100644 --- a/s0mev1rtn0de-nix/networking/interfaces/ens3.nix +++ b/s0mev1rtn0de-nix/networking/interfaces/ens3.nix @@ -1,16 +1,16 @@ {...}: { - networking = { - interfaces = { - ens3 = { - ipv6 = { - addresses = [ - { - address = ""; - prefixLength = 128; - } - ]; - }; - }; + networking = { + interfaces = { + ens3 = { + ipv6 = { + addresses = [ + { + address = ""; + prefixLength = 128; + } + ]; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/networking/nat.nix b/s0mev1rtn0de-nix/networking/nat.nix index 2adbfbc..6ff577a 100644 --- a/s0mev1rtn0de-nix/networking/nat.nix +++ b/s0mev1rtn0de-nix/networking/nat.nix @@ -1,12 +1,12 @@ {...}: { - networking = { - nat = { - enable = true; - enableIPv6 = true; - externalInterface = "ens3"; - internalInterfaces = [ - "wg0" - ]; - }; + networking = { + nat = { + enable = true; + enableIPv6 = true; + externalInterface = "ens3"; + internalInterfaces = [ + "wg0" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/networking/nftables.nix b/s0mev1rtn0de-nix/networking/nftables.nix index cf3d643..d0601b3 100644 --- a/s0mev1rtn0de-nix/networking/nftables.nix +++ b/s0mev1rtn0de-nix/networking/nftables.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - nftables = { - enable = false; - }; + networking = { + nftables = { + enable = false; }; + }; } diff --git a/s0mev1rtn0de-nix/networking/wg-quick.nix b/s0mev1rtn0de-nix/networking/wg-quick.nix index 7b6d2e6..4bab50d 100644 --- a/s0mev1rtn0de-nix/networking/wg-quick.nix +++ b/s0mev1rtn0de-nix/networking/wg-quick.nix @@ -1,50 +1,50 @@ { - config, - pkgs, - lib, - ... + config, + pkgs, + lib, + ... }: { - networking = { - wg-quick = { - interfaces = { - wg0 = { - type = "wireguard"; - listenPort = 53590; - privateKeyFile = config.sops.secrets.privateWgKey; + networking = { + wg-quick = { + interfaces = { + wg0 = { + type = "wireguard"; + listenPort = 53590; + privateKeyFile = config.sops.secrets.privateWgKey; - address = [ - "10.100.0.1/24" - ]; + address = [ + "10.100.0.1/24" + ]; - postUp = '' - ${lib.getExe' pkgs.iptables "iptables"} -A FORWARD -i wg0 -j ACCEPT - ${lib.getExe' pkgs.iptables "iptables"} -t nat -A POSTROUTING -s 10.100.0.0/24 -o ens3 -j MASQUERADE - ''; + postUp = '' + ${lib.getExe' pkgs.iptables "iptables"} -A FORWARD -i wg0 -j ACCEPT + ${lib.getExe' pkgs.iptables "iptables"} -t nat -A POSTROUTING -s 10.100.0.0/24 -o ens3 -j MASQUERADE + ''; - preDown = '' - ${lib.getExe' pkgs.iptables "iptables"} -D FORWARD -i wg0 -j ACCEPT - ${lib.getExe' pkgs.iptables "iptables"} -t nat -D POSTROUTING -s 10.100.0.0/24 -o ens3 -j MASQUERADE - ''; + preDown = '' + ${lib.getExe' pkgs.iptables "iptables"} -D FORWARD -i wg0 -j ACCEPT + ${lib.getExe' pkgs.iptables "iptables"} -t nat -D POSTROUTING -s 10.100.0.0/24 -o ens3 -j MASQUERADE + ''; - peers = [ - { - publicKey = "{}"; - presharedKeyFile = config.sops.secrets.presharedWgKey1; - allowedIPs = [ - "10.100.0.2/32" - ]; - } + peers = [ + { + publicKey = "{}"; + presharedKeyFile = config.sops.secrets.presharedWgKey1; + allowedIPs = [ + "10.100.0.2/32" + ]; + } - { - publicKey = "{}"; - presharedKeyFile = config.sops.secrets.presharedWgKey2; - allowedIPs = [ - "10.100.0.3/32" - ]; - } - ]; - }; - }; + { + publicKey = "{}"; + presharedKeyFile = config.sops.secrets.presharedWgKey2; + allowedIPs = [ + "10.100.0.3/32" + ]; + } + ]; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/networking/wireguard.nix b/s0mev1rtn0de-nix/networking/wireguard.nix index a618877..2ee5c02 100644 --- a/s0mev1rtn0de-nix/networking/wireguard.nix +++ b/s0mev1rtn0de-nix/networking/wireguard.nix @@ -1,7 +1,7 @@ {...}: { - networking = { - wireguard = { - enable = true; - }; + networking = { + wireguard = { + enable = true; }; + }; } diff --git a/s0mev1rtn0de-nix/nix/settings/allowed-users.nix b/s0mev1rtn0de-nix/nix/settings/allowed-users.nix index d05c725..d483d0c 100644 --- a/s0mev1rtn0de-nix/nix/settings/allowed-users.nix +++ b/s0mev1rtn0de-nix/nix/settings/allowed-users.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - sandbox = true; - allowed-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + sandbox = true; + allowed-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix b/s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix index 731bc0c..14f13c5 100644 --- a/s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix +++ b/s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix @@ -1,7 +1,7 @@ {...}: { - nix = { - settings = { - auto-optimise-store = true; - }; + nix = { + settings = { + auto-optimise-store = true; }; + }; } diff --git a/s0mev1rtn0de-nix/nix/settings/experimental-features.nix b/s0mev1rtn0de-nix/nix/settings/experimental-features.nix index f2161b9..7ce7e89 100644 --- a/s0mev1rtn0de-nix/nix/settings/experimental-features.nix +++ b/s0mev1rtn0de-nix/nix/settings/experimental-features.nix @@ -1,10 +1,10 @@ {...}: { - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - }; + nix = { + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/nix/settings/substituters.nix b/s0mev1rtn0de-nix/nix/settings/substituters.nix index dfa08ed..9136405 100644 --- a/s0mev1rtn0de-nix/nix/settings/substituters.nix +++ b/s0mev1rtn0de-nix/nix/settings/substituters.nix @@ -1,19 +1,19 @@ {...}: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://nixos-cache-proxy.cofob.dev" - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://ags.cachix.org" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - ]; - }; + nix = { + settings = { + substituters = [ + # cache.nixos.org + "https://nixos-cache-proxy.cofob.dev" + "https://cache.nixos.org" + # cache.garnix.org + "https://cache.garnix.io" + # cachix + "https://nix-community.cachix.org/" + "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" + "https://hyprland.cachix.org" + "https://chaotic-nyx.cachix.org/" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix b/s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix index 053e721..62cbbde 100644 --- a/s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix +++ b/s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix @@ -1,18 +1,18 @@ {...}: { - nix = { - settings = { - trusted-public-keys = [ - # cache.nixos.org - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - # cache.garnix.io - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # cachix.org - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - ]; - }; + nix = { + settings = { + trusted-public-keys = [ + # cache.nixos.org + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + # cache.garnix.io + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + # cachix.org + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/nix/settings/trusted-users.nix b/s0mev1rtn0de-nix/nix/settings/trusted-users.nix index 93619a5..e4a9dae 100644 --- a/s0mev1rtn0de-nix/nix/settings/trusted-users.nix +++ b/s0mev1rtn0de-nix/nix/settings/trusted-users.nix @@ -1,9 +1,9 @@ {...}: { - nix = { - settings = { - trusted-users = [ - "@wheel" - ]; - }; + nix = { + settings = { + trusted-users = [ + "@wheel" + ]; }; + }; } diff --git a/s0mev1rtn0de-nix/nixpkgs/config.nix b/s0mev1rtn0de-nix/nixpkgs/config.nix index 4532569..0425353 100644 --- a/s0mev1rtn0de-nix/nixpkgs/config.nix +++ b/s0mev1rtn0de-nix/nixpkgs/config.nix @@ -1,8 +1,8 @@ {...}: { - nixpkgs = { - config = { - allowBroken = true; - allowUnfree = true; - }; + nixpkgs = { + config = { + allowBroken = true; + allowUnfree = true; }; + }; } diff --git a/s0mev1rtn0de-nix/nixpkgs/platform.nix b/s0mev1rtn0de-nix/nixpkgs/platform.nix index c8930f6..63fda3b 100644 --- a/s0mev1rtn0de-nix/nixpkgs/platform.nix +++ b/s0mev1rtn0de-nix/nixpkgs/platform.nix @@ -1,6 +1,6 @@ {...}: { - nixpkgs = { - system = "x86_64-linux"; - hostPlatform = "x86_64-linux"; - }; + nixpkgs = { + system = "x86_64-linux"; + hostPlatform = "x86_64-linux"; + }; } diff --git a/s0mev1rtn0de-nix/programs/nh.nix b/s0mev1rtn0de-nix/programs/nh.nix index b2f7993..d641bad 100644 --- a/s0mev1rtn0de-nix/programs/nh.nix +++ b/s0mev1rtn0de-nix/programs/nh.nix @@ -1,7 +1,7 @@ {...}: { - programs = { - nh = { - enable = true; - }; + programs = { + nh = { + enable = true; }; + }; } diff --git a/s0mev1rtn0de-nix/services/caddy.nix b/s0mev1rtn0de-nix/services/caddy.nix index bfca9b1..d978c83 100644 --- a/s0mev1rtn0de-nix/services/caddy.nix +++ b/s0mev1rtn0de-nix/services/caddy.nix @@ -1,55 +1,55 @@ {pkgs, ...}: { - services = { - caddy = { - enable = true; + services = { + caddy = { + enable = true; - package = pkgs.caddy.withPlugins { - plugins = [ - "github.com/mholt/caddy-l4@v0.0.0-20250902102621-4a517a98d7fa" - "github.com/caddy-dns/cloudflare@v0.2.1" - ]; - hash = "sha256-1/jRWotKCvx7QncjVSVGYXb2gAmIiokC/ZbCUelG5Rc="; - }; + package = pkgs.caddy.withPlugins { + plugins = [ + "github.com/mholt/caddy-l4@v0.0.0-20250902102621-4a517a98d7fa" + "github.com/caddy-dns/cloudflare@v0.2.1" + ]; + hash = "sha256-1/jRWotKCvx7QncjVSVGYXb2gAmIiokC/ZbCUelG5Rc="; + }; - globalConfig = '' - debug - email me@hand7s.org + globalConfig = '' + debug + email me@hand7s.org - acme_ca https://acme-v02.api.letsencrypt.org/directory + acme_ca https://acme-v02.api.letsencrypt.org/directory - ''; + ''; - # acme_ca https://api.zerossl.com/directory + # acme_ca https://api.zerossl.com/directory - virtualHosts = { - "hand7s.org" = { - extraConfig = '' + virtualHosts = { + "hand7s.org" = { + extraConfig = '' - respond "hi! :D WIP btw" - ''; - }; - - "git.hand7s.org" = { - extraConfig = '' - - reverse_proxy ${homeIP}:53350 - ''; - }; - - "bin.hand7s.org" = { - extraConfig = '' - - reverse_proxy ${homeIP}:80 - ''; - }; - - "zitadel.hand7s.org" = { - extraConfig = '' - - reverse_proxy ${homeIP}:8443 - ''; - }; - }; + respond "hi! :D WIP btw" + ''; }; + + "git.hand7s.org" = { + extraConfig = '' + + reverse_proxy ${homeIP}:53350 + ''; + }; + + "bin.hand7s.org" = { + extraConfig = '' + + reverse_proxy ${homeIP}:80 + ''; + }; + + "zitadel.hand7s.org" = { + extraConfig = '' + + reverse_proxy ${homeIP}:8443 + ''; + }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/services/fail2ban.nix b/s0mev1rtn0de-nix/services/fail2ban.nix index 538a6e2..bb6ee40 100644 --- a/s0mev1rtn0de-nix/services/fail2ban.nix +++ b/s0mev1rtn0de-nix/services/fail2ban.nix @@ -1,14 +1,14 @@ {...}: { - services = { - fail2ban = { - enable = true; - bantime-increment = { - enable = true; - factor = "10"; - formula = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; - overalljails = true; - maxtime = "500h"; - }; - }; + services = { + fail2ban = { + enable = true; + bantime-increment = { + enable = true; + factor = "10"; + formula = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; + overalljails = true; + maxtime = "500h"; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/services/netbird.nix b/s0mev1rtn0de-nix/services/netbird.nix index 71e3cd8..071330a 100644 --- a/s0mev1rtn0de-nix/services/netbird.nix +++ b/s0mev1rtn0de-nix/services/netbird.nix @@ -1,7 +1,7 @@ {...}: { - services = { - netbird = { - enable = true; - }; + services = { + netbird = { + enable = true; }; + }; } diff --git a/s0mev1rtn0de-nix/services/openssh.nix b/s0mev1rtn0de-nix/services/openssh.nix index 6eb7472..9034b10 100644 --- a/s0mev1rtn0de-nix/services/openssh.nix +++ b/s0mev1rtn0de-nix/services/openssh.nix @@ -1,20 +1,20 @@ {...}: { - services = { - openssh = { - enable = true; + services = { + openssh = { + enable = true; - settings = { - PrintMotd = false; - PermitRootLogin = "no"; - PasswordAuthentication = false; - MaxAuthTries = 3; - LoginGraceTime = 10; - PermitEmptyPasswords = "no"; - ChallengeResponseAuthentication = "no"; - KerberosAuthentication = "no"; - GSSAPIAuthentication = "no"; - X11Forwarding = false; - }; - }; + settings = { + PrintMotd = false; + PermitRootLogin = "no"; + PasswordAuthentication = false; + MaxAuthTries = 3; + LoginGraceTime = 10; + PermitEmptyPasswords = "no"; + ChallengeResponseAuthentication = "no"; + KerberosAuthentication = "no"; + GSSAPIAuthentication = "no"; + X11Forwarding = false; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/services/qemuGuest.nix b/s0mev1rtn0de-nix/services/qemuGuest.nix index 81c74ff..d0c8739 100644 --- a/s0mev1rtn0de-nix/services/qemuGuest.nix +++ b/s0mev1rtn0de-nix/services/qemuGuest.nix @@ -1,7 +1,7 @@ {...}: { - services = { - qemuGuest = { - enable = true; - }; + services = { + qemuGuest = { + enable = true; }; + }; } diff --git a/s0mev1rtn0de-nix/services/sing-box.nix b/s0mev1rtn0de-nix/services/sing-box.nix index beca41f..f7881c7 100644 --- a/s0mev1rtn0de-nix/services/sing-box.nix +++ b/s0mev1rtn0de-nix/services/sing-box.nix @@ -1,91 +1,91 @@ { - # config, - ... + # config, + ... }: { - services = { - sing-box = { - enable = true; - settings = { - log = { - level = "debug"; - }; - - dns = { - servers = [ - { - type = "local"; - tag = "local"; - } - ]; - - final = "local"; - strategy = "prefer_ipv6"; - }; - - route = { - final = "direct-out"; - auto_detect_interface = true; - }; - - outbounds = [ - { - tag = "direct-out"; - type = "direct"; - } - ]; - - inbounds = [ - { - type = "vless"; - tag = "vless-inbound"; - - listen = "::"; - listen_port = 53570; - - users = [ - { - name = "hand7s_1"; - uuid = "${singboxUUID2}"; - flow = "xtls-rprx-vision"; - } - - { - name = "hand7s_2"; - uuid = "${singboxUUID2}"; - flow = "xtls-rprx-vision"; - } - ]; - - tls = rec { - enabled = true; - server_name = "vk.com"; - reality = { - enabled = true; - max_time_difference = "5m"; - handshake = { - server = server_name; - server_port = 443; - }; - - private_key = "${singboxKey}"; - - short_id = [ - "${singboxId}" - ]; - }; - }; - - transport = { - type = "httpupgrade"; - }; - - multiplex = { - enabled = true; - padding = false; - }; - } - ]; - }; + services = { + sing-box = { + enable = true; + settings = { + log = { + level = "debug"; }; + + dns = { + servers = [ + { + type = "local"; + tag = "local"; + } + ]; + + final = "local"; + strategy = "prefer_ipv6"; + }; + + route = { + final = "direct-out"; + auto_detect_interface = true; + }; + + outbounds = [ + { + tag = "direct-out"; + type = "direct"; + } + ]; + + inbounds = [ + { + type = "vless"; + tag = "vless-inbound"; + + listen = "::"; + listen_port = 53570; + + users = [ + { + name = "hand7s_1"; + uuid = "${singboxUUID2}"; + flow = "xtls-rprx-vision"; + } + + { + name = "hand7s_2"; + uuid = "${singboxUUID2}"; + flow = "xtls-rprx-vision"; + } + ]; + + tls = rec { + enabled = true; + server_name = "vk.com"; + reality = { + enabled = true; + max_time_difference = "5m"; + handshake = { + server = server_name; + server_port = 443; + }; + + private_key = "${singboxKey}"; + + short_id = [ + "${singboxId}" + ]; + }; + }; + + transport = { + type = "httpupgrade"; + }; + + multiplex = { + enabled = true; + padding = false; + }; + } + ]; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/system/stateVersion.nix b/s0mev1rtn0de-nix/system/stateVersion.nix index 0dcbcd5..304a150 100644 --- a/s0mev1rtn0de-nix/system/stateVersion.nix +++ b/s0mev1rtn0de-nix/system/stateVersion.nix @@ -1,5 +1,5 @@ {...}: { - system = { - stateVersion = "23.11"; - }; + system = { + stateVersion = "23.11"; + }; } diff --git a/s0mev1rtn0de-nix/users/users.nix b/s0mev1rtn0de-nix/users/users.nix index 2c39188..54415f1 100644 --- a/s0mev1rtn0de-nix/users/users.nix +++ b/s0mev1rtn0de-nix/users/users.nix @@ -1,5 +1,5 @@ {...}: { - users = { - mutableUsers = false; - }; + users = { + mutableUsers = false; + }; } diff --git a/s0mev1rtn0de-nix/users/users/askhat.nix b/s0mev1rtn0de-nix/users/users/askhat.nix index 41849f7..3fba6bc 100644 --- a/s0mev1rtn0de-nix/users/users/askhat.nix +++ b/s0mev1rtn0de-nix/users/users/askhat.nix @@ -1,23 +1,23 @@ {...}: { + users = { users = { - users = { - askhat = { - description = "askhat"; - isNormalUser = true; - hashedPassword = "$y$j9T$t3G0Vj47wHY86twX2bfwr/$kUajwW8gxtu09z9btWBB7YNEcj1Ut3QfYEazWr7utgC"; - extraGroups = [ - "wheel" - "docker" - ]; + askhat = { + description = "askhat"; + isNormalUser = true; + hashedPassword = "$y$j9T$t3G0Vj47wHY86twX2bfwr/$kUajwW8gxtu09z9btWBB7YNEcj1Ut3QfYEazWr7utgC"; + extraGroups = [ + "wheel" + "docker" + ]; - openssh = { - authorizedKeys = { - keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICfdXRE2ckx++O1lHFcmZlBMN1Sgy3aqSadOdC+ZOLj5 kixoncon33@gmail.com" - ]; - }; - }; - }; + openssh = { + authorizedKeys = { + keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICfdXRE2ckx++O1lHFcmZlBMN1Sgy3aqSadOdC+ZOLj5 kixoncon33@gmail.com" + ]; + }; }; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/users/users/hand7s.nix b/s0mev1rtn0de-nix/users/users/hand7s.nix index 2074f86..3ad5002 100644 --- a/s0mev1rtn0de-nix/users/users/hand7s.nix +++ b/s0mev1rtn0de-nix/users/users/hand7s.nix @@ -1,15 +1,15 @@ {...}: { + users = { users = { - users = { - hand7s = { - description = "hands"; - isNormalUser = true; - hashedPassword = "$y$j9T$eHfq328GBp7Ga8xsbOTV/0$kcihv7zWLqSkj2jKAhI1pdbTSwvaf2RY5Rokm69XTL/"; - extraGroups = [ - "wheel" - "docker" - ]; - }; - }; + hand7s = { + description = "hands"; + isNormalUser = true; + hashedPassword = "$y$j9T$eHfq328GBp7Ga8xsbOTV/0$kcihv7zWLqSkj2jKAhI1pdbTSwvaf2RY5Rokm69XTL/"; + extraGroups = [ + "wheel" + "docker" + ]; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/users/users/root.nix b/s0mev1rtn0de-nix/users/users/root.nix index c905c49..320de35 100644 --- a/s0mev1rtn0de-nix/users/users/root.nix +++ b/s0mev1rtn0de-nix/users/users/root.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { + users = { users = { - users = { - root = { - shell = "${pkgs.util-linux}/bin/nologin"; - }; - }; + root = { + shell = "${pkgs.util-linux}/bin/nologin"; + }; }; + }; } diff --git a/s0mev1rtn0de-nix/virtualisation/docker.nix b/s0mev1rtn0de-nix/virtualisation/docker.nix index a7f10d7..df2d700 100644 --- a/s0mev1rtn0de-nix/virtualisation/docker.nix +++ b/s0mev1rtn0de-nix/virtualisation/docker.nix @@ -1,14 +1,14 @@ {...}: { - virtualisation = { - oci-containers = { - backend = "docker"; - }; - - docker = { - enable = true; - rootless = { - enable = true; - }; - }; + virtualisation = { + oci-containers = { + backend = "docker"; }; + + docker = { + enable = true; + rootless = { + enable = true; + }; + }; + }; } diff --git a/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix b/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix index b4b0fa1..441db20 100644 --- a/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix +++ b/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix @@ -1,26 +1,26 @@ {...}: { - virtualisation = { - oci-containers = { - containers = { - "3x-ui" = { - autoStart = true; - image = "ghcr.io/mhsanaei/3x-ui:latest"; - volumes = [ - "/docker/3x-ui/db/:/etc/x-ui/" - "/docker/3x-ui/certs/:/root/cert/" - ]; + virtualisation = { + oci-containers = { + containers = { + "3x-ui" = { + autoStart = true; + image = "ghcr.io/mhsanaei/3x-ui:latest"; + volumes = [ + "/docker/3x-ui/db/:/etc/x-ui/" + "/docker/3x-ui/certs/:/root/cert/" + ]; - environment = { - XRAY_VMESS_AEAD_FORCED = toString false; - XUI_ENABLE_FAIL2BAN = toString false; - }; + environment = { + XRAY_VMESS_AEAD_FORCED = toString false; + XUI_ENABLE_FAIL2BAN = toString false; + }; - extraOptions = [ - "--network=host" - "--tty=true" - ]; - }; - }; + extraOptions = [ + "--network=host" + "--tty=true" + ]; }; + }; }; + }; } From 804a660827fd6f27af255383eb3b0839e5cf54f0 Mon Sep 17 00:00:00 2001 From: s0me1newithhand7s Date: Mon, 29 Dec 2025 22:48:21 +0300 Subject: [PATCH 3/3] big staging update pt.2 Signed-off-by: s0me1newithhand7s --- flake.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 16aee49..6e35ed2 100644 --- a/flake.nix +++ b/flake.nix @@ -331,12 +331,8 @@ }; }; - outputs = inputs @ { - flake-parts, - self, - ... - }: - flake-parts.lib.mkFlake { + outputs = inputs @ {self, ...}: + inputs.flake-parts.lib.mkFlake { inherit inputs self