[feat] Remove useless overlay stuff

config/nix/common/home.nix

@@ -1,21 +1,20 @@
-{ config
+{
-, pkgs
+  config,
-, lib
+  pkgs,
-, device
+  lib,
-, overlays
+  device,
-, ...
+  # overlays,
-
+  ...
-}:
+}: let
-let
   start-tmux = (import ../scripts/start-tmux.nix) pkgs;
 in
-# https://mipmip.github.io/home-manager-option-search/
+  # https://mipmip.github.io/home-manager-option-search/
-{
+  {
-  nixpkgs.overlays = [
+    #nixpkgs.overlays = [
-    (self: super: {
+    #  (self: super: {
-      neovim-nightly = overlays.neovim-nightly;
+    #    neovim-nightly = overlays.neovim-nightly;
-    })
+    #  })
-  ];
+    #];
     imports = [
       # Include the results of the hardware scan.
       ./tmux.nix
@@ -139,20 +138,19 @@ in
       # manage.
       username = device.user;
       homeDirectory =
-      if device.system == "x86-64-linux" then
+        if device.system == "x86-64-linux"
-        lib.mkForce "/home/${device.user}"
+        then lib.mkForce "/home/${device.user}"
-      else
+        else lib.mkForce "/Users/${device.user}";
-        lib.mkForce "/Users/${device.user}";
-
 
       stateVersion = "23.11";
 
-    packages = [
+      packages = with pkgs; [
-      pkgs.macchina
+        macchina
-      pkgs.ripgrep
+        ripgrep
-      pkgs.alejandra
+        fd
-      # pkgs.neovim-nightly
+        alejandra
-      pkgs.cachix
+        neovim-nightly
+        cachix
         # # Adds the 'hello' command to your environment. It prints a friendly
         # # "Hello, world!" when run.
         # pkgs.hello
@@ -191,4 +189,4 @@ in
         "${config.home.homeDirectory}/.nix-profile/bin"
       ];
     };
-}
+  }

config/nix/flake.lock

@@ -71,9 +71,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "id": "flake-utils",
-        "repo": "flake-utils",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "flake-utils_2": {
@@ -146,11 +145,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1707868264,
+        "lastModified": 1707941489,
-        "narHash": "sha256-Ewc5fxKb09XQeO6LeKmko0x7MxKmVCGUYwKq7w8sZD0=",
+        "narHash": "sha256-S5KG+iYMFVHIEfeXSWYei2jcHs6kOfhM1pUoVQ9G/Lw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "a376d979bda103fa9998d05c3cc4ba56d3c3cece",
+        "rev": "d09957e0a06f350443c750d9838b5f1016c0cccc",
         "type": "github"
       },
       "original": {
@@ -169,11 +168,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1707935913,
+        "lastModified": 1707955468,
-        "narHash": "sha256-uAkWeyJUNyZS9/u9huCoAJXyTiHw1F+5a91IDujPppk=",
+        "narHash": "sha256-ZVka2bcB1AQTiVWqp2yH9Rnsd4Tvpcf5NXXzJIp7QNE=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b57bf64254630de4920177333f06b341653b1f28",
+        "rev": "0b6b4afc71e14d7f17f4e4a367ce271b9d398432",
         "type": "github"
       },
       "original": {

config/nix/flake.nix

@@ -13,17 +13,16 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-    flake-utils.url = "github:numtide/flake-utils";
+    # flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs =
+  outputs = {
-    { nixpkgs
+    nixpkgs,
-    , home-manager
+    home-manager,
-    , nix-darwin
+    nix-darwin,
-    , flake-utils
+    flake-utils,
-    , ...
+    ...
-    } @ inputs:
+  } @ inputs: let
-    let
     devices = [
       {
         name = "mirai";
@@ -48,20 +47,18 @@
     ];
     linux = builtins.filter (x: x.system == "x86_64-linux") devices;
     darwin = builtins.filter (x: x.system == "aarch64-darwin") devices;
-    in
+  in {
-    {
     homeConfigurations = builtins.listToAttrs (builtins.map
       (device: {
         name = device.user;
-          value =
+        value = let
-            let
           pkgs = nixpkgs.legacyPackages.${device.system};
-              overlays = [ inputs.neovim-nightly-overlay.overlay ];
+          overlays = [inputs.neovim-nightly-overlay.overlay];
         in
           home-manager.lib.homeManagerConfiguration {
             inherit pkgs;
             modules = [
-                ./home.nix
+              ./common/home.nix
               {
                 nixpkgs.overlays = overlays;
               }
@@ -75,10 +72,9 @@
       (builtins.map
         (device: {
           name = device.name;
-              value =
+          value = let
-                let
             pkgs = nixpkgs.legacyPackages.${device.system};
-                  overlays = [ inputs.neovim-nightly-overlay.overlay ];
+            overlays = [inputs.neovim-nightly-overlay.overlay];
           in
             nix-darwin.lib.darwinSystem {
               inherit pkgs;
@@ -86,14 +82,14 @@
                 ./darwin
                 home-manager.darwinModules.home-manager
                 {
+                  nixpkgs.overlays = overlays;
                   home-manager = {
                     useGlobalPkgs = true;
                     useUserPackages = true;
                     extraSpecialArgs = {
                       inherit device;
-                          inherit overlays;
                     };
-                        users.${device.user}.imports = [ ./common/home.nix ];
+                    users.${device.user}.imports = [./common/home.nix];
                   };
                 }
               ];

config/nix/nix.conf

@@ -6,4 +6,3 @@ experimental-features = nix-command flakes repl-flake
 bash-prompt-prefix = (nix:$name)\040
 max-jobs = auto
 extra-nix-path = nixpkgs=flake:nixpkgs
-upgrade-nix-store-path-url = https://install.determinate.systems/nix-upgrade/stable/universal