treewide: remove overlay

don't need it tbh

11 files changed, 32 insertions, 89 deletions

diff --git a/flake.nix b/flake.nix
index a093227..8402a07 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,6 @@
         # primary outputs
         ./lib
         ./modules
-        ./overlay
         ./systems
         ./users
 
diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix
index 8fcfc97..29b817f 100644
--- a/modules/shared/base/nix.nix
+++ b/modules/shared/base/nix.nix
@@ -26,6 +26,7 @@ in {
 
         trusted-substituters = ["https://cache.garnix.io"];
         trusted-public-keys = ["cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="];
+
         nix-path = config.nix.nixPath;
       };
 
@@ -36,7 +37,6 @@ in {
     };
 
     nixpkgs = {
-      overlays = [inputs.self.overlays.default];
       config.allowUnfree = lib.mkDefault true;
     };
   };
diff --git a/overlay/btop.nix b/overlay/btop.nix
deleted file mode 100644
index 62b105b..0000000
--- a/overlay/btop.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-_: prev: {
-  btop =
-    if prev.stdenv.isLinux
-    then
-      prev.symlinkJoin {
-        inherit (prev.btop) passthru;
-        name = "btop-nodesktop-${prev.btop.version}";
-        paths = [prev.btop];
-        postBuild = ''
-          rm -rf $out/share/{icons,applications}
-        '';
-      }
-    else prev.btop;
-}
diff --git a/overlay/default.nix b/overlay/default.nix
deleted file mode 100644
index fdcf7c9..0000000
--- a/overlay/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  flake = {
-    overlays.default = final: prev:
-      prev.lib.composeManyExtensions
-      (
-        prev.lib.pipe ./. [
-          builtins.readDir
-          builtins.attrNames
-          (builtins.filter (name: name != "default.nix"))
-          (map (file: import ./${file}))
-        ]
-      )
-      final
-      prev;
-  };
-}
diff --git a/overlay/discord.nix b/overlay/discord.nix
deleted file mode 100644
index fa9d805..0000000
--- a/overlay/discord.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-_: prev: let
-  flags = "--enable-gpu-rasterization --enable-zero-copy --enable-gpu-compositing --enable-native-gpu-memory-buffers --enable-oop-rasterization --enable-features=UseSkiaRenderer,WaylandWindowDecorations";
-
-  mkOverride = d: let
-    # TODO: re-enable openASAR when gnome wayland decorations work with it
-    d' = d; #.override {withOpenASAR = true;};
-  in
-    if prev.stdenv.isLinux
-    then
-      d'.overrideAttrs (old: {
-        desktopItem = old.desktopItem.override (old': {
-          exec = "${old'.exec} ${flags}";
-        });
-      })
-    else d';
-in {
-  discord = mkOverride prev.discord;
-  discord-canary = mkOverride prev.discord-canary;
-}
diff --git a/overlay/fish.nix b/overlay/fish.nix
deleted file mode 100644
index d998ada..0000000
--- a/overlay/fish.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-_: prev: {
-  fish =
-    if prev.stdenv.isLinux
-    then
-      prev.symlinkJoin {
-        inherit (prev.fish) passthru;
-        name = "fish-nodesktop";
-        paths = [prev.fish];
-        postBuild = ''
-          rm -rf $out/share/{applications,icons}
-        '';
-      }
-    else prev.fish;
-}
diff --git a/overlay/vim-full.nix b/overlay/vim-full.nix
deleted file mode 100644
index 9a419b1..0000000
--- a/overlay/vim-full.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-_: prev: {
-  vim-full =
-    if prev.stdenv.isLinux
-    then
-      prev.vimUtils.makeCustomizable (
-        prev.symlinkJoin {
-          inherit (prev.vim-full) passthru;
-          name = "vim-nodesktop-${prev.vim-full.version}";
-          paths = [prev.vim-full];
-          postBuild = ''
-            rm -rf $out/share/{icons,applications}
-          '';
-        }
-      )
-    else prev.vim-full;
-}
diff --git a/users/seth/base/standalone.nix b/users/seth/base/standalone.nix
index 4b02690..941d0a7 100644
--- a/users/seth/base/standalone.nix
+++ b/users/seth/base/standalone.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  inputs,
   ...
 }: let
   cfg = config.seth.standalone;
@@ -20,7 +19,5 @@ in {
         then "/Users/${config.home.username}"
         else "/home/${config.home.username}";
     };
-
-    nixpkgs.overlays = [inputs.self.overlays.default];
   };
 }
diff --git a/users/seth/desktop/default.nix b/users/seth/desktop/default.nix
index d7b5176..0cbd6c4 100644
--- a/users/seth/desktop/default.nix
+++ b/users/seth/desktop/default.nix
@@ -23,11 +23,32 @@ in {
   ];
 
   config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      discord
-      element-desktop
-      spotify
-      (prismlauncher.override {withWaylandGLFW = true;})
+    home.packages = [
+      (
+        let
+          inherit (pkgs) discord;
+          flags = lib.concatStringsSep " " [
+            "--enable-gpu-rasterization"
+            "--enable-zero-copy"
+            "--enable-gpu-compositing"
+            "--enable-native-gpu-memory-buffers"
+            "--enable-oop-rasterization"
+            "--enable-features=UseSkiaRenderer,WaylandWindowDecorations"
+          ];
+        in
+          if pkgs.stdenv.isLinux
+          then
+            discord.overrideAttrs (old: {
+              desktopItem = old.desktopItem.override (old': {
+                exec = "${old'.exec} ${flags}";
+              });
+            })
+          else discord
+      )
+
+      pkgs.element-desktop
+      pkgs.spotify
+      (pkgs.prismlauncher.override {withWaylandGLFW = true;})
     ];
   };
 }
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index bc18b6e..ad29b83 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -18,6 +18,7 @@ in {
   imports = with inputs; [
     catppuccin.homeManagerModules.catppuccin
     nix-index-database.hmModules.nix-index
+
     ./bat.nix
     ./chromium.nix
     ./eza.nix
diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix
index a67effa..b07b090 100644
--- a/users/seth/programs/vim.nix
+++ b/users/seth/programs/vim.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   cfg = config.seth.programs.vim;
@@ -13,11 +14,14 @@ in {
   config = lib.mkIf cfg.enable {
     programs.vim = {
       enable = true;
+      packageConfigurable = pkgs.vim;
+
       settings = {
         expandtab = false;
         shiftwidth = 2;
         tabstop = 2;
       };
+
       extraConfig = ''
         " https://wiki.archlinux.org/title/XDG_Base_Directory
         set runtimepath^=${configHome}/vim