rename nixpkgs.channels.default -> nixpkgs.channels.base

flake.lock

@@ -37,11 +37,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775558810,
+        "lastModified": 1772292445,
-        "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=",
+        "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2",
+        "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1774191766,
+        "lastModified": 1770895252,
-        "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=",
+        "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=",
         "ref": "refs/heads/main",
-        "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456",
+        "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c",
-        "revCount": 1336,
+        "revCount": 1331,
         "type": "git",
         "url": "https://codeberg.org/LGFae/awww"
       },
@@ -98,11 +98,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1775586808,
+        "lastModified": 1772820255,
-        "narHash": "sha256-4Sk8qj8kFO3dhrxX5WVOGSISyILJTCmjR5eeGuX1lY4=",
+        "narHash": "sha256-vdktxEQihZUcKiwbaYCBl8LuTrJZULpjwqtJyBzXBN8=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "97ca4cf337f839170998814f0f347857596a1794",
+        "rev": "aada771f510dbd9ac48614cc7b4b21a292989d3a",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1775535525,
+        "lastModified": 1772644657,
-        "narHash": "sha256-Q1HqL7lxx3sIYaAb+e4pl9L4Le3a3bEm/2IY9kSzARU=",
+        "narHash": "sha256-7zQSBFv9gFeYhe65NchqLLste7mJ396jA1OnNcf+OQQ=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "708043b2186d50d4e6ec1a1377b1452de08c3b91",
+        "rev": "ff5ccc4fa26d5272d929fb9c1838593a6347ca10",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1775568994,
+        "lastModified": 1772731186,
-        "narHash": "sha256-geh/xiRM8JFBo7lPuV9Op0LAZHz/VdhSQuCYNTthTJw=",
+        "narHash": "sha256-y70pS9Cma7+WCsni3VTacHh9g/udulmBS6zrYE2Fz64=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "b953e9a0044ab79b30abccee243afebfc185b622",
+        "rev": "eac8168ee15f742547d4d20ba5c7fea283f23019",
         "type": "github"
       },
       "original": {
@@ -146,29 +146,29 @@
     "cerulean": {
       "inputs": {
         "deploy-rs": "deploy-rs",
-        "home-manager": "home-manager",
         "microvm": "microvm",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nt": "nt",
+        "sops-nix": "sops-nix",
         "systems": [
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1771409623,
+        "lastModified": 1773744164,
-        "narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=",
+        "narHash": "sha256-dGupwWUL9YPvC0/m4maCRD9psomWhFr/JAsGnC9toQM=",
-        "ref": "refs/heads/main",
+        "owner": "cry128",
-        "rev": "d5211287bd3cb96078f2053488d67d557848a8f2",
+        "repo": "cerulean",
-        "revCount": 176,
+        "rev": "e7fdbf416ccb3e7e6bf30042e4aacd065983ddad",
-        "type": "git",
+        "type": "github"
-        "url": "https://tearforge.net/cry/cerulean"
       },
       "original": {
-        "rev": "d5211287bd3cb96078f2053488d67d557848a8f2",
+        "owner": "cry128",
-        "type": "git",
+        "ref": "v0.2.6-alpha",
-        "url": "https://tearforge.net/cry/cerulean"
+        "repo": "cerulean",
+        "type": "github"
       }
     },
     "crane": {
@@ -213,11 +213,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1766051518,
+        "lastModified": 1770019181,
-        "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
+        "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
+        "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
         "type": "github"
       },
       "original": {
@@ -227,12 +227,33 @@
       }
     },
     "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1772780947,
+        "narHash": "sha256-cblRAy3ctJniRFaSLpqYeHor+RJhkptPZNMUc4Sl+v4=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "26a5e59df51222c849deb63c9196ac6d7a531535",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "fenix_2": {
       "inputs": {
         "nixpkgs": [
           "iamb",
           "nixpkgs"
         ],
-        "rust-analyzer-src": "rust-analyzer-src"
+        "rust-analyzer-src": "rust-analyzer-src_2"
       },
       "locked": {
         "lastModified": 1760510549,
@@ -331,11 +352,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1772408722,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -463,16 +484,15 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "cerulean",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1775425411,
+        "lastModified": 1772633058,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
+        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
+        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
         "type": "github"
       },
       "original": {
@@ -489,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775598298,
+        "lastModified": 1772807318,
-        "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=",
+        "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86",
+        "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
         "type": "github"
       },
       "original": {
@@ -503,48 +523,6 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775425411,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_3": {
-      "inputs": {
-        "nixpkgs": [
-          "zen",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1774991950,
-        "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -561,11 +539,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772461003,
+        "lastModified": 1753964049,
-        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -590,11 +568,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775496928,
+        "lastModified": 1770511807,
-        "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=",
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
         "type": "github"
       },
       "original": {
@@ -622,11 +600,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1775578056,
+        "lastModified": 1772833450,
-        "narHash": "sha256-TiSPoIM8EBf6Z6Hrne5wX4hPfss1xTRcRfTL6+DfmLo=",
+        "narHash": "sha256-XuuvhTD/72mH8MBncTeOyN0JzLCtwav7lkwBQlIofd4=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "75dc67e63f1873f1e97f73daf0ce284f75afa97c",
+        "rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433",
         "type": "github"
       },
       "original": {
@@ -668,11 +646,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774710575,
+        "lastModified": 1767023960,
-        "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=",
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "0703df899520001209646246bef63358c9881e36",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
         "type": "github"
       },
       "original": {
@@ -681,6 +659,36 @@
         "type": "github"
       }
     },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland-git"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771865848,
+        "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -693,11 +701,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772460177,
+        "lastModified": 1765214753,
-        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -722,11 +730,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772459629,
+        "lastModified": 1771866172,
-        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
         "type": "github"
       },
       "original": {
@@ -774,11 +782,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772462885,
+        "lastModified": 1764592794,
-        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
         "type": "github"
       },
       "original": {
@@ -799,11 +807,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774911391,
+        "lastModified": 1771271487,
-        "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=",
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
         "type": "github"
       },
       "original": {
@@ -824,11 +832,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772459835,
+        "lastModified": 1770501770,
-        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
         "type": "github"
       },
       "original": {
@@ -853,11 +861,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775414057,
+        "lastModified": 1771606233,
-        "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=",
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
         "type": "github"
       },
       "original": {
@@ -869,7 +877,7 @@
     "iamb": {
       "inputs": {
         "crane": "crane",
-        "fenix": "fenix",
+        "fenix": "fenix_2",
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs-unstable"
@@ -983,16 +991,16 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1775461179,
+        "lastModified": 1772792509,
-        "narHash": "sha256-4vvuk6tl8M2wuW3VJU9Uwc3HCrL95cSJImEODNNQEy8=",
+        "narHash": "sha256-c2X+x/D8txqV5UaN6TYYh9PEXyMaWVZl4mAQ0Sl21f8=",
-        "owner": "mangowm",
+        "owner": "DreamMaoMao",
-        "repo": "mango",
+        "repo": "mangowc",
-        "rev": "e83a9dff820ce2215ecbbbea7d617d24d0825174",
+        "rev": "9a17a0279c39b330d155d50282d1d2641d519dc3",
         "type": "github"
       },
       "original": {
-        "owner": "mangowm",
+        "owner": "DreamMaoMao",
-        "repo": "mango",
+        "repo": "mangowc",
         "type": "github"
       }
     },
@@ -1005,11 +1013,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1775329298,
+        "lastModified": 1773018425,
-        "narHash": "sha256-xmntQolopr1WwBO5rAC+SKyON+ritVQLUHZdvpjUM90=",
+        "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=",
         "owner": "microvm-nix",
         "repo": "microvm.nix",
-        "rev": "4a9ff5adcefd23e68de76f33ebc7b3909e06c09b",
+        "rev": "25ebda3c558e923720c965832dc9a04f559a055c",
         "type": "github"
       },
       "original": {
@@ -1026,11 +1034,11 @@
         "spectrum": "spectrum_2"
       },
       "locked": {
-        "lastModified": 1775329298,
+        "lastModified": 1772742184,
-        "narHash": "sha256-xmntQolopr1WwBO5rAC+SKyON+ritVQLUHZdvpjUM90=",
+        "narHash": "sha256-zGnRxJQZ8wZTwvSxF4SAGoefbta15/W032tK22uIF2E=",
         "owner": "microvm-nix",
         "repo": "microvm.nix",
-        "rev": "4a9ff5adcefd23e68de76f33ebc7b3909e06c09b",
+        "rev": "a257ca90febb686c75826918f9f8876d74f875eb",
         "type": "github"
       },
       "original": {
@@ -1195,11 +1203,11 @@
     },
     "nixcats": {
       "locked": {
-        "lastModified": 1774835836,
+        "lastModified": 1770584904,
-        "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=",
+        "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d",
+        "rev": "538fdde784d2909700d97a8ef307783b33a86fb1",
         "type": "github"
       },
       "original": {
@@ -1214,15 +1222,14 @@
         "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1775592269,
+        "lastModified": 1772813986,
-        "narHash": "sha256-SB76MADRKDwYwLmKP3tpjlnhmQ9xVBE6WHyv9sskvZI=",
+        "narHash": "sha256-x0fD+LL+O99p36c2UnjnHvVq4/7TvGH/8G5lTNIJBCo=",
         "owner": "FlameFlag",
         "repo": "nixcord",
-        "rev": "814ebf38f04e99a37ebaf9159f5112238f828a1e",
+        "rev": "e433a2919eb9b3a8c85ab3017c08685816e63a66",
         "type": "github"
       },
       "original": {
@@ -1233,11 +1240,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775545155,
+        "lastModified": 1772774498,
-        "narHash": "sha256-hTjWyj6wz9Iw6IjfrP+rZj1V1DjbVRCd1WjcpxH8Fqs=",
+        "narHash": "sha256-85HBHBEzVRQ0ZRe6u3E2snUvAyTr5mSvi5m2vl4HExo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f97e195236002ce34b91d43ffe68557ac7d007fc",
+        "rev": "943ba5b1a58e68eb9a2c284ba6e3b30ebfe45abe",
         "type": "github"
       },
       "original": {
@@ -1249,11 +1256,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1774748309,
+        "lastModified": 1772328832,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
         "type": "github"
       },
       "original": {
@@ -1294,11 +1301,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1775605449,
+        "lastModified": 1772820052,
-        "narHash": "sha256-7xNGBc+aDnV5O2NEbVedKqTJZf7fMQplQ2KP0Uuso2c=",
+        "narHash": "sha256-qXEI8n+4eXT+BqMzUMuKFdkltE82TjgIceiJCpdjzD4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad1602de15363141e019f759c7c9fe8646b28b30",
+        "rev": "d78e468770f4ab5e00c5015f4d77c1a499a76dc8",
         "type": "github"
       },
       "original": {
@@ -1308,29 +1315,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-nixcord": {
-      "locked": {
-        "lastModified": 1773222311,
-        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0590cd39f728e129122770c029970378a79d076a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-staging": {
       "locked": {
-        "lastModified": 1775585988,
+        "lastModified": 1772820753,
-        "narHash": "sha256-lIfMIN05ks3wNz3MqM9H6RkdNLg6RJuuDH0o4o1LOvI=",
+        "narHash": "sha256-Sv689sGseiqNPXGSggxrESyivroe8cgY4dxqJdBLsEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2d38540b4428002cf24c82e81d947a3b2670d8a6",
+        "rev": "e2239e5b2c5676b963d78dccbee06a9bbbdb05d6",
         "type": "github"
       },
       "original": {
@@ -1342,11 +1333,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1772624091,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
         "type": "github"
       },
       "original": {
@@ -1374,11 +1365,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1775305101,
+        "lastModified": 1772598333,
-        "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=",
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "36a601196c4ebf49e035270e10b2d103fe39076b",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
         "type": "github"
       },
       "original": {
@@ -1395,11 +1386,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1770975056,
+        "lastModified": 1773738366,
-        "narHash": "sha256-ZXTz/P3zUbbM6lNXzt91u8EwfNqhXpYMu8+wvFZqQHE=",
+        "narHash": "sha256-oH22HyNHEdCoCQo734sQCHUr6C0jmGQJMZ13dsgEHkk=",
         "owner": "cry128",
         "repo": "nt",
-        "rev": "f42dcdd49a7921a7f433512e83d5f93696632412",
+        "rev": "f32c3a726a3d608d30aaaa1df2301c1eaf5ef8f4",
         "type": "github"
       },
       "original": {
@@ -1418,11 +1409,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775036584,
+        "lastModified": 1772024342,
-        "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
         "type": "github"
       },
       "original": {
@@ -1453,9 +1444,11 @@
         "awww": "awww",
         "cachyos": "cachyos",
         "cerulean": "cerulean",
-        "home-manager": "home-manager_2",
+        "fenix": "fenix",
+        "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
         "hyprland-git": "hyprland-git",
+        "hyprland-plugins": "hyprland-plugins",
         "iamb": "iamb",
         "mango": "mango",
         "microvm": "microvm_2",
@@ -1473,6 +1466,23 @@
       }
     },
     "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1772701851,
+        "narHash": "sha256-2g4Xg+w6wx2ewn1Tv576RzDc6Uof99H8kofHWdJktEs=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "2a8f00fb9344cc6701063192fe0aaf66ecf9d337",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "rust-analyzer-src_2": {
       "flake": false,
       "locked": {
         "lastModified": 1760457219,
@@ -1538,11 +1548,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775529071,
+        "lastModified": 1771956684,
-        "narHash": "sha256-z7LF/Vn8Zfbh5pgF/y7TPhz19AwTlQKrfGJdJHpOqOg=",
+        "narHash": "sha256-+EtzmEzGA2xqwIvKrP0euYaOzrmTQWEWAiWV+k2WBEM=",
         "owner": "uiriansan",
         "repo": "SilentSDDM",
-        "rev": "f8ec3cd49dcd98c04860ca1ac105727b5cfc6981",
+        "rev": "34f82e1fb8412fff78b82a0dcce763492b36054c",
         "type": "github"
       },
       "original": {
@@ -1551,6 +1561,27 @@
         "type": "github"
       }
     },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "cerulean",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1773096132,
+        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
     "spectrum": {
       "flake": false,
       "locked": {
@@ -1570,11 +1601,11 @@
     "spectrum_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1772189877,
+        "lastModified": 1759482047,
-        "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=",
+        "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=",
         "ref": "refs/heads/main",
-        "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358",
+        "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9",
-        "revCount": 1255,
+        "revCount": 996,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },
@@ -1593,11 +1624,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775421933,
+        "lastModified": 1772494187,
-        "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=",
+        "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096",
+        "rev": "915ab06b046d05613041780c575c62a32fe67cea",
         "type": "github"
       },
       "original": {
@@ -1767,11 +1798,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773601989,
+        "lastModified": 1761431178,
-        "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {
@@ -1782,17 +1813,19 @@
     },
     "zen": {
       "inputs": {
-        "home-manager": "home-manager_3",
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs-unstable"
         ]
       },
       "locked": {
-        "lastModified": 1775453133,
+        "lastModified": 1772772172,
-        "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=",
+        "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "8d0508ffceba8ad785ae442591dd115080a55142",
+        "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -19,7 +19,7 @@
     };
 
     cerulean = {
-      url = "git+https://tearforge.net/cry/cerulean?rev=d5211287bd3cb96078f2053488d67d557848a8f2";
+      url = "github:cry128/cerulean/v0.2.6-alpha";
       inputs = {
         systems.follows = "systems";
         nixpkgs.follows = "nixpkgs";
@@ -40,13 +40,13 @@
       url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
-    # hyprland-plugins = {
+    hyprland-plugins = {
-    #   url = "github:hyprwm/hyprland-plugins";
+      url = "github:hyprwm/hyprland-plugins";
-    #   inputs.hyprland.follows = "hyprland-git";
+      inputs.hyprland.follows = "hyprland-git";
-    # };
+    };
 
     mango = {
-      url = "github:mangowm/mango";
+      url = "github:DreamMaoMao/mangowc";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
@@ -59,7 +59,10 @@
 
     zen = {
       url = "github:0xc000022070/zen-browser-flake";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs = {
+        nixpkgs.follows = "nixpkgs-unstable";
+        home-manager.follows = "home-manager";
+      };
     };
 
     iamb = {
@@ -85,6 +88,11 @@
       };
     };
 
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     # temp theme until i bother creating my own </3
     sddm-silent = {
       url = "github:uiriansan/SilentSDDM";
@@ -96,5 +104,6 @@
     extra-experimental-features = "pipe-operators";
   };
 
-  outputs = inputs: import ./snow.nix inputs;
+  outputs = {cerulean, ...} @ inputs:
+    cerulean.snow.flake inputs ./.;
 }

groups/all/default.nix

@@ -1,6 +1,6 @@
 {...}: {
   nix.settings = {
-    experimental-features = ["nix-command" "flakes" "pipe-operators"];
+    experimental-features = ["nix-command" "flakes"];
     download-buffer-size = 524288000;
   };
 }

homes/aurora/default.nix

@@ -85,8 +85,8 @@
 
     # fonts
     nerd-fonts.departure-mono # pretty pixel art font i love!! x3
-    noto-fonts-cjk-sans # bitmap font for cjk support :3
+    nerd-fonts.jetbrains-mono
-    zpix-pixel-font # bitmap font for cjk support :3
+    noto-fonts
 
     # cli / tui tools and commands!
     eza # replaces: ls (rust)
@@ -111,13 +111,10 @@
     pastel # color generator / manipulator :3 i love colors!! <3
     eva # calculator repl 
     silicon # makes pretty images of code :3
-    wormhole-rs # send people stuff!! :3
-    croc # other way to send people stuff!! :3
 
     # cli fun
     pokeget-rs # prints a random pokemon to the terminal :3
     pipes # pipes program <3
-    cmatrix # the matrix :3
 
     # dev
     gnumake
@@ -133,7 +130,6 @@
     gleam
     delta # git diff viewer
     tlrc # tldr rust client
-    shellcheck
 
     # apps
     qutebrowser # keyboard-focused browser (chromium)
@@ -143,6 +139,7 @@
     obsidian # literally best notes app (i use vim mode)
     qimgv # image viewer!
     feh # other image viewer! (im indecisive)
+    vesktop # modded discord client!
     gimp # open source image manipulation program
     krita # open source painting application!
     imhex # hex editor
@@ -156,7 +153,6 @@
     element-desktop # 'official' gui matrix client
     blender # AMAZING 3D MODELLING PROGRAMMM <3
     session-desktop # idk silly chat app
-    localsend # share files locally :3
 
     # media
     playerctl # mpris cli interface for media apps :3
@@ -177,6 +173,7 @@
     # gui settings apps
     nwg-look # gtk 2 / 3 settings thing idc i hate gtk
     pavucontrol # i wanna get rid of this but its audio control thing
+    rquickshare # android quick share (this is pretty cool!!)
 
     # wayland desktop tools / de / wm stuff / gui stuffs
     cliphist
@@ -292,7 +289,7 @@
         git.pagers = [
           {
             colorArg = "always";
-            pager = "delta --dark --pager=never";
+            pager = "delta --dark --pager=never --line-numbers --side-by-side";
           }
         ];
       };
@@ -321,6 +318,7 @@
     zen-browser = {
       enable = true;
       package = inputs.zen.packages.${system}.twilight;
+      suppressXdgMigrationWarning = true;
     };
 
     mpv = {

homes/modules/de/waybar/style.css

@@ -3,7 +3,7 @@
 * {
   border: none;
   border-radius: 0;
-  font-family: "DepartureMono Nerd Font", "Unifont";
+  font-family: 'DepartureMono Nerd Font';
   font-size: 10px;
   font-weight: bold;
   min-height: 10px;
@@ -37,7 +37,6 @@ tooltip label {
 #network,
 #workspaces,
 #taskbar,
-#submap,
 #cpu,
 #pulseaudio,
 #privacy,
@@ -49,7 +48,6 @@ tooltip label {
   padding: 4px 16px;
   border-radius: 32px;
   border: 1px solid @color01;
-  min-height: 14px;
 }
 
 /*
@@ -76,7 +74,6 @@ right-side modules
 #cpu,
 #pulseaudio,
 #tray,
-#submap,
 #privacy {
   margin: 4px 0px 4px 4px;
 }
@@ -99,34 +96,6 @@ right-side modules
   border: none;
 }
 
-#submap.name {
-  color: @colorfg;
-}
-
-#pulseaudio.sink {
-  margin: 4px 0 4px 4px;
-  border-radius: 32px 0px 0px 32px;
-  color: @colorbg;
-  border-color: @color12;
-  background-color: @color12;
-}
-#pulseaudio.sink.muted {
-  color: @color12;
-  background-color: @colorbg;
-}
-#pulseaudio.source {
-  margin: 4px 0 4px 0;
-  border-radius: 0px 32px 32px 0px;
-  border-width: 1px 1px 1px 0px;
-  color: @colorbg;
-  border-color: @color14;
-  background-color: @color14;
-}
-#pulseaudio.source.source-muted {
-  color: @color14;
-  background-color: @colorbg;
-}
-
 /*
   connects the workspace and taskbar together :3
 */
@@ -145,7 +114,7 @@ right-side modules
 */
 
 #cpu {
-  margin: 4px 0 4px 4px;
+  margin: 4px 0 4px 0;
   border-radius: 32px 0px 0px 32px;
 }
 #memory {

homes/modules/de/waybar/waybar.nix

@@ -6,45 +6,24 @@
         layer = "top";
         position = "top";
         height = 20;
-
+        modules-left = ["hyprland/workspaces" "wlr/taskbar" "custom/media"];
-        modules-left = [
+        modules-center = ["clock"];
-          "hyprland/workspaces"
+        modules-right = ["cpu" "memory" "network" "pulseaudio" "privacy" "tray"];
-          "wlr/taskbar"
-          "custom/media"
-        ];
-
-        modules-center = [
-          "clock"
-        ];
-
-        modules-right = [
-          "hyprland/submap"
-          "cpu"
-          "memory"
-          "network"
-          "pulseaudio#sink"
-          "pulseaudio#source"
-          "privacy"
-          "tray"
-        ];
 
         # left
         "hyprland/workspaces" = {
           format = "{id}";
         };
-
-        # not enabled yet, hyprland and mango need two different configs ;-;
         "ext/workspaces" = {
+          # not enabled yet, hyprland and mango need two different configs ;-;
           format = "{id}";
           ignore-hidden = true;
           on-click = "activate";
         };
-
         "wlr/taskbar" = {
           format = "{icon}";
           icon-size = 12;
         };
-
         "custom/media" = {
           exec = "auroramedia";
           return-type = "json";
@@ -60,24 +39,14 @@
         };
 
         # right
-        "hyprland/submap" = {
-          format = "{}";
-          # always-on = true;
-          # default-submap = "normal";
-          max-length = 12;
-          tooltip = false;
-        };
-
         "cpu" = {
           format = "  {usage}%";
           interval = 1;
         };
-
         "memory" = {
           format = "  {used:0.1f} / {total:0.1f} GiB";
           interval = 1;
         };
-
         "network" = {
           format = "{bandwidthUpBytes}   {bandwidthDownBytes}  {ifname}";
           format-wifi = "  {bandwidthUpBytes}   {bandwidthDownBytes} ";
@@ -86,8 +55,7 @@
           interval = 1;
           max-length = 32;
         };
-
+        "pulseaudio" = {
-        "pulseaudio#sink" = {
           format = "{icon}  {volume}%";
           format-muted = "  {volume}%";
           format-icons = {
@@ -98,18 +66,7 @@
             ];
           };
           "scroll-step" = 5;
-          tooltip = true;
         };
-
-        "pulseaudio#source" = {
-          format = "{format_source}";
-          format-source = "  {volume}%";
-          format-source-muted = "  {volume}%";
-          on-scroll-up = "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%+";
-          on-scroll-down = "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%-";
-          tooltip = true;
-        };
-
         "privacy" = {
           icon-size = 12;
           icon-spacing = 5;
@@ -127,7 +84,6 @@
             }
           ];
         };
-
         "tray" = {
           icon-size = 12;
           spacing = 10;

homes/modules/programs/neovim/init.lua

@@ -2,16 +2,12 @@ vim.g.mapleader = " "
 
 vim.opt.termguicolors = true -- use terminal colors
 vim.opt.relativenumber = true
-vim.opt.number = true
 vim.opt.wrap = false
 vim.opt.colorcolumn = "80"
-vim.opt.scrolloff = 4
 
 require("plugins")
 require("lsp")
-require("colors")
 
--- move windows :3
 vim.keymap.set("n", "<A-h>", function()
 	vim.cmd("wincmd h")
 end)
@@ -25,71 +21,73 @@ vim.keymap.set("n", "<A-l>", function()
 	vim.cmd("wincmd l")
 end)
 
--- splits <3 (i love splits sm)
+local uv = vim.loop
-vim.keymap.set("n", "<leader>s", function()
+local colorscheme_filepath = "/home/aurora/.cache/nvim/neovim-colors"
-	vim.cmd("split")
+local colors = {}
-end)
-vim.keymap.set("n", "<leader>v", function()
-	vim.cmd("vsplit")
-end)
 
--- u can put delta inside of neovim omg they are spoiling me <3
+-- function to load colors
-local git_diff_win = nil
+local function load_colors()
-
+	local new_colors = {}
-vim.api.nvim_create_autocmd("VimResized", {
+	for line in io.lines(colorscheme_filepath) do
-	callback = function()
+		table.insert(new_colors, line)
-		if git_diff_win and vim.api.nvim_win_is_valid(git_diff_win) then
-			local width = math.floor(vim.o.columns * 0.9)
-			local height = math.floor((vim.o.lines - 2) * 0.9)
-
-			vim.api.nvim_win_set_config(git_diff_win, {
-				relative = "editor",
-				width = width,
-				height = height,
-				col = math.floor((vim.o.columns - width) / 2),
-				row = math.floor((vim.o.lines - height) / 2) - 2,
-			})
-		end
-	end,
-})
-
-vim.keymap.set("n", "<leader>gd", function()
-	if git_diff_win and vim.api.nvim_win_is_valid(git_diff_win) then
-		vim.api.nvim_win_close(git_diff_win, true)
-		git_diff_win = nil
-		return
 	end
 
-	local buf = vim.api.nvim_create_buf(false, true)
+	-- ensure the table has enough entries to avoid indexing issues
+	if #new_colors >= 18 then
+		colors = new_colors
+		require("base16-colorscheme").setup({
+			base00 = colors[17],
+			base01 = colors[1],
+			base02 = colors[3],
+			base03 = colors[3],
+			base04 = colors[5],
+			base05 = colors[8],
+			base06 = colors[5],
+			base07 = colors[8],
+			base08 = colors[18],
+			base09 = colors[4],
+			base0A = colors[11],
+			base0B = colors[5],
+			base0C = colors[6],
+			base0D = colors[7],
+			base0E = colors[6],
+			base0F = colors[16],
+		})
 
-	vim.bo[buf].filetype = "terminal"
+		-- set colors for blink.cmp's completion menu
+		vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = colors[17] })
+		vim.api.nvim_set_hl(0, "BlinkCmpMenuBorder", { bg = colors[17], fg = colors[13] })
+		vim.api.nvim_set_hl(0, "BlinkCmpMenuSelection", { bg = colors[15], fg = colors[17] })
+		vim.api.nvim_set_hl(0, "BlinkCmpScrollBarThumb", { bg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpKind", { bg = colors[17], fg = colors[14] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabel", { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabelMatch", { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabelDetail", { bg = colors[17], fg = colors[18] })
+		vim.api.nvim_set_hl(0, "BlinkCmpLabelDescription", { bg = colors[17], fg = colors[18] })
+	else
+		print("Error: Not enough colors in file")
+	end
+end
 
-	-- deletes the last two lines of the buffer when the process exits :3
+-- initial load
-	vim.api.nvim_create_autocmd("TermClose", {
+load_colors()
-		buffer = buf,
-		callback = function()
-			vim.defer_fn(function()
-				vim.bo[buf].modifiable = true
-				vim.api.nvim_buf_set_lines(buf, -3, -1, false, {})
-				vim.bo[buf].modifiable = false
-			end, 10)
-		end,
-	})
 
-	local width = math.floor(vim.o.columns * 0.9)
+-- vim.defer_fn(load_colors, 1)
-	local height = math.floor((vim.o.lines - 2) * 0.9)
 
-	git_diff_win = vim.api.nvim_open_win(buf, true, {
+-- set up a file watcher
-		relative = "editor",
+local function watch_colorscheme()
-		width = width,
+	local handle
-		height = height,
+	handle = uv.new_fs_event()
-		col = math.floor((vim.o.columns - width) / 2),
+	if handle then
-		row = math.floor((vim.o.lines - height) / 2) - 2,
+		uv.fs_event_start(handle, colorscheme_filepath, {}, function(err, _, _)
-		style = "minimal",
+			if err then
-		border = "rounded",
+				print("Error watching colorscheme file:", err)
-	})
+				return
+			end
+			-- debounce by adding a slight delay before reloading
+			vim.defer_fn(load_colors, 100)
+		end)
+	end
+end
 
-	vim.fn.jobstart("git diff | delta --pager=never", { term = true })
+watch_colorscheme()
-
-	vim.keymap.set("n", "q", "<cmd>close<CR>", { buffer = buf })
-end)

homes/modules/programs/neovim/lua/colors.lua

@@ -1,238 +0,0 @@
-local colorscheme_filepath = "/home/aurora/.cache/nvim/neovim-colors"
-local colors = {}
-
-local function hex_to_int(hex)
-	hex = hex:gsub("#", "")
-	return tonumber(hex:sub(1, 2), 16) * 0x10000 + tonumber(hex:sub(3, 4), 16) * 0x100 + tonumber(hex:sub(5, 6), 16)
-end
-
--- TODO: change to use lab color space
-local function blend_colors(c1, c2, t)
-	local r1 = math.floor(c1 / 0x10000)
-	local g1 = math.floor((c1 % 0x10000) / 0x100)
-	local b1 = c1 % 0x100
-
-	local r2 = math.floor(c2 / 0x10000)
-	local g2 = math.floor((c2 % 0x10000) / 0x100)
-	local b2 = c2 % 0x100
-
-	return math.floor(r1 + (r2 - r1) * t) * 0x10000
-		+ math.floor(g1 + (g2 - g1) * t) * 0x100
-		+ math.floor(b1 + (b2 - b1) * t)
-end
-
--- function to load colors
-local function load_colors()
-	local new_colors = {}
-	for line in io.lines(colorscheme_filepath) do
-		table.insert(new_colors, line)
-	end
-
-	-- ensure the table has enough entries to avoid indexing issues
-	if #new_colors == 18 then
-		colors = new_colors
-		require("base16-colorscheme").setup({
-			base00 = colors[18],
-			base01 = colors[1],
-			base02 = colors[3],
-			base03 = colors[3],
-			base04 = colors[5],
-			base05 = colors[8],
-			base06 = colors[5],
-			base07 = colors[8],
-			base08 = colors[17],
-			base09 = colors[4],
-			base0A = colors[11],
-			base0B = colors[5],
-			base0C = colors[6],
-			base0D = colors[7],
-			base0E = colors[6],
-			base0F = colors[16],
-		})
-
-		-- colors ------------------------------------------------------------------
-
-		local color_00 = colors[1]
-		local color_01 = colors[2]
-		local color_02 = colors[3]
-		local color_03 = colors[4]
-		local color_04 = colors[5]
-		local color_05 = colors[6]
-		local color_06 = colors[7]
-		local color_07 = colors[8]
-
-		local color_08 = colors[9]
-		local color_09 = colors[10]
-		local color_10 = colors[11]
-		local color_11 = colors[12]
-		local color_12 = colors[13]
-		local color_13 = colors[14]
-		local color_14 = colors[15]
-		local color_15 = colors[16]
-
-		local fg = colors[17]
-		local bg = colors[18]
-
-		local bg_90 = blend_colors(hex_to_int("#000000"), hex_to_int(bg), 0.90)
-
-		local fg_10 = blend_colors(hex_to_int(bg), hex_to_int(fg), 0.10)
-		local fg_30 = blend_colors(hex_to_int(bg), hex_to_int(fg), 0.30)
-
-		local secondary_10 = blend_colors(hex_to_int(bg), hex_to_int(color_13), 0.10)
-		local secondary_30 = blend_colors(hex_to_int(bg), hex_to_int(color_13), 0.30)
-
-		-- editor colors :3 --------------------------------------------------------
-
-		vim.api.nvim_set_hl(0, "Visual", { bg = secondary_10 })
-		vim.api.nvim_set_hl(0, "ColorColumn", { bg = secondary_30 })
-
-		-- blink.cmp ---------------------------------------------------------------
-
-		vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = bg })
-		vim.api.nvim_set_hl(0, "BlinkCmpMenuBorder", { fg = color_12, bg = bg })
-		vim.api.nvim_set_hl(0, "BlinkCmpMenuSelection", { fg = bg, bg = color_14 })
-		vim.api.nvim_set_hl(0, "BlinkCmpScrollBarThumb", { bg = fg })
-		vim.api.nvim_set_hl(0, "BlinkCmpKind", { fg = fg, bg = bg })
-		vim.api.nvim_set_hl(0, "BlinkCmpLabel", { fg = fg, bg = bg })
-		vim.api.nvim_set_hl(0, "BlinkCmpLabelMatch", { fg = fg, bg = bg })
-		vim.api.nvim_set_hl(0, "BlinkCmpLabelDetail", { fg = fg, bg = bg })
-		vim.api.nvim_set_hl(0, "BlinkCmpLabelDescription", { fg = fg, bg = bg })
-
-		-- telescope :3 ------------------------------------------------------------
-
-		vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopePromptNormal", { bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopeResultsNormal", { bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { bg = bg_90 })
-
-		vim.api.nvim_set_hl(0, "TelescopeBorder", { fg = color_15, bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopePromptBorder", { fg = color_15, bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopeResultsBorder", { fg = color_15, bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { fg = color_15, bg = bg_90 })
-
-		vim.api.nvim_set_hl(0, "TelescopePromptTitle", { fg = color_15, bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { fg = color_15, bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopePreviewTitle", { fg = color_15, bg = bg_90 })
-
-		vim.api.nvim_set_hl(0, "TelescopePromptPrefix", { fg = color_14, bg = bg_90 })
-		vim.api.nvim_set_hl(0, "TelescopePromptCounter", { fg = color_13, bg = bg_90 })
-
-		-- gitsigns.nvim -----------------------------------------------------------
-
-		vim.api.nvim_set_hl(0, "GitSignsAdd", { fg = color_13 })
-		vim.api.nvim_set_hl(0, "GitSignsChange", { fg = color_11 })
-		vim.api.nvim_set_hl(0, "GitSignsDelete", { fg = color_09 })
-
-		local blame_palette = {
-			color_13,
-			color_11,
-			color_09,
-			color_06,
-			color_05,
-			color_04,
-			color_03,
-			color_12,
-		}
-
-		local blame_group = vim.api.nvim_create_augroup("GitSignsBlameColors", { clear = true })
-
-		local function get_heatmap_palette()
-			local c1 = hex_to_int(color_13) -- old
-			local c2 = hex_to_int(color_14) -- recent
-
-			local palette = {}
-			for i = 0, 7 do
-				palette[i] = blend_colors(c1, c2, i / 7)
-			end
-
-			return palette
-		end
-
-		local heatmap_palette = get_heatmap_palette()
-
-		local function set_blame_colors()
-			local highlights = vim.api.nvim_exec2("highlight", { output = true }).output
-
-			local i = 1
-			for hl_name in highlights:gmatch("(GitSignsBlameColor%.[%x]+)") do
-				local color = blame_palette[(i - 1) % #blame_palette + 1]
-				vim.api.nvim_set_hl(0, hl_name, { fg = color })
-				i = i + 1
-			end
-
-			i = 1
-			for hl_name in highlights:gmatch("(GitSignsColorTemp%.fg%.[%d]+)") do
-				local color = heatmap_palette[(i - 1) % #heatmap_palette + 1]
-				vim.api.nvim_set_hl(0, hl_name, { fg = color })
-				i = i + 1
-			end
-		end
-
-		set_blame_colors()
-
-		vim.api.nvim_create_autocmd("FileType", {
-			group = blame_group,
-			pattern = "gitsigns-blame",
-			callback = function()
-				set_blame_colors()
-			end,
-		})
-
-		-- fyler.nvim --------------------------------------------------------------
-
-		vim.api.nvim_set_hl(0, "FylerBlue", { fg = color_06 })
-		vim.api.nvim_set_hl(0, "FylerGreen", { fg = color_02 })
-		vim.api.nvim_set_hl(0, "FylerGrey", { fg = color_08 })
-		vim.api.nvim_set_hl(0, "FylerRed", { fg = color_01 })
-		vim.api.nvim_set_hl(0, "FylerYellow", { fg = color_03 })
-
-		vim.api.nvim_set_hl(0, "FylerFSDirectoryIcon", { fg = color_06 })
-		vim.api.nvim_set_hl(0, "FylerFSDirectoryName", { fg = fg })
-		vim.api.nvim_set_hl(0, "FylerFSFile", { fg = color_15 })
-		vim.api.nvim_set_hl(0, "FylerFSLink", { fg = color_08 })
-
-		vim.api.nvim_set_hl(0, "FylerGitAdded", { fg = color_04 })
-		vim.api.nvim_set_hl(0, "FylerGitConflict", { fg = color_03 })
-		vim.api.nvim_set_hl(0, "FylerGitDeleted", { fg = color_03 })
-		vim.api.nvim_set_hl(0, "FylerGitIgnored", { fg = color_08 })
-		vim.api.nvim_set_hl(0, "FylerGitModified", { fg = color_05 })
-		vim.api.nvim_set_hl(0, "FylerGitRenamed", { fg = color_05 })
-		vim.api.nvim_set_hl(0, "FylerGitStaged", { fg = color_04 })
-		vim.api.nvim_set_hl(0, "FylerGitUnstaged", { fg = color_05 })
-		vim.api.nvim_set_hl(0, "FylerGitUntracked", { fg = color_06 })
-
-		vim.api.nvim_set_hl(0, "FylerWinPick", { fg = color_15, bg = fg })
-
-		-- lualine.nvim
-		vim.api.nvim_exec_autocmds("User", { pattern = "RefreshLualine" })
-
-		-- hlchunk.nvim
-		vim.api.nvim_set_hl(0, "HLIndent1", { fg = secondary_30 })
-		vim.api.nvim_set_hl(0, "HLChunk1", { fg = color_11 })
-	else
-		print("Error: Not enough colors in file")
-	end
-end
-
--- initial load
-load_colors()
-
--- vim.defer_fn(load_colors, 1)
-
--- set up a file watcher
-local function watch_colorscheme()
-	local handle
-	handle = vim.loop.new_fs_event()
-	if handle then
-		vim.loop.fs_event_start(handle, colorscheme_filepath, {}, function(err, _, _)
-			if err then
-				print("Error watching colorscheme file:", err)
-				return
-			end
-			-- debounce by adding a slight delay before reloading
-			vim.defer_fn(load_colors, 100)
-		end)
-	end
-end
-
-watch_colorscheme()

homes/modules/programs/neovim/lua/lsp/completion.lua

@@ -17,7 +17,7 @@ return {
 				keymap = {
 					["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
 					["<C-e>"] = { "hide", "fallback" },
-					["<C-h>"] = { "select_and_accept", "fallback" },
+					["<C-y>"] = { "select_and_accept", "fallback" },
 
 					["<C-k>"] = { "select_prev", "fallback_to_mappings" },
 					["<C-j>"] = { "select_next", "fallback_to_mappings" },
@@ -30,7 +30,7 @@ return {
 					["<Tab>"] = { "snippet_forward", "fallback" },
 					["<S-Tab>"] = { "snippet_backward", "fallback" },
 
-					["<C-s>"] = { "show_signature", "hide_signature", "fallback" },
+					["<C-S-k>"] = { "show_signature", "hide_signature", "fallback" },
 				},
 
 				appearance = {
@@ -84,7 +84,7 @@ return {
 					},
 
 					documentation = {
-						auto_show = true,
+						auto_show = false,
 						window = {
 							border = "rounded",
 						},

homes/modules/programs/neovim/lua/lsp/indentation.lua

@@ -1,12 +1,5 @@
 vim.api.nvim_create_autocmd("FileType", {
-	pattern = {
+	pattern = { "lua", "nix", "gleam" },
-		"lua",
-		"nix",
-		"gleam",
-		"css",
-		"json",
-		"haskell",
-	},
 	callback = function()
 		vim.opt_local.shiftwidth = 2
 		vim.opt_local.tabstop = 2
@@ -14,38 +7,14 @@ vim.api.nvim_create_autocmd("FileType", {
 	end,
 })
 
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = {
-		"sql",
-	},
-	callback = function()
-		vim.opt_local.shiftwidth = 4
-		vim.opt_local.tabstop = 4
-		vim.opt_local.expandtab = true
-	end,
-})
-
 vim.api.nvim_create_autocmd("User", {
 	pattern = "TelescopePreviewerLoaded",
 	callback = function(args)
 		local ft = args.data.filetype
-		if vim.tbl_contains({
+		if vim.tbl_contains({ "lua", "nix", "gleam", "rust" }, ft) then
-			"lua",
-			"nix",
-			"gleam",
-			"css",
-			"json",
-			"haskell",
-		}, ft) then
 			vim.bo.shiftwidth = 2
 			vim.bo.tabstop = 2
 			vim.bo.expandtab = true
-		elseif vim.tbl_contains({
-			"sql",
-		}, ft) then
-			vim.bo.shiftwidth = 4
-			vim.bo.tabstop = 4
-			vim.bo.expandtab = true
 		end
 	end,
 })

homes/modules/programs/neovim/lua/lsp/lsp.lua

@@ -47,11 +47,6 @@ if nixCats("lang.rust.lsp") then
 			diagnostics = {
 				enable = true,
 			},
-			["rust-analyzer"] = {
-				procMacro = {
-					enable = true,
-				},
-			},
 		},
 	}
 end

homes/modules/programs/neovim/lua/plugins/dressing.lua

@@ -1,6 +1,5 @@
 return {
 	{
 		"dressing.nvim",
-		enabled = nixCats("ui.dressing") or false,
 	},
 }

homes/modules/programs/neovim/lua/plugins/format.lua

@@ -58,22 +58,10 @@ return {
 				formatters_by_ft = {
 					lua = nixCats("lang.lua.format") and { "stylua" } or nil,
 					nix = nixCats("lang.nix.format") and { "alejandra" } or nil,
-					rust = (function()
+					rust = nixCats("lang.rust.format") and { "rustfmt", lsp_format = "fallback" } or nil,
-						if not nixCats("lang.rust.format") then
-							return nil
-						end
-						local formatters = {}
-						if nixCats("lang.rust.formatters.leptos") then
-							table.insert(formatters, "leptosfmt")
-						end
-						table.insert(formatters, "rustfmt")
-						formatters.lsp_format = "fallback"
-						return formatters
-					end)(),
 					haskell = nixCats("lang.haskell.format") and { "ormolu" } or nil,
 					proto = nixCats("lang.protobuf.format") and { "buf" } or nil,
 					toml = nixCats("lang.toml.format") and { "taplo" } or nil,
-					sql = nixCats("lang.sql.format") and { "sqlfluff" } or nil,
 				},
 				format_on_save = {
 					timeout_ms = 500,

homes/modules/programs/neovim/lua/plugins/fyler.lua

@@ -4,12 +4,12 @@ return {
 		cmd = { "Fyler" },
 		keys = {
 			{
-				"<leader>F",
+				"<leader>tf",
 				function()
 					return require("fyler").toggle({ kind = "split_right" })
 				end,
 				mode = { "n" },
-				desc = "Open File [E]xplorer (Fyler)",
+				desc = "Open [F]yler",
 			},
 		},
 		load = function(name)

homes/modules/programs/neovim/lua/plugins/git.lua

@@ -1,12 +1,12 @@
 return {
 	{
 		"vim-fugitive",
-		enabled = nixCats("git.merge") or false,
+		enabled = nixCats("git") or false,
 		cmd = { "Git", "Gvdiffsplit" },
 	},
 	{
 		"resolve-nvim",
-		enabled = nixCats("git.merge") or false,
+		enabled = nixCats("git") or false,
 		event = { "BufReadPre", "BufNewFile" },
 		after = function(plugin)
 			require("resolve").setup({
@@ -21,73 +21,4 @@ return {
 			})
 		end,
 	},
-	{
-		"gitsigns.nvim",
-		enabled = nixCats("git.gitsigns") or false,
-		after = function(plugin)
-			require("gitsigns").setup({
-				signs = {
-					add = { text = "┃" },
-					change = { text = "┇" },
-					delete = { text = "_" },
-					topdelete = { text = "‾" },
-					changedelete = { text = "~" },
-					untracked = { text = "╎" },
-				},
-				signs_staged = {
-					add = { text = "┃" },
-					change = { text = "┇" },
-					delete = { text = "_" },
-					topdelete = { text = "‾" },
-					changedelete = { text = "~" },
-					untracked = { text = "╎" },
-				},
-				on_attach = function(bufnr)
-					local gitsigns = require("gitsigns")
-
-					-- toggle git blame
-					vim.keymap.set("n", "<leader>gb", function()
-						local wins = vim.api.nvim_list_wins()
-						for _, win in ipairs(wins) do
-							local buf = vim.api.nvim_win_get_buf(win)
-							local ft = vim.api.nvim_get_option_value("filetype", { buf = buf })
-							if ft == "gitsigns-blame" then
-								vim.api.nvim_win_close(win, true)
-								return
-							end
-						end
-						vim.cmd("Gitsigns blame")
-					end)
-
-					vim.keymap.set("n", "<leader>bl", gitsigns.toggle_current_line_blame)
-
-					vim.keymap.set("n", "]c", function()
-						if vim.wo.diff then
-							vim.cmd.normal({ "]c", bang = true })
-						else
-							gitsigns.nav_hunk("next")
-						end
-					end)
-
-					vim.keymap.set("n", "[c", function()
-						if vim.wo.diff then
-							vim.cmd.normal({ "[c", bang = true })
-						else
-							gitsigns.nav_hunk("prev")
-						end
-					end)
-
-					vim.keymap.set("n", "<leader>hs", gitsigns.stage_hunk)
-					vim.keymap.set("n", "<leader>hu", gitsigns.undo_stage_hunk)
-
-					vim.keymap.set("n", "<leader>hS", gitsigns.stage_buffer)
-					vim.keymap.set("n", "<leader>hU", gitsigns.reset_buffer_index)
-
-					vim.keymap.set("n", "<leader>hi", gitsigns.toggle_current_line_blame)
-
-					vim.keymap.set("n", "<leader>hp", gitsigns.preview_hunk_inline)
-				end,
-			})
-		end,
-	},
 }

homes/modules/programs/neovim/lua/plugins/hlchunk.lua

@@ -1,36 +0,0 @@
-return {
-	{
-		"hlchunk.nvim",
-		enabled = nixCats("ui.hlchunk") or false,
-		after = function(plugin)
-			require("hlchunk").setup({
-				chunk = {
-					enable = true,
-					use_treesitter = true,
-					chars = {
-						horizontal_line = "─",
-						vertical_line = "│",
-						left_top = "╭",
-						left_bottom = "╰",
-						right_arrow = "─",
-					},
-					style = {
-						"#B0F0FA",
-					},
-				},
-				indent = {
-					enable = true,
-					use_treesitter = false,
-					ahead_lines = 10,
-					delay = 25,
-					chars = {
-						"│",
-					},
-					style = {
-						"#9080FA",
-					},
-				},
-			})
-		end,
-	},
-}

homes/modules/programs/neovim/lua/plugins/init.lua

@@ -7,6 +7,4 @@ require("lze").load({
 	{ import = "plugins.format" },
 	{ import = "plugins.comment" },
 	{ import = "plugins.git" },
-	{ import = "plugins.lualine" },
-	{ import = "plugins.hlchunk" },
 })

homes/modules/programs/neovim/lua/plugins/lualine.lua

@@ -1,22 +0,0 @@
-local config = {
-	options = {
-		theme = "auto",
-	},
-}
-
-return {
-	{
-		"lualine.nvim",
-		enabled = nixCats("ui.lualine") or false,
-		after = function(plugin)
-			require("lualine").setup(config)
-
-			vim.api.nvim_create_autocmd("User", {
-				pattern = "RefreshLualine",
-				callback = function()
-					require("lualine").setup(config)
-				end,
-			})
-		end,
-	},
-}

homes/modules/programs/neovim/lua/plugins/telescope.lua

@@ -1,16 +1,12 @@
 return {
 	{
 		"telescope.nvim",
-		enabled = nixCats("telescope.enable") or false,
 		cmd = { "Telescope" },
 		keys = {
 			{
 				"<leader>f",
 				function()
-					return require("telescope.builtin").find_files({
+					return require("telescope.builtin").find_files()
-						hidden = true,
-						file_ignore_patterns = { "^.git/" },
-					})
 				end,
 				mode = { "n" },
 				desc = "Telescope search [F]iles",
@@ -26,10 +22,7 @@ return {
 			{
 				"<leader>ts",
 				function()
-					return require("telescope.builtin").live_grep({
+					return require("telescope.builtin").live_grep()
-						additional_args = { "--hidden" },
-						glob_pattern = { "!.git/" },
-					})
 				end,
 				mode = { "n" },
 				desc = "[T]elescope [S]earch cwd with grep",
@@ -37,10 +30,7 @@ return {
 			{
 				"<leader>tw",
 				function()
-					return require("telescope.builtin").grep_string({
+					return require("telescope.builtin").grep_string()
-						additional_args = { "--hidden" },
-						glob_pattern = { "!.git/" },
-					})
 				end,
 				mode = { "n" },
 				desc = "[T]elescope search current [W]ord",
@@ -61,33 +51,10 @@ return {
 				mode = { "n" },
 				desc = "[T]elescope search [B]uffers",
 			},
-			{
-				"<leader>th",
-				function()
-					return require("telescope.builtin").highlights()
-				end,
-				mode = { "n" },
-				desc = "[T]elescope [H]ighlights",
-			},
-			{
-				"<leader>gs",
-				function()
-					return require("telescope.builtin").git_status()
-				end,
-				mode = { "n" },
-				desc = "[G]it [S]tatus",
-			},
 		},
 		load = function(name)
 			vim.cmd.packadd(name)
-
+			vim.cmd.packadd("telescope-fzf-native.nvim")
-			if nixCats("telescope.fzf") then
-				vim.cmd.packadd("telescope-fzf-native.nvim")
-			end
-
-			if nixCats("telescope.zf") then
-				vim.cmd.packadd("telescope-zf-native.nvim")
-			end
 		end,
 		after = function(plugin)
 			local telescope = require("telescope")
@@ -95,8 +62,6 @@ return {
 
 			telescope.setup({
 				defaults = {
-					border = true,
-					borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
 					mappings = {
 						i = {
 							["<C-k>"] = actions.move_selection_previous, -- move to prev result
@@ -107,13 +72,7 @@ return {
 				},
 			})
 
-			if nixCats("telescope.fzf") then
+			pcall(telescope.load_extension, "fzf")
-				telescope.load_extension("fzf")
-			end
-
-			if nixCats("telescope.zf") then
-				telescope.load_extension("zf-native")
-			end
 		end,
 	},
 }

homes/modules/programs/neovim/nixcats.nix

@@ -15,10 +15,11 @@ in {
   ];
 
   config = {
+    # this value, nixCats is the defaultPackageName you pass to mkNixosModules
+    # it will be the namespace for your options.
     nixCats = {
       enable = true;
       nixpkgs_version = inputs.nixpkgs-unstable;
-      # TODO: ask butterfly about this, am confused :3
       # this will add the overlays from ./overlays and also,
       # add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins
       # It will not apply to overall system, just nixCats.
@@ -27,13 +28,15 @@ in {
         [
           (utils.standardPluginOverlay inputs)
         ];
-
+      # see the packageDefinitions below.
       # This says which of those to install.
       packageNames = ["auroranvim"];
 
       luaPath = "${./.}";
 
-      # for usage of this section, refer to :h nixCats.flake.outputs.categories
+      # the .replace vs .merge options are for modules based on existing configurations,
+      # they refer to how multiple categoryDefinitions get merged together by the module.
+      # for useage of this section, refer to :h nixCats.flake.outputs.categories
       categoryDefinitions.replace = {
         pkgs,
         settings,
@@ -64,10 +67,7 @@ in {
             rust = {
               lsp = [cargo mpkgs.rust-analyzer];
               # nightly rustfmt has nicer features :3
-              format = [(rustfmt.override {asNightly = true;})];
+              format = [inputs.fenix.packages.${system}.complete.rustfmt];
-              formatters = {
-                  leptos = [leptosfmt];
-              };
             };
             zig = {
               lsp = [zls];
@@ -100,12 +100,6 @@ in {
             toml = {
               format = [taplo];
             };
-            bash = {
-              lsp = [bash-language-server];
-            };
-            sql = {
-              format = [sqlfluff];
-            };
           };
         };
 
@@ -126,23 +120,18 @@ in {
 
         optionalPlugins = with pkgs.vimPlugins; {
           general = [];
-          ui = {
+          ui = [
-            dressing = [dressing-nvim];
+            dressing-nvim
-            lualine = [lualine-nvim];
+          ];
-            hlchunk = [hlchunk-nvim];
-          };
           qol = [
             undotree
             mini-hipatterns
           ];
-          telescope = {
+          telescope = [
-            enable = [
+            telescope-nvim
-              telescope-nvim
+            telescope-fzf-native-nvim
-              telescope-ui-select-nvim
+            telescope-ui-select-nvim
-            ];
+          ];
-            fzf = [telescope-fzf-native-nvim];
-            zf = [telescope-zf-native-nvim];
-          };
           fyler = [
             fyler-nvim
           ];
@@ -170,15 +159,10 @@ in {
           comment = [
             comment-nvim
           ];
-          git = {
+          git = [
-            merge = [
+            resolve-nvim
-              resolve-nvim
+            vim-fugitive
-              vim-fugitive
+          ];
-            ];
-            gitsigns = [
-              gitsigns-nvim
-            ];
-          };
           lang = {
             java = [
               nvim-jdtls
@@ -189,7 +173,9 @@ in {
         # shared libraries to be added to LD_LIBRARY_PATH
         # variable available to nvim runtime
         sharedLibraries = {
-          general = with pkgs; [];
+          general = with pkgs; [
+            # libgit2
+          ];
         };
 
         environmentVariables = {
@@ -225,11 +211,15 @@ in {
 
       # see :help nixCats.flake.outputs.packageDefinitions
       packageDefinitions.replace = {
+        # these are the names of your packages
+        # you can include as many as you wish.
         auroranvim = {pkgs, ...}: {
           # they contain a settings set defined above
           # see :help nixCats.flake.outputs.settings
           settings = {
             wrapRc = true;
+            # IMPORTANT:
+            # your alias may not conflict with your other packages.
             aliases = [
               "auravim"
               "foxyvim"
@@ -237,26 +227,14 @@ in {
               "fvix"
             ];
           };
-
+          # and a set of categories that you want
+          # (and other information to pass to lua)
           categories = {
             general = true;
 
-            ui = {
+            ui = true;
-              dressing = true;
-              lualine = true;
-              hlchunk = true;
-            };
-
             qol = true;
-
+            telescope = true;
-            telescope = {
-              enable = true;
-
-              # only enable one at a time
-              fzf = true;
-              zf = false;
-            };
-
             fyler = true;
 
             lsp = true;
@@ -266,48 +244,50 @@ in {
             format = true;
             comment = true;
 
-            git = {
+            git = false; # not really setup yet
-              merge = false; # not really setup yet.. </3
-              gitsigns = true;
-            };
 
             lang = {
-              lua.lsp = true;
+              lua = {
-              lua.format = true;
+                lsp = true;
-
+                format = true;
-              nix.lsp = true;
+              };
-              nix.format = true;
+              nix = {
-              nix.docs = true;
+                lsp = true;
-
+                format = true;
-              rust.lsp = true;
+                docs = true;
-              rust.format = true;
+              };
-              rust.formatters = {
+              rust = {
-                leptos = true;
+                lsp = true;
+                format = true;
+              };
+              zig = {
+                lsp = true;
+                format = true;
+              };
+              elixir = {
+                lsp = true;
+                format = true;
+              };
+              gleam = {
+                lsp = true;
+                format = true;
+              };
+              haskell = {
+                lsp = true;
+                format = true;
+              };
+              java = {
+                lsp = true;
+                format = true;
+              };
+              protobuf = {
+                lsp = true;
+                format = true;
+              };
+              toml = {
+                lsp = true;
+                format = true;
               };
-
-              zig.lsp = true;
-              zig.format = true;
-
-              elixir.lsp = true;
-              elixir.format = true;
-
-              gleam.lsp = true;
-              gleam.format = true;
-
-              haskell.lsp = true;
-              haskell.format = true;
-
-              java.lsp = true;
-              java.format = true;
-
-              protobuf.lsp = true;
-              protobuf.format = true;
-
-              toml.format = true;
-
-              bash.lsp = true;
-
-              sql.format = true;
             };
           };
         };

homes/modules/programs/nixcord.nix

@@ -10,12 +10,9 @@
 
   programs.nixcord = {
     enable = true;
-
     equibop.enable = true;
     equibop.package = upkgs.equibop;
 
-    vesktop.enable = true;
-
     discord = {
       vencord.enable = false;
       equicord.enable = true;
@@ -78,6 +75,7 @@
         forwardAnywhere.enable = true;
         spotifyCrack.enable = true;
         spotifyShareCommands.enable = true;
+        spotifyControls.enable = true;
         fullUserInChatbox.enable = true;
         gifPaste.enable = true;
         ignoreActivities = {
@@ -101,6 +99,7 @@
         };
         platformIndicators.enable = true;
         previewMessage.enable = true;
+        relationshipNotifier.enable = true;
         revealAllSpoilers.enable = true;
         serverInfo.enable = true;
         serverListIndicators.enable = true;
@@ -141,7 +140,7 @@
         whoReacted.enable = true;
         whosWatching.enable = true;
         quickReply.enable = true;
-        # questCompleter.enable = true; # does not seem to exist anymore?
+        questCompleter.enable = true;
         shikiCodeblocks = {
           enable = true;
           useDevIcon = "COLOR";
@@ -165,9 +164,9 @@
             "1436964273162289185"
             "1436988320474206311"
             "1449837047383855119"
+            "1436968495190642722"
             "1465424321919975454"
             "1468324280445046824"
-            "1461929299727749145"
           ];
         }
         {
@@ -176,7 +175,6 @@
           color = 10223511;
           collapsed = false;
           channels = [
-            "1436968495190642722"
             "1436985374286155799"
             "1436965657076826222"
             "1429921297160212681"
@@ -193,6 +191,7 @@
             "1461885176534794427"
             "1462155159470866443"
             "1468735915076878407"
+            "1461929299727749145"
             "1470963392121536657"
           ];
         }
@@ -239,7 +238,6 @@
             "1437283420312047659"
             "1437089201651847315"
             "1467307140443148288"
-            "1473192300363649024"
           ];
         }
         {

homes/modules/programs/yazi/yazi.nix

@@ -13,7 +13,6 @@
     settings = {
       mgr = {
         show_hidden = true;
-        mouse_events = ["scroll"];
       };
       log = {
         enabled = false;

homes/modules/scripts/hyprland-layout-toggle.sh

@@ -1 +0,0 @@
-#!/usr/bin/env bash

homes/modules/shell/zsh.nix

@@ -34,7 +34,7 @@
 
     shellAliases = {
       # files and nav stuff
-      ls = "eza --icons=auto";
+      ls = "eza";
       ll = "ls -la";
       lt = "ls --tree";
       llt = "ll --tree";
@@ -51,15 +51,12 @@
       cb-fox = "ssh-add ~/.ssh/codeberg_foxxyora";
       tf-fox = "ssh-add ~/.ssh/tearforge_foxora";
 
-      tx = "wormhole-rs tx";
-      rx = "wormhole-rs rx";
-
       # --------------------
       # shorthand nix command aliases
 
       # open nix develop with preferred shell
       # description: nd = nix develop
-      nd = "[[ -f ./flake.sh ]] && ./flake.sh -c $SHELL || nix develop -c $SHELL";
+      nd = "nix develop -c $SHELL";
 
       # description: cdns = change directory [to] nix settings
       cdns = "cd ~/.nix";

homes/modules/themeing/wallust/templates/neovim-template

@@ -14,5 +14,5 @@
 {{ color13 }}
 {{ color14 }}
 {{ color15 }}
-{{ foreground }}
 {{ background }}
+{{ foreground }}

homes/modules/wm/hyprland/hypr/keybinds/virtual.conf

@@ -1,7 +1,7 @@
 # a submap for emulating keys/buttons/functions on the keyboard or mouse
 
-bind = $mod, a, submap, cursor
+bind = $mod+shift+alt, a, submap, virtual
-submap = cursor
+submap = virtual
 
 # exit submap
 bind = , escape, submap, reset
@@ -38,6 +38,6 @@ binde = alt, e, exec, wlrctl pointer scroll -15 0 # scroll left
 binde = alt, y, exec, wlrctl pointer scroll 0 15 # scroll right
 
 # catches all other keys and keeps us in the submap
-bind = , catchall, submap, cursor
+bind = , catchall, submap, virtual
 
 submap = reset

homes/modules/wm/hyprland/hyprland.nix

@@ -4,6 +4,10 @@
     package = null;
     portalPackage = null;
 
+    plugins = [
+      #inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling
+    ];
+
     xwayland.enable = true;
 
     extraConfig = ''
@@ -60,16 +64,16 @@
         layout = "dwindle";
       };
 
-      dwindle = {
+      plugin = {
-        preserve_split = true;
+        # options at https://github.com/hyprwm/hyprland-plugins/tree/main/hyprscrolling
+        hyprscrolling = {
+          fullscreen_on_one_column = false;
+          column_width = 1.0;
+        };
       };
 
-      scrolling = {
+      dwindle = {
-        fullscreen_on_one_column = true;
+        preserve_split = true;
-        column_width = 0.9;
-        wrap_focus = true;
-        wrap_swapcol = true;
-        direction = "right";
       };
 
       decoration = {
@@ -107,7 +111,7 @@
         force_no_accel = false; # not recommended to turn on
       };
 
-      # cursor.no_hardware_cursors = true;
+      cursor.no_hardware_cursors = true;
 
       misc = {
         enable_anr_dialog = false;
@@ -148,7 +152,6 @@
 
         # media binds (more in binde below)
         ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-        "Ctrl_R, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
         ", XF86AudioPlay, exec, playerctl play-pause"
         ", XF86AudioNext, exec, playerctl next"
         ", XF86AudioPrev, exec, playerctl previous"
@@ -259,8 +262,6 @@
       binde = [
         ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+"
         ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-"
-        "Ctrl_R, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%+"
-        "Ctrl_R, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%-"
         "Shift_R, XF86AudioRaiseVolume, exec, playerctl volume 0.05+"
         "Shift_R, XF86AudioLowerVolume, exec, playerctl volume 0.05-"
 

hosts/arcturus/default.nix

@@ -13,7 +13,7 @@
   };
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_12;
+    kernelPackages = pkgs.linuxPackages_latest;
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;

hosts/lyra/default.nix

@@ -13,7 +13,7 @@
   };
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_12;
+    kernelPackages = pkgs.linuxPackages_latest;
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;

hosts/nixarawrui/default.nix

@@ -22,20 +22,17 @@
 
     # kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4;
     # TODO: idk make this a toggle or smth idfk
-    kernelPackages = upkgs.linuxPackages_zen;
+    # kernelPackages = upkgs.linuxPackages_zen;
+    # FIX: it said my disk was full
+    kernelPackages = upkgs.linuxPackages_latest;
     kernelModules = ["v4l2loopback"];
+    # force kernel to use dGPU
     kernelParams = [
-      # force kernel to use dGPU
       "amdgpu.primary=0000:03:00.0"
       "video=PCI:0000:03:00.0:e"
       "initcall_blacklist=simpledrm_platform_driver_init"
       "fbcon=map:0"
-
+      "pci=assign-busses"
-      # stops kernel from setting power states on nvme drives because it keeps
-      # disconnecting my drive and my system locks up
-      "nvme_core.default_ps_max_latency_us=0"
-      "pcie_aspm=off"
-      "pcie_port_pm=off"
     ];
     extraModulePackages = with kernelPackages; [v4l2loopback];
 
@@ -63,11 +60,13 @@
 
       allowedTCPPorts = [
         21110 # slimevr
+        44949 # rquickshare
       ];
       allowedUDPPorts = [
         6969 # slimevr
         8266 # slimevr
         35903 # slimevr
+        44949 # rquickshare
       ];
     };
 
@@ -308,18 +307,7 @@
 
     alvr = {
       enable = true;
-
+      package = upkgs.alvr;
-      package = upkgs.alvr.overrideAttrs (old: rec {
-        postPatch =
-          (old.postPatch or "")
-          + ''
-            substituteInPlace alvr/server_openvr/src/lib.rs \
-              --replace-fail \
-              "let early_hmd_initialization = !dashboard_process_paths.is_empty();" \
-              "let early_hmd_initialization = true;"
-          '';
-      });
-
       openFirewall = true;
     };
 

nixpkgs.nix

@@ -1,6 +1,6 @@
 {inputs, ...} @ args: {
   nixpkgs.channels = {
-    default = {
+    base = {
       overlays = [(import ./overlays.nix args)];
       config.allowUnfree = true;
     };

snow.nix

@@ -1,6 +1,5 @@
-{cerulean, ...} @ inputs:
+{inputs, ...}: {
-cerulean.mkNexus ./. (self: {
+  nodes = {
-  nexus = {
     args = {inherit inputs;};
 
     modules = with inputs; [];
@@ -12,12 +11,7 @@ cerulean.mkNexus ./. (self: {
       servers = {};
     };
 
-    nodes = let
+    nodes = {
-      inherit
-        (self.nexus)
-        groups
-        ;
-    in {
       nixarawrui = {
         system = "x86_64-linux";
 
@@ -33,7 +27,7 @@ cerulean.mkNexus ./. (self: {
       arcturus = {
         system = "x86_64-linux";
 
-        groups = [
+        groups = groups: [
           groups.servers
         ];
 
@@ -120,7 +114,7 @@ cerulean.mkNexus ./. (self: {
       lyra = {
         system = "x86_64-linux";
 
-        groups = [
+        groups = groups: [
           groups.servers
         ];
 
@@ -132,4 +126,4 @@ cerulean.mkNexus ./. (self: {
       };
     };
   };
-})
+}