refactor to use new idyllsPkgs structure

flake.lock

@@ -1,5 +1,43 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1687709756,
+        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "ref": "dbabf0c",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "idyllsPkgs": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "mozilla": "mozilla",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-mce6yHa3GACWabfxuwU/mvdoVBFxbGOFX88KUqVtinM=",
+        "path": "./pkgs",
+        "type": "path"
+      },
+      "original": {
+        "path": "./pkgs",
+        "type": "path"
+      }
+    },
     "mozilla": {
       "locked": {
         "lastModified": 1687771476,
@@ -50,10 +88,25 @@
     },
     "root": {
       "inputs": {
-        "mozilla": "mozilla",
+        "idyllsPkgs": "idyllsPkgs",
         "nixpkgs": "nixpkgs",
         "nixpkgsUnstable": "nixpkgsUnstable"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,24 +1,17 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    idyllsPkgs = {
+      url = "path:./pkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    mozilla.url = "github:mozilla/nixpkgs-mozilla/3a44b87";
   };
 
-  outputs = { self, nixpkgs, nixpkgsUnstable, mozilla }:
-    let mypkgs = import ./pkgs;
-        mkhost = import ./machines/mkhost.nix;
-        overlays = [
-          mozilla.overlays.rust
-          mozilla.overlays.firefox
-          mypkgs
-          (final: prev: {
-            signal-desktop = nixpkgsUnstable.legacyPackages.${prev.system}.signal-desktop;
-          })
-        ];
+  outputs = { self, nixpkgs, nixpkgsUnstable, idyllsPkgs }:
+    let mkhost = import ./machines/mkhost.nix;
         mkhost' = system: args: mkhost system ({
-          inherit overlays;
-          inherit (nixpkgs) lib;
+          inherit nixpkgs nixpkgsUnstable idyllsPkgs;
         } // args);
     in {
       nixosConfigurations.hera = mkhost' "hera" {

machines/mkhost.nix

@@ -1,15 +1,23 @@
-name: { overlays, lib, system, user }@inputs:
+name: { nixpkgs, idyllsPkgs, nixpkgsUnstable, system, user }@inputs:
 
-lib.nixosSystem {
+let pkgs = import nixpkgs {
+      inherit system;
+      config.allowUnfree = true;
+    };
+    pkgsUnstable = nixpkgsUnstable.legacyPackages.${system};
+    pkgsIdylls = idyllsPkgs.packages.${system};
+in nixpkgs.lib.nixosSystem {
   modules = [
-    { nixpkgs.overlays = overlays; }
-
     ./${name}/configuration.nix
 
     ./../users/${user}/configuration.nix
 
     {
       config._module.args = {
+        inherit pkgsUnstable pkgsIdylls;
+
+        pkgs = nixpkgs.lib.mkForce pkgs;
+
         currentSystem = system;
         currentSystemName = name;
       };

users/idylls/configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, pkgsUnstable, pkgsIdylls, ... }:
 
 {
   programs.fish.enable = true;
@@ -14,16 +14,18 @@
   users.users.idylls = {
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
+    packages = [
       # Dev Tools
-      git emacs kitty fd eww deno ripgrep fnm
+      pkgs.git pkgsIdylls.emacs pkgs.kitty pkgs.fd pkgsIdylls.eww pkgs.deno
+      pkgs.ripgrep
 
       # Desktop
-      rofi i3 sxhkd keepassxc dunst slock nitrogen lxappearance
-      gnome.adwaita-icon-theme gnome.gnome-themes-extra
+      pkgs.rofi pkgs.i3 pkgs.sxhkd pkgs.keepassxc pkgs.dunst pkgs.slock
+      pkgs.nitrogen pkgs.lxappearance pkgs.gnome.adwaita-icon-theme
+      pkgs.gnome.gnome-themes-extra
 
       # Applications
-      firefox discord signal-desktop chromium
+      pkgs.firefox pkgs.discord pkgsUnstable.signal-desktop pkgs.chromium
     ];
     shell = pkgs.fish;
   };