diff --git a/flake.lock b/flake.lock index 1d1ba69..e44b4aa 100755 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", + "lastModified": 1741282631, + "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", + "rev": "81498562d0f53e613d30368bb5b076784fa86f80", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739456434, - "narHash": "sha256-uJAPcqNplLPM0L6vzZCkghyU6vLQzZm+zOzDODq/pY8=", + "lastModified": 1740474275, + "narHash": "sha256-E1ztdEjkfFOpm6Hu3ZjKbyJyE+vt78ZFmuLcGOxdEqc=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "dfa7ed3c4e3b300b6e8bd02ffda6cbc6aa2b2817", + "rev": "e09b4c0588ce95fd72993adb5af198d5ba32e752", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "crane": { "locked": { - "lastModified": 1737563566, - "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", + "lastModified": 1739936662, + "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", "owner": "ipetkov", "repo": "crane", - "rev": "849376434956794ebc7a6b487d31aace395392ba", + "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", "type": "github" }, "original": { @@ -72,42 +72,6 @@ "type": "github" } }, - "crane_2": { - "locked": { - "lastModified": 1736898272, - "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { "nixpkgs": [ @@ -212,20 +176,6 @@ } }, "flake-compat_6": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -241,7 +191,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1733328505, @@ -257,7 +207,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_8": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -279,11 +229,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -315,27 +265,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -433,25 +362,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -492,11 +403,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739813871, - "narHash": "sha256-1UAvBHL6haAa8PysB01t83+FBvMgkE4k8BAtOx56yQE=", + "lastModified": 1741473443, + "narHash": "sha256-H+rS9UDb1Qd0bTUxppNgiIHLzr4sR/LnDox4VhR5Q1w=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "da32534e8a63423d34d46caa9f60f342ed27235f", + "rev": "d3fd2b02e71f3eaecd310b246ee64a26a59b78e3", "type": "github" }, "original": { @@ -505,32 +416,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -576,28 +461,6 @@ } }, "gitignore_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_4": { "inputs": { "nixpkgs": [ "pre-commit-hooks-nix", @@ -620,7 +483,6 @@ }, "helix": { "inputs": { - "crane": "crane", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -628,11 +490,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739835410, - "narHash": "sha256-G6GBholUJ4/EOWxm74xOIVNVgoYT4U0kkGcZZApCMxc=", + "lastModified": 1741370148, + "narHash": "sha256-nzGqv+4teMbOjhylRCfGsqH7XFLt5m+uwJHgGA0YpUQ=", "owner": "helix-editor", "repo": "helix", - "rev": "48194825b9f412cd895100573a73bdc472a48881", + "rev": "dc4761ad3a09a1cc9a3219d75765ff098fb203af", "type": "github" }, "original": { @@ -675,32 +537,11 @@ ] }, "locked": { - "lastModified": 1739845242, - "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", + "lastModified": 1741461731, + "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44", "type": "github" }, "original": { @@ -785,11 +626,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739838816, - "narHash": "sha256-EgKxEVus8CKEKnuJ8xZQtYmydMYJ8tnw7SbO+PtingQ=", + "lastModified": 1741461862, + "narHash": "sha256-TNTtpDHoNB+wOEfypkGTu2zC0wHUwbabQo4HyU53Yok=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e59623d1d564089543cddb496fbed30fbd6ab247", + "rev": "d30cc19d253a3db784ad10c3084f58cbb52d325a", "type": "github" }, "original": { @@ -957,11 +798,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -1011,11 +852,11 @@ ] }, "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", + "lastModified": 1741123584, + "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", + "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", "type": "github" }, "original": { @@ -1061,11 +902,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -1099,34 +940,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, "lix": { "flake": false, "locked": { @@ -1171,14 +984,15 @@ "nixpkgs-stable": "nixpkgs-stable_2", "pre-commit-hooks": "pre-commit-hooks_2", "sops-nix": "sops-nix", - "systems": "systems_6" + "systems": "systems_6", + "yants": "yants" }, "locked": { - "lastModified": 1739813062, - "narHash": "sha256-Nnx/eIOUU6VtD+geS3x2FW772CtODNoYW+IQ8/YhkrQ=", + "lastModified": 1741379880, + "narHash": "sha256-DKlMDfJpiqlwb4X4+3BBITNsMa8PvwzxPBexwPdrhCI=", "owner": "ngi-nix", "repo": "ngipkgs", - "rev": "22ed8f3dbc977e763f86ce6e172cab0034643de6", + "rev": "716f0f56604f76aa731b4dd47386028a91a7a0c5", "type": "github" }, "original": { @@ -1187,27 +1001,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_5", @@ -1215,11 +1008,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1739847682, - "narHash": "sha256-YvAKu47G5jOH715jw2dkfFxTj4Hdx4DnA7b6aDLrExQ=", + "lastModified": 1741432127, + "narHash": "sha256-JrN9MWJLVVEjVYINDX0NHI2U91/7qSywm6m6mGKwB0E=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "cd7563ca23e71bc61a199a0a7ebabb861c3c821c", + "rev": "bf3d41b9fc89883823ce9fadbec1b44f2cdd1fac", "type": "github" }, "original": { @@ -1230,11 +1023,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739667012, - "narHash": "sha256-6QWdUgz2O2Mm+pYx/AYB4Rot5/s1OR1C6bt30TI81yY=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1dcdd535fef84d4671129a10e7072d56dca9a4d3", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -1262,11 +1055,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { @@ -1278,11 +1071,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -1310,11 +1103,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -1326,11 +1119,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -1356,48 +1149,20 @@ "type": "github" } }, - "nixvim": { + "nur": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1739751913, - "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_3" - }, - "locked": { - "lastModified": 1739852521, - "narHash": "sha256-hN3xAIwn7PhTvl0zzsXsLr8Z0GTEto7muGAwkZvprhA=", + "lastModified": 1741473895, + "narHash": "sha256-mWiCOdvGkDVJO6C9OaXDpYuKUJocyeZhtWP7QNqS2Zs=", "owner": "nix-community", "repo": "NUR", - "rev": "eb601ac5af63c33acff913ae195cc06503fe1974", + "rev": "3c1d774501d2300c51ce37ea6d1405d5ea12e740", "type": "github" }, "original": { @@ -1406,29 +1171,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_5", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", - "owner": "NuschtOS", - "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1439,11 +1181,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1454,18 +1196,18 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_7", - "gitignore": "gitignore_4", + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1484,11 +1226,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -1550,11 +1292,10 @@ "ngipkgs": "ngipkgs", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_8", + "systems": "systems_7", "waybar": "waybar", "yazi": "yazi", "zed-editor": "zed-editor" @@ -1568,11 +1309,11 @@ ] }, "locked": { - "lastModified": 1737599167, - "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", + "lastModified": 1740623427, + "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38374302ae9edf819eac666d1f276d62c712dd06", + "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", "type": "github" }, "original": { @@ -1610,11 +1351,11 @@ ] }, "locked": { - "lastModified": 1737166965, - "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", + "lastModified": 1740882709, + "narHash": "sha256-VC+8GxWK4p08jjIbmsNfeFQajW2lsiOR/XQiOOvqgvs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", + "rev": "f4d5a693c18b389f0d58f55b6f7be6ef85af186f", "type": "github" }, "original": { @@ -1654,11 +1395,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -1674,11 +1415,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -1778,21 +1519,6 @@ } }, "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { "locked": { "lastModified": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -1807,7 +1533,7 @@ "type": "github" } }, - "systems_9": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1845,27 +1571,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nur", @@ -1888,17 +1593,17 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1738752268, - "narHash": "sha256-v2AXqro8mL5/IZNHNUAnRqLlR/vBiHxEXshYLiRAnTI=", + "lastModified": 1740125099, + "narHash": "sha256-VpT3ePqmo75Ni6/02KFGV6ltnpiV70/ovG/p1f2wKkU=", "owner": "Alexays", "repo": "Waybar", - "rev": "c32d5e3883558db2913dcd09c1b96a7e6c467c25", + "rev": "8490a1d9b9a5c8770dd63e9faca0a5e01acedcae", "type": "github" }, "original": { @@ -1948,18 +1653,34 @@ "type": "github" } }, + "yants": { + "flake": false, + "locked": { + "lastModified": 1645270620, + "narHash": "sha256-wwkl3K200UbW9Z7BRlVH8HOEXCaVYP2MqZpsF9EhgZg=", + "ref": "refs/heads/canon", + "rev": "efeb6dc11eb1a1e88d41dc2093fc5aa31f7abd35", + "revCount": 15, + "type": "git", + "url": "https://code.tvl.fyi/depot.git:/nix/yants.git" + }, + "original": { + "type": "git", + "url": "https://code.tvl.fyi/depot.git:/nix/yants.git" + } + }, "yazi": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739776850, - "narHash": "sha256-XWzxhk0Nrw9cu6E5yjsmhAVfbt9ArVN54zz8qgzBA/I=", + "lastModified": 1741418166, + "narHash": "sha256-9/KZCzO2V2DgNp5225dvNjWFUZDSRNc52wV4a/tU95Y=", "owner": "sxyazi", "repo": "yazi", - "rev": "1ddbbfea711636dcb997239ea9d2b483cea16f80", + "rev": "31177fd1fd71500e6a30edee60a122f78e5e7424", "type": "github" }, "original": { @@ -1970,19 +1691,19 @@ }, "zed-editor": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_9", + "crane": "crane", + "flake-compat": "flake-compat_8", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1739855277, - "narHash": "sha256-O2fmGklbUPXNtSFAFD/gryEbLL3iETTuhxgd9iIzt6U=", + "lastModified": 1741472240, + "narHash": "sha256-STuoLQxDC9b7j26rNSfVNnX19jxI7P2MzoMYqA0Khfs=", "owner": "zed-industries", "repo": "zed", - "rev": "8942e657aa792203d0a576982159a4e46d6bed49", + "rev": "ed6bf7f161c6af6e10354faacb8b643a55c80b27", "type": "github" }, "original": { @@ -2031,17 +1752,17 @@ ] }, "locked": { - "lastModified": 1738263917, - "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "lastModified": 1741368279, + "narHash": "sha256-WTaC8HmnIq6O71iK0g9as404BbmS+YyEP5qS85m2JBY=", "owner": "jcollie", "repo": "zig2nix", - "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "rev": "672971b5b6911de21446ad4fc76dee677922eda0", "type": "github" }, "original": { "owner": "jcollie", "repo": "zig2nix", - "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "rev": "672971b5b6911de21446ad4fc76dee677922eda0", "type": "github" } } diff --git a/flake.nix b/flake.nix index 05e9ba1..31b1ec5 100755 --- a/flake.nix +++ b/flake.nix @@ -38,10 +38,6 @@ url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; hyprland = { url = "github:hyprwm/Hyprland"; @@ -87,7 +83,6 @@ inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops - inputs.nixvim.nixosModules.nixvim ]; venus = inputs.self.lib.mkLinuxSystem [ ./systems/venus diff --git a/modules/config/instances/config/searx.nix b/modules/config/instances/config/searx.nix old mode 100644 new mode 100755 diff --git a/modules/home/default.nix b/modules/home/default.nix index 367787b..a0a6a5f 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -54,6 +54,7 @@ in wayland theming polychromatic + nautilus ; }; }; @@ -82,9 +83,8 @@ in imports = builtins.attrValues { inherit (modules) cli + firefox brave - firefoxNix - braveNix code ghostty gaming diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix deleted file mode 100755 index d7ab060..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - name = "Academic"; - toolbar = false; - bookmarks = [ - { - name = "PubMed"; - url = "https://pubmed.ncbi.nlm.nih.gov"; - tags = [ - "pub" - "pubmed" - "science" - "research" - "academic" - ]; - keyword = "Pub"; - } - { - name = "Sci-Hub"; - url = "https://sci-hub.ee"; - tags = [ - "sci" - "sci-hub" - "scihub" - "science" - "research" - "academic" - "torrent" - ]; - keyword = "Sci"; - } - { - name = "Stanford Encyclopedia of Philosophy"; - url = "https://plato.stanford.edu"; - tags = [ - "standford" - "encyclopedia" - "philosophy" - "phil" - ]; - keyword = "Phil"; - } - { - name = "Zotero Bibliography"; - url = "https://zbib.org"; - tags = [ - "votero" - "bibliography" - "bib" - "zbib" - ]; - keyword = "Bib"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/development.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/development.nix deleted file mode 100755 index 85f01f0..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/development.nix +++ /dev/null @@ -1,98 +0,0 @@ -let - gitlabTags = [ - "git" - "gitlab" - ]; - gitlabURL = "https://gitlab.com"; -in -{ - name = "Development"; - toolbar = false; - bookmarks = [ - { - name = "Discord (Development Portal)"; - url = "https://discord.com/developers/applications"; - tags = [ - "discord" - "development" - "portal" - "bot" - ]; - keyword = "Discord"; - } - { - name = "Elm-UI"; - url = "https://package.elm-lang.org/packages/mdgriffith/elm-ui/latest/"; - tags = [ - "elm-ui" - "elm" - "ui" - ]; - keyword = "Elm"; - } - { - name = "Elm Examples"; - url = "https://elm-lang.org/examples"; - tags = [ - "elm" - "elm" - "examples" - ]; - keyword = "Elm"; - } - { - name = "GitHub"; - url = "https://github.com/BRBWaffles"; - tags = [ - "git" - "github" - "brbwaffles" - ]; - keyword = "GitHub"; - } - { - name = "GitLab (Fallaryn)"; - url = "${gitlabURL}/fallaryn/dotfiles"; - tags = [ - "fallaryn" - ] ++ gitlabTags; - keyword = "GitLab"; - } - { - name = "GitLab (Isaac)"; - url = "${gitlabURL}/askyourself/dotfiles"; - tags = [ - "isaac" - "askyourself" - ] ++ gitlabTags; - keyword = "GitLab"; - } - { - name = "GitLab (Nick)"; - url = "${gitlabURL}/upRootNutrition/dotfiles"; - tags = [ - "brbwaffles" - ] ++ gitlabTags; - keyword = "GitLab"; - } - { - name = "Hackage"; - url = "https://hackage.haskell.org"; - tags = [ - "hackage" - "hack" - "haskell" - ]; - keyword = "Hack"; - } - { - name = "Discord-Haskell"; - url = "https://hackage.haskell.org/package/discord-haskell-1.17.1"; - tags = [ - "discord" - "haskell" - ]; - keyword = "Dack"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix deleted file mode 100755 index d1564f9..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix +++ /dev/null @@ -1,154 +0,0 @@ -{ - name = "Finances"; - toolbar = false; - bookmarks = [ - { - name = "Adsense"; - url = "https://www.google.com/adsense/new/u/0/pub-4524791551954022/payments"; - tags = [ - "google" - "adsense" - "ads" - "money" - ]; - keyword = "Adsense"; - } - { - name = "Canada Revenue Agency"; - url = "https://apps4.ams-sga.cra-arc.gc.ca/gol-ged/awsc/amss/browser/check?program=mima&target=login&lang=en&idp=cms"; - tags = [ - "cra" - "canada" - "money" - ]; - keyword = "CRA"; - } - { - name = "Credit Karma"; - url = "https://www.creditkarma.ca"; - tags = [ - "credit" - "karma" - "bank" - "banking" - ]; - keyword = "Credit"; - } - { - name = "Kijiji"; - url = "https://www.kijiji.ca"; - tags = [ - "kijiji" - "kij" - "ki" - ]; - keyword = "Kij"; - } - { - name = "LiberaPay"; - url = "https://liberapay.com/upRootNutrition"; - tags = [ - "libera" - "liberapay" - "donations" - "bank" - "banking" - "money" - "uprootnutrition" - ]; - keyword = "Libera"; - } - { - name = "Patreon"; - url = "https://www.patreon.com/upRootNutrition"; - tags = [ - "patreon" - "donations" - "bank" - "banking" - "money" - "uprootnutrition" - ]; - keyword = "Patreon"; - } - { - name = "PayPal"; - url = "https://www.paypal.com/myaccount/summary?intl=0"; - tags = [ - "paypal" - "bank" - "banking" - "money" - ]; - keyword = "PayPal"; - } - { - name = "Shopify"; - url = "https://uprootnutrition.myshopify.com/admin"; - tags = [ - "shopify" - "business" - "shop" - "bank" - "banking" - "money" - ]; - keyword = "Shopify"; - } - { - name = "Simplii"; - url = "https://online.simplii.com/ebm-resources/public/client/web/index.html#/signon"; - tags = [ - "simplii" - "bank" - "banking" - "money" - ]; - keyword = "Simplii"; - } - { - name = "Stripe"; - url = "https://dashboard.stripe.com/settings/user"; - tags = [ - "stripe" - "bank" - "banking" - "money" - ]; - keyword = "Stripe"; - } - { - name = "Telus (Security)"; - url = "https://smarthome-security.telus.com/web/system/home"; - tags = [ - "telus" - "security" - ]; - keyword = "ADT"; - } - { - name = "Wealthsimple"; - url = "https://my.wealthsimple.com/app/tax-onboarding/2021"; - tags = [ - "wealth" - "simple" - "bank" - "banking" - "crypto" - ]; - keyword = "Wealth"; - } - { - name = "Wix"; - url = "https://manage.wix.com/dashboard/413fd74d-8a8f-4c77-bd91-9ea560ffe906/home"; - tags = [ - "wix" - "website" - "business" - "bills" - "uprootnutrition" - ]; - keyword = "Wix"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix deleted file mode 100755 index 31b465c..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix +++ /dev/null @@ -1,213 +0,0 @@ -{ flake, ... }: -let - inherit (flake.config.people) - user0 - ; - inherit (flake.config.people.users.${user0}) - aliases - ; - inherit (flake.config.machines.devices) - synology - ceres - ; - inherit (flake.config.services) - instances - ; - - jellyfinTags = [ - "jelly" - "video" - "streaming" - "movies" - "shows" - "music" - ]; - ollamaTags = [ - instances.ollama.name - "chat" - "ai" - ]; - owncastTags = [ - instances.owncast.name - "own" - "cast" - "stream" - ]; - syncthingTags = [ - instances.syncthing.name - "sync" - "thing" - instances.synology.name - ]; -in -{ - name = "Self Hosted"; - toolbar = false; - bookmarks = [ - { - name = "Elm-Land Server"; - url = "http://localhost:1234"; - tags = [ - "elm-land" - "elm" - "land" - ]; - keyword = "Website"; - } - { - name = instances.forgejo.label; - url = "https://${instances.forgejo.subdomain}.${instances.web.domains.url3}"; - tags = [ - instances.forgejo.name - "forge" - "git" - ]; - keyword = instances.forgejo.label; - } - # { - # name = instances.hledger.label; - # url = "http://localhost.${builtins.toString instances.hledger.ports.port0}"; - # tags = [ - # instances.hledger.name - # "hledger" - # "finances" - # ]; - # keyword = instances.hledger.label; - # } - { - name = "${instances.jellyfin.label} (Internet)"; - url = "https://${instances.jellyfin.name}.${instances.web.domains.url0}"; - tags = jellyfinTags; - keyword = instances.jellyfin.label; - } - { - name = "${instances.jellyfin.label} (Local)"; - url = "http://${ceres.ip.address0}:${toString instances.jellyfin.ports.port1}"; - tags = jellyfinTags; - keyword = instances.jellyfin.label; - } - { - name = instances.mastodon.label; - url = "https://${instances.mastodon.subdomain}.${instances.web.domains.url3}"; - tags = [ - instances.mastodon.name - "mast" - "md" - ]; - keyword = instances.mastodon.label; - } - { - name = "Namecheap"; - url = "https://www.namecheap.com"; - tags = [ - "namecheap" - "name" - "cheap" - "dns" - ]; - keyword = "Name"; - } - { - name = instances.nextcloud.label; - url = "https://${instances.nextcloud.subdomain}.${instances.web.domains.url1}"; - tags = [ - instances.nextcloud.name - "next" - "cloud" - "calendar" - ]; - keyword = instances.nextcloud.label; - } - { - name = aliases.name2; - url = instances.web.domains.url2; - tags = [ - aliases.name3 - "blog" - ]; - keyword = aliases.name2; - } - { - name = "${instances.ollama.label} (Server)"; - url = "https://${instances.ollama.subdomain}.${instances.web.domains.url0}"; - tags = ollamaTags; - keyword = instances.ollama.label; - } - { - name = "${instances.ollama.label} (Desktop)"; - url = "http://localhost:${toString instances.ollama.ports.port0}"; - tags = ollamaTags; - keyword = instances.ollama.label; - } - # { - # name = "${instances.owncast.label} (Admin)"; - # url = "http://${ceres.ip.address0}:${toString instances.owncast.ports.port0}/admin"; - # tags = owncastTags; - # keyword = instances.owncast.label; - # } - # { - # name = "${instances.owncast.label} (Server)"; - # url = "http://${instances.owncast.subdomain}.${instances.web.domains.url1}"; - # tags = owncastTags; - # keyword = instances.owncast.label; - # } - # { - # name = instances.peertube.label; - # url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}"; - # tags = [ - # instances.peertube.name - # "peer" - # "tube" - # "uprootnutrition" - # ]; - # keyword = instances.peertube.label; - # } - { - name = "Router"; - url = "http://${instances.web.localhost.address2}"; - tags = [ - "router" - "asus" - ]; - keyword = "Router"; - } - { - name = "${instances.syncthing.label} (${instances.synology.label})"; - url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}"; - tags = [ - "synology" - ] ++ syncthingTags; - keyword = instances.syncthing.label; - } - { - name = "${instances.syncthing.label} (Desktop)"; - url = "http://localhost:${toString instances.syncthing.ports.port0}"; - tags = [ - "desktop" - ] ++ syncthingTags; - keyword = instances.syncthing.label; - } - { - name = instances.synology.label; - url = "https://${synology.ip.address0}:${toString instances.synology.ports.port0}"; - tags = [ - instances.synology.name - "dsm" - "cloud" - ]; - keyword = instances.synology.label; - } - { - name = instances.vaultwarden.label; - url = "https://${instances.vaultwarden.subdomain}.${instances.web.domains.url0}"; - tags = [ - instances.vaultwarden.name - "bitwarden" - "vault" - "bit" - "warden" - ]; - keyword = instances.vaultwarden.label; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix deleted file mode 100755 index e16fb8b..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - name = "Gaming"; - toolbar = false; - bookmarks = [ - { - name = "Battle.net"; - url = "https://us.shop.battle.net"; - tags = [ - "battle.net" - "battle" - "net" - ]; - keyword = "Battle"; - } - { - name = "Chess.com"; - url = "https://www.chess.com/home"; - tags = [ - "chess" - ]; - keyword = "Chess"; - } - { - name = "Lichess"; - url = "https://lichess.org"; - tags = [ - "lichess" - "chess" - ]; - keyword = "Li"; - } - { - name = "ProtonDB"; - url = "https://www.protondb.com"; - tags = [ - "steam" - "db" - ]; - keyword = "DB"; - } - { - name = "SteamDB"; - url = "https://steamdb.info"; - tags = [ - "steamdb" - "steam" - "db" - ]; - keyword = "SteamDB"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix deleted file mode 100755 index 871c0e3..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - name = "Shopping"; - toolbar = false; - bookmarks = [ - { - name = "Amazon"; - url = "https://www.amazon.ca"; - tags = [ - "amazon" - "shopping" - "supply" - ]; - keyword = "Amazon"; - } - { - name = "Door Dash"; - url = "https://www.doordash.com"; - tags = [ - "doordash" - "door" - "dash" - "food" - ]; - keyword = "Dash"; - } - { - name = "Fiverr"; - url = "https://www.fiverr.com"; - tags = [ - "fiverr" - "graphic" - "design" - ]; - keyword = "Five"; - } - { - name = "FTY Supplies"; - url = "https://fytsupplies.ca"; - tags = [ - "tattoo tat" - "fyt" - "shopping" - "supply" - ]; - keyword = "FYT"; - } - { - name = "Skip the Dishes"; - url = "https://www.skipthedishes.com"; - tags = [ - "skip" - "dishes" - "food" - ]; - keyword = "Skip"; - } - { - name = "Uber Eats"; - url = "https://www.ubereats.com"; - tags = [ - "uber" - "eats" - "food" - ]; - keyword = "Uber"; - } - { - name = "TatSoul"; - url = "https://www.tatsoul.com"; - tags = [ - "tattoo" - "tat" - "tatsoul" - "shopping" - "supply" - ]; - keyword = "TatSoul"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix deleted file mode 100755 index d83ad21..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix +++ /dev/null @@ -1,186 +0,0 @@ -let - discordTags = [ - "disboard" - "discord" - "dis" - "ds" - "social" - ]; - youtubeTags = [ - "youtube" - "you" - "tube" - "yt" - ]; -in -{ - name = "Social Media"; - toolbar = false; - bookmarks = [ - { - name = "upRootNutrition"; - url = "https://upRootNutrition.com"; - tags = [ - "uprootnutrition" - "up" - "root" - "nutrition" - ]; - keyword = "Root"; - } - { - name = "Disboard"; - url = "https://disboard.org"; - tags = discordTags; - keyword = "Disboard"; - } - { - name = "Discord (Web Client)"; - url = "https://discord.com/channels/@me"; - tags = discordTags; - keyword = "Discord"; - } - { - name = "Facebook"; - url = "https://www.facebook.com/"; - tags = [ - "facebook" - "face" - "book" - ]; - keyword = "Face"; - } - { - name = "Gmail"; - url = "https://mail.google.com/mail/u/0/#inbox"; - tags = [ - "gmail" - "google" - "mail" - "gm" - "email" - ]; - keyword = "Gmail"; - } - { - name = "Lemmy"; - url = "https://lemmy.world"; - tags = [ - "lemmy" - "social" - ]; - keyword = "Lem"; - } - { - name = "OnlyFans"; - url = "https://onlyfans.com"; - tags = [ - "onlyfans" - "only" - "fans" - ]; - keyword = "Only"; - } - { - name = "Pixelfed"; - url = "https://pixelfed.social/i/web/profile/651714972141461392"; - tags = [ - "pixelfed" - "pixel" - "pi" - ]; - keyword = "Pix"; - } - { - name = "Proton Mail"; - url = "https://mail.proton.me/u/1/inbox"; - tags = [ - "proton" - "mail" - "pr" - "email" - ]; - keyword = "Pro"; - } - { - name = "Proton Calendar"; - url = "https://calendar.proton.me"; - tags = [ - "proton" - "calendar" - ]; - keyword = "Cal"; - } - { - name = "Proton VPN"; - url = "https://account.proton.me/u/0/vpn"; - tags = [ - "proton" - "vpn" - ]; - keyword = "VPN"; - } - { - name = "Reddit"; - url = "https://www.reddit.com"; - tags = [ - "reddit" - "social" - ]; - keyword = "Reddit"; - } - { - name = "Slack"; - url = "https://app.slack.com/"; - tags = [ - "slack" - "social" - ]; - keyword = "Slack"; - } - { - name = "StreamLabs"; - url = "https://streamlabs.com/dashboard"; - tags = [ - "streamlabs" - "stream" - "labs" - ]; - keyword = "Stream"; - } - { - name = "Tinder"; - url = "https://tinder.com/app/recs"; - tags = [ - "tinder" - "dating" - "booty" - ]; - keyword = "Tinder"; - } - { - name = "YouTube"; - url = "https://www.youtube.com"; - tags = youtubeTags; - keyword = "You"; - } - { - name = "YouTube Studio"; - url = "https://studio.youtube.com/channel/UCy9yYcDx2XuVVgcWLJJDoxw"; - tags = [ - "studio" - ] ++ youtubeTags; - keyword = "Studio"; - } - { - name = "X (Twitter)"; - url = "https://x.com/upRootNutrition"; - tags = [ - "twitter" - "x" - "social" - ]; - keyword = "Twitter"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix deleted file mode 100755 index c7662d5..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ - name = "Tools"; - toolbar = false; - bookmarks = [ - { - name = "Mullvad"; - url = "https://mullvad.net"; - tags = [ - "mullvad" - "vpn" - ]; - keyword = "Mull"; - } - { - name = "Cyanophage Layout Analyzer"; - url = "https://cyanophage.github.io"; - tags = [ - "cyanophage" - "keyboard" - "layout" - ]; - keyword = "Layout"; - } - { - name = "Smtp2Go"; - url = "https://app-us.smtp2go.com/dashboard/main"; - tags = [ - "smtp" - "email" - ]; - keyword = "Smtp"; - } - { - name = "Oryx"; - url = "https://configure.zsa.io/moonlander"; - tags = [ - "zsa" - "moonlander" - "keyboard" - "layout" - ]; - keyword = "Moon"; - } - { - name = "Hugging Face"; - url = "https://www.huggingface.co"; - tags = [ - "hugging" - "face" - "ai" - "gguf" - ]; - keyword = "Hug"; - } - { - name = "DeepSeek"; - url = "https://chat.deepseek.com/"; - tags = [ - "deepseek" - "deep" - "seek" - "ai" - ]; - keyword = "Deep"; - } - { - name = "Uncensored AI"; - url = "https://www.aiuncensored.info"; - tags = [ - "uncensored" - "ai" - ]; - keyword = "AI"; - } - { - name = "Canadian Blood Services"; - url = "https://www.blood.ca/en"; - tags = [ - "canadian" - "blood" - "services" - "give" - ]; - keyword = "Give"; - } - { - name = "Chmod Calculator"; - url = "https://chmod-calculator.com"; - tags = [ - "chmod" - "calculator" - ]; - keyword = "Chmod"; - } - { - name = "ChatGPT"; - url = "https://chatgpt.com"; - tags = [ - "chat" - "chatgpt" - "gpt" - ]; - keyword = "Chat"; - } - { - name = "Claude AI"; - url = "https://claude.ai"; - tags = [ - "claude" - "ai" - ]; - keyword = "Claude"; - } - { - name = "Cronometer"; - url = "https://cronometer.com/#diary"; - tags = [ - "cronometer" - "cron" - "nutrition" - ]; - keyword = "Cron"; - } - { - name = "DNS Checker"; - url = "https://dnschecker.org"; - tags = [ - "dns" - "checker" - ]; - keyword = "DNS"; - } - { - name = "EventBrite"; - url = "https://www.eventbrite.ca/d/canada--winnipeg/events--today/winnipeg/?page=1"; - tags = [ - "eventbrite" - "event" - "brite" - ]; - keyword = "Event"; - } - { - name = "Google Maps"; - url = "https://www.google.com/maps"; - tags = [ - "maps" - "google" - ]; - keyword = "Map"; - } - { - name = "ListenBrainz"; - url = "https://listenbrainz.org/user/BRBWaffles"; - tags = [ - "listenbrainz" - "listen" - "brains" - ]; - keyword = "Listen"; - } - { - name = "Memory Express"; - url = "https://www.memoryexpress.com"; - tags = [ - "memoryexpress" - "memory" - "mem" - "express" - ]; - keyword = "Mem"; - } - { - name = "Percentage Calculator"; - url = "https://percentagecalculator.net"; - tags = [ - "percentage" - "percent" - "calculator" - ]; - keyword = "Percent"; - } - { - name = "Portchecker"; - url = "https://portchecker.co"; - tags = [ - "portchecker" - "port" - "checker" - ]; - keyword = "Port"; - } - { - name = "Proof Tree"; - url = "https://www.umsu.de/trees"; - tags = [ - "proof" - "tree" - "logic" - "academic" - ]; - keyword = "Logic"; - } - { - name = "RhymeZone"; - url = "https://www.rhymezone.com"; - tags = [ - "rhymezone" - "rhyme" - "zone" - ]; - keyword = "Rhyme"; - } - { - name = "Sci-Hub"; - url = "https://sci-hub.ee"; - tags = [ - "sci" - "sci-hub" - "scihub" - "science" - "research" - "academic" - "torrent" - ]; - keyword = "Sci"; - } - { - name = "Speedtest"; - url = "https://www.speedtest.net"; - tags = [ - "speedtest" - "speed" - "test" - ]; - keyword = "Speed"; - } - { - name = "Stanford Encyclopedia of Philosophy"; - url = "https://plato.stanford.edu"; - tags = [ - "standford" - "encyclopedia" - "philosophy" - "phil" - ]; - keyword = "Phil"; - } - { - name = "Telus (Billing)"; - url = "https://www.telus.com/my-telus/billing/summary"; - tags = [ - "telus" - "phone" - "bills" - "money" - ]; - keyword = "Telus"; - } - { - name = "TinEye"; - url = "https://tineye.com"; - tags = [ - "tineye" - "tin" - "eye" - ]; - keyword = "Tin"; - } - { - name = "Zotero Bibliography"; - url = "https://zbib.org"; - tags = [ - "votero" - "bibliography" - "bib" - "zbib" - ]; - keyword = "Bib"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix deleted file mode 100755 index f68ddba..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - name = "Tracking"; - toolbar = false; - bookmarks = [ - { - name = "1337"; - url = "https://1337x.to"; - tags = [ - "torrent" - "1337" - ]; - keyword = "1337"; - } - { - name = "Core Radio"; - url = "https://coreradio.online"; - tags = [ - "core" - "radio" - "metal" - ]; - keyword = "Core"; - } - { - name = "Metal Tracker"; - url = "https://en.metal-tracker.com"; - tags = [ - "metaltracker" - "metal" - "tracker" - ]; - keyword = "Metal"; - } - { - name = "Torrent Leech"; - url = "https://www.torrentleech.org"; - tags = [ - "torrent" - "leech" - ]; - keyword = "Leech"; - } - ]; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/bookmarks/default.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/default.nix deleted file mode 100755 index 5d338de..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/bookmarks/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ flake, ... }: -let - configPath = ./config; - flakedPath = configPath + /flake; - - filterFiles = name: builtins.match ".*\\.nix$" name != null; - - regularBookmarks = - let - files = builtins.attrNames (builtins.readDir configPath); - in - builtins.foldl' ( - emptyList: bookmarkFile: emptyList ++ (import (configPath + "/${bookmarkFile}")).bookmarks - ) [ ] (builtins.filter filterFiles files); - - flakedBookmarks = - let - files = builtins.attrNames (builtins.readDir flakedPath); - in - builtins.foldl' ( - emptyList: bookmarkFile: - emptyList - ++ (import (flakedPath + "/${bookmarkFile}") { - inherit - flake - ; - }).bookmarks - ) [ ] (builtins.filter filterFiles files); - - aggregatedBookmarks = regularBookmarks ++ flakedBookmarks; -in -{ - bookmarks = aggregatedBookmarks; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/extensions/default.nix b/modules/home/gui/apps/browsers/firefox/config/extensions/default.nix deleted file mode 100755 index 7ca99b3..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/extensions/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: -{ - extensions = builtins.attrValues { - inherit (pkgs.nur.repos.rycee.firefox-addons) - bitwarden - enhancer-for-youtube - sponsorblock - ublock-origin - unpaywall - sidebery - ; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/academic.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/academic.nix deleted file mode 100755 index 57889a4..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/academic.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Sci-Hub" = { - definedAliases = [ - "@sc" - ]; - icon = ./icons/sc.png; - urls = [ - { template = "https://sci-hub.ee/{searchTerms}"; } - ]; - }; - "Wikipedia" = { - definedAliases = [ - "@wi" - ]; - urls = [ - { template = "https://en.wikipedia.org/wiki/{searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/development.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/development.nix deleted file mode 100755 index 6e557b2..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/development.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - "DNS Checker" = { - definedAliases = [ - "@dn" - ]; - icon = ./icons/dn.png; - urls = [ - { template = "https://dnschecker.org/#A/{searchTerms}"; } - ]; - }; - "Hackage" = { - definedAliases = [ - "@ha" - ]; - icon = ./icons/ha.png; - urls = [ - { template = "https://hackage.haskell.org/packages/search?terms={searchTerms}"; } - ]; - }; - "Hoogle" = { - definedAliases = [ - "@ho" - ]; - icon = ./icons/ho.png; - urls = [ - { template = "https://www.stackage.org/lts-22.33/hoogle?q={searchTerms}"; } - ]; - }; - "Nix Home Manager" = { - definedAliases = [ - "@nh" - ]; - icon = ./icons/nx.png; - urls = [ - { template = "https://searchix.alanpearce.eu/options/home-manager/search?query={searchTerms}"; } - ]; - }; - "Nix Options" = { - definedAliases = [ - "@no" - ]; - icon = ./icons/nx.png; - urls = [ - { - template = "https://search.nixos.org/options?channel=unstable&size=50&sort=relevance&type=packages&query={searchTerms}"; - } - ]; - }; - "Nix Packages" = { - definedAliases = [ - "@np" - ]; - icon = ./icons/nx.png; - urls = [ - { - template = "https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query={searchTerms}"; - } - ]; - }; - "Nix Wiki" = { - definedAliases = [ - "@nw" - ]; - icon = ./icons/nx.png; - urls = [ - { template = "https://nixos.wiki/index.php?search={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png b/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png deleted file mode 100755 index 1709e06..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png b/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png deleted file mode 100755 index 98b4b62..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix deleted file mode 100755 index f0df93e..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ flake, ... }: -let - inherit (flake.config.services) - instances - ; -in -{ - "${instances.jellyfin.label}" = { - definedAliases = [ - "@jf" - ]; - icon = ./icons/jf.png; - urls = [ - { - template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}"; - } - ]; - }; - "${instances.peertube.label}" = { - definedAliases = [ - "@pt" - ]; - icon = ./icons/pt.png; - urls = [ - { - template = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}/search?search={searchTerms}"; - } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/gaming.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/gaming.nix deleted file mode 100755 index 59538e2..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/gaming.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Proton DB" = { - definedAliases = [ - "@pd" - ]; - icon = ./icons/pd.png; - urls = [ - { template = "https://www.protondb.com/search?q={searchTerms}"; } - ]; - }; - - "Steam DB" = { - definedAliases = [ - "@sd" - ]; - icon = ./icons/sd.png; - urls = [ - { template = "https://steamdb.info/search/?a=all&q={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/hidden.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/hidden.nix deleted file mode 100755 index 3a0160c..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/hidden.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Amazon.ca".metaData.hidden = true; - "Bing".metaData.hidden = true; - "eBay".metaData.hidden = true; - "Google".metaData.hidden = true; - "Wikipedia (en)".metaData.hidden = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/13.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/13.png deleted file mode 100755 index 8bef493..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/13.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/al.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/al.png deleted file mode 100755 index a8420f6..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/al.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/am.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/am.png deleted file mode 100755 index afd11bb..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/am.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/br.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/br.png deleted file mode 100755 index 74a4557..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/br.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/cr.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/cr.png deleted file mode 100755 index 4625510..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/cr.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/dn.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/dn.png deleted file mode 100755 index d7347a6..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/dn.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/do.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/do.png deleted file mode 100755 index 0b78a5f..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/do.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/fy.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/fy.png deleted file mode 100755 index 34341e0..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/fy.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ha.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ha.png deleted file mode 100755 index 972d5ad..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ha.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ho.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ho.png deleted file mode 100755 index 04e4623..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ho.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ka.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ka.png deleted file mode 100755 index 612d510..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ka.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ki.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ki.png deleted file mode 100755 index 9d650e3..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ki.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/me.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/me.png deleted file mode 100755 index 8f9bb1c..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/me.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ne.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ne.png deleted file mode 100755 index 3683220..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ne.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/nx.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/nx.png deleted file mode 100755 index 8a00594..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/nx.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pd.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pd.png deleted file mode 100755 index 80264ad..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pd.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ph.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ph.png deleted file mode 100755 index b049088..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ph.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pi.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pi.png deleted file mode 100755 index 9dbe973..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pi.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/re.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/re.png deleted file mode 100755 index 4365d5b..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/re.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/rz.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/rz.png deleted file mode 100755 index 08a642f..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/rz.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sb.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sb.png deleted file mode 100755 index ecb7055..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sb.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sc.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sc.png deleted file mode 100755 index 85fb3c3..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sc.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sd.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sd.png deleted file mode 100755 index 206935d..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sd.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sk.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sk.png deleted file mode 100755 index 1707950..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sk.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tl.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tl.png deleted file mode 100755 index 985ebfb..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tl.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tw.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tw.png deleted file mode 100755 index a34710a..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tw.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ur.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ur.png deleted file mode 100755 index 252ce67..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ur.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/vs.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/vs.png deleted file mode 100755 index 122ae5e..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/vs.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/wi.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/wi.png deleted file mode 100755 index 802344a..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/wi.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xh.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xh.png deleted file mode 100755 index df33a22..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xh.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xv.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xv.png deleted file mode 100755 index 2a367fc..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xv.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/yo.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/yo.png deleted file mode 100755 index ce619ae..0000000 Binary files a/modules/home/gui/apps/browsers/firefox/config/search/config/icons/yo.png and /dev/null differ diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/shopping.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/shopping.nix deleted file mode 100755 index 9db95bb..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/shopping.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - "Amazon" = { - definedAliases = [ - "@am" - ]; - icon = ./icons/am.png; - urls = [ - { template = "https://www.amazon.ca/s?k={searchTerms}&ref=nav_bb_sb"; } - ]; - }; - "Door Dash" = { - definedAliases = [ - "@do" - ]; - icon = ./icons/do.png; - urls = [ - { template = "https://www.doordash.com/search/store/{searchTerms}"; } - ]; - }; - "FYT Supplies" = { - definedAliases = [ - "@fy" - ]; - icon = ./icons/fy.png; - urls = [ - { - template = "https://fytsupplies.ca/search?type=product%2Carticle%2Cpage%2Ccollection&options[prefix]=last&q={searchTerms}*"; - } - ]; - }; - "Kijiji" = { - definedAliases = [ - "@ki" - ]; - icon = ./icons/ki.png; - urls = [ - { template = "https://www.kijiji.ca/b-winnipeg/{searchTerms}"; } - ]; - }; - "Memory Express" = { - definedAliases = [ - "@me" - ]; - icon = ./icons/me.png; - urls = [ - { template = "https://www.memoryexpress.com/Search/Products?Search={searchTerms}"; } - ]; - }; - "Skip The Dishes" = { - definedAliases = [ - "@sk" - ]; - icon = ./icons/sk.png; - urls = [ - { template = "https://www.skipthedishes.com/winnipeg/items?search={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/socialMedia.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/socialMedia.nix deleted file mode 100755 index 37813d1..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/socialMedia.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - "Reddit" = { - definedAliases = [ - "@re" - ]; - icon = ./icons/re.png; - urls = [ - { template = "https://www.reddit.com/search/?q={searchTerms}"; } - ]; - }; - "YouTube" = { - definedAliases = [ - "@yo" - ]; - icon = ./icons/yo.png; - urls = [ - { template = "https://www.youtube.com/results?search_query={searchTerms}"; } - ]; - }; - "X" = { - definedAliases = [ - "@tw" - ]; - icon = ./icons/tw.png; - urls = [ - { template = "https://x.com/search?q={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/spank.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/spank.nix deleted file mode 100755 index fedc206..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/spank.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - "Spankbang" = { - definedAliases = [ - "@sb" - ]; - icon = ./icons/sb.png; - urls = [ - { template = "https://spankbang.com/s/{searchTerms}/"; } - ]; - }; - "XHampster" = { - definedAliases = [ - "@xh" - ]; - icon = ./icons/xh.png; - urls = [ - { template = "https://xhamster.com/search/{searchTerms}"; } - ]; - }; - "XVideos" = { - definedAliases = [ - "@xv" - ]; - icon = ./icons/xv.png; - urls = [ - { template = "https://www.xvideos.com/?k={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/tools.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/tools.nix deleted file mode 100755 index fc0265d..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/tools.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - "AlternativeTo" = { - definedAliases = [ - "@al" - ]; - icon = ./icons/al.png; - urls = [ - { template = "https://alternativeto.net/browse/search/?q={searchTerms}"; } - ]; - }; - "Rhyme Zone" = { - definedAliases = [ - "@rz" - ]; - icon = ./icons/rz.png; - urls = [ - { - template = "https://www.rhymezone.com/r/rhyme.cgi?Word={searchTerms}&typeofrhyme=perfect&org1=syl&org2=l&org3=y"; - } - ]; - }; - "Urban Dictionary" = { - definedAliases = [ - "@ur" - ]; - icon = ./icons/ur.png; - urls = [ - { template = "https://www.urbandictionary.com/define.php?term={searchTerms}"; } - ]; - }; - "Stanford Encyclopedia of Philosophy" = { - definedAliases = [ - "@ph" - ]; - icon = ./icons/ph.png; - urls = [ - { template = "https://plato.stanford.edu/search/searcher.py?query={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/tracking.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/tracking.nix deleted file mode 100755 index ee72fcd..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/tracking.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - "1337x" = { - definedAliases = [ - "@13" - ]; - icon = ./icons/13.png; - urls = [ - { template = "https://1337x.to/search/{searchTerms}/1/"; } - ]; - }; - "Core Radio" = { - definedAliases = [ - "@cr" - ]; - icon = ./icons/cr.png; - urls = [ - { template = "https://coreradio.online/?do=search&subaction=search&story={searchTerms}"; } - ]; - }; - "The Pirate Bay" = { - definedAliases = [ - "@pi" - ]; - icon = ./icons/pi.png; - urls = [ - { - template = "https://thepiratebay.org/search.php?q={searchTerms}&all=on&search=Pirate+Search&page=0&orderby="; - } - ]; - }; - "Torrent Leech" = { - definedAliases = [ - "@tl" - ]; - icon = ./icons/tl.png; - urls = [ - { template = "https://www.torrentleech.org/torrents/browse/index/query/{searchTerms}"; } - ]; - }; - "VSTorrent" = { - definedAliases = [ - "@vs" - ]; - icon = ./icons/vs.png; - urls = [ - { template = "https://vstorrent.org/?s={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/config/web.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/web.nix deleted file mode 100755 index e2946e3..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/config/web.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - "Brave" = { - definedAliases = [ - "@br" - ]; - icon = ./icons/br.png; - urls = [ - { template = "https://search.brave.com/search?q={searchTerms}&source=web"; } - ]; - }; - "Kagi" = { - definedAliases = [ - "@ka" - ]; - icon = ./icons/ka.png; - urls = [ - { template = "https://kagi.com/search?q={searchTerms}"; } - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/search/default.nix b/modules/home/gui/apps/browsers/firefox/config/search/default.nix deleted file mode 100755 index d2f1b33..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/search/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ flake, ... }: -let - configPath = ./config; - flakedPath = configPath + /flake; - - regularSearchEngines = - let - files = builtins.attrNames (builtins.readDir configPath); - in - builtins.foldl' ( - emptySet: searchEngine: emptySet // (import (configPath + "/${searchEngine}")) - ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files); - - flakedSearchEngines = - let - files = builtins.attrNames (builtins.readDir flakedPath); - in - builtins.foldl' ( - emptySet: searchEngine: - emptySet - // (import (flakedPath + "/${searchEngine}") { - inherit - flake - ; - }) - ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files); - - aggregatedSearchEngines = regularSearchEngines // flakedSearchEngines; -in -{ - search = { - force = true; - default = "Kagi"; - engines = aggregatedSearchEngines; - order = [ - "AlternativeTo" - "Core Radio" - "Hackage" - "Hoogle" - "Jellyfin" - "Kagi" - "Nix Home Manager" - "Nix Options" - "Nix Packages" - "Nix Wiki" - "PeerTube" - "Sci-Hub" - "Torrent Leech" - "Urban Dictionary" - "Wikipedia" - "YouTube" - ]; - }; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix deleted file mode 100755 index 6ef0084..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - "ui.systemUsesDarkTheme" = 1; - "browser.aboutConfig.showWarning" = false; - "browser.aboutwelcome.enabled" = false; - "browser.bookmarks.addedImportButton" = false; - "browser.toolbars.bookmarks.visibility" = "never"; - "browser.urlbar.suggest.history" = false; - "browser.urlbar.suggest.bookmark" = true; - "browser.urlbar.suggest.openpage" = false; - "browser.urlbar.suggest.shortcut" = false; - "browser.urlbar.suggest.searches" = false; - "browser.urlbar.suggest.recentsearches" = false; - "dom.forms.autocomplete.formautofill" = true; - "extensions.pocket.enabled" = false; - "general.autoScroll" = true; - "media.eme.enabled" = true; - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "browser.compactmode.show" = true; - "browser.display.use_document_fonts" = true; - "gfx.downloadable_fonts.enabled" = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix deleted file mode 100755 index 0217bee..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - # DISK AVOIDANCE - "browser.cache.disk.enable" = false; - "browser.privatebrowsing.forceMediaMemoryCache" = true; - "media.memory_cache_max_size" = 65536; - "browser.sessionstore.privacy_level" = 2; - "toolkit.winRegisterApplicationRestart" = false; - "browser.shell.shortcutFavicons" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix deleted file mode 100755 index 606b129..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - # FPP (fingerprintingProtection) - "privacy.fingerprintingProtection.pbmode" = true; - "privacy.fingerprintingProtection" = true; - - # RFP (resistFingerprinting) - "privacy.resistFingerprinting" = false; - "privacy.window.maxInnerWidth" = 1600; - "privacy.window.maxInnerHeight" = 900; - "privacy.resistFingerprinting.block_mozAddonManager" = true; - "privacy.resistFingerprinting.letterboxing" = false; - "privacy.spoof_english" = 1; - "browser.display.use_system_colors" = false; - "widget.non-native-theme.enabled" = true; - "browser.link.open_newwindow" = 3; - "browser.link.open_newwindow.restriction" = 0; - "webgl.disabled" = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/formFill.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/formFill.nix deleted file mode 100755 index 767fd2d..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/formFill.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - # LOCATION BAR / SEARCH BAR / SUGGESTIONS / HISTORY / FORMS - "browser.formfill.enable" = false; - "browser.search.separatePrivateDefault.ui.enabled" = true; - "browser.search.separatePrivateDefault" = true; - "browser.search.suggest.enabled" = false; - "browser.urlbar.maxRichResults" = 16; - "browser.urlbar.speculativeConnect.enabled" = false; - "extensions.formautofill.addresses.enabled" = false; - "extensions.formautofill.addresses.supported" = "on"; - "extensions.formautofill.addresses.usage.hasEntry" = true; - "extensions.formautofill.creditCards.enabled" = false; - "extensions.formautofill.heuristics.enabled" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/geolocation.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/geolocation.nix deleted file mode 100755 index cc5924e..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/geolocation.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - "geo.provider.network.url" = - "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"; - "geo.provider.ms-windows-location" = false; - "geo.provider.use_corelocation" = false; - "geo.provider.use_gpsd" = false; - "geo.provider.use_geoclue" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/hardening.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/hardening.nix deleted file mode 100755 index 14a3ab1..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/hardening.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - # OPTIONAL HARDENING - # These settings are commented out in the original template; uncomment if needed - # "mathml.disabled" = true; - # "svg.disabled" = true; - # "gfx.font_rendering.graphite.enabled" = false; - # "javascript.options.asmjs" = false; - # "javascript.options.ion" = false; - # "javascript.options.baselinejit" = false; - # "javascript.options.jit_trustedprincipals" = true; - # "javascript.options.wasm" = false; - # "gfx.font_rendering.opentype_svg.enabled" = false; - # "media.eme.enabled" = false; - # "browser.eme.ui.enabled" = false; - # "network.dns.disableIPv6" = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/https.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/https.nix deleted file mode 100755 index 85aff20..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/https.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - # HTTPS (SSL/TLS / OCSP / CERTS / HPKP) - "security.ssl.require_safe_negotiation" = true; - "security.tls.enable_0rtt_data" = false; - "security.OCSP.enabled" = 1; - "security.OCSP.require" = true; - "security.cert_pinning.enforcement_level" = 2; - "security.remote_settings.crlite_filters.enabled" = true; - "security.pki.crlite_mode" = 2; - "dom.security.https_only_mode" = true; - "dom.security.https_only_mode_send_http_background_request" = false; - "security.ssl.treat_unsafe_negotiation_as_broken" = true; - "browser.xul.error_pages.expert_bad_cert" = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/misc.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/misc.nix deleted file mode 100755 index 5b60b2f..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/misc.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - # CONTAINERS - "privacy.userContext.enabled" = true; - "privacy.userContext.ui.enabled" = true; - # DOM (DOCUMENT OBJECT MODEL) - "dom.disable_window_move_resize" = true; - # MISCELLANEOUS - "browser.safebrowsing.downloads.remote.enabled" = false; - "browser.download.start_downloads_in_tmp_dir" = true; - "browser.helperApps.deleteTempFileOnExit" = true; - "browser.uitour.enabled" = false; - "devtools.debugger.remote-enabled" = false; - "network.IDN_show_punycode" = true; - "pdfjs.disabled" = false; - "pdfjs.enableScripting" = false; - # PLUGINS / MEDIA / WEBRTC - "media.peerconnection.ice.proxy_only_if_behind_proxy" = true; - "media.peerconnection.ice.default_address_only" = true; - # REFERERS - "network.http.referer.XOriginTrimmingPolicy" = 2; - # NON-PROJECT RELATED - # "browser.startup.homepage_override.mstone" = "ignore"; - "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false; - "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false; - "browser.urlbar.showSearchTerms.enabled" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/noTouching.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/noTouching.nix deleted file mode 100755 index 5055c4c..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/noTouching.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - # DON'T TOUCH - "extensions.blocklist.enabled" = true; - "network.http.referer.spoofSource" = false; - "security.dialog_enable_delay" = 1000; - "privacy.firstparty.isolate" = false; - "extensions.webcompat.enable_shims" = true; - "security.tls.version.enable-deprecated" = false; - "extensions.webcompat-reporter.enabled" = false; - "extensions.quarantinedDomains.enabled" = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/opSec.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/opSec.nix deleted file mode 100755 index ce59f5c..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/opSec.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - # ETP (ENHANCED TRACKING PROTECTION) - "browser.contentblocking.category" = "strict"; - # OPTIONAL OPSEC - "browser.download.useDownloadDir" = false; - "browser.download.alwaysOpenPanel" = false; - "browser.download.manager.addToRecentDocs" = false; - "browser.download.always_ask_before_handling_new_types" = true; - "extensions.enabledScopes" = 5; - "extensions.postDownloadThirdPartyPrompt" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/outbound.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/outbound.nix deleted file mode 100755 index 41af8b5..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/outbound.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - # BLOCK IMPLICIT OUTBOUND - "network.prefetch-next" = false; - "network.dns.disablePrefetch" = true; - "network.predictor.enabled" = false; - "network.predictor.enable-prefetch" = false; - "network.http.speculative-parallel-limit" = 0; - "browser.places.speculativeConnect.enabled" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/passwords.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/passwords.nix deleted file mode 100755 index f3046a4..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/passwords.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - # PASSWORDS - "network.auth.subresource-http-auth-allow" = 1; - "signon.autofillForms" = false; - "signon.formlessCapture.enabled" = false; - "signon.rememberSignons" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/privacy.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/privacy.nix deleted file mode 100755 index a41aaa6..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/privacy.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - # SHUTDOWN & SANITIZING - "privacy.sanitize.sanitizeOnShutdown" = false; - "privacy.clearOnShutdown.cache" = true; - "privacy.clearOnShutdown.downloads" = true; - "privacy.clearOnShutdown.formdata" = true; - "privacy.clearOnShutdown.history" = true; - "privacy.clearOnShutdown.cookies" = true; - "privacy.clearOnShutdown.offlineApps" = true; - "privacy.clearOnShutdown.sessions" = false; - "privacy.clearSiteData.cache" = true; - "privacy.clearSiteData.historyFormDataAndDownloads" = true; - "privacy.clearHistory.cache" = true; - "privacy.clearHistory.cookiesAndStorage" = false; - "privacy.clearHistory.historyFormDataAndDownloads" = true; - "privacy.cpd.sessions" = true; - # SHUTDOWN & SANITIZING (continued) - "privacy.clearOnShutdown_v2.cache" = true; - "privacy.clearOnShutdown_v2.historyFormDataAndDownloads" = true; - "privacy.clearOnShutdown_v2.cookiesAndStorage" = true; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/proxy.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/proxy.nix deleted file mode 100755 index 4ea0f00..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/proxy.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - # DNS / DoH / PROXY / SOCKS - "network.proxy.socks_remote_dns" = true; - "network.file.disable_unc_paths" = true; - "network.gio.supported-protocols" = ""; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/startup.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/startup.nix deleted file mode 100755 index acd675b..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/startup.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - "browser.newtab.url" = "about:home"; - "browser.newtabpage.activity-stream.default.sites" = ""; - "browser.newtabpage.activity-stream.feeds.system.topstories" = false; - "browser.newtabpage.activity-stream.feeds.topsites" = false; - "browser.newtabpage.activity-stream.showRecentSaves" = false; - "browser.newtabpage.activity-stream.showSearch" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.showWeather" = false; - "browser.newtabpage.enabled" = true; - "browser.startup.homepage" = "about:home"; - "browser.startup.page" = 1; - "browser.tabs.closeWindowWithLastTab" = false; - "browser.tabs.firefox-view-newIcon" = false; - "browser.tabs.firefox-view" = false; - "browser.tabs.inTitlebar" = 1; - "browser.tabs.loadBookmarksInBackground" = true; - "browser.tabs.tabmanager.enabled" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/config/telemetry.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/telemetry.nix deleted file mode 100755 index 777909b..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/config/telemetry.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - "extensions.getAddons.showPane" = false; - "extensions.htmlaboutaddons.recommendations.enabled" = false; - "browser.discovery.enabled" = false; - "browser.shopping.experience2023.enabled" = false; - "datareporting.policy.dataSubmissionEnabled" = false; - "datareporting.healthreport.uploadEnabled" = false; - "toolkit.telemetry.unified" = false; - "toolkit.telemetry.enabled" = false; - "toolkit.telemetry.server" = "data:,"; - "toolkit.telemetry.archive.enabled" = false; - "toolkit.telemetry.newProfilePing.enabled" = false; - "toolkit.telemetry.shutdownPingSender.enabled" = false; - "toolkit.telemetry.updatePing.enabled" = false; - "toolkit.telemetry.bhrPing.enabled" = false; - "toolkit.telemetry.firstShutdownPing.enabled" = false; - "toolkit.telemetry.coverage.opt-out" = true; - "toolkit.coverage.opt-out" = true; - "toolkit.coverage.endpoint.base" = ""; - "browser.newtabpage.activity-stream.feeds.telemetry" = false; - "browser.newtabpage.activity-stream.telemetry" = false; - "app.shield.optoutstudies.enabled" = false; - "app.normandy.enabled" = false; - "app.normandy.api_url" = ""; - "breakpad.reportURL" = ""; - "browser.tabs.crashReporting.sendReport" = false; - "network.captive-portal-service.enabled" = false; - "network.connectivity-service.enabled" = false; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/settings/default.nix b/modules/home/gui/apps/browsers/firefox/config/settings/default.nix deleted file mode 100755 index 9644f42..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/settings/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -let - configPath = ./config; - - aggregatedSettings = - let - files = builtins.attrNames (builtins.readDir configPath); - in - builtins.foldl' ( - emptySet: settingsFile: emptySet // (import (configPath + "/${settingsFile}")) - ) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files); -in -{ - settings = aggregatedSettings; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/themes/config/userChrome.css b/modules/home/gui/apps/browsers/firefox/config/themes/config/userChrome.css deleted file mode 100755 index 6c3faa9..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/themes/config/userChrome.css +++ /dev/null @@ -1,107 +0,0 @@ -* { - font-size: 13px !important; -} - -/* Title bar */ -.titlebar-spacer { - display: none !important; -} - -/* Tab bar */ -#navigator-toolbox { - border: 0px !important; -} -#TabsToolbar { - margin-left: 3px !important; -} -#TabsToolbar > .tabbrowser-arrowscrollbox { - overflow: visible !important; -} - -.titlebar-buttonbox-container { - display: none !important; -} - - -/* Nav bar */ -/* #nav-bar { - height: 0px; - min-height: 0px !important; - overflow: hidden; - transition: height 0.0s ease-in-out; -} */ - -/* Only show nav-bar when specifically focused, not when clicking tab bar */ -/* #nav-bar:focus-within { - overflow: visible; - height: auto; -} */ - -/* Remove placeholder text in the URL bar */ -#urlbar-input::placeholder { - color: transparent !important; -} -#urlbar { - padding: 2px !important; -} - -/* Hide URL bar text */ -#urlbar-background { - border: none !important; -} - -#urlbar-border:focus-within { - overflow: visible; - height: auto; -} - -/* Hide search engine icon */ -#urlbar .search-one-offs:not([hidden]) { - display: none !important; -} - -/* Hide tracking protection icon */ -#tracking-protection-icon-container { - display: none !important; -} -#urlbar-container { - width: auto !important; -} -#urlbar { - box-shadow: none !important; -} -#page-action-buttons { - display: none !important; -} - -/* Hide site information button */ -#identity-box { - display: none !important; -} - -/* Hide shield icon */ -#tracking-protection-icon-container { - display: none !important; -} - -/* Hide forward and back buttons when not active */ -#back-button[disabled="true"] { - display: none !important; -} -#forward-button[disabled="true"] { - display: none !important; -} -.personalize-button { - display: none !important; -} - -.tab-close-button { - visibility: hidden !important; - margin-inline-end: 0 !important; - width: 16px !important; - height: 16px !important; - padding: 2px !important; -} -.tabbrowser-tab:hover .tab-close-button { - visibility: visible !important; -} diff --git a/modules/home/gui/apps/browsers/firefox/config/themes/default.nix b/modules/home/gui/apps/browsers/firefox/config/themes/default.nix deleted file mode 100755 index 0d3f0ac..0000000 --- a/modules/home/gui/apps/browsers/firefox/config/themes/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - userChrome = builtins.readFile ./config/userChrome.css; -} diff --git a/modules/home/gui/apps/browsers/firefox/default.nix b/modules/home/gui/apps/browsers/firefox/default.nix index 0ee54ef..bc96b62 100755 --- a/modules/home/gui/apps/browsers/firefox/default.nix +++ b/modules/home/gui/apps/browsers/firefox/default.nix @@ -1,45 +1,11 @@ { pkgs, - flake, ... }: -let - inherit (flake.config.people) - user0 - ; -in { - programs.firefox = - let - configPath = ./config; - bookmarksPath = import (configPath + /bookmarks) { inherit flake; }; - extensionsPath = import (configPath + /extensions) { inherit pkgs; }; - searchPath = import (configPath + /search) { inherit flake; }; - settingsPath = import (configPath + /settings); - themesPath = import (configPath + /themes); - in - { - enable = true; - package = pkgs.firefox; - profiles = { - ${user0} = - { - isDefault = true; - id = 0; - } - // bookmarksPath - // extensionsPath - // searchPath - // settingsPath - // themesPath; - testing = - { - isDefault = false; - id = 1; - } - // bookmarksPath - // searchPath - // themesPath; - }; - }; + home.packages = builtins.attrValues { + inherit (pkgs) + firefox + ; + }; } diff --git a/modules/home/gui/apps/browsers/firefoxNix/default.nix b/modules/home/gui/apps/browsers/firefoxNix/default.nix deleted file mode 100755 index bc96b62..0000000 --- a/modules/home/gui/apps/browsers/firefoxNix/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - firefox - ; - }; -} diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/tools.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/tools.nix index c7662d5..84e5a63 100755 --- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/tools.nix +++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/tools.nix @@ -11,6 +11,15 @@ ]; keyword = "Mull"; } + { + name = "Monkeytype"; + url = "https://monkeytype.com/"; + tags = [ + "monkeytype" + "type" + ]; + keyword = "Monk"; + } { name = "Cyanophage Layout Analyzer"; url = "https://cyanophage.github.io"; diff --git a/modules/home/gui/apps/browsers/floorp/config/search/config/flake/icons/sx.png b/modules/home/gui/apps/browsers/floorp/config/search/config/flake/icons/sx.png old mode 100644 new mode 100755 diff --git a/modules/home/gui/apps/browsers/floorp/config/search/default.nix b/modules/home/gui/apps/browsers/floorp/config/search/default.nix index 8dbfef3..87687b4 100755 --- a/modules/home/gui/apps/browsers/floorp/config/search/default.nix +++ b/modules/home/gui/apps/browsers/floorp/config/search/default.nix @@ -30,7 +30,7 @@ in { search = { force = true; - default = "SearXNG"; + default = "Brave"; engines = aggregatedSearchEngines; order = [ "AlternativeTo" @@ -38,7 +38,7 @@ in "Hackage" "Hoogle" "Jellyfin" - "Kagi" + "SearXNG" "Nix Home Manager" "Nix Options" "Nix Packages" diff --git a/modules/home/gui/apps/media/docs/docEditing/logseq/default.nix b/modules/home/gui/apps/media/docs/docEditing/logseq/default.nix deleted file mode 100755 index c5e70d1..0000000 --- a/modules/home/gui/apps/media/docs/docEditing/logseq/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = builtins.attrValues { - inherit (pkgs) - logseq - ; - }; -} diff --git a/modules/home/gui/apps/media/docs/docViewing/okular/default.nix b/modules/home/gui/apps/media/docs/docViewing/okular/default.nix index a561e70..508abb9 100755 --- a/modules/home/gui/apps/media/docs/docViewing/okular/default.nix +++ b/modules/home/gui/apps/media/docs/docViewing/okular/default.nix @@ -4,7 +4,7 @@ }: { home.packages = builtins.attrValues { - inherit (pkgs) + inherit (pkgs.kdePackages) okular ; }; diff --git a/modules/home/gui/apps/media/images/imageViewing/gwenview/default.nix b/modules/home/gui/apps/media/images/imageViewing/gwenview/default.nix index 244c425..fd956da 100755 --- a/modules/home/gui/apps/media/images/imageViewing/gwenview/default.nix +++ b/modules/home/gui/apps/media/images/imageViewing/gwenview/default.nix @@ -4,7 +4,7 @@ }: { home.packages = builtins.attrValues { - inherit (pkgs) + inherit (pkgs.kdePackages) gwenview ; }; diff --git a/modules/home/gui/apps/browsers/braveNix/default.nix b/modules/home/gui/apps/tools/dolphin/default.nix similarity index 62% rename from modules/home/gui/apps/browsers/braveNix/default.nix rename to modules/home/gui/apps/tools/dolphin/default.nix index 0dfcccc..b7525ef 100755 --- a/modules/home/gui/apps/browsers/braveNix/default.nix +++ b/modules/home/gui/apps/tools/dolphin/default.nix @@ -4,8 +4,8 @@ }: { home.packages = builtins.attrValues { - inherit (pkgs) - brave + inherit (pkgs.kdePackages) + dolphin ; }; } diff --git a/modules/home/gui/desktop/wayland/waybar/default.nix b/modules/home/gui/desktop/wayland/waybar/default.nix index 9d275e8..730ad7e 100755 --- a/modules/home/gui/desktop/wayland/waybar/default.nix +++ b/modules/home/gui/desktop/wayland/waybar/default.nix @@ -12,7 +12,7 @@ in { programs.waybar = { enable = true; - package = flake.inputs.waybar.packages.${pkgs.system}.default; + # package = flake.inputs.waybar.packages.${pkgs.system}.default; settings = settingsPath; style = stylePath; }; diff --git a/modules/home/gui/desktop/wayland/wpaperd/default.nix b/modules/home/gui/desktop/wayland/wpaperd/default.nix index 6fe6221..2b596f6 100755 --- a/modules/home/gui/desktop/wayland/wpaperd/default.nix +++ b/modules/home/gui/desktop/wayland/wpaperd/default.nix @@ -1,5 +1,5 @@ { - programs.wpaperd = { + services.wpaperd = { enable = true; settings = { "default" = { diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/juliemao-1741428128332-6023.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/juliemao-1741428128332-6023.jpg old mode 100644 new mode 100755 diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-eyrj7o.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-eyrj7o.jpg old mode 100644 new mode 100755 diff --git a/modules/home/gui/desktop/wayland/wpaperd/wallpaper/yrTphE7NymvE-bSD.mp4 b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/yrTphE7NymvE-bSD.mp4 new file mode 100755 index 0000000..b23b561 Binary files /dev/null and b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/yrTphE7NymvE-bSD.mp4 differ diff --git a/modules/nixos/programs/nixvim/default.nix b/modules/nixos/programs/nixvim/default.nix deleted file mode 100755 index 7dd4210..0000000 --- a/modules/nixos/programs/nixvim/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ pkgs, ... }: -{ - programs.nixvim = { - enable = true; - colorschemes.catppuccin = { - enable = true; - settings.flavour = "macchiato"; - }; - globals.mapleader = " "; - keymaps = [ - { - action = "Neotree toggle"; - key = "e"; - mode = "n"; - options.silent = true; - } - ]; - - plugins = { - avante = { - enable = true; - settings = { - claude = { - model = "claude-3-5-sonnet-latest"; - }; - }; - }; - - trouble.enable = true; - web-devicons.enable = true; - conform-nvim = { - enable = true; - settings = { - formatters_by_ft = { - - css = [ - "prettierd" - "prettier" - ]; - html = [ - "prettierd" - "prettier" - ]; - javascript = [ - "prettierd" - "prettier" - ]; - javascriptreact = [ "prettier" ]; - json = [ "prettier" ]; - markdown = [ "prettier" ]; - nix = [ "nixfmt" ]; - rust = [ "rustfmt" ]; - sh = [ "shfmt" ]; - typescript = [ - "prettierd" - "prettier" - ]; - typescriptreact = [ "prettier" ]; - yaml = [ - "prettierd" - "prettier" - ]; - }; - formatters = { - asmfmt = { - command = "asmfmt"; - stdin = true; - }; - }; - }; - settings.format_on_save = { - lspFallback = true; - timeoutMs = 2000; - }; - }; - direnv = { - enable = true; - }; - treesitter = { - enable = true; - }; - lean.enable = true; - nix.enable = true; - markdown-preview.enable = true; - zellij.enable = true; - zellij-nav.enable = true; - yazi.enable = true; - gitsigns = { - enable = true; - settings = { - current_line_blame = true; - trouble = true; - }; - }; - copilot-chat = { - enable = true; - }; - nvim-tree = { - enable = true; - openOnSetupFile = true; - autoReloadOnWrite = true; - }; - nix-develop.enable = true; - lazygit.enable = true; - haskell-scope-highlighting.enable = true; - lsp = { - enable = true; - servers = { - elmls.enable = true; - hls = { - enable = true; - installGhc = true; - }; - ghcide.enable = true; - leanls.enable = true; - markdown_oxide.enable = true; - nixd.enable = true; - nushell.enable = true; - rls.enable = true; - rust_analyzer = { - enable = true; - installCargo = true; - installRustc = true; - }; - yamlls.enable = true; - java_language_server = { - package = "java-language-server"; - cmd = [ "java-language-server" ]; - }; - }; - }; - }; - opts = { - updatetime = 100; - number = true; - relativenumber = true; - splitbelow = true; - splitright = true; - scrolloff = 4; - - autoindent = true; - clipboard = "unnamedplus"; - expandtab = true; - shiftwidth = 2; - smartindent = true; - tabstop = 2; - - ignorecase = true; - incsearch = true; - smartcase = true; - wildmode = "list:longest"; - - swapfile = false; - undofile = true; - }; - clipboard.providers.wl-copy.enable = true; - extraPlugins = builtins.attrValues { - inherit (pkgs) - - ; - }; - }; -} diff --git a/modules/nixos/programs/steam/default.nix b/modules/nixos/programs/steam/default.nix index b3fee58..3f9d680 100755 --- a/modules/nixos/programs/steam/default.nix +++ b/modules/nixos/programs/steam/default.nix @@ -10,8 +10,12 @@ curl ; }; + gamescopeSession.enable = true; }; java.enable = true; }; hardware.steam-hardware.enable = true; + programs.gamescope = { + enable = true; + }; } diff --git a/modules/nixos/services/searx/default.nix b/modules/nixos/services/searx/default.nix old mode 100644 new mode 100755