feat: go back to nixpkgs nvim to reduce amount of IFD

common/default.nix

@@ -2,7 +2,6 @@
   config,
   home-manager,
   lib,
-  mozilla-addons-to-nix,
   nh,
   nix-melt,
   nurl,
@@ -100,8 +99,6 @@
       (nurl.packages.${pkgs.system}.default.override {
         nix = config.nix.package;
       })
-
-      mozilla-addons-to-nix.packages.${pkgs.system}.default
     ];
 
   home-manager = let

common/home/neovim/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  neovim-nightly,
   pkgs,
   ...
 }: let
@@ -16,7 +15,6 @@ in {
   programs = {
     neovim = {
       enable = true;
-      package = neovim-nightly.packages.${pkgs.system}.neovim;
 
       extraLuaConfig =
         # lua
@@ -43,6 +41,25 @@ in {
             noremap = true,
             silent = true,
           });
+
+          -- Get rid of deprecated messages
+          vim.tbl_add_reverse_lookup = function(tbl)
+              for k, v in pairs(tbl) do
+                  tbl[v] = k;
+              end
+          end;
+          vim.tbl_islist = function(tbl)
+              return vim.islist(tbl);
+          end;
+          vim.diagnostic.is_disabled = function()
+              return not vim.diagnostic.is_enabled();
+          end;
+          vim.lsp.buf_get_clients = function()
+              return vim.lsp.get_clients();
+          end;
+          vim.lsp.get_active_clients = function()
+              return vim.lsp.get_clients();
+          end;
         '';
 
       plugins = [

common/home/neovim/langs/default.nix

@@ -27,28 +27,6 @@ in {
         lib.mkBefore
         # lua
         ''
-          -- Get rid of deprecated functions
-          vim.tbl_add_reverse_lookup = function(tbl)
-              for k, v in pairs(tbl) do
-                  tbl[v] = k;
-              end
-          end;
-          vim.tbl_islist = function(tbl)
-              return vim.islist(tbl);
-          end;
-          vim.tbl_flatten = function(tbl)
-              return vim.iter(tbl):flatten():totable();
-          end;
-          vim.diagnostic.is_disabled = function()
-              return not vim.diagnostic.is_enabled();
-          end;
-          vim.lsp.buf_get_clients = function()
-              return vim.lsp.get_clients();
-          end;
-          vim.lsp.get_active_clients = function()
-              return vim.lsp.get_clients();
-          end;
-
           -- Start completion / snippet stuff
           vim.g.coq_settings = {
               auto_start = 'shut-up',

devices/nos/modules/jellyfin/default.nix

@@ -1,12 +1,10 @@
 {
   config,
   jellyfin-flake,
-  jellyfin-ultrachromic-src,
   lib,
-  pkgs,
   ...
 }: let
-  inherit (lib) hasAttr fileContents optionals;
+  inherit (lib) hasAttr optionals;
   inherit (config.vars) mainUser;
 
   optionalGroup = name:
@@ -58,29 +56,23 @@ in {
       };
 
       branding = let
-        jellyTheme = pkgs.stdenv.mkDerivation {
+        importFile = file: "@import url('https://cdn.jsdelivr.net/gh/CTalvio/Ultrachromic/${file}.css');";
-          name = "Ultrachromic";
-          src = jellyfin-ultrachromic-src;
-          postInstall = "cp -ar $src $out";
-        };
-
-        importFile = file: fileContents "${jellyTheme}/${file}";
       in {
         customCss = ''
           /* Base theme */
-          ${importFile "base.css"}
+          ${importFile "base"}
-          ${importFile "accentlist.css"}
+          ${importFile "accentlist"}
-          ${importFile "fixes.css"}
+          ${importFile "fixes"}
 
-          ${importFile "type/dark_withaccent.css"}
+          ${importFile "type/dark_withaccent"}
 
-          ${importFile "rounding.css"}
+          ${importFile "rounding"}
-          ${importFile "progress/floating.css"}
+          ${importFile "progress/floating"}
-          ${importFile "titlepage/title_banner-logo.css"}
+          ${importFile "titlepage/title_banner-logo"}
-          ${importFile "header/header_transparent.css"}
+          ${importFile "header/header_transparent"}
-          ${importFile "login/login_frame.css"}
+          ${importFile "login/login_frame"}
-          ${importFile "fields/fields_border.css"}
+          ${importFile "fields/fields_border"}
-          ${importFile "cornerindicator/indicator_floating.css"}
+          ${importFile "cornerindicator/indicator_floating"}
 
           /* Style backdrop */
           .backdropImage {filter: blur(18px) saturate(120%) contrast(120%) brightness(40%);}
@@ -91,13 +83,13 @@ in {
 
           /* https://github.com/CTalvio/Ultrachromic/issues/79 */
           .skinHeader {
-            color: rgba(var(--accent), 0.8);;
+              color: rgba(var(--accent), 0.8);;
           }
           .countIndicator,
           .fullSyncIndicator,
           .mediaSourceIndicator,
           .playedIndicator {
-            background-color: rgba(var(--accent), 0.8);
+              background-color: rgba(var(--accent), 0.8);
           }
         '';
       };

flake/inputs.nix

@@ -59,11 +59,6 @@ let
   };
 
   nvimInputs = {
-    neovim-nightly = mkDep {
-      owner = "nix-community";
-      repo = "neovim-nightly-overlay";
-    };
-
     # uses nixVersions.nix_2_19
     nixd = mkDep {
       owner = "nix-community";
@@ -251,11 +246,6 @@ let
     }
 
     ## Theme sources
-    {
-      name = "jellyfin-ultrachromic-src";
-      owner = "CTalvio";
-      repo = "Ultrachromic";
-    }
     {
       name = "bat-theme-src";
       owner = "matt1432";

flake/lib.nix

@@ -12,12 +12,12 @@
     import input {
       inherit system;
       config.allowUnfree = true;
-      overlays = [
+      overlays = map (i: inputs.${i}.overlays.default) [
-        inputs.discord-overlay.overlays.default
+        "discord-overlay"
-        inputs.grim-hyprland.overlays.default
+        "grim-hyprland"
-        inputs.jovian.overlays.default
+        "jovian"
-        inputs.nixpkgs-wayland.overlays.default
+        "lix-module"
-        inputs.lix-module.overlays.default
+        "nixpkgs-wayland"
       ];
     };