flake.lock

@@ -498,11 +498,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1721841700,
+        "lastModified": 1721756973,
-        "narHash": "sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es=",
+        "narHash": "sha256-M7Zb3UfjQ0o3qXHolhykIk+QzfhEBcEYK9QAPSiBtW4=",
-        "rev": "8d12e0fbb7306cbc58b12ef051d7067d703738de",
+        "rev": "53f3e39815c3357c6465963359e94a6318b54af7",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8d12e0fbb7306cbc58b12ef051d7067d703738de.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/53f3e39815c3357c6465963359e94a6318b54af7.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -679,11 +679,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1721918221,
+        "lastModified": 1721691437,
-        "narHash": "sha256-y5whWNY6QegCurAwLAGkpRYL+9vjrQquVXC4Jfel1bU=",
+        "narHash": "sha256-z3h4XqAdE1sqCdZxI9+gxLDEEbgGOVHIWZRMIjQheDo=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26",
+        "rev": "79e1f9e956c60af6520c5f9d9e451e555a82da6f",
         "type": "github"
       },
       "original": {
@@ -774,11 +774,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1721743106,
+        "lastModified": 1721562059,
-        "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
+        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
+        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
         "type": "github"
       },
       "original": {
@@ -1160,7 +1160,6 @@
       "original": {
         "owner": "Cloudef",
         "repo": "zig2nix",
-        "rev": "9ec43c3e2cfd195bc7cbe3924037788e72a958e3",
         "type": "github"
       }
     },
@@ -1185,7 +1184,6 @@
       "original": {
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "adf3b839b19df88c09877526007d8347ec982abb",
         "type": "github"
       }
     }

flake.nix

@@ -27,13 +27,12 @@
     hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1&rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9";
     hyprland-contrib.url = "github:hyprwm/contrib";
 
-    # zls build failure?
     zig2nix = {
-      url = "github:Cloudef/zig2nix/9ec43c3e2cfd195bc7cbe3924037788e72a958e3";
+      url = "github:Cloudef/zig2nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zls = {
-      url = "github:zigtools/zls/adf3b839b19df88c09877526007d8347ec982abb";
+      url = "github:zigtools/zls";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     roc = {

hosts/mannaz/system.nix

@@ -1,5 +1,6 @@
 {
   config,
+  pkgs,
   enabled,
   ...
 }:

lib/checks.nix

@@ -1,45 +1,34 @@
-{
+{ inputs, system }:
-  inputs,
-  system,
-  lib,
-}:
 let
-  inherit (builtins) map;
-  inherit (lib) pkgFromSystem pkgsFromSystem overlayFrom;
   pkgs = import inputs.nixpkgs {
     inherit system;
-    overlays = map [
+    overlays = [
-      "lix-module"
+      inputs.lix-module.overlays.default
-      "hyprland-contrib"
+      inputs.hyprland-contrib.overlays.default
-      "nixpkgs-wayland"
+      inputs.nixpkgs-wayland.overlay
-    ] overlayFrom;
+    ];
   };
-  pkgsFrom = pkgsFromSystem system;
-  pkgFrom = pkgFromSystem system;
 in
 {
   makePackages =
     pkgs.runCommandLocal "build-third-party"
       {
         src = ./.;
-        nativeBuildInputs =
+        nativeBuildInputs = [
-          [
           pkgs.pixi
           pkgs.swww
           pkgs.nixVersions.stable
-          ]
+
-          ++ (map [
+          inputs.hyprland.packages.${pkgs.system}.default
-            "tsm"
+          inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
-            "hyprman"
+
-            "zls"
+          inputs.tsm.packages.${pkgs.system}.default
-          ] pkgFrom)
+          inputs.hyprman.packages.${pkgs.system}.default
-          ++ (with pkgsFrom "hyprland"; [
+
-            default
+          inputs.roc.packages.${pkgs.system}.full # cli + lang_server
-            xdg-desktop-portal-hyprland
+
-          ])
+          inputs.zls.outputs.packages.${pkgs.system}.default
-          ++ [
+          inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin
-            (pkgsFrom "roc").full
-            (pkgsFrom "zig2nix").zig.master.bin
         ];
       }
       ''

lib/default.nix

@@ -1,6 +1,6 @@
 inputs@{ nixpkgs, self, ... }:
 let
-  lib = nixpkgs.lib.extend (import ./extended.nix inputs);
+  lib = nixpkgs.lib.extend (import ./extended.nix);
 
   inherit (builtins) mapAttrs readDir listToAttrs;
   inherit (lib) genAttrs;
@@ -30,7 +30,7 @@ let
     checks = forAllSystems (
       pkgs:
       import ./checks.nix {
-        inherit inputs lib;
+        inherit inputs;
         system = pkgs.system;
       }
     );

lib/extended.nix

@@ -1,4 +1,4 @@
-inputs: final: prev:
+final: prev:
 let
   inherit (builtins) listToAttrs substring filter;
   inherit (final)
@@ -71,11 +71,6 @@ let
   filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
   listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
 
-  # defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
-  # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
-  pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
-  pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
-  overlayFrom = flake: inputs."${flake}".overlays.default;
 in
 {
   inherit
@@ -90,8 +85,5 @@ in
     isNixFile
     listNixFilesRecursive
     flakeVer
-    pkgsFromSystem
-    pkgFromSystem
-    overlayFrom
     ;
 }

lib/generators.nix

@@ -13,25 +13,24 @@ let
     mkOizysModule
     enabled
     enableAttrs
-    pkgsFromSystem
-    pkgFromSystem
-    overlayFrom
     ;
   inherit (lib.filesystem) listFilesRecursive;
 
-  pkgFrom = pkgFromSystem "x86_64-linux";
-  pkgsFrom = pkgsFromSystem "x86_64-linux";
-
   mkIso = nixosSystem {
     system = "x86_64-linux";
     modules = [
       self.nixosModules.nix
       self.nixosModules.essentials
       (
-        { pkgs, modulesPath, ... }:
+        {
+          self,
+          pkgs,
+          modulesPath,
+          ...
+        }:
         {
           imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
-          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (pkgFrom "self") ];
+          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ self.packages.${pkgs.system}.default ];
         }
       )
     ];
@@ -65,9 +64,6 @@ let
           enabled
           enableAttrs
           hostName
-          pkgFrom
-          pkgsFrom
-          overlayFrom
           ;
       };
     };

modules/desktop/gui.nix

@@ -1,8 +1,8 @@
 {
+  inputs,
   pkgs,
   config,
   lib,
-  pkgFrom,
   ...
 }:
 let
@@ -10,9 +10,7 @@ let
 in
 {
   config = mkIf config.oizys.desktop.enable {
-    environment.systemPackages =
+    environment.systemPackages = with pkgs; [
-      [ (pkgFrom "f1multiviewer") ]
-      ++ (with pkgs; [
       wezterm
       alacritty
 
@@ -30,6 +28,8 @@ in
         accents = [ "rosewater" ];
         variant = "mocha";
       })
-      ]);
+
+      inputs.f1multiviewer.outputs.packages.${pkgs.system}.default
+    ];
   };
 }

modules/desktop/window-managers/hyprland.nix

@@ -1,11 +1,9 @@
 {
+  inputs,
   pkgs,
   config,
   mkOizysModule,
   enabled,
-  pkgFrom,
-  pkgsFrom,
-  overlayFrom,
   ...
 }:
 
@@ -43,10 +41,12 @@ mkOizysModule config "hyprland" {
 
       catppuccin-cursors.mochaDark
     ])
-    ++ [ (pkgFrom "hyprman") ]
+    ++ [
+      inputs.hyprman.packages.${pkgs.system}.default
+    ]
 
     # swww-git is broken
-    ++ (with (pkgsFrom "nixpkgs-wayland"); [
+    ++ (with inputs.nixpkgs-wayland.packages.${pkgs.system}; [
       mako
       eww
       wlr-randr
@@ -56,8 +56,8 @@ mkOizysModule config "hyprland" {
     ]);
 
   nixpkgs.overlays = [
-    (overlayFrom "hyprland-contrib")
+    inputs.hyprland-contrib.overlays.default
-    # (overlayFrom "nixpkgs-wayland")
+    # inputs.nixpkgs-wayland.overlay
-    # (overlayFrom "hyprland")
+    # inputs.hyprland.overlays.default
   ];
 }

modules/development/cli.nix

@@ -1,9 +1,9 @@
 {
+  inputs,
   pkgs,
   config,
   enabled,
   mkDefaultOizysModule,
-  pkgFrom,
   ...
 }:
 mkDefaultOizysModule config "cli" {
@@ -35,5 +35,5 @@ mkDefaultOizysModule config "cli" {
       btop
       gdu
     ])
-    ++ [ (pkgFrom "tsm") ];
+    ++ [ inputs.tsm.packages.${pkgs.system}.tsm ];
 }

modules/languages/python.nix

@@ -1,8 +1,8 @@
 {
+  inputs,
   config,
   lib,
   pkgs,
-  pkgFrom,
   ...
 }:
 let
@@ -10,7 +10,7 @@ let
   cfg = config.oizys.languages;
 
   python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
-  pixi = pkgFrom "pixi";
+  pixi = inputs.pixi.packages.${pkgs.system}.default;
 in
 {
   config = mkIfIn "python" cfg {

modules/languages/roc.nix

@@ -1,8 +1,8 @@
 {
   config,
   lib,
+  pkgs,
   inputs,
-  pkgsFrom,
   ...
 }:
 let
@@ -10,13 +10,14 @@ let
 
   version = flakeVer inputs.roc;
   cfg = config.oizys.languages;
-  rocPkgs = pkgsFrom "roc";
+  rocPkgs = inputs.roc.packages.${pkgs.system};
   # I'm setting the versions so the changes are more apparent as flake is updated
   roc = rocPkgs.cli.overrideAttrs {
     inherit version;
 
   };
   lang-server = rocPkgs.lang-server.overrideAttrs { inherit version; };
+
 in
 {
   config = mkIfIn "roc" cfg {

modules/languages/zig.nix

@@ -1,15 +1,17 @@
 {
+  inputs,
   config,
   lib,
-  pkgsFrom,
+  pkgs,
-  pkgFrom,
   ...
 }:
 let
   inherit (lib) mkIfIn;
   cfg = config.oizys.languages;
-  zig = (pkgsFrom "zig2nix").zig.master.bin;
+  zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
-  zls = (pkgFrom "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
+  zls = inputs.zls.outputs.packages.${pkgs.system}.default.overrideAttrs {
+    nativeBuildInputs = [ zig ];
+  };
 in
 {
   config = mkIfIn "zig" cfg {

modules/nix.nix

@@ -1,9 +1,9 @@
 {
   inputs,
+  self,
   pkgs,
   lib,
   enabled,
-  pkgFrom,
   ...
 }:
 let
@@ -31,7 +31,7 @@ in
     pkgs.nixfmt-rfc-style
     pkgs.nix-output-monitor
 
-    (pkgFrom "self")
+    self.packages.${pkgs.system}.default
   ];
 
   programs.nix-index-database.comma = enabled;