shells: refactor to exclude neovim

Author: hasundue

flake.nix

@@ -45,16 +45,17 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, stylix, nvim, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, stylix, nvim, ... } @ inputs:
     let
-      inherit (nixpkgs) lib;
+      lib = builtins // nixpkgs.lib;
 
       forSystem = system: f: f {
         inherit lib;
         pkgs = import nixpkgs {
           inherit system;
           config.allowUnfree = true;
           overlays = [
+            self.overlays.default
             nvim.overlays.default
             (final: prev: {
               firefox-addons = inputs.firefox-addons.packages.${system};
@@ -90,7 +91,9 @@
       };
     in
     {
-      devShells = forEachSystem (import ./shells);
+      devShells = forEachSystem (args: lib.mapAttrs'
+        (name: _: lib.nameValuePair (lib.removeSuffix ".nix" name) (import ./shells/${name} args))
+        (lib.readDir ./shells));
 
       nixosConfigurations = {
         # Thinkpad X1 Carbon 5th Gen
@@ -100,5 +103,7 @@
       };
 
       homeConfigurations = forEachSystem homeConfig;
+
+      overlays = import ./overlays;
     };
 }

home/nix.nix

@@ -1,11 +1,26 @@
 { pkgs, ... }:
 
 {
-  home.shellAliases = {
-    nd = "nom develop";
-  };
+  home = {
+    packages = with pkgs; [
+      cachix
+      nix-output-monitor
+    ];
+
+    shellAliases = rec {
+      nd = "nom develop";
+
+      nf = "nix flake";
+      nfc = "${nf} check";
+      nfs = "${nf} show";
+      nfu = "${nf} update";
 
-  home.packages = with pkgs; [
-    nix-output-monitor
-  ];
+      nor = "sudo nixos-rebuild --flake .";
+      norb = "${nr} boot |& nom";
+      nors = "${nr} switch |& nom";
+      nort = "${nr} test |& nom";
+
+      nr = "nix run";
+    };
+  };
 }

overlays/default.nix

@@ -0,0 +1,9 @@
+{
+  default = final: prev: rec {
+    writeAliasBin = alias: command:
+      final.writeShellScriptBin alias ''
+        exec ${command} "$@"
+      '';
+    writeAliasScripts = aliases: final.lib.mapAttrsToList writeAliasBin aliases;
+  };
+}

shells/default.nix

@@ -1,25 +1,14 @@
-{ pkgs, lib, ... } @ args:
+{ pkgs, ... } @ args:
 
 let
-  mkScript = alias: command:
-    pkgs.writeShellScriptBin alias ''
-      exec ${command} "$@"
-    '';
-  mkShell =
-    { aliases ? { }
-    , nativeBuildInputs ? [ ]
-    , packages ? [ ]
-    , shellHook ? ""
-    ,
-    }:
-    pkgs.mkShell {
-      inherit nativeBuildInputs shellHook;
-      packages = packages ++ (lib.mapAttrsToList mkScript aliases);
-    };
+  aliases = rec {
+    nr = "sudo nixos-rebuild --flake .";
+    nrb = "${nr} boot |& nom";
+    nrs = "${nr} switch |& nom";
+    nrt = "${nr} test |& nom";
+  };
 in
-lib.mapAttrs (name: path: mkShell ((import path) args)) rec {
-  deno = ./deno.nix;
-  ebiten = ./ebiten.nix;
-  nix = ./nix.nix;
-  default = nix;
+pkgs.mkShellNoCC {
+  packages = (pkgs.writeAliasScripts aliases);
+  inputsFrom = [ (import ./nix.nix args) ];
 }

shells/deno.nix

@@ -1,27 +1,14 @@
 { pkgs, ... }:
 
 let
-  inherit (pkgs) mkNeovim;
-
-  neovim = mkNeovim {
-    modules = with mkNeovim.modules; [
-      core
-      clipboard
-      copilot
-      deno
-    ];
-  };
-in
-{
   aliases = rec {
-    nv = "nvim";
-
     dt = "deno task";
     dtr = "${dt} run";
     dtt = "${dt} test";
   };
+in
+pkgs.mkShellNoCC {
   packages = with pkgs; [
     deno
-    neovim
-  ];
+  ] ++ (pkgs.writeAliasScripts aliases);
 }

shells/ebiten.nix

@@ -1,18 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
-let
-  inherit (pkgs) mkNeovim;
-  inherit (pkgs.lib) getLib;
-
-  neovim = mkNeovim {
-    modules = with mkNeovim.modules; [
-      core
-      clipboard
-      copilot
-    ];
-  };
-in
-{
+pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
     libGL
     xorg.libX11
@@ -25,10 +13,9 @@ in
 
   packages = with pkgs; [
     go
-    neovim
   ];
 
   shellHook = ''
-    export LD_LIBRARY_PATH=${pkgs.wayland}/lib:${getLib pkgs.libGL}/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=${pkgs.wayland}/lib:${lib.getLib pkgs.libGL}/lib:$LD_LIBRARY_PATH
   '';
 }

shells/nix.nix

@@ -1,33 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, ... } @ args:
 
 let
-  neovim = pkgs.mkNeovim {
-    modules = with pkgs.mkNeovim.modules; [
-      core
-      clipboard
-      copilot
-      nix
-    ];
-  };
+  home = (import ../home/nix.nix args).home;
 in
-{
-  aliases = rec {
-    nf = "nix flake";
-    nfc = "${nf} check";
-    nfs = "${nf} show";
-    nfu = "${nf} update";
-
-    nr = "sudo nixos-rebuild --flake .";
-    nrb = "${nr} boot |& nom";
-    nrs = "${nr} switch |& nom";
-    nrt = "${nr} test |& nom";
-
-    nv = "nvim";
-  };
-
-  packages = with pkgs; [
-    cachix
-    neovim
-    nix-output-monitor
-  ];
+pkgs.mkShellNoCC {
+  packages = home.packages ++ (pkgs.writeAliasScripts home.shellAliases);
 }