Compare commits
10 Commits
c49f782e11
...
bbd84a0903
| Author | SHA1 | Date | |
|---|---|---|---|
 Sweetbread
|
bbd84a0903
|
||
|
Sweetbread
|
7a9f10ffb5
|
||
|
Sweetbread
|
7d5b12ba34
|
||
|
Sweetbread
|
13b4e7b1a8
|
||
|
Sweetbread
|
731a95289a
|
||
 Chest
|
1deef1e46b
|
||
|
Chest
|
42d3628e35
|
||
|
Sweetbread
|
48d90fac39
|
||
|
Sweetbread
|
d460f0c8d5
|
||
|
Sweetbread
|
22572128fc
|
Generated
+104
-120
@@ -7,11 +7,11 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772290697,
|
||||
"narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
|
||||
"lastModified": 1778493762,
|
||||
"narHash": "sha256-PG7vz7Dk3U3hB8OXtIS3bJ4QmJEw08ycFprJuAO7YS0=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
|
||||
"rev": "75aac6845b47e913b53c2a0af7fd124fdb8fe84a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -23,7 +23,7 @@
|
||||
"ags": {
|
||||
"inputs": {
|
||||
"astal": "astal",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1744557573,
|
||||
@@ -132,11 +132,11 @@
|
||||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"lastModified": 1776754714,
|
||||
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -165,11 +165,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764873433,
|
||||
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
|
||||
"lastModified": 1776136500,
|
||||
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
|
||||
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -218,11 +218,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767609335,
|
||||
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -290,20 +290,18 @@
|
||||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1767737596,
|
||||
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "gitlab"
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "gitlab"
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
@@ -313,11 +311,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773681856,
|
||||
"narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
|
||||
"lastModified": 1778954430,
|
||||
"narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce",
|
||||
"rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -395,7 +393,7 @@
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"hyprwire": "hyprwire",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"systems": "systems",
|
||||
"xdph": "xdph"
|
||||
@@ -478,11 +476,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771865848,
|
||||
"narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
|
||||
"lastModified": 1778926589,
|
||||
"narHash": "sha256-IX6e5ggQi60UChhDJx6wsczbPRCEE8WZbEtlDMazLmU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-plugins",
|
||||
"rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
|
||||
"rev": "f1569efa6a939fd68cee605d2a34d0db3af5d879",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -678,11 +676,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770841267,
|
||||
"narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=",
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -710,11 +708,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1773610124,
|
||||
"narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=",
|
||||
"lastModified": 1778737229,
|
||||
"narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9fe1300f4360e13f39d6d1d006e54fd5093e9ad5",
|
||||
"rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -725,22 +723,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
@@ -756,7 +738,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1772542754,
|
||||
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
|
||||
@@ -772,29 +754,29 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1773646010,
|
||||
"narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
|
||||
"lastModified": 1776718653,
|
||||
"narHash": "sha256-eU5yaR3OY3jrvxpQlKUWyGzYovBZ0UB4EdZelq1Hq1g=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
|
||||
"rev": "5a5f98738120adbb3d2753087b17839a45701cbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5a5f98738120adbb3d2753087b17839a45701cbe",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1773507054,
|
||||
"narHash": "sha256-Q8U5VXgrcxmCxPtCCJCIZkcAX3FCZwGh1GNVIXxMND0=",
|
||||
"lastModified": 1775888245,
|
||||
"narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e80236013dc8b77aa49ca90e7a12d86f5d8d64c9",
|
||||
"rev": "13043924aaa7375ce482ebe2494338e058282925",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -804,13 +786,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1767767207,
|
||||
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -820,13 +802,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1772419343,
|
||||
"narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
|
||||
"lastModified": 1776329215,
|
||||
"narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
|
||||
"rev": "b86751bc4085f48661017fa226dee99fab6c651b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -848,11 +830,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767810917,
|
||||
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
|
||||
"lastModified": 1777598946,
|
||||
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
|
||||
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -891,42 +873,46 @@
|
||||
"home-manager": "home-manager",
|
||||
"hyprland": "hyprland",
|
||||
"hyprland-plugins": "hyprland-plugins",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-pinned": "nixpkgs-pinned",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"russia-blocked-geoip": "russia-blocked-geoip",
|
||||
"sops-nix": "sops-nix",
|
||||
"stylix": "stylix",
|
||||
"yazi": "yazi"
|
||||
"yazi": "yazi",
|
||||
"yazi-plugins": "yazi-plugins"
|
||||
}
|
||||
},
|
||||
"russia-blocked-geoip": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1773677447,
|
||||
"narHash": "sha256-jo3BJ7iHaicSyrljzIOQu6Ce4ALfpZSgYVNFFcZuMq0=",
|
||||
"lastModified": 1777481212,
|
||||
"narHash": "sha256-NCkYOw4OM3xBv/TCmhGCm7lH+QkpetbUOYbQnOs9nRg=",
|
||||
"owner": "runetfreedom",
|
||||
"repo": "russia-blocked-geoip",
|
||||
"rev": "f6fa2c8e8fb5d29ba674cd809e58a4b25c99e9bf",
|
||||
"rev": "bbe32b96712342ae479ac598fb1a939b59d586c2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "runetfreedom",
|
||||
"ref": "release",
|
||||
"repo": "russia-blocked-geoip",
|
||||
"rev": "bbe32b96712342ae479ac598fb1a939b59d586c2",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": [
|
||||
"aagl",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770952264,
|
||||
"narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
|
||||
"lastModified": 1777605393,
|
||||
"narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
|
||||
"rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -943,11 +929,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772420823,
|
||||
"narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
|
||||
"lastModified": 1776741231,
|
||||
"narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
|
||||
"rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -958,14 +944,14 @@
|
||||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773550941,
|
||||
"narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
|
||||
"lastModified": 1777944972,
|
||||
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
|
||||
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -983,21 +969,20 @@
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-parts": "flake-parts",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nur": "nur",
|
||||
"systems": "systems_2",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
"tinted-tmux": "tinted-tmux",
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772296853,
|
||||
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
|
||||
"lastModified": 1778776709,
|
||||
"narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
|
||||
"rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1051,23 +1036,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726913040,
|
||||
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-foot",
|
||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-foot",
|
||||
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-kitty": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -1087,11 +1055,11 @@
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1767710407,
|
||||
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
|
||||
"lastModified": 1777041405,
|
||||
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
|
||||
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1103,11 +1071,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1767489635,
|
||||
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
|
||||
"lastModified": 1777169200,
|
||||
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
|
||||
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1119,11 +1087,11 @@
|
||||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1767488740,
|
||||
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
|
||||
"lastModified": 1777463218,
|
||||
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
|
||||
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1176,15 +1144,15 @@
|
||||
"yazi": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773638943,
|
||||
"narHash": "sha256-TgGuoRB28Q7IeHupfLZ/NFeztWgXS8H0HkPMy5Neb4c=",
|
||||
"lastModified": 1778801438,
|
||||
"narHash": "sha256-TtawbMZ+tgKAiDpkJJw7m2OLOJHUbRZB0xLDXBxTPck=",
|
||||
"owner": "sxyazi",
|
||||
"repo": "yazi",
|
||||
"rev": "de01a56ac5a566ecb4804659a5ecb413a9e3734f",
|
||||
"rev": "3f5cc47a4852cbffbd8536507ae7499d3da1f0b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1192,6 +1160,22 @@
|
||||
"repo": "yazi",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"yazi-plugins": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1778691457,
|
||||
"narHash": "sha256-cZlnrlgv8+SFeNgIW69q//i/apcpvAv41q5W8bJwVaI=",
|
||||
"owner": "yazi-rs",
|
||||
"repo": "plugins",
|
||||
"rev": "5d5c4803dd12bab4e4f19d606f8db0c871e6bec5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "yazi-rs",
|
||||
"repo": "plugins",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -20,13 +20,18 @@
|
||||
|
||||
inputs = {
|
||||
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/5a5f98738120adbb3d2753087b17839a45701cbe";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs-pinned.url = "github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
stylix.url = "github:danth/stylix";
|
||||
ags.url = "github:Aylur/ags/3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6";
|
||||
|
||||
yazi.url = "github:sxyazi/yazi";
|
||||
yazi-plugins = {
|
||||
url = "github:yazi-rs/plugins";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
hyprland.url = "github:hyprwm/Hyprland/v0.54.2-b";
|
||||
hyprland-plugins = {
|
||||
@@ -40,7 +45,7 @@
|
||||
};
|
||||
|
||||
russia-blocked-geoip = {
|
||||
url = "github:runetfreedom/russia-blocked-geoip/release";
|
||||
url = "github:runetfreedom/russia-blocked-geoip/bbe32b96712342ae479ac598fb1a939b59d586c2";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,15 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
wayland.windowManager.hyprland = let
|
||||
wallpaper = pkgs.fetchurl {
|
||||
name = "miku_wallpaper.jpg";
|
||||
url = "https://c.lair.moe/pub/miku_wallpaper.jpeg?raw";
|
||||
hash = "sha256-inK4X5KzQk5FHwDw2DYy43nm7XtXlC6I0S1PkYUv+3w=";
|
||||
};
|
||||
in {
|
||||
settings = {
|
||||
exec-once = [
|
||||
"${lib.getExe pkgs.swww} img -o eDP-1 ${wallpaper}"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
./secrets/secrets.nix
|
||||
./modules/grub.nix
|
||||
./modules/syncthing.nix
|
||||
./modules/torrent.nix
|
||||
../modules/gpu/nvidia.nix
|
||||
|
||||
(import ../modules/common.nix {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
fileSystems."/mnt/D" = {
|
||||
device = "/dev/disk/by-label/Data";
|
||||
fsType = "ntfs";
|
||||
fsType = "ntfs3";
|
||||
options = ["umask=0022" "gid=100" "uid=1000" "nofail" ];
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
{ pkgs, ... }: {
|
||||
services.transmission = {
|
||||
enable = true; # Включаем демон
|
||||
package = pkgs.transmission_4;
|
||||
openRPCPort = true; # Открываем порт для веб-интерфейса
|
||||
settings = {
|
||||
download-dir = "/home/sweetbread/Downloads"; # Папка для загрузок
|
||||
};
|
||||
};
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -24,6 +24,7 @@
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
host.laptop = true;
|
||||
host.nvidia.prime.enable = true;
|
||||
|
||||
environment.systemPackages = [ pkgs.dbgate ];
|
||||
}
|
||||
|
||||
+17
-1
@@ -7,7 +7,23 @@
|
||||
];
|
||||
|
||||
options = {
|
||||
host.laptop = lib.mkEnableOption "laptop mode";
|
||||
host = {
|
||||
laptop = lib.mkEnableOption "laptop mode";
|
||||
|
||||
nvidia.prime = {
|
||||
enable = lib.mkEnableOption "NVIDIA PRIME offload for hybrid graphics";
|
||||
intelBusId = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "PCI:0:2:0";
|
||||
description = "Intel/iGPU Bus ID used by NVIDIA PRIME.";
|
||||
};
|
||||
nvidiaBusId = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "PCI:1:0:0";
|
||||
description = "NVIDIA dGPU Bus ID used by NVIDIA PRIME.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
|
||||
@@ -1,6 +1,16 @@
|
||||
{ config, pkgs-stable, lib, ... }: {
|
||||
boot.kernelParams = [ "nvidia-drm.modeset=1" ];
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
{ config, pkgs-stable, lib, ... }: let
|
||||
primeCfg = config.host.nvidia.prime;
|
||||
isPrimeOffload = primeCfg.enable;
|
||||
in {
|
||||
boot = {
|
||||
kernelParams = [ "nvidia-drm.modeset=1" ];
|
||||
initrd.kernelModules = lib.optionals isPrimeOffload [ "i915" ];
|
||||
};
|
||||
|
||||
services.xserver.videoDrivers =
|
||||
if isPrimeOffload
|
||||
then [ "modesetting" "nvidia" ]
|
||||
else [ "nvidia" ];
|
||||
|
||||
hardware = {
|
||||
graphics = {
|
||||
@@ -24,21 +34,28 @@
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
|
||||
prime = lib.optionalAttrs config.host.laptop {
|
||||
intelBusId = "PCI:0:2:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
prime = lib.optionalAttrs isPrimeOffload {
|
||||
offload = {
|
||||
enable = true;
|
||||
enableOffloadCmd = true;
|
||||
};
|
||||
intelBusId = primeCfg.intelBusId;
|
||||
nvidiaBusId = primeCfg.nvidiaBusId;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
__GL_VRR_ALLOWED = 1;
|
||||
ELECTRON_OZONE_PLATFORM_HINT = "auto";
|
||||
NIXOS_OZONE_WL = 1;
|
||||
} // lib.optionalAttrs isPrimeOffload {
|
||||
LIBVA_DRIVER_NAME = "iHD";
|
||||
} // lib.optionalAttrs (!isPrimeOffload) {
|
||||
WLR_NO_HARDWARE_CURSORS = 1;
|
||||
WLR_DRM_NO_ATOMIC = 1;
|
||||
GBM_BACKEND = "nvidia-drm";
|
||||
LIBVA_DRIVER_NAME = "nvidia";
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
__GL_VRR_ALLOWED = 1;
|
||||
ELECTRON_OZONE_PLATFORM_HINT = "auto";
|
||||
NIXOS_OZONE_WL = 1;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = {
|
||||
V2RAYA_LOG_FILE = "/var/log/v2raya/v2raya.log";
|
||||
V2RAYA_V2RAY_BIN = pkgs.lib.getExe pkgs.xray;
|
||||
V2RAY_LOCATION_ASSET = "/etc/v2raya";
|
||||
XRAY_LOCATION_ASSET = "/etc/v2raya";
|
||||
};
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
# Важно: портал должен быть собран под тот же Hyprland, что и сам Hyprland
|
||||
# (есть отдельная опция именно для этого).
|
||||
programs.hyprland = {
|
||||
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
# Два бэкенда: Hyprland (композитор-специфичное) + GTK (интеграция/диалоги/OpenURI)
|
||||
extraPortals = [
|
||||
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
persistentKeys = true;
|
||||
settings = {
|
||||
Peers = [
|
||||
"tcp://lair.moe:5001"
|
||||
"tls://ip4.01.ekb.ru.dioni.su:9003"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
./user/qt.nix
|
||||
./user/sops.nix
|
||||
./user/ssh.nix
|
||||
./user/waybar.nix
|
||||
./user/yazi.nix
|
||||
./user/zsh.nix
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
configDir = null;
|
||||
|
||||
extraPackages = with inputs.ags.packages.${pkgs.system}; [
|
||||
extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
battery
|
||||
mpris
|
||||
hyprland
|
||||
|
||||
@@ -15,16 +15,18 @@ in {
|
||||
wl-clipboard
|
||||
wl-clip-persist
|
||||
xclip
|
||||
awww
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = let
|
||||
colors = config.lib.stylix.colors;
|
||||
in {
|
||||
enable = true;
|
||||
configType = "hyprlang";
|
||||
xwayland.enable = true;
|
||||
|
||||
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||
plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
# hyprbars # Version mismatch
|
||||
];
|
||||
|
||||
@@ -113,7 +115,7 @@ in {
|
||||
|
||||
exec-once = lib.mkBefore [
|
||||
"systemctl --user start plasma-polkit-agent"
|
||||
"${lib.getExe' pkgs.swww "swww-daemon"}"
|
||||
"awww-daemon"
|
||||
"wl-clip-persist --clipboard both"
|
||||
"clipse -listen"
|
||||
"${lib.getExe' pkgs.udiskie "udiskie"}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ pkgs, pkgs-pinned, inputs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
pkgs-pinned.ayugram-desktop
|
||||
ayugram-desktop
|
||||
vesktop
|
||||
obs-studio
|
||||
mpv
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
mtr
|
||||
imagemagick
|
||||
wl-clipboard
|
||||
pkgsCross.mingw32.wine-discord-ipc-bridge
|
||||
];
|
||||
|
||||
xdg.mimeApps = {
|
||||
|
||||
@@ -1,140 +0,0 @@
|
||||
{ osConfig, config, pkgs, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
font-awesome
|
||||
nerd-fonts.symbols-only
|
||||
playerctl
|
||||
];
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
settings.mainBar = {
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
"hyprland/language"
|
||||
"keyboard-state"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
"mpris"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"tray"
|
||||
"group/system"
|
||||
"pulseaudio"
|
||||
"battery"
|
||||
"clock"
|
||||
];
|
||||
|
||||
clock = {
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
format = "{:L%d %b - %H:%M %a}";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
phone-muted = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" ""];
|
||||
};
|
||||
on-click = "ghostty --title=pulsemixer -e pulsemixer";
|
||||
};
|
||||
|
||||
mpris = {
|
||||
format = "{dynamic}";
|
||||
dynamic-len = if osConfig.host.laptop then 32 else 64;
|
||||
dynamic-order = [ "title" "artist" "album" ];
|
||||
};
|
||||
|
||||
battery = {
|
||||
interval = 5;
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-icons = {
|
||||
default = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
charging = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
};
|
||||
};
|
||||
|
||||
"keyboard-state" = {
|
||||
capslock = true;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
locked = "CAPS";
|
||||
unlocked = "";
|
||||
};
|
||||
};
|
||||
|
||||
"hyprland/language" = {
|
||||
format-en = "en";
|
||||
format-ru = "ru";
|
||||
};
|
||||
|
||||
|
||||
"group/system" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
transition-duration = 500;
|
||||
transition-left-to-right = false;
|
||||
};
|
||||
modules = [
|
||||
"network"
|
||||
"custom/mem"
|
||||
"cpu"
|
||||
"temperature"
|
||||
];
|
||||
};
|
||||
|
||||
network = {
|
||||
format = "{ifname}";
|
||||
format-wifi = " {essid} ({signalStrength}%)";
|
||||
format-ethernet = "{ifname}";
|
||||
format-disconnected = "";
|
||||
tooltip-format = "{ipaddr}";
|
||||
max-length = 50;
|
||||
on-click = "ghostty --title=nmtui -e nmtui";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
format = "{}";
|
||||
tooltip = true;
|
||||
interval = 1800;
|
||||
exec = "python3 $HOME/.config/waybar/scripts/wttr.py";
|
||||
return-type = "json";
|
||||
};
|
||||
|
||||
"custom/mem" = {
|
||||
format = "{} ";
|
||||
interval = 3;
|
||||
exec = "free -h | awk '/Mem:/{printf $3}'";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 2;
|
||||
format = "{usage}% ";
|
||||
min-length = 6;
|
||||
};
|
||||
|
||||
temperature = {
|
||||
hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = ["" "" "" "" ""];
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
+34
-11
@@ -25,7 +25,7 @@
|
||||
};
|
||||
plugin = {
|
||||
preloaders = [
|
||||
{ name = "*.crdownload"; run = "noop"; }
|
||||
{ url = "*.crdownload"; run = "noop"; }
|
||||
];
|
||||
|
||||
prepend_previewers = [
|
||||
@@ -37,28 +37,51 @@
|
||||
];
|
||||
|
||||
prepend_fetchers = [
|
||||
{ id = "git"; mime = "*"; run = "git"; }
|
||||
{ group = "git"; url = "*"; run = "git"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
plugins = with pkgs.yaziPlugins; {
|
||||
plugins = let
|
||||
yaziPlugin = name: pkgs.stdenvNoCC.mkDerivation {
|
||||
pname = "${name}.yazi";
|
||||
version = "unstable";
|
||||
src = inputs.yazi-plugins;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r ${name}.yazi/* $out/
|
||||
rm -f $out/LICENSE
|
||||
cp LICENSE $out/LICENSE
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in with pkgs.yaziPlugins; {
|
||||
inherit
|
||||
chmod
|
||||
ouch
|
||||
full-border
|
||||
starship
|
||||
mount
|
||||
git
|
||||
toggle-pane
|
||||
;
|
||||
|
||||
full-border = {
|
||||
package = yaziPlugin "full-border";
|
||||
setup = true;
|
||||
};
|
||||
|
||||
starship = {
|
||||
package = starship;
|
||||
setup = true;
|
||||
};
|
||||
|
||||
git = {
|
||||
package = git;
|
||||
setup = true;
|
||||
};
|
||||
};
|
||||
|
||||
initLua = ''
|
||||
require("git"):setup()
|
||||
require("full-border"):setup()
|
||||
require("starship"):setup()
|
||||
|
||||
Status:children_add(function()
|
||||
local h = cx.active.current.hovered
|
||||
if not h or ya.target_family() ~= "unix" then
|
||||
@@ -83,7 +106,7 @@
|
||||
}
|
||||
{
|
||||
on = "Y";
|
||||
run = ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list'';
|
||||
run = ''shell -- for path in %s; do echo "file://$path"; done | wl-copy -t text/uri-list'';
|
||||
desc = "Copy files into system clipboard";
|
||||
}
|
||||
{
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
SUBSTITUTERS=(
|
||||
"https://cache.garnix.io"
|
||||
"https://cache.m7.rs"
|
||||
"https://cache.nixos.org"
|
||||
"https://cache.soopy.moe"
|
||||
"https://chaotic-nyx.cachix.org"
|
||||
"https://colmena.cachix.org"
|
||||
"https://hyprland.cachix.org"
|
||||
"https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"
|
||||
"https://mirrors.ustc.edu.cn/nix-channels/store"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://nix-gaming.cachix.org"
|
||||
"https://nixos-cache-proxy.cofob.dev"
|
||||
"https://nixos.snix.store"
|
||||
"https://nixos.tvix.store"
|
||||
)
|
||||
|
||||
TEST_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
|
||||
|
||||
clean_url() {
|
||||
echo "$1" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
|
||||
}
|
||||
|
||||
check_speed() {
|
||||
local url=$(clean_url "$1")
|
||||
local cache_info=$(curl -s -o /dev/null -w "%{http_code},%{time_total}" -L "${url}/nix-cache-info" --max-time 10 --insecure)
|
||||
IFS=',' read -r code time_info <<< "$cache_info"
|
||||
|
||||
if [[ "$code" == "200" ]]; then
|
||||
echo -e "\033[1;32m✓ nix-cache-info: ${time_info}s\033[0m"
|
||||
|
||||
local narinfo_time=$(curl -s -o /dev/null -w "%{time_total}" -L "${url}/${TEST_HASH}.narinfo" --max-time 10 --insecure)
|
||||
echo -e " .narinfo: \033[1;33m${narinfo_time}s\033[0m"
|
||||
|
||||
local nar_time=$(curl -s -o /dev/null -w "%{time_total}" -L "${url}/nar/${TEST_HASH}.nar.xz" --max-time 10 --insecure)
|
||||
echo -e " .nar.xz: \033[1;33m${nar_time}s\033[0m"
|
||||
|
||||
local speed=$(curl -s -o /dev/null -w "%{speed_download}" -L "${url}/nix-cache-info" --max-time 10 --insecure)
|
||||
echo -e " СКОРОСТЬ: \033[1;36m$(numfmt --to=iec-i --suffix=B/s $speed | sed 's/Bi *//')\033[0m"
|
||||
return 0
|
||||
else
|
||||
echo -e "\033[1;31m✗ nix-cache-info: $code (${time_info}s)\033[0m"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
main() {
|
||||
echo "🚀 Тест скорости Nix Substituters ($(date '+%H:%M:%S'))"
|
||||
echo "=============================================="
|
||||
|
||||
local working=()
|
||||
|
||||
for url in "${SUBSTITUTERS[@]}"; do
|
||||
local clean_url=$(clean_url "$url")
|
||||
echo -e "\n\033[1;34m=== $clean_url ===\033[0m"
|
||||
|
||||
if check_speed "$url"; then
|
||||
working+=("$clean_url")
|
||||
fi
|
||||
echo "----------------------------------------"
|
||||
done
|
||||
|
||||
echo -e "\n\033[1;36m🏆 РЕКОМЕНДУЕМЫЙ ПОРЯДОК (по скорости):\033[0m"
|
||||
printf 'nix.settings.substituters = [\n'
|
||||
for url in "${working[@]}"; do
|
||||
printf ' "%s"\n' "$url"
|
||||
done
|
||||
printf '];\n'
|
||||
}
|
||||
|
||||
main
|
||||
@@ -80,6 +80,8 @@
|
||||
in {
|
||||
stylix = {
|
||||
enable = true;
|
||||
overlays.enable = false;
|
||||
|
||||
targets = {
|
||||
hyprland.enable = false;
|
||||
waybar.enable = false;
|
||||
|
||||
+212
-33
@@ -1,35 +1,214 @@
|
||||
{ config, pkgs, ... }: {
|
||||
programs.waybar.settings.mainBar.spacing = 4;
|
||||
programs.waybar.style = let
|
||||
{ osConfig, config, pkgs, lib, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
font-awesome
|
||||
nerd-fonts.symbols-only
|
||||
playerctl
|
||||
cava
|
||||
pulsemixer
|
||||
];
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
settings.mainBar = {
|
||||
modules-center = [
|
||||
"group/left"
|
||||
"group/center"
|
||||
"group/right"
|
||||
];
|
||||
|
||||
|
||||
"group/left" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"hyprland/workspaces"
|
||||
"custom/sep-left"
|
||||
"hyprland/language"
|
||||
"keyboard-state"
|
||||
];
|
||||
};
|
||||
|
||||
"group/center" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"cava"
|
||||
"mpris"
|
||||
];
|
||||
};
|
||||
|
||||
"group/right" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"tray"
|
||||
"custom/sep-left"
|
||||
"group/system"
|
||||
"custom/sep-left"
|
||||
"pulseaudio"
|
||||
"custom/sep-left"
|
||||
"battery"
|
||||
"clock"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
cava = {
|
||||
bars = 9;
|
||||
bar_delimiter = 0;
|
||||
stereo = false;
|
||||
input_delay = 0;
|
||||
format-icons = [" " "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
};
|
||||
|
||||
clock = {
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
format = "{:L%d %b - %H:%M %a}";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
phone-muted = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" ""];
|
||||
};
|
||||
on-click = "ghostty --title=pulsemixer -e pulsemixer";
|
||||
};
|
||||
|
||||
mpris = {
|
||||
format = "{dynamic}";
|
||||
dynamic-len = if osConfig.host.laptop then 16 else 32;
|
||||
dynamic-order = [ "title" "artist" "album" ];
|
||||
};
|
||||
|
||||
battery = {
|
||||
interval = 5;
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}% | ";
|
||||
format-icons = {
|
||||
default = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
charging = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
};
|
||||
};
|
||||
|
||||
"custom/sep-left" = {
|
||||
format = " | ";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"keyboard-state" = {
|
||||
capslock = true;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
locked = "CAPS";
|
||||
unlocked = "";
|
||||
};
|
||||
};
|
||||
|
||||
"hyprland/language" = {
|
||||
format-en = "en";
|
||||
format-ru = "ru";
|
||||
};
|
||||
|
||||
"group/system" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
transition-duration = 500;
|
||||
transition-left-to-right = false;
|
||||
};
|
||||
modules = [
|
||||
"network"
|
||||
"custom/mem"
|
||||
"cpu"
|
||||
"temperature"
|
||||
];
|
||||
};
|
||||
|
||||
network = {
|
||||
format = "{ifname}";
|
||||
format-wifi = " {essid} ({signalStrength}%)";
|
||||
format-ethernet = "{ifname}";
|
||||
format-disconnected = "";
|
||||
tooltip-format = "{ipaddr}";
|
||||
max-length = 50;
|
||||
on-click = "ghostty --title=nmtui -e nmtui";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
format = "{}";
|
||||
tooltip = true;
|
||||
interval = 1800;
|
||||
exec = "python3 $HOME/.config/waybar/scripts/wttr.py";
|
||||
return-type = "json";
|
||||
};
|
||||
|
||||
"custom/mem" = {
|
||||
format = "{} ";
|
||||
interval = 3;
|
||||
exec = "free -h | awk '/Mem:/{printf $3}'";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 2;
|
||||
format = "{usage}% ";
|
||||
min-length = 6;
|
||||
};
|
||||
|
||||
temperature = {
|
||||
hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = ["" "" "" "" ""];
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
|
||||
style = let
|
||||
colors = config.lib.stylix.colors.withHashtag;
|
||||
accent = colors.base0E;
|
||||
scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
|
||||
window#waybar {
|
||||
background: ${colors.base00}80;
|
||||
background: transparent;
|
||||
color: ${colors.base05};
|
||||
font-weight: bold;
|
||||
font-size: .85em;
|
||||
& > * { padding: 0 0 6px 0; }
|
||||
}
|
||||
|
||||
#mpris,
|
||||
#pulseaudio,
|
||||
#network,
|
||||
#battery,
|
||||
#cpu,
|
||||
#temperature,
|
||||
#custom-mem,
|
||||
#clock {
|
||||
background: ${colors.base01};
|
||||
padding: 8px;
|
||||
.modules-center {
|
||||
background: ${colors.base01}CC;
|
||||
border-radius: 12px;
|
||||
padding: 10px;
|
||||
box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
|
||||
#left,
|
||||
#right,
|
||||
#center {
|
||||
background: ${colors.base02};
|
||||
padding: 0 2px;
|
||||
margin: 0 8px;
|
||||
border-radius: 8px;
|
||||
}
|
||||
#left { margin-left: 0; }
|
||||
#right { margin-right: 0; }
|
||||
|
||||
#clock { padding-right: 10px; }
|
||||
|
||||
#cava { padding: 0 10px; }
|
||||
|
||||
#language { padding: 8px; }
|
||||
|
||||
#workspaces,
|
||||
#tray {
|
||||
background: ${colors.base01};
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
color: ${colors.base05};
|
||||
padding: 0 2px;
|
||||
@@ -37,52 +216,51 @@
|
||||
border: 1pt solid transparent;
|
||||
min-width: 20px;
|
||||
|
||||
&:hover { background: ${colors.base02}; }
|
||||
&:hover { background: ${colors.base03}; }
|
||||
|
||||
&.active {
|
||||
background: ${accent};
|
||||
color: ${colors.base00};
|
||||
min-width: 30px;
|
||||
min-width: 25px;
|
||||
|
||||
&:hover {
|
||||
border-color: ${accent};
|
||||
background: ${colors.base02};
|
||||
background: ${colors.base03};
|
||||
color: ${accent};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#mpris {
|
||||
border-radius: 0 0 20px 20px;
|
||||
padding: 10px;
|
||||
&:hover { background: ${colors.base02}; }
|
||||
border-radius: 8px;
|
||||
padding: 4px;
|
||||
&:hover { background: ${colors.base03}; }
|
||||
&.playing {
|
||||
border: 3px solid ${accent};
|
||||
border-top-color: transparent;
|
||||
padding: calc(10px - 3px);
|
||||
border: 2px solid ${accent};
|
||||
padding: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
#tray {
|
||||
widget {
|
||||
border: 1pt solid transparent;
|
||||
&:hover { background: ${colors.base02}; }
|
||||
&:hover { background: ${colors.base03}; }
|
||||
& > image { padding: 8px; }
|
||||
}
|
||||
|
||||
& > .passive { border-color: ${colors.base02}; }
|
||||
& > .passive { border-color: ${colors.base03}; }
|
||||
& > .needs-attention { border-color: ${colors.base09}; }
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
&:hover { background: ${colors.base02}; }
|
||||
&:hover { background: ${colors.base03}; }
|
||||
&.muted {
|
||||
background: ${colors.base08};
|
||||
color: ${colors.base00};
|
||||
color: ${colors.base01};
|
||||
|
||||
&:hover {
|
||||
color: ${colors.base08};
|
||||
background: ${colors.base02};
|
||||
background: ${colors.base03};
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -139,4 +317,5 @@
|
||||
nativeBuildInputs = [ pkgs.dart-sass ];
|
||||
} "sass ${scssFile} $out";
|
||||
in builtins.readFile cssFile;
|
||||
};
|
||||
}
|
||||
+1
-1
@@ -57,7 +57,7 @@
|
||||
|
||||
services.greetd = let
|
||||
tuigreet = lib.getExe pkgs.tuigreet;
|
||||
session = lib.getExe' inputs.hyprland.packages.${pkgs.system}.default "start-hyprland";
|
||||
session = lib.getExe' inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default "start-hyprland";
|
||||
in {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
filename = choice(listdir(folder))
|
||||
|
||||
finally:
|
||||
system(f"${lib.getExe pkgs.swww} img {folder}/{filename} --transition-type center")
|
||||
system(f"awww img {folder}/{filename} --transition-type center")
|
||||
'';
|
||||
in {
|
||||
settings = {
|
||||
|
||||
@@ -83,6 +83,8 @@ in {
|
||||
# {
|
||||
stylix = {
|
||||
enable = true;
|
||||
overlays.enable = false;
|
||||
|
||||
targets = {
|
||||
hyprpaper.enable = lib.mkForce false;
|
||||
waybar.enable = false;
|
||||
@@ -142,9 +144,12 @@ in {
|
||||
};
|
||||
|
||||
gtk = {
|
||||
gtk4.extraConfig = {
|
||||
gtk4 = {
|
||||
theme = null;
|
||||
extraConfig = {
|
||||
gtk-application-prefer-dark-theme = true;
|
||||
};
|
||||
};
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = true;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,157 @@
|
||||
{ config, pkgs, ... }: {
|
||||
programs.waybar.settings.mainBar.spacing = 8;
|
||||
programs.waybar.style = let
|
||||
{ osConfig, config, pkgs, lib, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
font-awesome
|
||||
nerd-fonts.symbols-only
|
||||
playerctl
|
||||
cava
|
||||
pulsemixer
|
||||
];
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
settings.mainBar = {
|
||||
spacing = 8;
|
||||
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
"hyprland/language"
|
||||
"keyboard-state"
|
||||
"cava"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
"mpris"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"tray"
|
||||
"group/system"
|
||||
"pulseaudio"
|
||||
"battery"
|
||||
"clock"
|
||||
];
|
||||
|
||||
cava = {
|
||||
bars = 14;
|
||||
sleep_timer = 5;
|
||||
hide_on_silence = true;
|
||||
bar_delimiter = 0;
|
||||
input_delay = 0;
|
||||
format-icons = [" " "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
};
|
||||
|
||||
clock = {
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
format = "{:L%d %b - %H:%M %a}";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
phone-muted = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" ""];
|
||||
};
|
||||
on-click = "ghostty --title=pulsemixer -e pulsemixer";
|
||||
};
|
||||
|
||||
mpris = {
|
||||
format = "{dynamic}";
|
||||
dynamic-len = if osConfig.host.laptop then 32 else 64;
|
||||
dynamic-order = [ "title" "artist" "album" ];
|
||||
};
|
||||
|
||||
battery = {
|
||||
interval = 5;
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-icons = {
|
||||
default = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
charging = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
};
|
||||
};
|
||||
|
||||
"keyboard-state" = {
|
||||
capslock = true;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
locked = "CAPS";
|
||||
unlocked = "";
|
||||
};
|
||||
};
|
||||
|
||||
"hyprland/language" = {
|
||||
format-en = "en";
|
||||
format-ru = "ru";
|
||||
};
|
||||
|
||||
|
||||
"group/system" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
transition-duration = 500;
|
||||
transition-left-to-right = false;
|
||||
};
|
||||
modules = [
|
||||
"network"
|
||||
"custom/mem"
|
||||
"cpu"
|
||||
"temperature"
|
||||
];
|
||||
};
|
||||
|
||||
network = {
|
||||
format = "{ifname}";
|
||||
format-wifi = " {essid} ({signalStrength}%)";
|
||||
format-ethernet = "{ifname}";
|
||||
format-disconnected = "";
|
||||
tooltip-format = "{ipaddr}";
|
||||
max-length = 50;
|
||||
on-click = "ghostty --title=nmtui -e nmtui";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
format = "{}";
|
||||
tooltip = true;
|
||||
interval = 1800;
|
||||
exec = "python3 $HOME/.config/waybar/scripts/wttr.py";
|
||||
return-type = "json";
|
||||
};
|
||||
|
||||
"custom/mem" = {
|
||||
format = "{} ";
|
||||
interval = 3;
|
||||
exec = "free -h | awk '/Mem:/{printf $3}'";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 2;
|
||||
format = "{usage}% ";
|
||||
min-length = 6;
|
||||
};
|
||||
|
||||
temperature = {
|
||||
hwmon-path = "/sys/class/hwmon/hwmon5/temp1_input";
|
||||
critical-threshold = 80;
|
||||
format = "{temperatureC}°C {icon}";
|
||||
format-icons = ["" "" "" "" ""];
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
|
||||
style = let
|
||||
colors = config.lib.stylix.colors.withHashtag;
|
||||
radius = "6px";
|
||||
scssFile = pkgs.writeText "waybar.scss" /*scss*/ ''
|
||||
@@ -14,6 +165,7 @@
|
||||
& > * { padding: 8px; }
|
||||
}
|
||||
|
||||
#cava,
|
||||
#language,
|
||||
#mpris,
|
||||
#pulseaudio,
|
||||
@@ -138,6 +290,7 @@
|
||||
nativeBuildInputs = [ pkgs.dart-sass ];
|
||||
} "sass ${scssFile} $out";
|
||||
in builtins.readFile cssFile;
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings.layerrule = [
|
||||
"blur on, match:namespace waybar"
|
||||
|
||||
Reference in New Issue
Block a user