From 472548c3ecf15869d7792d8e2987dfc8c8eaa974 Mon Sep 17 00:00:00 2001 From: neverness <of_neverness@vk.com> Date: Thu, 5 Dec 2024 23:36:13 +0900 Subject: [PATCH] update --- flake.lock | 226 ++++++++++++---------- jetpure/default.nix | 20 +- jetpure/home/parts/pkgs.nix | 8 +- jetpure/host/default.nix | 2 +- jetpure/host/parts/default.nix | 7 +- libx/builder.nix | 4 +- modules/home/themes/gtk/default.nix | 10 +- modules/home/themes/nerdfonts/default.nix | 68 +++++++ modules/home/themes/nerdfonts/shas.nix | 71 +++++++ modules/home/themes/nerdfonts/version.nix | 1 + modules/home/themes/stylix/default.nix | 110 +++++------ modules/home/wm/terminals/kitty/sets.nix | 3 - modules/nixos/hardware/boot/default.nix | 114 ++++++----- 13 files changed, 412 insertions(+), 232 deletions(-) create mode 100644 modules/home/themes/nerdfonts/default.nix create mode 100644 modules/home/themes/nerdfonts/shas.nix create mode 100644 modules/home/themes/nerdfonts/version.nix diff --git a/flake.lock b/flake.lock index 064bdbe..18f0f47 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", + "lastModified": 1731959031, + "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", + "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1731549112, - "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "5fd852c4155a689098095406500d0ae3d04654a8", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1731470588, - "narHash": "sha256-radsH6TieMS9S2+NQgWOV+Md6/Kz7lD+Q1GEmIxvjCY=", + "lastModified": 1733305782, + "narHash": "sha256-+as6y53LIKqsxE3d6CNCcnh59VY8nSG0SODy2TBw0rY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6cfc4ff20b755e675848c0417da3017a92a206e1", + "rev": "1afe1eeefc74e6eb67f2d2fd881cd8448e0bff10", "type": "gitlab" }, "original": { @@ -198,11 +198,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -214,11 +214,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -372,11 +372,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1732413017, - "narHash": "sha256-LJy3CkUErelRM3bDojyFB0xe4c2CF/6HTF51QLJkqVA=", + "lastModified": 1733101372, + "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "87623b5ebb18d3ab6c342526afe6b7d0cb96c486", + "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", "type": "github" }, "original": { @@ -410,27 +410,27 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } }, "hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -447,11 +447,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1733304249, + "narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -510,10 +510,40 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733248371, + "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -524,11 +554,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731425185, - "narHash": "sha256-/v5mz2LKOsBjwW9M+2kg0jVhpkFNIAvM/fUDy3OiOj4=", + "lastModified": 1733266710, + "narHash": "sha256-O3SohtpjLpC0NbokgMvCQXJkqbIRYs/h+NFQ9PyD2sI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bb160cfe377da2d2b2e4431a3399fa60114f3911", + "rev": "3c617ce33c64cb43049489598b6391911eed7070", "type": "github" }, "original": { @@ -603,11 +633,11 @@ ] }, "locked": { - "lastModified": 1731163338, - "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -666,11 +696,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -694,14 +724,14 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-stable": { @@ -722,11 +752,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -738,11 +768,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -754,11 +784,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -771,8 +801,8 @@ "nixpkgs_5": { "locked": { "lastModified": 0, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", - "path": "/nix/store/0sxsfzswhjck7f4sbsvznz285s4i7y64-source", + "narHash": "sha256-LJeSDbiebN0/eRt9vyOm+Bxljdsq5ZdalmmTk9Xpp30=", + "path": "/nix/store/zyh8f18z0m1r9jppvdcdivfvfxg0j3fv-source", "type": "path" }, "original": { @@ -798,11 +828,11 @@ }, "nur": { "locked": { - "lastModified": 1731494868, - "narHash": "sha256-gFzX+e1ATJmhjOMvbBmqf1v4WgMz770dZhtGN4dZtng=", + "lastModified": 1733306116, + "narHash": "sha256-ZlbxSsBfrwQKfne/HIKjDaaIbpjqri9Ch5v3YubyHks=", "owner": "nix-community", "repo": "NUR", - "rev": "4b0e599bebf4bdf6725cdf8036a335096bf13097", + "rev": "d07fbb0bcbdc0a0969373a8679d24aa565805a35", "type": "github" }, "original": { @@ -816,11 +846,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733269028, + "narHash": "sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb+nlIYEFnyXhGA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "e37654df08605b510ad84eceaafcc7248495e843", "type": "github" }, "original": { @@ -837,11 +867,11 @@ ] }, "locked": { - "lastModified": 1733031174, - "narHash": "sha256-JuABhfC13YDmgm6YiRpb4TCIqGpNNWDKvf7EglwDEjw=", + "lastModified": 1733202246, + "narHash": "sha256-g4TLmYmzCmpQcX9Lz98vhxHfj2vMQkwZpejp3ipXgYw=", "owner": "phanirithvij", "repo": "nur-packages", - "rev": "5d916acadc2686fdd450a9bdce7dfc86b83d451c", + "rev": "eb33adb8d51f9ca1aa282a52ef1c67c16ddf5bdc", "type": "github" }, "original": { @@ -861,11 +891,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -922,11 +952,11 @@ ] }, "locked": { - "lastModified": 1732421741, - "narHash": "sha256-r3q4NYO3Z/OG3Oy5zHrEjAn+s5Bcgy569fUJUG9Ipuc=", + "lastModified": 1733285820, + "narHash": "sha256-B6BME0Jl/5xpkC51OSOc7srtw/3o4g6TIym/YfhUZes=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8380d08050b6bd1f5c93de48e5ceef5b5105ecf6", + "rev": "41d44f790d8d53d4a54782edbf033d2d4783ad8a", "type": "github" }, "original": { @@ -952,11 +982,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731657386, - "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", + "lastModified": 1733262405, + "narHash": "sha256-/AT315It87ll6mlZLYcmfoe6Uogx9MjPBCCZZZTq8xY=", "owner": "danth", "repo": "stylix", - "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", + "rev": "ffba1f1bab63ea49541f812c72a4fcf305461d67", "type": "github" }, "original": { @@ -1002,11 +1032,11 @@ ] }, "locked": { - "lastModified": 1731921520, - "narHash": "sha256-xbznSyfG6tkW/II01KxifNHwrNLseGSz74BI2HUeWgE=", + "lastModified": 1733139119, + "narHash": "sha256-L38U6WBaqTIOZOFsI2b8lMCQvD7nZCOD94rRwriwmVk=", "owner": "FedericoBruzzone", "repo": "tgt", - "rev": "1f789defdab212e2ae4a2417163a89bda4254bcd", + "rev": "bc55ee3306d7cd0c283c5c550bd7f4dd92e1b349", "type": "github" }, "original": { @@ -1052,11 +1082,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { @@ -1117,11 +1147,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1732337089, - "narHash": "sha256-dwFza03ETqrcmVGSCdgDDKTWKRgckpQ3vXkZRCYtM9g=", + "lastModified": 1733037609, + "narHash": "sha256-HkS24indfMaQbVZ+9GY5BHc+rqPvh8htF0rWYhvgPKI=", "ref": "refs/heads/main", - "rev": "f6a6af3191f5497d95d8f8aaa08826a45da199c4", - "revCount": 842, + "rev": "e559e2e50999093c3e837d33886f9e14e34ead0a", + "revCount": 863, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -1161,11 +1191,11 @@ ] }, "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", + "lastModified": 1731703417, + "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", + "rev": "8070f36deec723de71e7557441acb17e478204d3", "type": "github" }, "original": { diff --git a/jetpure/default.nix b/jetpure/default.nix index 50e5192..e13cffe 100644 --- a/jetpure/default.nix +++ b/jetpure/default.nix @@ -1,13 +1,13 @@ -{ self, inputs, ... }: -let +{ inputs, ... }: +let # CONFIGURATION builder = import ../libx/builder.nix { - inherit self inputs userName hostName flakeDir dev; - }; - hostName = "jetpure"; - userName = "nixzoid"; - flakeDir = "/persist/flake"; - dev = { - hdd = "/mnt/HDD"; - ssd = "/mnt/SSD"; + inherit inputs; + hostName = "jetpure"; + userName = "nixzoid"; + flakeDir = "/persist/flake"; + dev = { + hdd = "/mnt/HDD"; + ssd = "/mnt/SSD"; + }; }; in { flake = builder.flake; } diff --git a/jetpure/home/parts/pkgs.nix b/jetpure/home/parts/pkgs.nix index 508e1e8..8fcf755 100644 --- a/jetpure/home/parts/pkgs.nix +++ b/jetpure/home/parts/pkgs.nix @@ -2,6 +2,7 @@ imports = with inputs; [ nur.hmModules.nur ]; module.programs = { gui.pkgs = with pkgs; [ + foot nemo # GUI FM nemo-fileroller # ADDON file-roller # ARCHIVER @@ -19,6 +20,7 @@ (prismlauncher.override { gamemodeSupport = true; controllerSupport = true; + textToSpeechSupport = false; jdks = [ temurin-jre-bin-21 temurin-jre-bin-17 temurin-jre-bin-8 ]; }) # MINECRAFT IS MY LIFE @@ -44,9 +46,9 @@ wineWow64Packages.staging # SIMPLE LAUNCHER config.nur.repos.rycee.mozilla-addons-to-nix # ADDONS TO NIX - inputs.tgt.packages.${system}.default # TG TUI - inputs.transg.packages.${system}.default # TRANSMISSION TUI - inputs.phani.packages.${system}.qbittorrentui # QBITUI + # inputs.tgt.packages.${system}.default # TG TUI + # inputs.transg.packages.${system}.default # TRANSMISSION TUI + # inputs.phani.packages.${system}.qbittorrentui # QBITUI ]; }; } diff --git a/jetpure/host/default.nix b/jetpure/host/default.nix index 1421711..1a662a0 100644 --- a/jetpure/host/default.nix +++ b/jetpure/host/default.nix @@ -6,7 +6,7 @@ hardware = { amd = True // { amdvlk = False; }; bluetooth = True; - boot = True; + boot = True // { plymouth = True; }; network = True; security = True; sound = True; diff --git a/jetpure/host/parts/default.nix b/jetpure/host/parts/default.nix index 8e8239a..067c743 100644 --- a/jetpure/host/parts/default.nix +++ b/jetpure/host/parts/default.nix @@ -1,10 +1,9 @@ { inputs, ... }: { - imports = [ - inputs.disko.nixosModules.default + imports = with inputs; [ + ./pkgs.nix + disko.nixosModules.default (import ./disko.nix { device = "/dev/by-id/ata-KINGSTON_SA400S37240G_50026B72828C9A2D"; }) - - ./pkgs.nix ]; } diff --git a/libx/builder.nix b/libx/builder.nix index 5006585..3f0d35d 100644 --- a/libx/builder.nix +++ b/libx/builder.nix @@ -1,4 +1,4 @@ -{ self, inputs, hostName, userName, flakeDir, dev, ... }: { +{ inputs, hostName, userName, flakeDir, dev, ... }: { flake = let pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; sec = import ./secrets.nix; @@ -12,7 +12,7 @@ # SYSINFO stateVersion = "24.05"; # IDK platform = "x86_64-linux"; - inherit self inputs hostName userName flakeDir sec dev; + inherit inputs hostName userName flakeDir sec dev; }; in with inputs; { nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem { diff --git a/modules/home/themes/gtk/default.nix b/modules/home/themes/gtk/default.nix index a0d5d6c..996887c 100644 --- a/modules/home/themes/gtk/default.nix +++ b/modules/home/themes/gtk/default.nix @@ -30,17 +30,19 @@ in { home.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans ]; gtk = with pkgs; True // { + gtk3 = { extraConfig = extra; }; + gtk4 = { extraConfig = extra; }; iconTheme = { name = "Papirus-Dark"; package = papirus-icon-theme.override { color = cfg.icon; }; }; font = lib.mkForce { - name = "JetBrainsMono NerdFont"; - package = nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; size = 12; + name = "JetBrainsMono NerdFont"; + package = (pkgs.callPackage ../nerdfonts/default.nix { + fonts = [ "JetBrainsMono" ]; + }); }; - gtk3 = { extraConfig = extra; }; - gtk4 = { extraConfig = extra; }; }; }; } diff --git a/modules/home/themes/nerdfonts/default.nix b/modules/home/themes/nerdfonts/default.nix new file mode 100644 index 0000000..4d7d1b2 --- /dev/null +++ b/modules/home/themes/nerdfonts/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, lib +# To select only certain fonts, put a list of strings to `fonts`: every key in +# ./shas.nix is an optional font +, fonts ? [ ] + # Whether to enable Windows font variants, their internal font name is limited + # to 31 characters +, enableWindowsFonts ? false }: + +let + # both of these files are generated via ./update.sh + version = import ./version.nix; + fontsShas = import ./shas.nix; + knownFonts = builtins.attrNames fontsShas; + selectedFonts = if (fonts == [ ]) then + knownFonts + else + let unknown = lib.subtractLists knownFonts fonts; + in if (unknown != [ ]) then + throw "Unknown font(s): ${lib.concatStringsSep " " unknown}" + else + fonts; + selectedFontsShas = + lib.attrsets.genAttrs selectedFonts (fName: fontsShas."${fName}"); + srcs = lib.attrsets.mapAttrsToList (fName: fSha: + (fetchurl { + url = + "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/${fName}.tar.xz"; + sha256 = fSha; + })) selectedFontsShas; + +in stdenv.mkDerivation (finalAttrs: { + inherit version; + inherit srcs; + pname = "nerdfonts"; + sourceRoot = "."; + buildPhase = '' + echo "selected fonts are ${toString selectedFonts}" + ls *.otf *.ttf + ''; + installPhase = '' + find -name \*.otf -exec mkdir -p $out/share/fonts/opentype/NerdFonts \; -exec mv {} $out/share/fonts/opentype/NerdFonts \; + find -name \*.ttf -exec mkdir -p $out/share/fonts/truetype/NerdFonts \; -exec mv {} $out/share/fonts/truetype/NerdFonts \; + ${lib.optionalString (!enableWindowsFonts) '' + rm -rfv $out/share/fonts/opentype/NerdFonts/*Windows\ Compatible.* + rm -rfv $out/share/fonts/truetype/NerdFonts/*Windows\ Compatible.* + ''} + ''; + passthru.updateScript = fetchurl { + url = + "https://raw.githubusercontent.com/NixOS/nixpkgs/924dd674814aaf618e329dd252e07f9a083c5f20/pkgs/data/fonts/nerdfonts/update.sh"; + sha256 = lib.fakeSha256; + }; + + meta = with lib; { + description = + "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; + longDescription = '' + Nerd Fonts is a project that attempts to patch as many developer targeted + and/or used fonts as possible. The patch is to specifically add a high + number of additional glyphs from popular 'iconic fonts' such as Font + Awesome, Devicons, Octicons, and others. + ''; + homepage = "https://nerdfonts.com/"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + hydraPlatforms = [ ]; # 'Output limit exceeded' on Hydra + }; +}) diff --git a/modules/home/themes/nerdfonts/shas.nix b/modules/home/themes/nerdfonts/shas.nix new file mode 100644 index 0000000..75de268 --- /dev/null +++ b/modules/home/themes/nerdfonts/shas.nix @@ -0,0 +1,71 @@ +{ + "0xProto" = "09q4ipl3vvav3jbs0s14fqmd2wk70mc7i8mmplpj20jwcicm05ng"; + "3270" = "0zcj5xhylyqxpwn6dzp28kh8xybhh4y9lva3smcqs7iklhbf8s31"; + "Agave" = "1xxylrjb0zbq3kj14fx5d3lpb7abl0br6mkj961i391qyqlx01y3"; + "AnonymousPro" = "1lq9wkf8c153jkjmhnddih12y9xd4gabbkgac0vx9j98hmy7yjqy"; + "Arimo" = "1f7zljmljrp1dxkrhkyz8zh9ddv7l7m9br6gaygzxr26bq0vrwr0"; + "AurulentSansMono" = "0wlwwgp1w7rqvqx66dkqwhz5flw75620fj9fb795hakpkjiya6yp"; + "BigBlueTerminal" = "115cxnll1iyj75f5wi7b7pi5hgfa3b5kbx269alm9183h284lb23"; + "BitstreamVeraSansMono" = + "1s6jpg0vrdwgi9qyn0mbcy8r7h1lqw8z6q39wiin61szfn642a2k"; + "CascadiaCode" = "1sg6czl3km7yi70vdcyb0ff1xkq1p4nalj0yh164gan3psp9mxss"; + "CascadiaMono" = "0rrknf86kdwyjpnryp5870nmnq2sxjda8pgs93z23lh7hw758wln"; + "CodeNewRoman" = "0p1wkmpzcrxw8qv5lf9fwsxqpjglhwim83amf7i8mmxdx1drzlj5"; + "ComicShannsMono" = "1p35nmzl51mn2mk0g9fdcawvssv4v7bklxxmdx99357ihnlka26w"; + "CommitMono" = "0jjzi98i28s3z2x8v7rakcdhgdf7jxzagj8snrylw2mvwn7mlgqp"; + "Cousine" = "1ccq3sp8fqbi0njm9w2p6cf5r7avpan5fklwzpx4mknwbdqlrwdq"; + "D2Coding" = "1c0chgbsmzlgq0vinbcz7ydkdhnram8cif8zx8kkpha31abna5n0"; + "DaddyTimeMono" = "1nz4g26a4dx7ng5nv6bc4hg474inan1c00c86mdlmvl2vgmx6zbf"; + "DejaVuSansMono" = "12x18i15723hxc1l6ng92m77wycjk0d6r15j34n1zsww5r6xwjxr"; + "DroidSansMono" = "1mqd1qqbs9dxwmi98i4xw88c68l1bww1sqlsmxmn86368rjh14fk"; + "EnvyCodeR" = "197g4jaljcb1yncn9rvh17n077p7bq0v59lvb9vqkq3lms5lzjni"; + "FantasqueSansMono" = "079mk8xrri4r1d5k1w5fv1hb0hp3w499csirkd6yriss35sbhv9d"; + "FiraCode" = "1i1vw65f00n6vjinyqr1bq5ni5r6g8cjinrfl5zhlqm0gagv5x6y"; + "FiraMono" = "1i9bfxblx568wsjq7ks1kyyfn9k36i4r2an4n45mb46swc94n8n0"; + "GeistMono" = "0wvc9hqkh7ap3ysklcin8k72706l72p2wyqv3bg5brzcmwcpy90g"; + "Go-Mono" = "0j6rr0r7418f8a5bmxbagpmcf7bas2n53f0hg835zp2ikx9cx924"; + "Gohu" = "0h8hjiqs3f6xwn7g4wg12xim65ybw2546nlf5p9ip4ymr7x17dks"; + "Hack" = "1wxmd4jr4p11cfhzs5chyh649vps6sdz4bq28204npkd7wzh5fc9"; + "Hasklig" = "1nja4r8sn67g3gn85xhb1h7p1pi96wl0hpg5b5gyd1z5llbgzc2g"; + "HeavyData" = "1a3a1pixv97wlnai24zb8dhkzxb2llcarhjkfrgd4syhn37sdf7n"; + "Hermit" = "1bh18rzwma7gzrx3ybw8g2s9k5xv7wx8ybnyas3qaxb03fpjqm93"; + "iA-Writer" = "0vsppg62l35zhzlsa0fwczv09pk1nhrag9xhcaadipd962dv7c45"; + "IBMPlexMono" = "0hd04z17l2p21hij4a0gmwnlfxs7s8qqh08zf4pzqld10557gqlp"; + "Inconsolata" = "1xy3h05zy49h91k7fqk8934p1f776w46i0bh510addg12w8mm7rc"; + "InconsolataGo" = "0hcvh3s2rnnir03pszfmmwhbdsapx1b516phhjhb4wl0dqma9q39"; + "InconsolataLGC" = "0bfwhzbz422kfdv9ppr83cc2aqqdn7g49f73zipl4yp5636gi5ks"; + "IntelOneMono" = "0388390dlcprxhxxl57gy8rllwk8wsd92b5xwnqwb5f394gbc5m0"; + "Iosevka" = "0dzkcn277jxiqrrqkyigw6jgd4lp9411r28rkpkwx6js6px27q8v"; + "IosevkaTerm" = "1xccqkydkhmhq8akk23kkypqzcc2svyicxv9gblwzwbndjrfgmdm"; + "IosevkaTermSlab" = "1svig63li8mjj2dkgiawgb82gpk8vkrkhih5cp0a6174bh4gycii"; + "JetBrainsMono" = "01j0rkgrix7mdp9fx0y8zzk1kh40yfcp932p0r5y666aq4mq5y3c"; + "Lekton" = "00cm8ni3cnmgzwj1ypvpcy8gvnlz31la51j411dpsdqsclbcp0i2"; + "LiberationMono" = "1941pgw723a6my44g6idi56a88qvsi8lj3wl7slpr5l3pmfda2lx"; + "Lilex" = "0qz23h6a77i4n8nmhb7hc56mkiwn3pj1s6dbl2v53fvypwghswm2"; + "MartianMono" = "0zfcvi150yn274i41n66zr20hqgqb0r5v75q21bbgqvaysl4wj32"; + "Meslo" = "1sjrsr7i3diz4h7wkrl8va7b40g4m1432dz6bpbm2nmp89aszg8s"; + "Monaspace" = "0il36cm37pc6ndp96j32j0fqpqvwyv2xm3jr7d3zxwax1lcfilp5"; + "Monofur" = "10gzx2r5a5f5jl192c6cwsil5k57aslmryfnilkv4g8417xmn0zb"; + "Monoid" = "1fhsb326lc093ckrq2kz4vhr3ibrgp8y0mwa3qwdbapldxazz9f7"; + "Mononoki" = "18zp94dnv6kp8l58151dybjf2w1gi99nh1rw098hkrf52gfrfdpb"; + "MPlus" = "0x7yvpkn32x50y9zpdpjrp1gvwwp4fsmjbqbnfzy14xhi03p0q2w"; + "NerdFontsSymbolsOnly" = + "0y4r1rid5sjd9ihi6nkwy0sja792aghg21bpl3ri029b9pifx8xp"; + "Noto" = "0vq9lgf4j6pi7pw3bfgfzkcdixnhikf4yys8fr0qql7mkwhj3rjb"; + "OpenDyslexic" = "1yl1fm4pfjvxq411m6f8nycqjnpnhkllmlx16wjrjfqpaf63mm4n"; + "Overpass" = "1plcn2qx2b08va65zagn1ybkh850157ii7x20nnrhp0h5f4rddzw"; + "ProFont" = "11c3shv09dssjbjwa44y64dwq7dxn3gs23bfgvhkv51vshsx0fzy"; + "ProggyClean" = "1l822wqrz7xmgnw535i9vl9gwjl4h037hi3xl0g4907kcdxwan0s"; + "Recursive" = "1fngqsl1shbfbb1wcx77di42g65lm9f5fcw93m8dcvdzk5lxpxz5"; + "RobotoMono" = "0g6yvz4vpfcylnshhyhwy5llz61n8m0a0vp4jgjhiir5svcd9krw"; + "ShareTechMono" = "0mxsywg4gns31yzh1256y7pkbh0m6n3rf8gbb55mxw219ngskkyv"; + "SourceCodePro" = "088vi947kavk1pkvbl68kv7nz84yvfkj725n2zn7ypq354kkm92n"; + "SpaceMono" = "0f4kcm4i3y11mpxb9anmn8759zpv3lvril4shp3d4mfc0k3dgfdn"; + "Terminus" = "04kzc594sb5vk8fd3ww9ip7jsy4vi6wmxdf6vzsvb2fgd98ck335"; + "Tinos" = "14c31qv3ik0in44k98zjn398cffwgq8z7d5lx7sk6iv12hikrd11"; + "Ubuntu" = "1bgk4hx26qn5ylsydsy9655isz05ir7154pv8dy4x5rpr144s9ba"; + "UbuntuMono" = "15kkgx6i4f7zn6fdaw2dqqw3hcpl3pi4cy4g5jx67af8qlhqarrb"; + "UbuntuSans" = "0jj4v198zshwhns5swrh02h2np3wgnv8lacn8b7jhmcd575cgy1y"; + "VictorMono" = "03rh7rc6a934sgd1bs7h7y1swqwbv3g7zi624k6hd8v1m3f0j6xa"; + "ZedMono" = "0yhb9fp7ahw8niki1njzk8pbl0iy53pgf7gx5yfc2ass9vjwky9d"; +} diff --git a/modules/home/themes/nerdfonts/version.nix b/modules/home/themes/nerdfonts/version.nix new file mode 100644 index 0000000..038707f --- /dev/null +++ b/modules/home/themes/nerdfonts/version.nix @@ -0,0 +1 @@ +"3.2.1" diff --git a/modules/home/themes/stylix/default.nix b/modules/home/themes/stylix/default.nix index ca7a301..39730b8 100644 --- a/modules/home/themes/stylix/default.nix +++ b/modules/home/themes/stylix/default.nix @@ -34,63 +34,63 @@ in { }; }; - imports = [ inputs.stylix.homeManagerModules.stylix ../../../colors.nix ]; + imports = with inputs; [ + stylix.homeManagerModules.stylix + ../../../colors.nix + ]; config = mkIf cfg.enable { - stylix = with pkgs; - True // { - autoEnable = false; - image = "${wal}/wallpapers/paradise/${cfg.image}.jpg"; - cursor = with inputs.cursors; { - size = 16; - name = "GoogleDot-Custom"; - package = packages.${pkgs.system}.google-cursor.override { - background_color = cfg.cursor.bg; - outline_color = cfg.cursor.ol; - accent_color = cfg.cursor.ac; - }; - }; - fonts = let - jet = { - name = "JetBrainsMono NerdFont"; - package = nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; - }; - in { - serif = jet; - monospace = jet; - emoji = { - name = "OpenMoji Color"; - package = noto-fonts-emoji; - }; - sizes = { - desktop = 10; - popups = 10; - applications = 12; - terminal = 12; - }; - }; - targets = { - # CLI - tmux = True; - fish = True; - nushell = True; - # WM - hyprland = True; - sway = True; - foot = True; - kitty = True; - mako = False; - # TOOLS - nixvim = True; - yazi = True; - fzf = True; - bat = True; - mangohud = True; - # GUI - vesktop = True; - qutebrowser = True; - firefox = True; - gtk = True; + stylix = True // { + autoEnable = false; + image = "${wal}/wallpapers/paradise/${cfg.image}.jpg"; + cursor = with inputs.cursors; { + size = 16; + name = "GoogleDot-Custom"; + package = packages.${pkgs.system}.google-cursor.override { + background_color = cfg.cursor.bg; + outline_color = cfg.cursor.ol; + accent_color = cfg.cursor.ac; }; }; + fonts = let + font = { + name = "JetBrainsMono NerdFont"; + package = (pkgs.callPackage ../nerdfonts/default.nix { + fonts = [ "JetBrainsMono" ]; + }); + }; + in { + serif = font; + monospace = font; + sizes = { + desktop = 10; + popups = 10; + applications = 12; + terminal = 12; + }; + }; + targets = { + # CLI + tmux = True; + fish = True; + nushell = True; + # WM + hyprland = True; + sway = True; + foot = True; + kitty = True; + mako = False; + # TOOLS + nixvim = True; + yazi = True; + fzf = True; + bat = True; + mangohud = True; + # GUI + vesktop = True; + qutebrowser = True; + firefox = True; + gtk = True; + }; + }; }; } diff --git a/modules/home/wm/terminals/kitty/sets.nix b/modules/home/wm/terminals/kitty/sets.nix index ed0a71c..c62780a 100644 --- a/modules/home/wm/terminals/kitty/sets.nix +++ b/modules/home/wm/terminals/kitty/sets.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { programs.kitty = with pkgs; { settings = { - shell = "${fish}/bin/fish"; editor = "${helix}/bin/hx"; confirm_os_window_close = 0; @@ -29,8 +28,6 @@ underline_hyperlinks = "always"; enable_audio_bell = "no"; disable_ligatures = "never"; - font_features = - "+calt +liga +ss01 +ss02 +ss03 +ss04 +ss05 +ss06 +ss07 +ss08 +ss09"; kitty_mod = "alt"; }; diff --git a/modules/nixos/hardware/boot/default.nix b/modules/nixos/hardware/boot/default.nix index fedf5bd..7c7a60f 100644 --- a/modules/nixos/hardware/boot/default.nix +++ b/modules/nixos/hardware/boot/default.nix @@ -4,59 +4,69 @@ with lib; let cfg = config.module.hardware.boot; in { - options = { module.hardware.boot = { enable = mkEnableOption ""; }; }; - - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - config = mkIf cfg.enable { - boot = { # ITSELF LOL - kernelPackages = pkgs.linuxPackages_zen; - kernelModules = [ "kvm-amd" ]; - consoleLogLevel = 0; - kernelParams = [ - "quiet" - "loglevel=3" - "nowatchdog" - "page_alloc.shuffle=1" - "threadirqs" - "split_lock_detect=off" - "pci=pcie_bus_perf" - "psmouse.synaptics_intertouch=0" - "rd.systemd.show_status=false" - ]; - - loader = { # SYSTEMD BOOT AS DEFAULT - systemd-boot = True // { configurationLimit = 4; }; - efi.canTouchEfiVariables = true; - timeout = 0; # TIMEOUT FOR LAUNCH - }; - - initrd = { # IDK - availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "ohci_pci" - "ehci_pci" - "pata_atiixp" - "ums_realtek" - "sd_mod" - "sr_mod" - "sdhci_pci" - "usb_storage" - ]; - systemd = True; - compressor = "zstd"; - compressorArgs = [ "-9" ]; - verbose = false; - }; - - plymouth = True // { # PLYMOUTH WITH NIXOS LOGO - logo = - "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; - }; - - tmp.cleanOnBoot = true; + options = { + module.hardware.boot = { + enable = mkEnableOption ""; + plymouth.enable = mkEnableOption ""; }; }; + + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + config = mkMerge [ + (mkIf cfg.enable { + boot = { # ITSELF LOL + tmp.cleanOnBoot = true; + kernelPackages = pkgs.linuxPackages_zen; + kernelModules = [ "kvm-amd" ]; + consoleLogLevel = 0; + kernelParams = [ + "quiet" + "loglevel=3" + "nowatchdog" + "threadirqs" + "pci=pcie_bus_perf" + "boot.shell_on_fail" + "rd.udev.log_level=3" + "udev.log_priority=3" + "page_alloc.shuffle=1" + "page_alloc.shuffle=1" + "split_lock_detect=off" + "rd.systemd.show_status=false" + "psmouse.synaptics_intertouch=0" + ]; + loader = { # SYSTEMD BOOT AS DEFAULT + systemd-boot = True // { configurationLimit = 4; }; + efi.canTouchEfiVariables = true; + timeout = 0; # TIMEOUT FOR LAUNCH + }; + initrd = { # IDK + systemd = True; + compressor = "zstd"; + compressorArgs = [ "-9" ]; + verbose = false; + availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "ohci_pci" + "ehci_pci" + "pata_atiixp" + "ums_realtek" + "sd_mod" + "sr_mod" + "sdhci_pci" + "usb_storage" + ]; + }; + }; + }) + (mkIf cfg.plymouth.enable { + boot.plymouth = with pkgs; + True // { + logo = + "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; + }; + }) + ]; }