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.lock

@@ -312,38 +312,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
       "locked": {
         "lastModified": 1717312683,
         "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
@@ -401,48 +369,6 @@
       }
     },
     "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "neovim-nightly",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "neovim-nightly",
-          "hercules-ci-effects",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-parts",
-        "type": "indirect"
-      }
-    },
-    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
@@ -460,7 +386,7 @@
         "type": "github"
       }
     },
-    "flake-parts_6": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
@@ -478,7 +404,7 @@
         "type": "github"
       }
     },
-    "flake-parts_7": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_3"
       },
@@ -496,7 +422,7 @@
         "type": "github"
       }
     },
-    "flake-parts_8": {
+    "flake-parts_6": {
       "inputs": {
         "nixpkgs-lib": [
           "nixpkgs-wayland",
@@ -638,33 +564,6 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "neovim-nightly",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "neovim-nightly",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721042469,
-        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "git-theme-src": {
       "flake": false,
       "locked": {
@@ -703,28 +602,6 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "neovim-nightly",
-          "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"
-      }
-    },
     "gpu-screen-recorder-src": {
       "flake": false,
       "locked": {
@@ -857,28 +734,6 @@
         "type": "github"
       }
     },
-    "hercules-ci-effects_2": {
-      "inputs": {
-        "flake-parts": "flake-parts_4",
-        "nixpkgs": [
-          "neovim-nightly",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719226092,
-        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -1154,22 +1009,6 @@
         "type": "github"
       }
     },
-    "jellyfin-ultrachromic-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716820228,
-        "narHash": "sha256-d+RJDThiJMuUjJtaYeD2T4XJPGpTHnoZYCv9629yzMo=",
-        "owner": "CTalvio",
-        "repo": "Ultrachromic",
-        "rev": "5fedfcd3fe386d37b56514e2d0abad34ae14e35c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "CTalvio",
-        "repo": "Ultrachromic",
-        "type": "github"
-      }
-    },
     "jovian": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -1370,47 +1209,6 @@
         "type": "github"
       }
     },
-    "neovim-nightly": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_3",
-        "git-hooks": "git-hooks",
-        "hercules-ci-effects": "hercules-ci-effects_2",
-        "neovim-src": "neovim-src",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721696446,
-        "narHash": "sha256-JBYhrtQIbQlMbe+nYDqxMFMR+fzVvVXhQuKe4R2b8G8=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "0380256dfe668d2a3add4fa063b07724e6cec198",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "type": "github"
-      }
-    },
-    "neovim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1721687430,
-        "narHash": "sha256-v6rM0mqwirJkE5O0ozcdtVR+rjiV8esxlUPHyxGNnr8=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "9322b7e0594de77f8c0f6ef34c197b8a3aac7844",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "nh": {
       "inputs": {
         "nixpkgs": [
@@ -1433,7 +1231,7 @@
     },
     "nix-eval-jobs": {
       "inputs": {
-        "flake-parts": "flake-parts_8",
+        "flake-parts": "flake-parts_6",
         "nix-github-actions": "nix-github-actions_2",
         "nixpkgs": "nixpkgs_2",
         "treefmt-nix": "treefmt-nix_2"
@@ -1454,7 +1252,7 @@
     },
     "nix-fast-build": {
       "inputs": {
-        "flake-parts": "flake-parts_5",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1502,7 +1300,7 @@
     },
     "nix-gaming": {
       "inputs": {
-        "flake-parts": "flake-parts_6",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1633,7 +1431,7 @@
     },
     "nixd": {
       "inputs": {
-        "flake-parts": "flake-parts_7",
+        "flake-parts": "flake-parts_5",
         "flake-root": "flake-root",
         "nixpkgs": [
           "nixpkgs"
@@ -1808,7 +1606,7 @@
     },
     "nixpkgs-wayland": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_2",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": "nix-eval-jobs",
         "nixpkgs": [
@@ -2058,7 +1856,6 @@
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "jellyfin-flake": "jellyfin-flake",
-        "jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
         "jovian": "jovian",
         "libratbag-src": "libratbag-src",
         "lix-module": "lix-module",
@@ -2068,7 +1865,6 @@
         "mpv-persist-properties-src": "mpv-persist-properties-src",
         "mpv-pointer-event-src": "mpv-pointer-event-src",
         "mpv-touch-gestures-src": "mpv-touch-gestures-src",
-        "neovim-nightly": "neovim-nightly",
         "nh": "nh",
         "nix-fast-build": "nix-fast-build",
         "nix-gaming": "nix-gaming",

flake.nix

@@ -140,12 +140,6 @@
       repo = "nixos-jellyfin";
       type = "github";
     };
-    jellyfin-ultrachromic-src = {
-      flake = false;
-      owner = "CTalvio";
-      repo = "Ultrachromic";
-      type = "github";
-    };
     jovian = {
       inputs.nixpkgs.follows = "nixpkgs";
       owner = "Jovian-Experiments";
@@ -199,12 +193,6 @@
       repo = "mpv-touch-gestures";
       type = "github";
     };
-    neovim-nightly = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      owner = "nix-community";
-      repo = "neovim-nightly-overlay";
-      type = "github";
-    };
     nh = {
       inputs.nixpkgs.follows = "nixpkgs";
       owner = "viperML";

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"
       ];
     };