Compare commits

..

No commits in common. "01bc1610bf974f5808df43bbd93c38f02e306de2" and "879ea3474a8db05b5c1bcfc6cd44230a8c984eb7" have entirely different histories.

98 changed files with 652 additions and 604 deletions

336
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1740876632, "lastModified": 1736877444,
"narHash": "sha256-u695YUS3R5HI1VQp7feCifWYOn3Gh6yGde1vp5rKqTg=", "narHash": "sha256-K25atZ9alRsGb6TW+rRcpJTbtP5tnb3qusd762B2qWw=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "5505af25160f16ad26f9107aebee9ea7713b59d9", "rev": "a1f0ce3bfbe9f0cc81e8b7def5e652a021e95c98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,11 +25,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1738087375, "lastModified": 1737670873,
"narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", "narHash": "sha256-XRAGO5gQlD11Px43fTGbCedXQfSIwnd1KXF3enHml1E=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", "rev": "cbe373ff8571126424f8f11b1cc01d9ad19db13e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741282631, "lastModified": 1737636397,
"narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "81498562d0f53e613d30368bb5b076784fa86f80", "rev": "7fe006981fae53e931f513026fc754e322f13145",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1741757048, "lastModified": 1737874107,
"narHash": "sha256-MN3LM3xugPm8EnDQ57RxS8WWhyPYF4eGUicAvu6Sk9k=", "narHash": "sha256-7E3um7wF4zFOhv3Ec0V0fV/hiBbN1WCwsJ87LRjwKIE=",
"owner": "ayugram-port", "owner": "ayugram-port",
"repo": "ayugram-desktop", "repo": "ayugram-desktop",
"rev": "715dc517f4f243fb406a6a2f17edb8833cc33463", "rev": "6fd586fcf80f14507f302eab79cb9d008748311d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,28 +164,27 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732806396, "lastModified": 1735953590,
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github" "type": "github"
} }
}, },
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1741628778, "lastModified": 1736899990,
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,6 +226,7 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -242,28 +242,6 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@ -331,11 +309,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741379162, "lastModified": 1735882644,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +390,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741791118, "lastModified": 1737762889,
"narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18780912345970e5b546b1b085385789b6935a83", "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +411,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741635347, "lastModified": 1736785676,
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -462,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738664950, "lastModified": 1737634937,
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -491,11 +469,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739049071, "lastModified": 1737634889,
"narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -511,8 +489,8 @@
"hyprgraphics": "hyprgraphics", "hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils", "hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang", "hyprlang": "hyprlang_2",
"hyprutils": "hyprutils", "hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
@ -520,11 +498,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1741788549, "lastModified": 1737894219,
"narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", "narHash": "sha256-lNIHxX7F2hh0u0oFoItZIYo2vIh5OGcWXpYxllHfjMs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", "rev": "3cd6e3960f0cbf500786497017ff3084cc9deb17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,11 +528,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738966025, "lastModified": 1737682243,
"narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=", "narHash": "sha256-sQh5Wjt+BWzcLmL1/Aaup9slDJfHd952BfxFvJnDsnc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451", "rev": "7634792d199d32ed9396d5864e6431cde1cca6bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +553,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738422629, "lastModified": 1737556638,
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +568,7 @@
}, },
"hyprland-qt-support": { "hyprland-qt-support": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": "hyprlang",
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"hyprland-qtutils", "hyprland-qtutils",
@ -623,14 +597,8 @@
"hyprland-qtutils": { "hyprland-qtutils": {
"inputs": { "inputs": {
"hyprland-qt-support": "hyprland-qt-support", "hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [ "hyprutils": [
"hyprland", "hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils" "hyprutils"
], ],
"nixpkgs": [ "nixpkgs": [
@ -643,11 +611,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739048983, "lastModified": 1737811848,
"narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,6 +625,36 @@
} }
}, },
"hyprlang": { "hyprlang": {
"inputs": {
"hyprutils": "hyprutils",
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"systems"
]
},
"locked": {
"lastModified": 1737634606,
"narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprland", "hyprland",
@ -672,11 +670,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741191527, "lastModified": 1737634606,
"narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -686,6 +684,37 @@
} }
}, },
"hyprutils": { "hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"systems"
]
},
"locked": {
"lastModified": 1737632363,
"narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "006620eb29d54ea9086538891404c78563d1bae1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -697,11 +726,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741123584, "lastModified": 1737725508,
"narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -722,11 +751,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739870480, "lastModified": 1735493474,
"narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +766,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1740560979, "lastModified": 1734424634,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5135c59491985879812717f4c9fea69604e7f26f", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -765,11 +794,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1740743217, "lastModified": 1737672001,
"narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=", "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c", "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -797,11 +826,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1737746512,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -813,11 +842,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741246872, "lastModified": 1737632463,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -829,16 +858,16 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1741865919, "lastModified": 1737746512,
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "master", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -861,11 +890,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1741513245, "lastModified": 1736798957,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -891,29 +920,6 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"stylix",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1741693509,
"narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -924,11 +930,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741379162, "lastModified": 1737465171,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -957,11 +963,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1741644481, "lastModified": 1737411508,
"narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e653d71e82575a43fe9d228def8eddb73887b866", "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -983,20 +989,18 @@
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"nur": "nur",
"systems": "systems_2", "systems": "systems_2",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1741801299, "lastModified": 1737861120,
"narHash": "sha256-ZN5xn3HmG5+RWBc3gGdRfkyt98Tc1IhsUK7txwAw46s=", "narHash": "sha256-V/GWU1BQwbxyZif9RBvwn10S1KX+86uPkkI41KQEcQQ=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "9e3ab4d208e2cc2aef5ab0f8e18932ebf8064fc5", "rev": "d6951d0b2ffe74e4779a180e9b6a0e17627756e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1069,30 +1073,14 @@
"type": "github" "type": "github"
} }
}, },
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1741468895,
"narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "schemes",
"type": "github"
}
},
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740877430, "lastModified": 1735737224,
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1119,7 +1107,7 @@
}, },
"tlock": { "tlock": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
@ -1138,28 +1126,6 @@
"url": "https://github.com/eklairs/tlock" "url": "https://github.com/eklairs/tlock"
} }
}, },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [

View File

@ -18,7 +18,7 @@
inputs = { inputs = {
aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.url = "github:ezKEa/aagl-gtk-on-nix";
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
@ -38,41 +38,87 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: let outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... }@inputs:
let
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
nixosConfigurations = { nixosConfigurations = {
Rias = nixpkgs.lib.nixosSystem { Rias = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
inherit inputs system; inherit inputs system;
}; };
modules = [ ./host/Rias/configuration.nix ]; modules = [
./nixos/hosts/Rias/configuration.nix
inputs.sops-nix.nixosModules.sops
];
}; };
Senko = nixpkgs.lib.nixosSystem { Senko = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
inherit inputs system; inherit inputs system;
}; };
modules = [ ./host/Senko/configuration.nix ]; modules = [
./nixos/hosts/Senko/configuration.nix
inputs.sops-nix.nixosModules.sops
];
}; };
Eclipse = nixpkgs.lib.nixosSystem { Eclipse = nixpkgs-stable.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-unstable = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
inherit inputs system; inherit inputs system;
}; };
modules = [ ./host/Eclipse/configuration.nix ]; modules = [
./nixos/hosts/Eclipse/configuration.nix
inputs.sops-nix.nixosModules.sops
];
};
};
homeConfigurations = {
sweetbread = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {
inherit inputs;
pkgs-stable = import nixpkgs-stable {
inherit system;
config.allowUnfree = true;
};
};
modules = [
./home-manager/users/sweetbread/home.nix
inputs.sops-nix.homeManagerModules.sops
inputs.stylix.homeManagerModules.stylix
];
};
chest = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {
inherit inputs;
pkgs-stable = import nixpkgs-stable {
inherit system;
config.allowUnfree = true;
};
};
modules = [
./home-manager/users/chest/home.nix
inputs.sops-nix.homeManagerModules.sops
inputs.stylix.homeManagerModules.stylix
];
}; };
}; };

View File

@ -18,5 +18,5 @@
wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ]; wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ];
xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { colors = config.lib.stylix.colors; }); xdg.configFile."ags".source = (pkgs.callPackage ../packages/drvs/ags.nix { colors = config.lib.stylix.colors; });
} }

View File

@ -0,0 +1,16 @@
{
imports = [
./kitty.nix
./qt.nix
./sops.nix
./neofetch.nix
./yazi.nix
./ags.nix
./zsh.nix
./helix.nix
./btop.nix
./wms/wofi.nix
./wms/mako.nix
];
}

View File

@ -6,7 +6,6 @@
settings = { settings = {
# theme = "catppuccin-mocha"; # theme = "catppuccin-mocha";
editor = { editor = {
insert-final-newline = false;
whitespace.render = { whitespace.render = {
space = "all"; space = "all";
tab = "all"; tab = "all";

View File

@ -1,6 +1,4 @@
{ config, pkgs, lib, ... }: { pkgs, lib, ... }: {
lib.mkIf config.programs.hyprlock.enable {
wayland.windowManager.hyprland.settings.exec-once = [ "hyprlock" ]; wayland.windowManager.hyprland.settings.exec-once = [ "hyprlock" ];
programs.hyprlock = let programs.hyprlock = let
@ -10,9 +8,12 @@ lib.mkIf config.programs.hyprlock.enable {
hash = "sha256-wRFs/Inw1wEzF5UKFn/o6e/xH5ZJ3SVNxxno+mDx2Fs="; hash = "sha256-wRFs/Inw1wEzF5UKFn/o6e/xH5ZJ3SVNxxno+mDx2Fs=";
}; };
in { in {
enable = true;
settings = { settings = {
background = { background = {
path = lib.mkForce "${image}"; path = lib.mkForce "${image}";
color = "rgba(25, 20, 20, 1.0)";
blur_passes = 0; blur_passes = 0;
blur_size = 7; blur_size = 7;
noise = 0.0117; noise = 0.0117;
@ -57,12 +58,17 @@ lib.mkIf config.programs.hyprlock.enable {
dots_center = false; dots_center = false;
dots_rounding = -1; dots_rounding = -1;
dots_fade_time = 200; dots_fade_time = 200;
# outer_color = "rgb(151515)";
# inner_color = "rgb(200, 200, 200)";
# font_color = "rgb(10, 10, 10)";
font_family = "Noto Sans"; font_family = "Noto Sans";
fade_on_empty = true; fade_on_empty = true;
fade_timeout = 1000; fade_timeout = 1000;
placeholder_text = "<i>Input Password...</i>"; placeholder_text = "<i>Input Password...</i>";
hide_input = false; hide_input = false;
rounding = -1; rounding = -1;
# check_color = "rgb(204, 136, 34)";
# fail_color = "rgb(204, 34, 34)";
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>"; fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
fail_timeout = 2000; fail_timeout = 2000;
fail_transition = 300; fail_transition = 300;

View File

@ -1,6 +1,6 @@
{ config, ... }: { { config, ... }: {
sops = { sops = {
defaultSopsFile = ../../user/${config.home.username}/secrets.yaml; defaultSopsFile = ../users/${config.home.username}/secrets.yaml;
age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt"; age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
secrets."tokens/apis/wallhaven" = {}; secrets."tokens/apis/wallhaven" = {};

View File

@ -2,14 +2,8 @@
yazi-plugins = pkgs.fetchFromGitHub { yazi-plugins = pkgs.fetchFromGitHub {
owner = "yazi-rs"; owner = "yazi-rs";
repo = "plugins"; repo = "plugins";
rev = "07258518f3bffe28d87977bc3e8a88e4b825291b"; rev = "7afba3a73cdd69f346408b77ea5aac26fe09e551";
hash = "sha256-axoMrOl0pdlyRgckFi4DiS+yBKAIHDhVeZQJINh8+wk="; hash = "sha256-w9dSXW0NpgMOTnBlL/tzlNSCyRpZNT4XIcWZW5NlIUQ=";
};
starship = pkgs.fetchFromGitHub {
owner = "Rolv-Apneseth";
repo = "starship.yazi";
rev = "d1cd0a38aa6a2c2e86e62a466f43e415f781031e";
sha256 = "sha256-XiEsykudwYmwSNDO41b5layP1DqVa89e6Emv9Qf0mz0=";
}; };
in { in {
programs.yazi = { programs.yazi = {
@ -31,7 +25,12 @@ in {
chmod = "${yazi-plugins}/chmod.yazi"; chmod = "${yazi-plugins}/chmod.yazi";
full-border = "${yazi-plugins}/full-border.yazi"; full-border = "${yazi-plugins}/full-border.yazi";
max-preview = "${yazi-plugins}/max-preview.yazi"; max-preview = "${yazi-plugins}/max-preview.yazi";
starship = starship; starship = pkgs.fetchFromGitHub {
owner = "Rolv-Apneseth";
repo = "starship.yazi";
rev = "247f49da1c408235202848c0897289ed51b69343";
sha256 = "sha256-0J6hxcdDX9b63adVlNVWysRR5htwAtP5WhIJ2AK2+Gs=";
};
}; };
initLua = '' initLua = ''

View File

@ -45,6 +45,8 @@
}; };
}; };
zellij.enable = true;
zsh = { zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;

View File

@ -1,8 +1,8 @@
{ pkgs, inputs, pkgs-stable, ... }: { { pkgs, pkgs-stable, inputs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
google-chrome pkgs-stable.google-chrome
inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop
pkgs-stable.vesktop vesktop
obs-studio obs-studio
mpv mpv
obsidian obsidian

View File

@ -17,6 +17,5 @@
hexyl hexyl
jq jq
litecli litecli
trashy
]; ];
} }

View File

@ -74,28 +74,23 @@
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [ plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [
# hyprbars # Version mismatch hyprbars
]; ];
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
ecosystem.no_donation_nag = true;
env = [ env = [
"LIBVA_DRIVER_NAME,nvidia" "LIBVA_DRIVER_NAME,nvidia"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
"GBM_BACKEND,nvidia"
"XDG_SESSION_TYPE,wayland" "XDG_SESSION_TYPE,wayland"
"QT_QPA_PLATFORM,wayland" "GBM_BACKEND,nvidia"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
"XDG_CURRENT_DESKTOP,Hyprland"
"XDG_SESSION_DESKTOP,Hyprland"
"WLR_NO_HARDWARE_CURSORS,1" "WLR_NO_HARDWARE_CURSORS,1"
"XDG_CURRENT_DESKTOP,Hyprland"
"XDG_SESSION_TYPE,wayland"
"XDG_SESSION_DESKTOP,Hyprland"
"XCURSOR_SIZE,36" "XCURSOR_SIZE,36"
"QT_QPA_PLATFORM,wayland"
"XDG_SCREENSHOTS_DIR,~/screens" "XDG_SCREENSHOTS_DIR,~/screens"
]; ];
@ -117,7 +112,7 @@
natural_scroll = false; natural_scroll = false;
}; };
sensitivity = 0; sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
}; };
windowrule = [ windowrule = [

View File

@ -0,0 +1,26 @@
{ pkgs, pkgs-stable, ... }: {
imports = [
../../modules/bundle.nix
../../packages/art.nix
../../packages/desktop.nix
./modules/git.nix
./modules/hyprland.nix
./modules/style.nix
];
nixpkgs.config.allowUnfree = true;
home = {
username = "chest";
homeDirectory = "/home/chest";
stateVersion = "23.11";
packages = with pkgs; [
nautilus
] ++ (with pkgs-stable; [
jetbrains.pycharm-community
]);
};
}

View File

@ -2,6 +2,6 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "cheeest"; userName = "cheeest";
userEmail = "e.a.sunduk@gmail.com"; userEmail = "a.e.sunduk@gmail.com";
}; };
} }

View File

@ -1,6 +1,6 @@
{ pkgs, lib, config, inputs, ... }: { { pkgs, lib, config, inputs, ... }: {
imports = [( imports = [(
import ../../../modules/user/patterns/hyprland.nix { import ../../../patterns/hyprland.nix {
inherit lib; inherit lib;
inherit pkgs; inherit pkgs;
inherit config; inherit config;

View File

@ -0,0 +1,23 @@
{ pkgs, ... }: {
imports = [
../../modules/bundle.nix
../../modules/hyprlock.nix
../../packages/coding.nix
../../packages/desktop.nix
../../packages/utils.nix
../../packages/art.nix
./modules/git.nix
./modules/hyprland.nix
./modules/style.nix
];
nixpkgs.config.allowUnfree = true;
home = {
username = "sweetbread";
homeDirectory = "/home/sweetbread";
stateVersion = "23.11";
};
}

View File

@ -2,6 +2,6 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Sweetbread"; userName = "Sweetbread";
userEmail = "risdeveau@codrs.ru"; userEmail = "sweetbread@coders-squad.com";
}; };
} }

View File

@ -1,6 +1,6 @@
{ pkgs, lib, config, inputs, ... }: { { pkgs, lib, config, inputs, ... }: {
imports = [( imports = [(
import ../../../modules/user/patterns/hyprland.nix { import ../../../patterns/hyprland.nix {
inherit lib; inherit lib;
inherit pkgs; inherit pkgs;
inherit config; inherit config;

View File

@ -11,8 +11,8 @@
polarity = "dark"; polarity = "dark";
image = pkgs.fetchurl { image = pkgs.fetchurl {
url = "https://w.wallhaven.cc/full/8o/wallhaven-8o52j2.jpg"; url = "https://w.wallhaven.cc/full/kx/wallhaven-kxedr7.jpg";
sha256 = "sha256-u4d21a0Kh5OHEzQMSQ7+ey/Va2ftS1DefrOQFahaeC4="; sha256 = "0ypqnq7bsr2giq7nq1c3xrw2m0gkii9j5zhfp512r93wc96zvm50";
}; };
iconTheme = { iconTheme = {
@ -28,7 +28,7 @@
}; };
serif = { serif = {
name = "GabrieLa"; name = "Gabriela";
package = (pkgs.google-fonts.override { fonts = [ "Gabriela" ]; }); package = (pkgs.google-fonts.override { fonts = [ "Gabriela" ]; });
}; };
@ -40,7 +40,7 @@
opacity = { opacity = {
popups = .8; popups = .8;
terminal = .9; terminal = .75;
}; };
}; };
} }

View File

@ -1,27 +0,0 @@
{ config, pkgs, pkgs-stable, lib, inputs, ...}: {
imports = [
./secrets/secrets.nix
./modules/aagl.nix
./modules/grub.nix
./modules/zram.nix
../modules/nvidia.nix
(import ../modules/common.nix {
inherit lib;
inherit inputs;
hostname = "Eclipse";
})
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-stable;
inherit lib;
inherit inputs;
name = "chest";
})
];
nixpkgs.config.allowBroken = true;
programs.gamemode.enable = true;
}

View File

@ -1,29 +0,0 @@
{ inputs, ... }: {
imports = [ inputs.aagl.nixosModules.default ];
nix.settings = inputs.aagl.nixConfig; # Set up Cachix
programs.honkers-railway-launcher.enable = true;
networking.hosts."0.0.0.0" = [
"overseauspider.yuanshen.com"
"log-upload-os.hoyoverse.com"
"log-upload-os.mihoyo.com"
"dump.gamesafe.qq.com"
"apm-log-upload-os.hoyoverse.com"
"zzz-log-upload-os.hoyoverse.com"
"log-upload.mihoyo.com"
"devlog-upload.mihoyo.com"
"uspider.yuanshen.com"
"sg-public-data-api.hoyoverse.com"
"hkrpg-log-upload-os.hoyoverse.com"
"public-data-api.mihoyo.com"
"prd-lender.cdp.internal.unity3d.com"
"thind-prd-knob.data.ie.unity3d.com"
"thind-gke-usc.prd.data.corp.unity3d.com"
"cdp.cloud.unity3d.com"
"remote-config-proxy-prd.uca.cloud.unity3d.com"
"pc.crashsight.wetest.net"
];
}

View File

@ -1,27 +0,0 @@
{ config, pkgs, pkgs-stable, lib, inputs, ...}: {
imports = [
./secrets/secrets.nix
./modules/grub.nix
./modules/syncthing.nix
../../modules/host/adb.nix
../modules/nvidia.nix
(import ../modules/common.nix {
inherit lib;
inherit inputs;
hostname = "Rias";
})
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-stable;
inherit lib;
inherit inputs;
name = "sweetbread";
fullname = "Sweet Bread";
})
];
programs.gamemode.enable = true;
}

View File

@ -1,26 +0,0 @@
{ config, pkgs, pkgs-stable, lib, inputs, ...}: {
imports = [
./secrets/secrets.nix
./modules/grub.nix
../modules/nvidia.nix
(import ../modules/common.nix {
inherit lib;
inherit inputs;
hostname = "Senko";
})
(import ../../user/common.nix {
inherit config;
inherit pkgs;
inherit pkgs-stable;
inherit lib;
inherit inputs;
name = "sweetbread";
fullname = "Sweet Bread";
})
];
hardware.bluetooth.enable = true;
host.laptop = true;
}

View File

@ -1,11 +0,0 @@
{
sops = {
age.keyFile = "/root/age.key";
secrets = {
vpn_bolt = {
format = "binary";
sopsFile = ./vpn_bolt.db;
};
};
};
}

View File

@ -1 +0,0 @@
../../Rias/secrets/vpn_bolt.db

View File

@ -1,20 +0,0 @@
{ lib, inputs, hostname }: {
imports = [
inputs.sops-nix.nixosModules.sops
../${hostname}/hardware-configuration.nix
../../modules/host.nix
./packages.nix
];
options = {
host.laptop = lib.mkEnableOption "laptop mode";
};
config = {
networking.hostName = hostname;
time.timeZone = lib.mkDefault "Europe/Moscow";
i18n.defaultLocale = lib.mkDefault "ru_RU.UTF-8";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "23.05";
};
}

View File

@ -1,27 +0,0 @@
{ config, pkgs, lib, ... }: {
services.xserver.videoDrivers = [ "nvidia" ];
hardware = {
graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [nvidia-vaapi-driver intel-media-driver];
extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver];
};
nvidia = {
modesetting.enable = true;
powerManagement = {
enable = true;
finegrained = false;
};
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
prime = lib.optionalAttrs config.host.laptop {
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
};
}

View File

@ -1,23 +0,0 @@
{
imports = [
./host/bluetooth.nix
./host/bootloader.nix
./host/console.nix
./host/env.nix
./host/gamemode.nix
./host/gpg.nix
./host/laptop.nix
./host/printing.nix
./host/shutdown-on-lan.nix
./host/sound.nix
./host/virtmanager.nix
./host/vpn.nix
];
programs.hyprland.enable = true;
services = {
udisks2.enable = true;
fstrim.enable = true;
};
networking.networkmanager.enable = true;
}

View File

@ -1,21 +0,0 @@
{ config, pkgs, pkgs-stable, lib, ... }:
lib.mkIf config.programs.gamemode.enable {
programs.steam = {
enable = true;
gamescopeSession.enable = true;
};
environment.systemPackages = with pkgs-stable; [
mangohud
protonup
pkgs.bottles
heroic
pkgs.prismlauncher
];
environment.sessionVariables = {
STEAM_EXTRA_COMPAT_TOOLS_PATHS =
"\${HOME}/.steam/root/compatibilitytools.d";
};
}

View File

@ -1,19 +0,0 @@
{ config, lib, ... }:
lib.mkIf config.host.laptop {
services.tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 75;
};
};
}

View File

@ -1,9 +0,0 @@
{ config, lib, ... }:
lib.mkIf config.services.printing.enable {
services.avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
}

View File

@ -1,17 +0,0 @@
{
security.rtkit.enable = true;
services = {
pulseaudio.enable = false;
pipewire = {
enable = true;
alsa = {
enable = true;
support32Bit = true;
};
pulse.enable = true;
};
};
}

View File

@ -1,20 +0,0 @@
{
imports = [
./user/kitty.nix
./user/qt.nix
./user/sops.nix
./user/neofetch.nix
./user/yazi.nix
./user/ags.nix
./user/zsh.nix
./user/helix.nix
./user/hyprlock.nix
./user/btop.nix
./user/wofi.nix
./user/mako.nix
./user/packages/art.nix
./user/packages/desktop.nix
./user/packages/coding.nix
./user/packages/utils.nix
];
}

View File

@ -0,0 +1,68 @@
{ config, pkgs, ...}: {
imports = [
./hardware-configuration.nix
./secrets/secrets.nix
./modules/grub.nix
./modules/aagl.nix
../../packages.nix
../../modules/bundle.nix
../../modules/gamemode.nix
../../modules/users/chest.nix
];
networking.hostName = "Eclipse";
time.timeZone = "Europe/Moscow";
i18n.defaultLocale = "ru_RU.UTF-8";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "23.05";
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [nvidia-vaapi-driver intel-media-driver];
extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver];
};
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
networking.hosts = {
"0.0.0.0" = [
"overseauspider.yuanshen.com"
"log-upload-os.hoyoverse.com"
"log-upload-os.mihoyo.com"
"dump.gamesafe.qq.com"
"apm-log-upload-os.hoyoverse.com"
"zzz-log-upload-os.hoyoverse.com"
"log-upload.mihoyo.com"
"devlog-upload.mihoyo.com"
"uspider.yuanshen.com"
"sg-public-data-api.hoyoverse.com"
"hkrpg-log-upload-os.hoyoverse.com"
"public-data-api.mihoyo.com"
"prd-lender.cdp.internal.unity3d.com"
"thind-prd-knob.data.ie.unity3d.com"
"thind-gke-usc.prd.data.corp.unity3d.com"
"cdp.cloud.unity3d.com"
"remote-config-proxy-prd.uca.cloud.unity3d.com"
"pc.crashsight.wetest.net"
];
};
}

View File

@ -0,0 +1,5 @@
{ inputs, ... }: {
imports = [ inputs.aagl.nixosModules.default ];
nix.settings = inputs.aagl.nixConfig; # Set up Cachix
programs.honkers-railway-launcher.enable = true;
}

View File

@ -0,0 +1,45 @@
{ config, pkgs, inputs, ...}: {
imports = [
./hardware-configuration.nix
./secrets/secrets.nix
./modules/grub.nix
./modules/syncthing.nix
../../packages.nix
../../modules/bundle.nix
../../modules/adb.nix
../../modules/gamemode.nix
../../modules/users/sweetbread.nix
];
networking.hostName = "Rias";
time.timeZone = "Europe/Moscow";
i18n.defaultLocale = "ru_RU.UTF-8";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "23.05";
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [nvidia-vaapi-driver intel-media-driver];
extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver];
};
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
virtualisation.virtualbox.host.enable = true;
users.extraGroups.vboxusers.members = [ "sweetbread" ];
}

View File

@ -0,0 +1,40 @@
{ config, pkgs, ...}: {
imports = [
./hardware-configuration.nix
./secrets/secrets.nix
./modules/grub.nix
../../packages.nix
../../modules/bundle.nix
../../modules/adb.nix
../../modules/users/sweetbread.nix
../../modules/laptop.nix
];
networking.hostName = "Senko";
time.timeZone = "Europe/Moscow";
i18n.defaultLocale = "ru_RU.UTF-8";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
system.stateVersion = "23.05";
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [nvidia-vaapi-driver intel-media-driver];
extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver];
};
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
}

1
nixos/hosts/Senko/secrets Symbolic link
View File

@ -0,0 +1 @@
../Rias/secrets

View File

@ -1,6 +1,6 @@
{ config, lib, ... }: { {
hardware.bluetooth = hardware.bluetooth = {
lib.mkIf config.hardware.bluetooth.enable { enable = true;
powerOnBoot = true; powerOnBoot = true;
settings = { settings = {
General = { General = {

View File

@ -2,6 +2,7 @@
boot = { boot = {
loader = { loader = {
timeout = 3; timeout = 3;
# systemd-boot.enable = true;
efi = { efi = {
efiSysMountPoint = "/boot"; efiSysMountPoint = "/boot";
canTouchEfiVariables = true; canTouchEfiVariables = true;
@ -13,7 +14,12 @@
device = "nodev"; device = "nodev";
useOSProber = true; useOSProber = true;
}; };
# efi.canTouchEfiVariables = true;
}; };
# initrd = {
# verbose = false;
# # systemd.enable = true;
# };
consoleLogLevel = 0; consoleLogLevel = 0;
kernelParams = [ kernelParams = [
# "quiet" # "quiet"
@ -28,6 +34,7 @@
enable = true; enable = true;
theme = "black_hud"; theme = "black_hud";
themePackages = with pkgs; [ themePackages = with pkgs; [
# By default we would install all themes
(adi1090x-plymouth-themes.override { (adi1090x-plymouth-themes.override {
selected_themes = [ "black_hud" ]; selected_themes = [ "black_hud" ];
}) })

19
nixos/modules/bundle.nix Normal file
View File

@ -0,0 +1,19 @@
{
imports = [
./bootloader.nix
./sound.nix
./zram.nix
./env.nix
./nm.nix
./virtmanager.nix
./trim.nix
./bluetooth.nix
./vpn.nix
./printing.nix
./shutdown-on-lan.nix
./console.nix
];
programs.hyprland.enable = true;
services.udisks2.enable = true;
}

View File

@ -0,0 +1,17 @@
{ pkgs, pkgs-unstable, ...}: {
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
programs.gamemode.enable = true;
environment.systemPackages = with pkgs; [
mangohud
protonup
pkgs-unstable.bottles
heroic
];
environment.sessionVariables = {
STEAM_EXTRA_COMPAT_TOOLS_PATHS =
"\${HOME}/.steam/root/compatibilitytools.d";
};
}

17
nixos/modules/laptop.nix Normal file
View File

@ -0,0 +1,17 @@
{
services.tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 25;
};
};
}

3
nixos/modules/nm.nix Normal file
View File

@ -0,0 +1,3 @@
{
networking.networkmanager.enable = true;
}

View File

@ -0,0 +1,10 @@
{
services = {
printing.enable = true;
avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
};
}

17
nixos/modules/sound.nix Normal file
View File

@ -0,0 +1,17 @@
{
hardware.pulseaudio.enable = false;
# rtkit is optional but recommended
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
};
}

3
nixos/modules/trim.nix Normal file
View File

@ -0,0 +1,3 @@
{
services.fstrim.enable = true;
}

View File

@ -0,0 +1,34 @@
{ pkgs, lib, inputs, ... }: {
programs.zsh.enable = true;
users = {
defaultUserShell = pkgs.zsh;
users.chest = {
isNormalUser = true;
description = "Chest";
extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ];
packages = with pkgs; [];
};
};
services.greetd = let
tuigreet = pkgs.lib.getExe pkgs.greetd.tuigreet;
session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
username = "chest";
in {
enable = true;
settings = {
initial_session = {
command = "${session}";
user = "${username}";
};
default_session = {
command = "${tuigreet} --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time -cmd ${session}";
user = "greeter";
};
};
};
nix.settings.trusted-users = [ "chest" ];
}

View File

@ -0,0 +1,34 @@
{ pkgs, lib, inputs, ... }: {
programs.zsh.enable = true;
users = {
defaultUserShell = pkgs.zsh;
users.sweetbread = {
isNormalUser = true;
description = "Sweet Bread";
extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ];
packages = with pkgs; [];
};
};
services.greetd = let
tuigreet = pkgs.lib.getExe pkgs.greetd.tuigreet;
session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
username = "sweetbread";
in {
enable = true;
settings = {
initial_session = {
command = "${session}";
user = "${username}";
};
default_session = {
command = "${tuigreet} --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time -cmd ${session}";
user = "greeter";
};
};
};
nix.settings.trusted-users = [ "sweetbread" ];
}

View File

@ -1,5 +1,7 @@
{ pkgs, ... }: { { pkgs, ... }: {
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true; programs.virt-manager = {
enable = true;
};
} }

View File

@ -19,8 +19,8 @@
environment.etc = { environment.etc = {
"v2raya/ru_geoip.dat".source = pkgs.fetchurl { "v2raya/ru_geoip.dat".source = pkgs.fetchurl {
name = "geoip.dat"; name = "geoip.dat";
url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202502081519/geoip.dat"; url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202501260919/geoip.dat";
hash = "sha256-uzv+aNlTD/UycNK2WWbI9timBbaFLAK3ME/lOrzpFdg="; hash = "sha256-OZoWEyfp1AwIN1eQHaB5V3FP51gsUKKDbFBHtqs4UDM=";
}; };
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path; "v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;

View File

@ -2,7 +2,7 @@
zramSwap = { zramSwap = {
enable = true; enable = true;
algorithm = "lz4"; algorithm = "lz4";
memoryPercent = 125; memoryPercent = 100;
priority = 999; priority = 999;
}; };
} }

View File

@ -1,5 +1,8 @@
{ pkgs, inputs, ... }: { { pkgs, pkgs-unstable, inputs, ... }: {
nixpkgs.config.allowUnfree = true; nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = ["python-2.7.18.8" "electron-25.9.0" "freeimage-unstable-2021-11-01" "obsidian-1.5.12"];
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
file file
@ -15,12 +18,12 @@
ncdu ncdu
tldr tldr
helix helix
pkgs-unstable.home-manager
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs-unstable; [
jetbrains-mono jetbrains-mono
noto-fonts noto-fonts
(google-fonts.override{fonts=["Press Start 2P" "Overpass Mono"];})
noto-fonts-emoji noto-fonts-emoji
noto-fonts-cjk-sans noto-fonts-cjk-sans
twemoji-color-font twemoji-color-font

View File

@ -1,10 +0,0 @@
{ pkgs, pkgs-stable, ... }: {
disabledModules = [ ../../modules/user/packages/coding.nix ];
home.packages = with pkgs; [
nautilus
burpsuite
exiftool
python3
pkgs-stable.jetbrains.pycharm-community
];
}

View File

@ -1,64 +0,0 @@
{ pkgs, pkgs-stable, lib, inputs, name, fullname ? name, ... }: {
imports = [
inputs.home-manager.nixosModules.home-manager {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "rebuild";
users.${name} = {
imports = [
inputs.sops-nix.homeManagerModules.sops
inputs.stylix.homeManagerModules.stylix
../modules/user.nix
./${name}/modules/git.nix
./${name}/modules/hyprland.nix
./${name}/modules/style.nix
./${name}/home.nix
];
home = {
username = name;
homeDirectory = "/home/${name}";
stateVersion = "23.11";
};
};
extraSpecialArgs = {
inherit inputs;
inherit pkgs-stable;
};
};
}
];
programs.zsh.enable = true;
users = {
defaultUserShell = pkgs.zsh;
users."${name}" = {
isNormalUser = true;
description = fullname;
extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ];
};
};
services.greetd = let
tuigreet = lib.getExe pkgs.greetd.tuigreet;
session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
in {
enable = true;
settings = {
initial_session = {
command = "${session}";
user = "${name}";
};
default_session = {
command = "${tuigreet} --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time -cmd ${session}";
user = "greeter";
};
};
};
nix.settings.trusted-users = [ name ];
}

View File

@ -1,3 +0,0 @@
{
programs.hyprlock.enable = true;
}