flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1722089005,
+        "lastModified": 1721565819,
-        "narHash": "sha256-I2aJRi0hYzUCtWGfpC73iiqAMJeWUlYdRPTIAXiteOM=",
+        "narHash": "sha256-fRPq7r8lKBwgeiVsncSac6PQRLVpYOcEOWljHTDn2/s=",
         "owner": "daylinmorgan",
         "repo": "f1multiviewer-flake",
-        "rev": "648595e85951b03e53a4ddcc176f50874950ee30",
+        "rev": "ced556467e8bf72385734cc9dfc3fc670f554ae5",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1721992157,
+        "lastModified": 1721841700,
-        "narHash": "sha256-D5bBsSKvYmVn8U4lhrvMemko7m2I/sicjyAYEWDfW9A=",
+        "narHash": "sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es=",
-        "rev": "6abad7cb238c5c7bf59a83bed55e7590c544fc2e",
+        "rev": "8d12e0fbb7306cbc58b12ef051d7067d703738de",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6abad7cb238c5c7bf59a83bed55e7590c544fc2e.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8d12e0fbb7306cbc58b12ef051d7067d703738de.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -627,11 +627,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1722012218,
+        "lastModified": 1721650907,
-        "narHash": "sha256-Rnjo49C5/slnmcQW9c57IdiHJZ3YEFmUn3as/NIPD4E=",
+        "narHash": "sha256-2VX/zPeLhGTsHpToFH1gfI+oGNS6m7ZUWWaqwmw3HVY=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "ac026940beb42f74c5666f6ed3989aca41eddeea",
+        "rev": "6686cbe947cb8b135e229ad2a3447b88d1cf6da9",
         "type": "github"
       },
       "original": {
@@ -679,11 +679,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1721990326,
+        "lastModified": 1721918221,
-        "narHash": "sha256-AL/quEgRTlQ8OyLsbxlA6Q7jY2yxPJPvGvZRbAkhImY=",
+        "narHash": "sha256-y5whWNY6QegCurAwLAGkpRYL+9vjrQquVXC4Jfel1bU=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "55a7d37710a2e19e56e18be6f7a3be305383ff69",
+        "rev": "0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26",
         "type": "github"
       },
       "original": {
@@ -742,11 +742,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1722040881,
+        "lastModified": 1721782431,
-        "narHash": "sha256-NMDotPxtCNvmRnUo/YuxNOpN8+UMONBlNBnRFsGHADQ=",
+        "narHash": "sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "48bacf585a51d953def8bff32087970f273052e2",
+        "rev": "4f02464258baaf54992debfd010a7a3662a25536",
         "type": "github"
       },
       "original": {
@@ -774,11 +774,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1721924956,
+        "lastModified": 1721743106,
-        "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
+        "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
+        "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
         "type": "github"
       },
       "original": {

lib/checks.nix

@@ -5,17 +5,17 @@
 }:
 let
   inherit (builtins) map;
-  inherit (lib) flakeFromSystem;
+  inherit (lib) pkgFromSystem pkgsFromSystem overlayFrom;
-
-  flake = flakeFromSystem system;
   pkgs = import inputs.nixpkgs {
     inherit system;
     overlays = map [
       "lix-module"
       "hyprland-contrib"
       "nixpkgs-wayland"
-    ] flake.overlay;
+    ] overlayFrom;
   };
+  pkgsFrom = pkgsFromSystem system;
+  pkgFrom = pkgFromSystem system;
 in
 {
   makePackages =
@@ -32,14 +32,14 @@ in
             "tsm"
             "hyprman"
             "zls"
-          ] flake.pkg)
+          ] pkgFrom)
-          ++ (with flake.pkgs "hyprland"; [
+          ++ (with pkgsFrom "hyprland"; [
             default
             xdg-desktop-portal-hyprland
           ])
           ++ [
-            (flake.pkgs "roc").full
+            (pkgsFrom "roc").full
-            (flake.pkgs "zig2nix").zig.master.bin
+            (pkgsFrom "zig2nix").zig.master.bin
           ];
       }
       ''

lib/extended.nix

@@ -76,11 +76,6 @@ let
   pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
   pkgFromSystem = system: flake: (pkgsFromSystem system flake).default;
   overlayFrom = flake: inputs."${flake}".overlays.default;
-  flakeFromSystem = system: {
-    overlay = overlayFrom;
-    pkgs = pkgsFromSystem system;
-    pkg = pkgFromSystem system;
-  };
 in
 {
   inherit
@@ -98,6 +93,5 @@ in
     pkgsFromSystem
     pkgFromSystem
     overlayFrom
-    flakeFromSystem
     ;
 }

lib/generators.nix

@@ -16,13 +16,12 @@ let
     pkgFromSystem
     overlayFrom
     isNixFile
-    flakeFromSystem
     ;
   inherit (lib.filesystem) listFilesRecursive;
 
-  # pkgFrom = pkgFromSystem "x86_64-linux";
+  pkgFrom = pkgFromSystem "x86_64-linux";
-  # pkgsFrom = pkgsFromSystem "x86_64-linux";
+  pkgsFrom = pkgsFromSystem "x86_64-linux";
-  flake = flakeFromSystem "x86_64-linux";
+
   hostPath = host: ../. + "/hosts/${host}";
   # all nix files not including pkgs.nix
   hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
@@ -36,7 +35,7 @@ let
         { pkgs, modulesPath, ... }:
         {
           imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
-          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (flake.pkg "self") ];
+          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (pkgFrom "self") ];
         }
       )
     ];
@@ -71,7 +70,9 @@ let
           enabled
           enableAttrs
           hostName
-          flake
+          pkgFrom
+          pkgsFrom
+          overlayFrom
           ;
       };
     };

modules/desktop/gui.nix

@@ -2,7 +2,7 @@
   pkgs,
   config,
   lib,
-flake,
+  pkgFrom,
   ...
 }:
 let
@@ -11,7 +11,7 @@ in
 {
   config = mkIf config.oizys.desktop.enable {
     environment.systemPackages =
-      [ (flake.pkg "f1multiviewer") ]
+      [ (pkgFrom "f1multiviewer") ]
       ++ (with pkgs; [
         wezterm
         alacritty

modules/desktop/window-managers/hyprland.nix

@@ -3,7 +3,9 @@
   config,
   mkOizysModule,
   enabled,
-flake,
+  pkgFrom,
+  pkgsFrom,
+  overlayFrom,
   ...
 }:
 
@@ -41,10 +43,10 @@ mkOizysModule config "hyprland" {
 
       catppuccin-cursors.mochaDark
     ])
-    ++ [ (flake.pkg "hyprman") ]
+    ++ [ (pkgFrom "hyprman") ]
 
     # swww-git is broken
-    ++ (with (flake.pkgs "nixpkgs-wayland"); [
+    ++ (with (pkgsFrom "nixpkgs-wayland"); [
       mako
       eww
       wlr-randr
@@ -54,7 +56,7 @@ mkOizysModule config "hyprland" {
     ]);
 
   nixpkgs.overlays = [
-    (flake.overlay "hyprland-contrib")
+    (overlayFrom "hyprland-contrib")
     # (overlayFrom "nixpkgs-wayland")
     # (overlayFrom "hyprland")
   ];

modules/development/cli.nix

@@ -3,7 +3,7 @@
   config,
   enabled,
   mkDefaultOizysModule,
-flake,
+  pkgFrom,
   ...
 }:
 mkDefaultOizysModule config "cli" {
@@ -35,5 +35,5 @@ mkDefaultOizysModule config "cli" {
       btop
       gdu
     ])
-    ++ [ (flake.pkg "tsm") ];
+    ++ [ (pkgFrom "tsm") ];
 }

modules/languages/python.nix

@@ -2,7 +2,7 @@
   config,
   lib,
   pkgs,
-flake,
+  pkgFrom,
   ...
 }:
 let
@@ -10,7 +10,7 @@ let
   cfg = config.oizys.languages;
 
   python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
-  pixi = flake.pkg "pixi";
+  pixi = pkgFrom "pixi";
 in
 {
   config = mkIfIn "python" cfg {

modules/languages/roc.nix

@@ -2,7 +2,7 @@
   config,
   lib,
   inputs,
-flake,
+  pkgsFrom,
   ...
 }:
 let
@@ -10,7 +10,7 @@ let
 
   version = flakeVer inputs.roc;
   cfg = config.oizys.languages;
-  rocPkgs = flake.pkgs "roc";
+  rocPkgs = pkgsFrom "roc";
   # I'm setting the versions so the changes are more apparent as flake is updated
   roc = rocPkgs.cli.overrideAttrs {
     inherit version;

modules/languages/zig.nix

@@ -1,14 +1,15 @@
 {
   config,
   lib,
-flake,
+  pkgsFrom,
+  pkgFrom,
   ...
 }:
 let
   inherit (lib) mkIfIn;
   cfg = config.oizys.languages;
-  zig = (flake.pkgs "zig2nix").zig.master.bin;
+  zig = (pkgsFrom "zig2nix").zig.master.bin;
-  zls = (flake.pkg "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
+  zls = (pkgFrom "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
 in
 {
   config = mkIfIn "zig" cfg {

modules/nix.nix

@@ -3,7 +3,7 @@
   pkgs,
   lib,
   enabled,
-flake,
+  pkgFrom,
   ...
 }:
 let
@@ -31,7 +31,7 @@ in
     pkgs.nixfmt-rfc-style
     pkgs.nix-output-monitor
 
-    (flake.pkg "self")
+    (pkgFrom "self")
   ];
 
   programs.nix-index-database.comma = enabled;