diff --git a/flake.lock b/flake.lock index 37bb519..b0004cf 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -26,14 +26,15 @@ "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1713259062, - "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=", + "lastModified": 1717576207, + "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", "owner": "Kirottu", "repo": "anyrun", - "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39", + "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", "type": "github" }, "original": { @@ -143,15 +144,15 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -209,11 +210,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -225,11 +226,11 @@ "doom-emacs-config": { "flake": false, "locked": { - "lastModified": 1716154542, - "narHash": "sha256-Nx632y+SLXQm/Wdyckfa6D65SqWQGi6w6A2afjii4U4=", + "lastModified": 1717509774, + "narHash": "sha256-UWJN5xyLU4L5hdEhHUwfcb5VnT/RvhMhkHpOf6X7rEE=", "owner": "bloxx12", "repo": "doom-emacs-config", - "rev": "392fd7b74f117af3c5ce458c9f47b8326a13a39e", + "rev": "f478a6a045ce45276154eab706eb7245f9252120", "type": "github" }, "original": { @@ -241,11 +242,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1713464448, - "narHash": "sha256-Fhir4WlcfEh70V8+oNS1LVAGBftiqtD2qaHzOC8BJUI=", + "lastModified": 1719819335, + "narHash": "sha256-q23oxbXPg4Fq0TygPI1lIj/IqZmVwl7n4jzjbXncA70=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "9620bb45ac4cd7b0274c497b2d9d93c4ad9364ee", + "rev": "5da8304c4620d3b38c4bd6eb61366a83a89c0427", "type": "github" }, "original": { @@ -261,11 +262,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717260669, - "narHash": "sha256-0+XM3B4nIwUtbbZPIOXzGHtO8JjNgjukAIDa25wmjr8=", + "lastModified": 1719850620, + "narHash": "sha256-n/TlWcW3h7cC6zRjJLjLNk87LtXp4H6Nf0NghdnYlKY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "177491c08fa49c820cb22181f41f6fe85416fe64", + "rev": "6b14b1346a81aba358b2fe747e9f3de0e205945d", "type": "github" }, "original": { @@ -282,11 +283,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1717223092, - "narHash": "sha256-ih8NPk3Jn5EAILOGQZ+KS5NLmu6QmwohJX+36MaTAQE=", + "lastModified": 1719815435, + "narHash": "sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw=", "owner": "nix-community", "repo": "fenix", - "rev": "9a025daf6799e3af80b677f0af57ef76432c3fcf", + "rev": "ebfe2c639111d7e82972a12711206afaeeda2450", "type": "github" }, "original": { @@ -297,11 +298,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1688025799, - "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "owner": "nix-community", "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "type": "github" }, "original": { @@ -380,11 +381,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -401,11 +402,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -444,11 +445,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1719745305, + "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", "type": "github" }, "original": { @@ -465,11 +466,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -496,24 +497,9 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -531,7 +517,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -549,7 +535,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1701680307, @@ -567,7 +553,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1685518550, @@ -613,11 +599,11 @@ ] }, "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -677,11 +663,11 @@ ] }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1719226092, + "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", "type": "github" }, "original": { @@ -718,11 +704,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -739,11 +725,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -760,11 +746,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -781,11 +767,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -810,11 +796,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -827,17 +813,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", - "systems": "systems_3", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1717186020, - "narHash": "sha256-PQF/ng2hSQsKKsn4N+4RmVu+4ljzsrSsrAm5Yp7wADM=", + "lastModified": 1719786368, + "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=", "ref": "refs/heads/main", - "rev": "a54ab301602e205f273969c093cf494d38ba4a98", - "revCount": 4752, + "rev": "d7ea1b7785f31e9fd6477490309721a19a835592", + "revCount": 4900, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -853,6 +840,11 @@ "hyprland": [ "hyprland" ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], "systems": [ "hyprland-plugins", "hyprland", @@ -860,11 +852,11 @@ ] }, "locked": { - "lastModified": 1717171694, - "narHash": "sha256-LN2lrcGdAMpkooleWSOV+/q1+wx1f3pSBs1TWeoMCkA=", + "lastModified": 1719784423, + "narHash": "sha256-D7O5+nh2Wn9tQPJArWHrDSZeEfBCtj5zTGd86701LPE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e0cad229c3d799c7f72b1217ab2eb300ceecf3ac", + "rev": "98cb18c6fcfe8196ef4150d09fbae305b7bb2954", "type": "github" }, "original": { @@ -887,11 +879,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -901,6 +893,35 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { "inputs": { "nixpkgs": [ "hyprland", @@ -912,16 +933,16 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "repo": "hyprutils", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", "type": "github" } }, @@ -937,11 +958,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -956,11 +977,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1716725378, - "narHash": "sha256-bNTVDAVBLFSSTU+q54cJnntmFKBi+F/D8sSqlZwBGiM=", + "lastModified": 1719749459, + "narHash": "sha256-sAZRJNJ9FRUPvseuH21kmh9s+Q6AfQWPNxKVm534wgk=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "dbc9130fe1455e0f6ee4d8f5f799f9be551f866b", + "rev": "a15b020a1d0fc483386eb001ec6735b8a30bec81", "type": "github" }, "original": { @@ -977,11 +998,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -998,11 +1019,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715804156, - "narHash": "sha256-GtIHP86Cz1kD9xZO/cKbNQACHKdoT9WFbLJAq6W2EDY=", + "lastModified": 1719247822, + "narHash": "sha256-qbtex5uSOUQnK4797JztyTQWlnlhEsE8x5g5qs5DgvQ=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "bb95091f6c6f38f6cfc215a1797a2dd466312c8b", + "rev": "9bed665aa71907dcacc8ae6dba1a3055a9ff2de7", "type": "github" }, "original": { @@ -1057,11 +1078,11 @@ ] }, "locked": { - "lastModified": 1717036060, - "narHash": "sha256-Bm1pBy1goxIz9PD0PRJ9ZgQzl7MQOQ6n5IB4wLNdXrA=", + "lastModified": 1719454904, + "narHash": "sha256-/p5EdN8b8XxOihdqw6bTh5zsVR8iecdDB7qXo/jRy+4=", "owner": "nixpak", "repo": "nixpak", - "rev": "3a68b5453f75b1c8e5d31859a654e061a57dc059", + "rev": "02483947c304279c6861fcd15df9aee8859a5a7b", "type": "github" }, "original": { @@ -1088,11 +1109,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1716684580, - "narHash": "sha256-sIbMJWJr4hl2PWd9/iWlh89QfVzBn1NJ3u5RjeZADuM=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "d0d27192931680482081aa1c38389da2af84a651", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -1121,11 +1142,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -1143,11 +1164,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1717175759, - "narHash": "sha256-KiM5ue/UNQt8ktoqCV4yFqhHxM31U94Mf/piKW9dZ4c=", + "lastModified": 1719861366, + "narHash": "sha256-0AoX95NkDRQeCL+m1BDW+FdKVldsb6NF94vlE63q7No=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "93b225ddba91179248b378913a91defbc6aeb899", + "rev": "4cb5b074e41c963724d187c08c58be677154a9b8", "type": "github" }, "original": { @@ -1158,11 +1179,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1174,11 +1195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1190,11 +1211,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1206,11 +1227,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1715037484, - "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { @@ -1222,11 +1243,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -1273,7 +1294,6 @@ "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", - "flake-root": "flake-root", "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", @@ -1283,11 +1303,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1717255175, - "narHash": "sha256-MtsnAwzY2cmufUoFQvI/1mTzd3FKbZLCb8zF4jXkZLY=", + "lastModified": 1719860300, + "narHash": "sha256-ZeF+zI+/53HeS567/mXS2Gw+w8k9FsjRC/TzoVQOpi4=", "owner": "nix-community", "repo": "nixvim", - "rev": "df3aa867137227bda9e44beab82a63443d700f18", + "rev": "079c2c479b5707adf0b03f817be30945c92c15cf", "type": "github" }, "original": { @@ -1298,11 +1318,11 @@ }, "nur": { "locked": { - "lastModified": 1717258745, - "narHash": "sha256-6J5MOggjjXlLtbSROzCI/wba91WXeK/2qcz9vcvEN1k=", + "lastModified": 1719858509, + "narHash": "sha256-jtm8ua6/+NxXr9lr9LuTKpWGida1jeOInda0MdXrS+k=", "owner": "nix-community", "repo": "NUR", - "rev": "39bf5f1311fcf35a55df966ae774da7bf8e35d30", + "rev": "9f3d8cf1bb4a91c5d757dc09198c85344e06ce1a", "type": "github" }, "original": { @@ -1336,11 +1356,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1717169693, - "narHash": "sha256-qBruki5NHrSqIw5ulxtwFmVsb6W/aOKOMjsCJjfalA4=", + "lastModified": 1719760370, + "narHash": "sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d6d735e6f20ef78b16a79886fe28bd69cf059504", + "rev": "ea7fdada6a0940b239ddbde2048a4d7dac1efe1e", "type": "github" }, "original": { @@ -1362,14 +1382,14 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_6" + "systems": "systems_7" }, "locked": { - "lastModified": 1714677453, - "narHash": "sha256-MlkAYTZz5/bFJgNIewbJa8mbtoVqg6Pq7t8A5Z1wVvc=", + "lastModified": 1719058240, + "narHash": "sha256-pprpeDB/mvINS5m5FIOq/1I0xpBvO8l7FyWNmmO0Ir0=", "owner": "schizofox", "repo": "schizofox", - "rev": "9c7263441064d0e3e4c94e1d8dbd8d260d00408d", + "rev": "becff9b92a28c3cd6e6a215da7f5f56883d3a304", "type": "github" }, "original": { @@ -1428,11 +1448,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1716923053, - "narHash": "sha256-1KV6CErlIu73948+EVfH2OZeyIdUJlRIZLZMlo0Yqis=", + "lastModified": 1719609595, + "narHash": "sha256-qYVrBBghxCKoc1fK/MFagKFp3wvOEU83tvBwlTkLglA=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "df17c6f2d17d0156220a514d0ee622d734411905", + "rev": "19483b0e0e3e7ee5125e54ab36bcadf180a26ad3", "type": "github" }, "original": { @@ -1456,11 +1476,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1717212835, - "narHash": "sha256-fSNsRokB3YaTmJOcSdDzKJOFWq/bQ/FCoMGpF12sF5c=", + "lastModified": 1719525570, + "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "owner": "danth", "repo": "stylix", - "rev": "266db7f00cad4a465e0ce43d91798fda10716212", + "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "type": "github" }, "original": { @@ -1485,21 +1505,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1514,7 +1519,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1529,6 +1534,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_5": { "locked": { "lastModified": 1681028828, @@ -1545,6 +1565,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1559,7 +1594,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1604,11 +1639,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1719749022, + "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", "type": "github" }, "original": { @@ -1634,11 +1669,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3ed331b..683e930 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,10 @@ url = "github:doomemacs/doomemacs"; flake = false; }; + nvf = { + url = "github:notashelf/nvf"; + inputs.nixpkgs.follows = "nixpkgs"; + }; doom-emacs-config = { url = "github:bloxx12/doom-emacs-config"; flake = false; @@ -50,6 +54,8 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + + ags.url = "github:Aylur/ags"; schizofox = { url = "github:schizofox/schizofox"; inputs = { diff --git a/hosts/default.nix b/hosts/default.nix index 21141f7..2eca852 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -10,8 +10,8 @@ in { ../modules inputs.home-manager.nixosModules.home-manager inputs.agenix.nixosModules.default + inputs.nvf.nixosModules.default inputs.stylix.nixosModules.stylix - #inputs.nixvim.nixosModules.nixvim ]; }; hermit = lib.nixosSystem { @@ -22,8 +22,8 @@ in { ../modules inputs.home-manager.nixosModules.home-manager inputs.agenix.nixosModules.default + inputs.nvf.nixosModules.default inputs.stylix.nixosModules.stylix - inputs.nixvim.nixosModules.nixvim ]; }; } diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix index d6d4efa..2daf935 100644 --- a/hosts/vali/hermit/configuration.nix +++ b/hosts/vali/hermit/configuration.nix @@ -22,6 +22,20 @@ security.polkit.enable = true; programs.kdeconnect.enable = true; programs.dconf.enable = true; + services.thermald.enable = true; + services.auto-cpufreq = { + enable = true; + settings = { + battery = { + governor = "powersave"; + turbo = "auto"; + }; + charger = { + governor = "performance"; + turbo = "auto"; + }; + }; + }; # boot.kernelModules = [ "v4l2loopback" ]; boot.kernelPackages = pkgs.linuxPackages_xanmod_stable; # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; @@ -53,7 +67,6 @@ newsboat.enable = true; foot.enable = true; fish.enable = true; - stylix.enable = true; nh.enable = true; waybar.enable = true; spicetify.enable = true; @@ -74,6 +87,18 @@ dunst.enable = true; }; themes = { + stylix = { + enable = true; + scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml"; + cursor = { + size = 16; + }; + fontsizes = { + terminal = 12; + popups = 12; + }; + image = ../../../assets/wallpapers/tiredgod.png; + }; gtk = {enable = true;}; qt = { enable = true; diff --git a/hosts/vali/hermit/hardware-configuration.nix b/hosts/vali/hermit/hardware-configuration.nix index 099c5a3..0663cff 100644 --- a/hosts/vali/hermit/hardware-configuration.nix +++ b/hosts/vali/hermit/hardware-configuration.nix @@ -1,4 +1,4 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ + # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: @@ -8,25 +8,26 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/3d023930-3656-44bb-a737-b0e08a6bbd3e"; + { device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-10037600-c781-4ebc-9ceb-7e0367b1ed24".device = "/dev/disk/by-uuid/10037600-c781-4ebc-9ceb-7e0367b1ed24"; + boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3A39-FAF1"; + { device = "/dev/disk/by-uuid/E355-67EA"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; - - swapDevices = [ ]; +# swapDevices = +# [ { device = "/dev/disk/by-uuid/3518272e-1051-41e2-a7f0-f5c744e46789"; } +# ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/vali/hermit/profile.nix b/hosts/vali/hermit/profile.nix index 6ab615d..c843f8e 100644 --- a/hosts/vali/hermit/profile.nix +++ b/hosts/vali/hermit/profile.nix @@ -1,6 +1,7 @@ _: { imports = [ ../../../options/boot/grub-boot.nix + ../../../options/common/bluetooth.nix ../../../options/desktop/fonts.nix ../../../options/common/networking.nix ../../../options/common/gpu/nvidia.nix diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix index b7e155b..597be74 100644 --- a/hosts/vali/hermit/programs.nix +++ b/hosts/vali/hermit/programs.nix @@ -1,8 +1,5 @@ -{ - inputs, - pkgs, - ... -}: let +{ inputs, pkgs, ... }: +let fenix = inputs.fenix.packages.${pkgs.system}; nixpkgs-wayland = inputs.nixpkgs-wayland.packages.${pkgs.system}; in { @@ -11,6 +8,9 @@ in { alsa-utils asciinema bibata-cursors + blueman + bluetuith + bluez cmake difftastic dig diff --git a/modules/cli/default.nix b/modules/cli/default.nix index 22ea6b7..78901d3 100644 --- a/modules/cli/default.nix +++ b/modules/cli/default.nix @@ -1 +1 @@ -_: {imports = [./neovim.nix ./fish.nix ./nh.nix];} +_: {imports = [./fish.nix ./nh.nix];} diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix index 9210074..41131cf 100644 --- a/modules/cli/fish.nix +++ b/modules/cli/fish.nix @@ -37,10 +37,6 @@ in { enable = true; interactiveShellInit = "set fish_greeting"; plugins = [ - { - name = "grc"; - inherit (pkgs.fishPlugins.grc) src; - } { name = "sponge"; inherit (pkgs.fishPlugins.sponge) src; @@ -49,10 +45,6 @@ in { name = "done"; inherit (pkgs.fishPlugins.done) src; } - { - name = "colored_man_pages"; - inherit (pkgs.fishPlugins.colored-man-pages) src; - } { name = "tide"; inherit (pkgs.fishPlugins.tide) src; diff --git a/modules/cli/neovim.nix b/modules/cli/neovim.nix deleted file mode 100644 index 9c74151..0000000 --- a/modules/cli/neovim.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - lazyvim-config = pkgs.fetchFromGitHub { - owner = "Dragyx"; - repo = "lazyvim-config"; - rev = "d799724f48199d81ca6c8abb5951860fbf8fa0df"; - hash = "sha256-NF92CweRFQ1qZS8NXoTUEljazRGXgXS2AuDt5IWmwBc="; - }; - cfg = config.modules.programs.neovim-old; - username = config.modules.other.system.username; -in { - options.modules.programs.neovim-old.enable = lib.mkEnableOption "neovim-old"; - - config = lib.mkIf cfg.enable { - home-manager.users.${username} = { - home.packages = with pkgs; [lazygit ripgrep fd gcc xclip rust-analyzer]; - programs.neovim = { - enable = true; - viAlias = true; - vimAlias = true; - defaultEditor = true; - }; - - xdg.configFile."nvim" = { - enable = true; - source = lazyvim-config; - recursive = true; - }; - }; - }; -} diff --git a/modules/default.nix b/modules/default.nix index ea3e341..aec8ae8 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1 +1 @@ -_: {imports = [./cli ./gui ./tui ./other ./services ./editors ./wms];} +_: {imports = [./cli ./gui ./tui ./other ./services ./editors ./wms ./styling];} diff --git a/modules/editors/nixvim/default.nix b/modules/editors/nixvim/default.nix index e746d42..ac6d47a 100644 --- a/modules/editors/nixvim/default.nix +++ b/modules/editors/nixvim/default.nix @@ -1,3 +1,28 @@ -_: { - imports = [./nixvim.nix]; +{ + config, + lib, + inputs, + ... +}: let + inherit (builtins) filter map toString elem; + inherit (lib.filesystem) listFilesRecursive; + inherit (lib.strings) hasSuffix; + inherit (lib.lists) concatLists; + + mkNixvimModule = { + path, + ignoredPaths ? [ + ], + }: + filter (hasSuffix ".nix") ( + map toString ( + filter (path: path != ./default.nix && !elem path ignoredPaths) (listFilesRecursive path) + ) + ); +in { + imports = concatLists [ + [inputs.nixvim.nixosModules.nixvim] + + (mkNixvimModule {path = ./.;}) + ]; } diff --git a/modules/editors/nvf/default.nix b/modules/editors/nvf/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/editors/nvf/nvf.nix b/modules/editors/nvf/nvf.nix new file mode 100644 index 0000000..44d3128 --- /dev/null +++ b/modules/editors/nvf/nvf.nix @@ -0,0 +1,46 @@ +{ + inputs, + lib, + pkgs, + ... +}: { + programs.nvf = { + enable = true; + + defaultEditor = true; + enableManpages = true; + + settings = { + vim = { + # use neovim-unwrapped from nixpkgs + package = pkgs.neovim-unwrapped; + + viAlias = true; + vimAlias = true; + + withNodeJs = false; + withPython3 = false; + withRuby = false; + + # Prevent swapfile and backupfile from being created + preventJunkFiles = true; + + # Make use of the clipboard for default yank and paste operations. Don’t use * and + + useSystemClipboard = true; + spellcheck = { + enable = true; + languages = ["en" "de"]; + }; + + # Whether to enable the experimental Lua module loader to speed up the start up process + enableLuaLoader = true; + enableEditorconfig = true; + + debugMode = { + enable = false; + logFile = "/tmp/nvim.log"; + }; + }; + }; + }; +} diff --git a/modules/gui/chevron/config.js b/modules/gui/chevron/config.js deleted file mode 100644 index 8cade61..0000000 --- a/modules/gui/chevron/config.js +++ /dev/null @@ -1,737 +0,0 @@ -window.CONFIG = { - macros: [ - { - category: 'Entertainment', - name: 'YouTube', - triggers: [ - 'y', - 'yt', - 'youtube', - ], - key: 'KeyY', - icon: 'youtube', - url: 'https://youtube.com', - normalisedURL: 'youtube.com', - commands: { - go: { - template: 'https://youtu.be/{$}', - description: 'go to video' - }, - search: { - template: '{@}/results?search_query={$}' - } - }, - bgColor: { - type: 'solid', - color: '#f30002' - }, - textColor: '#212121', - pinned: true - }, - { - category: 'Communication', - name: 'Telegram', - icon: 'telegram', - url: 'http://t.me', - normalisedURL: 't.me', - triggers: [ - 'm', - 'tm', - 'tg', - 'teleg', - 'telega', - 'telegram' - ], - key: 'KeyM', - commands: { - go: { - template: '{@}/{$}' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'radial', - colors: ['#29aaed', '#25a4e2'], - stops: [40, 100] - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Communication', - name: 'WhatsApp', - icon: 'whatsApp', - url: 'https://web.whatsapp.com', - normalisedURL: 'whatsapp.com', - triggers: [ - 'w', - 'wa', - 'wapp', - 'wahtsapp', - ], - key: 'KeyW', - bgColor: { - type: 'gradient', - gradientType: 'linear', - angle: 45, - colors: ['#26d347', '#58f879'] - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Social', - name: 'Reddit', - triggers: [ - 'r', - 'rd', - 'reddit', - ], - key: 'KeyR', - icon: 'reddit', - url: 'https://reddit.com', - normalisedURL: 'reddit.com', - commands: { - go: { - template: '{@}/r/{$}', - description: 'go to subreddit' - }, - search: { - template: '{@}/search?q={$}' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#f07e23', '#f74300'], - stops: [0, 100] - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Programming', - name: 'GitHub', - icon: 'github', - url: 'https://github.com', - normalisedURL: 'github.com', - triggers: [ - 'g', - 'git', - 'github' - ], - key: 'KeyG', - commands: { - go: { - template: '{@}/{$}', - description: 'go to user' - }, - search: { - template: '{@}/search?q={$}' - } - }, - bgColor: { - type: 'solid', - color: '#171515' - }, - textColor: '#e8e8e8', - pinned: true - }, - { - category: 'Programming', - name: 'StackOverflow', - icon: 'stackoverflow', - url: 'https://stackoverflow.com', - normalisedURL: 'stackoverflow.com', - triggers: [ - 's', - 'st', - 'so', - 'stack', - 'stackoverflow' - ], - key: 'KeyS', - commands: { - search: { - template: '{@}/search?q={$}' - }, - go: { - template: '{@}/questions/{$}', - description: 'go to question' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#e87922', '#ffbe25'], - stops: [0, 100] - }, - textColor: '#212121', - pinned: true - }, - { - category: 'Programming', - name: 'ChatGPT', - icon: 'chatGPT', - url: 'https://chat.openai.com/chat', - normalisedURL: 'openai.com', - triggers: [ - 'c', - 'chat', - 'gpt', - 'cgpt', - 'chatgpt' - ], - key: 'KeyC', - bgColor: { - type: 'solid', - color: '#70a597', - }, - textColor: '#f7f7f7', - pinned: true - }, - { - category: 'Other', - name: 'Translate', - icon: 'translate', - url: 'https://translate.google.com', - normalisedURL: 'translate.google.com', - triggers: [ - 't', - 'translate' - ], - key: 'KeyT', - commands: { - search: { - template: '{@}/?text={$}', - description: 'translate text' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - angle: 45, - colors: ['#508bed', '#4654b4'] - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Social', - name: 'Instagram', - triggers: [ - 'i', - 'ig', - 'insta', - 'instagram' - ], - key: 'KeyI', - icon: 'instagram', - url: 'https://instagram.com', - normalisedURL: 'instagram.com', - commands: { - go: { - template: '{@}/{$}', - description: 'go to user' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'radial', - angle: 'circle at 30% 107%', - colors: ['#fdf497', '#fdf497', '#fd5949', '#d6249f', '#285aeb'], - stops: [0, 5, 45, 60, 90] - }, - textColor: '#e8e8e8', - pinned: true - }, - { - category: 'Music', - name: 'spotify', - icon: 'spotify', - url: 'https://open.spotify.com', - normalisedURL: 'spotify.com', - triggers: [ - 'music', - 'sp', - 'sfy', - 'spo', - 'spotify' - ], - commands: { - search: { - template: '{@}/search/{$}' - }, - go: { - template: '{@}/track/{$}', - description: 'go to track' - } - }, - bgColor: { - type: 'solid', - color: '#1ccc5b' - }, - textColor: '#000', - pinned: true - }, - { - category: 'Social', - name: 'Discord', - icon: 'discord', - key: 'KeyD', - triggers: [ - 'd', - 'dis', - 'discord' - ], - url: 'https://discord.com/app', - normalisedURL: 'discord.com', - bgColor: { - type: 'solid', - color: '#5460e6' - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Social', - name: 'Twitch', - icon: 'twitch', - url: 'https://twitch.tv', - normalisedURL: 'twitch.tv', - triggers: [ - 'tw', - 'twitch', - ], - commands: { - search: { - template: '{@}/search?term={$}' - }, - go: { - template: '{@}/{$}' - } - }, - bgColor: { - type: 'solid', - color: '#8c44f7' - }, - textColor: '#000', - pinned: true - }, - { - category: 'Entertainment', - name: 'Netflix', - triggers: [ - 'n', - 'nf', - 'nfx', - 'netflix', - ], - key: 'KeyN', - icon: 'netflix', - url: 'https://media.netflix.com', - normalisedURL: 'netflix.com', - commands: { - search: { - template: '{@}/en/search?&term={$}' - } - }, - bgColor: { - type: 'solid', - color: '#000' - }, - textColor: '#da0813', - pinned: true - }, - { - category: 'Social', - name: 'Twitter', - icon: 'twitter', - url: 'https://twitter.com', - normalisedURL: 'twitter.com', - triggers: [ - 'tt', - 'twt', - 'twit', - 'twitt', - 'twitter' - ], - commands: { - search: { - template: '{@}/search?q={$}' - }, - go: { - template: '{@}/{$}' - } - }, - bgColor: { - type: 'solid', - color: '#1c99e6' - }, - textColor: '#e8e8e8', - pinned: true - }, - { - category: 'Work', - name: 'Linkedin', - icon: 'linkedin', - key: 'KeyL', - triggers: [ - 'l', - 'lk', - 'li', - 'linked', - 'linkedin' - ], - url: 'https://linkedin.com', - normalisedURL: 'linkedin.com', - commands: { - search: { - template: '{@}/search/results/all/?keywords={$}' - } - }, - bgColor: { - type: 'solid', - color: '#0077b7' - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Communication', - name: 'Gmail', - icon: 'gmail', - url: 'https://gmail.com', - normalisedURL: 'gmail.com', - triggers: [ - 'em', - 'gm', - 'mail', - 'gmail' - ], - key: 'KeyE', - commands: { - search: { - template: '{@}/#search/{$}' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - angle: 45, - colors: ['#df493b', '#e8e8e8'], - stops: [50, 100] - }, - textColor: '#e8e8e8', - pinned: true - }, - { - category: 'Work', - name: 'Google Drive', - triggers: [ - 'gd', - 'drive', - 'gdrive', - 'google', - ], - icon: 'gdrive', - url: 'https://drive.google.com', - normalisedURL: 'drive.google.com', - bgColor: { - type: 'gradient', - angle: 70, - gradientType: 'linear', - colors: ['#2684fc', '#00ac47', '#ffba00'] - }, - textColor: '#fff', - pinned: true - }, - { - category: 'Shopping', - name: 'Amazon', - triggers: [ - 'a', - 'am', - 'amz', - 'amazon', - ], - icon: 'amazon', - key: 'KeyA', - url: 'https://www.amazon.com/', - normalisedURL: 'amazon.com', - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#f29100', '#fff'], - stops: [0, 80] - }, - textColor: '#000', - pinned: true - }, - { - category: 'Education', - name: 'Wikipedia', - icon: 'wikipedia', - triggers: [ - 'wi', - 'wiki', - 'wikipedia' - ], - url: 'https://www.wikipedia.org', - normalisedURL: 'wikipedia.org', - commands: { - search: { - template: '{@}/?search={$}' - }, - go: { - template: '{@}/wiki/{$}' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#e1e1e3', '#bbb'], - stops: [60, 100] - }, - textColor: '#000', - pinned: true - }, - { - category: 'Work', - name: 'Slack', - icon: 'slack', - triggers: [ - 'sl', - 'slack' - ], - url: 'https://app.slack.com', - normalisedURL: 'slack.com', - bgColor: { - type: 'gradient', - gradientType: 'linear', - angle: -200, - colors: ['#d6abb9', '#e6d7b8', '#bce2eb', '#8db0a4'] - }, - textColor: '#00bd6d', - }, - { - category: 'Social', - name: 'VK', - triggers: [ - 'v', - 'vk', - 'vkontakte', - ], - url: 'https://vk.com', - normalisedURL: 'vk.com', - commands: { - go: { - template: '{@}/{$}', - description: 'go to' - }, - search: { - template: '{@}/search?c%5Bq%5D={$}&c%5Bsection%5D=auto' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#0077ff', '#0033ff'] - }, - textColor: '#e8e8e8' - }, - { - category: 'Search', - name: 'DuckDuckGo', - triggers: [ - 'dd', - 'ddg', - 'duck', - 'duckduck', - 'duckduckgo' - ], - url: 'https://duckduckgo.com', - normalisedURL: 'duckduckgo.com', - commands: { - search: { - template: '{@}/?q={$}' - } - }, - bgColor: { - type: 'solid', - color: '#e37151' - }, - textColor: '#e8e8e8' - }, - { - category: 'Search', - name: 'Bing', - triggers: [ - 'b', - 'bing', - ], - url: 'https://www.bing.com', - normalisedURL: 'bing.com', - commands: { - search: { - template: '{@}/search?q={$}' - } - }, - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#3ab0f1', '#2351dd', '#40d1da'] - }, - textColor: '#e8e8e8' - }, - { - category: 'Search', - name: 'Yandex', - triggers: [ - 'ya', - 'yandex' - ], - url: 'https://ya.ru', - normalisedURL: 'ya.ru', - commands: { - search: { - template: '{@}/search/?text={$}' - } - }, - bgColor: { - type: 'solid', - color: '#fc3f1d' - }, - textColor: '#000' - }, - ], - commands: [ - { - type: 'search', - trigger: '?' - }, - { - type: 'go', - trigger: '/' - } - ], - engines: { - google: { - name: 'Google', - bgColor: { - type: 'solid', - color: '#aaa' - }, - textColor: '#fff', - types: { - // @ - origin query (what user typed); $ - final query (what is in the query field (selected)) - query: { - template: 'https://www.google.com/search?q={$}' - }, - calculator: { - template: 'https://www.google.com/search?q={@}' - }, - currency: { - template: 'https://www.google.com/search?q={@}' - } - } - }, - duckDuckGo: { - name: 'DuckDuckGo', - bgColor: { - type: 'solid', - color: '#e37151' - }, - textColor: '#e8e8e8', - types: { - query: { - template: 'https://duckduckgo.com/?q={$}' - }, - calculator: { - template: 'https://duckduckgo.com/?q={@}' - }, - currency: { - template: 'https://duckduckgo.com/?q={@}' - } - } - }, - yandex: { - name: 'Yandex', - bgColor: { - type: 'solid', - color: '#fc3f1d' - }, - textColor: '#000', - types: { - query: { - template: 'https://ya.ru/search/?text={$}' - }, - calculator: { - template: 'https://ya.ru/search/?text={@}' - }, - currency: { - template: 'https://ya.ru/search/?text={@}' - } - } - }, - qwant: { - name: 'Qwant', - bgColor: { - type: 'solid', - color: '#5992f7' - }, - textColor: '#000', - types: { - query: { - template: 'https://www.qwant.com/?q={$}' - }, - calculator: { - template: 'https://www.qwant.com/?q={@}' - }, - currency: { - template: 'https://www.qwant.com/?q={@}' - } - } - }, - bing: { - name: 'Bing', - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#3ab0f1', '#2351dd', '#40d1da'] - }, - textColor: '#e8e8e8', - types: { - query: { - template: 'https://www.bing.com/search?q={$}' - }, - calculator: { - template: 'https://www.bing.com/search?q={@}' - }, - currency: { - template: 'https://www.bing.com/search?q={@}' - } - } - }, - brave: { - name: 'Brave', - bgColor: { - type: 'gradient', - gradientType: 'linear', - colors: ['#FB542B', '#343546'] - }, - textColor: '#e8e8e8', - types: { - query: { - template: 'https://search.brave.com/search?q={$}' - }, - calculator: { - template: 'https://search.brave.com/search?q={@}' - }, - currency: { - template: 'https://search.brave.com/search?q={@}' - } - } - } - } -} diff --git a/modules/gui/chevron/font.css b/modules/gui/chevron/font.css deleted file mode 100644 index 517d210..0000000 --- a/modules/gui/chevron/font.css +++ /dev/null @@ -1,70 +0,0 @@ -/* Onest (default font) */ -@font-face { - font-family: 'Onest'; - src: url('./fonts/Onest/OnestMedium.ttf'); -} -@font-face { - font-family: 'Onest Bold'; - src: url('./fonts/Onest/OnestExtraBold.ttf'); -} -@font-face { - font-family: 'Onest Light'; - src: url('./fonts/Onest/OnestThin.ttf'); -} - -:root { - --font: 'Onest Bold' -} - -/* Blogger Sans */ -/* -@font-face { - font-family: 'Blogger Sans'; - src: url('./fonts/Blogger Sans/Blogger Sans Bold.ttf'); -} -@font-face { - font-family: 'Blogger Sans Light'; - src: url('./fonts/Blogger Sans/Blogger Sans Light.ttf.ttf'); -} -*/ - -/* Uni Sans */ -/* -@font-face { - font-family: 'Uni Sans'; - src: url('./fonts/Uni Sans/Uni Sans Heavy.otf'); -} -@font-face { - font-family: 'Uni Sans Light'; - src: url('./fonts/Uni Sans/Uni Sans Thin.otf'); -} -*/ - -/* Rubik */ -/* -@font-face { - font-family: 'Rubik'; - src: url('./fonts/Rubik/Rubik.ttf'); -} -*/ - -/* Figtree */ -/* -@font-face { - font-family: 'Figtree'; - src: url('./fonts/Figtree/Figtree-VariableFont_wght.ttf'); -} -@font-face { - font-family: 'Figtree'; - src: url('./fonts/Figtree/Figtree-Italic-VariableFont_wght.ttf'); - font-style: italic; -} -*/ - -/* Public Sans (Joy UI dependency) */ -/* -@font-face { - font-family: 'Public Sans'; - src: url('./fonts/Public Sans/PublicSans-Regular.ttf'); -} -*/ \ No newline at end of file diff --git a/modules/gui/chevron/fonts/Blogger Sans/Blogger Sans Bold.ttf b/modules/gui/chevron/fonts/Blogger Sans/Blogger Sans Bold.ttf deleted file mode 100644 index d287255..0000000 Binary files a/modules/gui/chevron/fonts/Blogger Sans/Blogger Sans Bold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Blogger Sans/Blogger Sans Light.ttf b/modules/gui/chevron/fonts/Blogger Sans/Blogger Sans Light.ttf deleted file mode 100644 index 0bb366b..0000000 Binary files a/modules/gui/chevron/fonts/Blogger Sans/Blogger Sans Light.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/Figtree-Italic-VariableFont_wght.ttf b/modules/gui/chevron/fonts/Figtree/Figtree-Italic-VariableFont_wght.ttf deleted file mode 100644 index efd8700..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/Figtree-Italic-VariableFont_wght.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/Figtree-VariableFont_wght.ttf b/modules/gui/chevron/fonts/Figtree/Figtree-VariableFont_wght.ttf deleted file mode 100644 index dbedb20..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/Figtree-VariableFont_wght.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/OFL.txt b/modules/gui/chevron/fonts/Figtree/OFL.txt deleted file mode 100644 index ec3dc2b..0000000 --- a/modules/gui/chevron/fonts/Figtree/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2022 The Figtree Project Authors (https://github.com/erikdkennedy/figtree) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/modules/gui/chevron/fonts/Figtree/README.txt b/modules/gui/chevron/fonts/Figtree/README.txt deleted file mode 100644 index 3814098..0000000 --- a/modules/gui/chevron/fonts/Figtree/README.txt +++ /dev/null @@ -1,77 +0,0 @@ -Figtree Variable Font -===================== - -This download contains Figtree as both variable fonts and static fonts. - -Figtree is a variable font with this axis: - wght - -This means all the styles are contained in these files: - Figtree-VariableFont_wght.ttf - Figtree-Italic-VariableFont_wght.ttf - -If your app fully supports variable fonts, you can now pick intermediate styles -that aren’t available as static fonts. Not all apps support variable fonts, and -in those cases you can use the static font files for Figtree: - static/Figtree-Light.ttf - static/Figtree-Regular.ttf - static/Figtree-Medium.ttf - static/Figtree-SemiBold.ttf - static/Figtree-Bold.ttf - static/Figtree-ExtraBold.ttf - static/Figtree-Black.ttf - static/Figtree-LightItalic.ttf - static/Figtree-Italic.ttf - static/Figtree-MediumItalic.ttf - static/Figtree-SemiBoldItalic.ttf - static/Figtree-BoldItalic.ttf - static/Figtree-ExtraBoldItalic.ttf - static/Figtree-BlackItalic.ttf - -Get started ------------ - -1. Install the font files you want to use - -2. Use your app's font picker to view the font family and all the -available styles - -Learn more about variable fonts -------------------------------- - - https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts - https://variablefonts.typenetwork.com - https://medium.com/variable-fonts - -In desktop apps - - https://theblog.adobe.com/can-variable-fonts-illustrator-cc - https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts - -Online - - https://developers.google.com/fonts/docs/getting_started - https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide - https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts - -Installing fonts - - MacOS: https://support.apple.com/en-us/HT201749 - Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux - Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows - -Android Apps - - https://developers.google.com/fonts/docs/android - https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts - -License -------- -Please read the full license text (OFL.txt) to understand the permissions, -restrictions and requirements for usage, redistribution, and modification. - -You can use them in your products & projects – print or digital, -commercial or otherwise. - -This isn't legal advice, please consider consulting a lawyer and see the full -license for all details. diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-Black.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-Black.ttf deleted file mode 100644 index e438365..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-Black.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-BlackItalic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-BlackItalic.ttf deleted file mode 100644 index 2a4183f..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-BlackItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-Bold.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-Bold.ttf deleted file mode 100644 index 627fbcd..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-Bold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-BoldItalic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-BoldItalic.ttf deleted file mode 100644 index 9e771da..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-BoldItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-ExtraBold.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-ExtraBold.ttf deleted file mode 100644 index 31a6622..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-ExtraBold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-ExtraBoldItalic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-ExtraBoldItalic.ttf deleted file mode 100644 index 928db7e..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-ExtraBoldItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-Italic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-Italic.ttf deleted file mode 100644 index 1d6069d..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-Italic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-Light.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-Light.ttf deleted file mode 100644 index 91300ed..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-Light.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-LightItalic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-LightItalic.ttf deleted file mode 100644 index 0eed0e0..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-LightItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-Medium.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-Medium.ttf deleted file mode 100644 index 2f8bfc3..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-Medium.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-MediumItalic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-MediumItalic.ttf deleted file mode 100644 index 34c2067..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-MediumItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-Regular.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-Regular.ttf deleted file mode 100644 index 635820d..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-Regular.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-SemiBold.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-SemiBold.ttf deleted file mode 100644 index 5c04a5c..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-SemiBold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Figtree/static/Figtree-SemiBoldItalic.ttf b/modules/gui/chevron/fonts/Figtree/static/Figtree-SemiBoldItalic.ttf deleted file mode 100644 index 4550a10..0000000 Binary files a/modules/gui/chevron/fonts/Figtree/static/Figtree-SemiBoldItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Onest/OnestExtraBold.ttf b/modules/gui/chevron/fonts/Onest/OnestExtraBold.ttf deleted file mode 100644 index 0f74a60..0000000 Binary files a/modules/gui/chevron/fonts/Onest/OnestExtraBold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Onest/OnestMedium.ttf b/modules/gui/chevron/fonts/Onest/OnestMedium.ttf deleted file mode 100644 index d4d35d3..0000000 Binary files a/modules/gui/chevron/fonts/Onest/OnestMedium.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Onest/OnestThin.ttf b/modules/gui/chevron/fonts/Onest/OnestThin.ttf deleted file mode 100644 index 3d72d8b..0000000 Binary files a/modules/gui/chevron/fonts/Onest/OnestThin.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Black.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Black.ttf deleted file mode 100644 index 8c9e8ec..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Black.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-BlackItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-BlackItalic.ttf deleted file mode 100644 index 98cde4b..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-BlackItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Bold.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Bold.ttf deleted file mode 100644 index 7a14109..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Bold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-BoldItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-BoldItalic.ttf deleted file mode 100644 index 505553b..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-BoldItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraBold.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraBold.ttf deleted file mode 100644 index 148fee4..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraBold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraBoldItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraBoldItalic.ttf deleted file mode 100644 index 433e2b8..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraBoldItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraLight.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraLight.ttf deleted file mode 100644 index ccad63c..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraLight.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraLightItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraLightItalic.ttf deleted file mode 100644 index 8c573f5..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-ExtraLightItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Italic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Italic.ttf deleted file mode 100644 index 7315d65..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Italic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Light.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Light.ttf deleted file mode 100644 index 286bb3a..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Light.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-LightItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-LightItalic.ttf deleted file mode 100644 index d2c621a..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-LightItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Medium.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Medium.ttf deleted file mode 100644 index 1421f42..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Medium.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-MediumItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-MediumItalic.ttf deleted file mode 100644 index 1144923..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-MediumItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Regular.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Regular.ttf deleted file mode 100644 index 7f55dba..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Regular.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-SemiBold.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-SemiBold.ttf deleted file mode 100644 index c7a1944..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-SemiBold.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-SemiBoldItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-SemiBoldItalic.ttf deleted file mode 100644 index 49780a6..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-SemiBoldItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-Thin.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-Thin.ttf deleted file mode 100644 index 3d45ec8..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-Thin.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Public Sans/PublicSans-ThinItalic.ttf b/modules/gui/chevron/fonts/Public Sans/PublicSans-ThinItalic.ttf deleted file mode 100644 index 293ad1d..0000000 Binary files a/modules/gui/chevron/fonts/Public Sans/PublicSans-ThinItalic.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Rubik/Rubik.ttf b/modules/gui/chevron/fonts/Rubik/Rubik.ttf deleted file mode 100644 index d2aed50..0000000 Binary files a/modules/gui/chevron/fonts/Rubik/Rubik.ttf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Uni Sans/Uni Sans Heavy.otf b/modules/gui/chevron/fonts/Uni Sans/Uni Sans Heavy.otf deleted file mode 100644 index facd333..0000000 Binary files a/modules/gui/chevron/fonts/Uni Sans/Uni Sans Heavy.otf and /dev/null differ diff --git a/modules/gui/chevron/fonts/Uni Sans/Uni Sans Thin.otf b/modules/gui/chevron/fonts/Uni Sans/Uni Sans Thin.otf deleted file mode 100644 index aa49745..0000000 Binary files a/modules/gui/chevron/fonts/Uni Sans/Uni Sans Thin.otf and /dev/null differ diff --git a/modules/gui/chevron/icons.js b/modules/gui/chevron/icons.js deleted file mode 100644 index cfa5322..0000000 --- a/modules/gui/chevron/icons.js +++ /dev/null @@ -1,22 +0,0 @@ -window.ICONS = { - github: '', - youtube: '', - gmail: '', - instagram: '', - reddit: '', - spotify: '', - stackoverflow: '', - telegram: '', - translate: '', - twitch: '', - twitter: '', - whatsApp: '', - chatGPT: '', - discord: '', - wikipedia: '', - linkedin: '', - slack: '', - netflix: '', - gdrive: '', - amazon: '' -} diff --git a/modules/gui/chevron/index.html b/modules/gui/chevron/index.html deleted file mode 100644 index 8429eba..0000000 --- a/modules/gui/chevron/index.html +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - Chevron - - - - - - - - - -
- - - - - diff --git a/modules/gui/default.nix b/modules/gui/default.nix index faa2fb6..d693f49 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -7,7 +7,6 @@ _: { # ./kakoune ./qt.nix ./zathura.nix - ./stylix.nix ./spicetify.nix ./anyrun ./rofi.nix diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix index 22daf8c..ad1d9e0 100644 --- a/modules/gui/foot.nix +++ b/modules/gui/foot.nix @@ -1,10 +1,5 @@ -{ - config, - inputs, - lib, - pkgs, - ... -}: let +{ config, inputs, lib, pkgs, ... }: +let cfg = config.modules.programs.foot; inherit (config.modules.other.system) username; @@ -16,7 +11,7 @@ in { }; config = mkIf cfg.enable { - environment.sessionVariables = {TERM = "foot";}; + environment.sessionVariables = { TERM = "foot"; }; home-manager.users.${username} = { programs.foot = { enable = true; @@ -29,7 +24,7 @@ in { title = "foot"; locked-title = "no"; - line-height = 20; + # line-height = 20; letter-spacing = 0; horizontal-letter-offset = 0; vertical-letter-offset = -0.75; @@ -41,7 +36,8 @@ in { pad = "5x5 center"; resize-delay-ms = 100; - notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; + notify = + "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}"; bold-text-in-bright = "no"; word-delimiters = '',│`|:"'()[]{}<>''; @@ -63,7 +59,8 @@ in { launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}"; label-letters = "sadfjklewcmpgh"; osc8-underline = "always"; - protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs"; + protocols = + "http, https, ftp, ftps, file, gemini, gopher, irc, ircs"; uri-characters = '' abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]''; }; @@ -96,7 +93,7 @@ in { # bright6 = "94e2d5"; # teal # bright7 = "a6adc8"; # Subtext 0 # }; - csd = {preferred = "server";}; + csd = { preferred = "server"; }; key-bindings = { show-urls-launch = "Control+Shift+u"; unicode-input = "Control+Shift+i"; diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix index 9a60fa0..0614a9f 100644 --- a/modules/gui/qt.nix +++ b/modules/gui/qt.nix @@ -10,7 +10,7 @@ with lib; let name = "Gruvbox-Dark-BL"; }; cfg = config.modules.themes.qt; - username = config.modules.other.system.username; + inherit (config.modules.other.system) username; in { options.modules.themes.qt = { enable = mkEnableOption "qt theming"; diff --git a/modules/styling/ags.nix b/modules/styling/ags.nix new file mode 100644 index 0000000..eed7124 --- /dev/null +++ b/modules/styling/ags.nix @@ -0,0 +1 @@ +_: {} diff --git a/modules/styling/default.nix b/modules/styling/default.nix new file mode 100644 index 0000000..7cf51db --- /dev/null +++ b/modules/styling/default.nix @@ -0,0 +1,6 @@ +_: { + imports = [ + ./ags.nix + ./stylix.nix + ]; +} diff --git a/modules/gui/stylix.nix b/modules/styling/stylix.nix similarity index 50% rename from modules/gui/stylix.nix rename to modules/styling/stylix.nix index a6c9072..f5c82a3 100644 --- a/modules/gui/stylix.nix +++ b/modules/styling/stylix.nix @@ -4,25 +4,63 @@ lib, ... }: let - cfg = config.modules.programs.stylix; + cfg = config.modules.themes.stylix; + inherit (config.modules.themes.stylix) scheme image; + inherit (config.modules.themes.stylix.cursor) size; + inherit (config.modules.themes.stylix.fontsizes) terminal popups; inherit (config.modules.other.system) username; in { - options.modules.programs.stylix.enable = lib.mkEnableOption "stylix"; + options.modules.themes.stylix = { + enable = lib.mkEnableOption "stylix"; + scheme = lib.mkOption { + description = " Color Scheme"; + type = lib.types.str; + }; + image = lib.mkOption { + description = "Image"; + type = lib.types.path; + }; + cursor = { + size = lib.mkOption { + description = "Cursor Size"; + type = lib.types.int; + }; + package = lib.mkOption { + description = "Cursor Package"; + type = lib.types.package; + }; + name = lib.mkOption { + description = "Cursor Name"; + type = lib.type.str; + }; + }; + fontsizes = { + terminal = lib.mkOption { + description = "Terminal font size"; + type = lib.types.int; + }; + popups = lib.mkOption { + description = "Popup font size"; + type = lib.types.int; + }; + }; + }; config = lib.mkIf cfg.enable { stylix = { - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml"; - image = ../../assets/wallpapers/tiredgod.png; + enable = true; + base16Scheme = scheme; + inherit image; polarity = "dark"; autoEnable = true; cursor = { + inherit size; + #size = 16; package = pkgs.bibata-cursors; name = "Bibata-Modern-Classic"; - size = 24; }; fonts = { sizes = { - terminal = 14; - popups = 14; + inherit terminal popups; }; monospace = { package = diff --git a/options/common/bluetooth.nix b/options/common/bluetooth.nix index f08d5aa..37ee1ee 100644 --- a/options/common/bluetooth.nix +++ b/options/common/bluetooth.nix @@ -1,10 +1,5 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (config.modules.other.system) username; +{ config, lib, pkgs, ... }: +let inherit (config.modules.other.system) username; in { hardware.bluetooth = { enable = true; @@ -16,8 +11,8 @@ in { # Bluetooth headset media control buttons systemd.user.services.mpris-proxy = { description = "Mpris proxy"; - after = ["network.target" "sound.target"]; - wantedBy = ["default.target"]; + after = [ "network.target" "sound.target" ]; + wantedBy = [ "default.target" ]; serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; }; } diff --git a/options/common/gpu/nvidia.nix b/options/common/gpu/nvidia.nix index ea24b52..913364d 100644 --- a/options/common/gpu/nvidia.nix +++ b/options/common/gpu/nvidia.nix @@ -4,11 +4,10 @@ ... }: { services.xserver.videoDrivers = ["nvidia"]; - hardware.opengl = { + hardware.graphics = { enable = true; package = pkgs.mesa.drivers; - driSupport = true; - driSupport32Bit = true; + # driSupport32Bit = true; }; hardware.nvidia = { modesetting.enable = true;