simplify flake accessors

flake.lock: Update
Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9&submodules=1' (2024-07-17) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9&submodules=1' (2024-07-17) • Updated input 'lix': '8d12e0fbb7.tar.gz?narHash=sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es%3D' (2024-07-24) → '6abad7cb23.tar.gz?narHash=sha256-D5bBsSKvYmVn8U4lhrvMemko7m2I/sicjyAYEWDfW9A%3D' (2024-07-26) • Updated input 'nixos-wsl': 'github:nix-community/NixOS-WSL/6686cbe947cb8b135e229ad2a3447b88d1cf6da9?narHash=sha256-2VX/zPeLhGTsHpToFH1gfI%2BoGNS6m7ZUWWaqwmw3HVY%3D' (2024-07-22) → 'github:nix-community/NixOS-WSL/abfab7ae6234f1cb15803b90137e3f7590c652b6?narHash=sha256-GYt49RaYYi09gVE8uwaoAzeN%2BRI0COQ5dQbIeaOUP2g%3D' (2024-07-26) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4f02464258baaf54992debfd010a7a3662a25536?narHash=sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs%3D' (2024-07-24) → 'github:nixos/nixpkgs/2122a9b35b35719ad9a395fe783eabb092df01b1?narHash=sha256-zYVwABlQnxpbaHMfX6Wt9jhyQstFYwN2XjleOJV3VVg%3D' (2024-07-25) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26?narHash=sha256-y5whWNY6QegCurAwLAGkpRYL%2B9vjrQquVXC4Jfel1bU%3D' (2024-07-25) → 'github:nix-community/nixpkgs-wayland/55a7d37710a2e19e56e18be6f7a3be305383ff69?narHash=sha256-AL/quEgRTlQ8OyLsbxlA6Q7jY2yxPJPvGvZRbAkhImY%3D' (2024-07-26) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f?narHash=sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA%3D' (2024-07-23) → 'github:nixos/nixpkgs/5ad6a14c6bf098e98800b091668718c336effc95?narHash=sha256-Sb1jlyRO%2BN8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M%3D' (2024-07-25)
2024-11-09 20:33:15 -06:00 · 2024-07-27 11:45:03 -05:00 · 2024-07-26 15:14:10 +00:00
11 changed files with 56 additions and 54 deletions
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1721565819,
-        "narHash": "sha256-fRPq7r8lKBwgeiVsncSac6PQRLVpYOcEOWljHTDn2/s=",
+        "lastModified": 1722089005,
+        "narHash": "sha256-I2aJRi0hYzUCtWGfpC73iiqAMJeWUlYdRPTIAXiteOM=",
        "owner": "daylinmorgan",
        "repo": "f1multiviewer-flake",
-        "rev": "ced556467e8bf72385734cc9dfc3fc670f554ae5",
+        "rev": "648595e85951b03e53a4ddcc176f50874950ee30",
        "type": "github"
      },
      "original": {
@ -498,11 +498,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1721841700,
-        "narHash": "sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es=",
-        "rev": "8d12e0fbb7306cbc58b12ef051d7067d703738de",
+        "lastModified": 1721992157,
+        "narHash": "sha256-D5bBsSKvYmVn8U4lhrvMemko7m2I/sicjyAYEWDfW9A=",
+        "rev": "6abad7cb238c5c7bf59a83bed55e7590c544fc2e",
        "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/6abad7cb238c5c7bf59a83bed55e7590c544fc2e.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -627,11 +627,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1721650907,
-        "narHash": "sha256-2VX/zPeLhGTsHpToFH1gfI+oGNS6m7ZUWWaqwmw3HVY=",
+        "lastModified": 1722012218,
+        "narHash": "sha256-Rnjo49C5/slnmcQW9c57IdiHJZ3YEFmUn3as/NIPD4E=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "6686cbe947cb8b135e229ad2a3447b88d1cf6da9",
+        "rev": "ac026940beb42f74c5666f6ed3989aca41eddeea",
        "type": "github"
      },
      "original": {
@ -679,11 +679,11 @@
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1721918221,
-        "narHash": "sha256-y5whWNY6QegCurAwLAGkpRYL+9vjrQquVXC4Jfel1bU=",
+        "lastModified": 1721990326,
+        "narHash": "sha256-AL/quEgRTlQ8OyLsbxlA6Q7jY2yxPJPvGvZRbAkhImY=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26",
+        "rev": "55a7d37710a2e19e56e18be6f7a3be305383ff69",
        "type": "github"
      },
      "original": {
@ -742,11 +742,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1721782431,
-        "narHash": "sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs=",
+        "lastModified": 1722040881,
+        "narHash": "sha256-NMDotPxtCNvmRnUo/YuxNOpN8+UMONBlNBnRFsGHADQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4f02464258baaf54992debfd010a7a3662a25536",
+        "rev": "48bacf585a51d953def8bff32087970f273052e2",
        "type": "github"
      },
      "original": {
@ -774,11 +774,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1721743106,
-        "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
+        "lastModified": 1721924956,
+        "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
+        "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
        "type": "github"
      },
      "original": {
--- a/lib/checks.nix
+++ b/lib/checks.nix
@ -5,17 +5,17 @@
 }:
 let
  inherit (builtins) map;
-  inherit (lib) pkgFromSystem pkgsFromSystem overlayFrom;
+  inherit (lib) flakeFromSystem;
+
+  flake = flakeFromSystem system;
  pkgs = import inputs.nixpkgs {
    inherit system;
    overlays = map [
      "lix-module"
      "hyprland-contrib"
      "nixpkgs-wayland"
-    ] overlayFrom;
+    ] flake.overlay;
  };
-  pkgsFrom = pkgsFromSystem system;
-  pkgFrom = pkgFromSystem system;
 in
 {
  makePackages =
@ -32,14 +32,14 @@ in
            "tsm"
            "hyprman"
            "zls"
-          ] pkgFrom)
-          ++ (with pkgsFrom "hyprland"; [
+          ] flake.pkg)
+          ++ (with flake.pkgs "hyprland"; [
            default
            xdg-desktop-portal-hyprland
          ])
          ++ [
-            (pkgsFrom "roc").full
-            (pkgsFrom "zig2nix").zig.master.bin
+            (flake.pkgs "roc").full
+            (flake.pkgs "zig2nix").zig.master.bin
          ];
      }
      ''
--- a/lib/extended.nix
+++ b/lib/extended.nix
@ -76,6 +76,11 @@ 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
@ -93,5 +98,6 @@ in
    pkgsFromSystem
    pkgFromSystem
    overlayFrom
+    flakeFromSystem
    ;
 }
--- a/lib/generators.nix
+++ b/lib/generators.nix
@ -16,12 +16,13 @@ let
    pkgFromSystem
    overlayFrom
    isNixFile
+    flakeFromSystem
    ;
  inherit (lib.filesystem) listFilesRecursive;

-  pkgFrom = pkgFromSystem "x86_64-linux";
-  pkgsFrom = pkgsFromSystem "x86_64-linux";
-
+  # pkgFrom = pkgFromSystem "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));
@ -35,7 +36,7 @@ let
        { pkgs, modulesPath, ... }:
        {
          imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
-          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (pkgFrom "self") ];
+          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (flake.pkg "self") ];
        }
      )
    ];
@ -70,9 +71,7 @@ let
          enabled
          enableAttrs
          hostName
-          pkgFrom
-          pkgsFrom
-          overlayFrom
+          flake
          ;
      };
    };
--- a/modules/desktop/gui.nix
+++ b/modules/desktop/gui.nix
@ -2,7 +2,7 @@
  pkgs,
  config,
  lib,
-  pkgFrom,
+flake,
  ...
 }:
 let
@ -11,7 +11,7 @@ in
 {
  config = mkIf config.oizys.desktop.enable {
    environment.systemPackages =
-      [ (pkgFrom "f1multiviewer") ]
+      [ (flake.pkg "f1multiviewer") ]
      ++ (with pkgs; [
        wezterm
        alacritty
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@ -3,9 +3,7 @@
  config,
  mkOizysModule,
  enabled,
-  pkgFrom,
-  pkgsFrom,
-  overlayFrom,
+flake,
  ...
 }:

@ -43,10 +41,10 @@ mkOizysModule config "hyprland" {

      catppuccin-cursors.mochaDark
    ])
-    ++ [ (pkgFrom "hyprman") ]
+    ++ [ (flake.pkg "hyprman") ]

    # swww-git is broken
-    ++ (with (pkgsFrom "nixpkgs-wayland"); [
+    ++ (with (flake.pkgs "nixpkgs-wayland"); [
      mako
      eww
      wlr-randr
@ -56,7 +54,7 @@ mkOizysModule config "hyprland" {
    ]);

  nixpkgs.overlays = [
-    (overlayFrom "hyprland-contrib")
+    (flake.overlay "hyprland-contrib")
    # (overlayFrom "nixpkgs-wayland")
    # (overlayFrom "hyprland")
  ];
--- a/modules/development/cli.nix
+++ b/modules/development/cli.nix
@ -3,7 +3,7 @@
  config,
  enabled,
  mkDefaultOizysModule,
-  pkgFrom,
+flake,
  ...
 }:
 mkDefaultOizysModule config "cli" {
@ -35,5 +35,5 @@ mkDefaultOizysModule config "cli" {
      btop
      gdu
    ])
-    ++ [ (pkgFrom "tsm") ];
+    ++ [ (flake.pkg "tsm") ];
 }
--- a/modules/languages/python.nix
+++ b/modules/languages/python.nix
@ -2,7 +2,7 @@
  config,
  lib,
  pkgs,
-  pkgFrom,
+flake,
  ...
 }:
 let
@ -10,7 +10,7 @@ let
  cfg = config.oizys.languages;

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

  version = flakeVer inputs.roc;
  cfg = config.oizys.languages;
-  rocPkgs = pkgsFrom "roc";
+  rocPkgs = flake.pkgs "roc";
  # I'm setting the versions so the changes are more apparent as flake is updated
  roc = rocPkgs.cli.overrideAttrs {
    inherit version;
--- a/modules/languages/zig.nix
+++ b/modules/languages/zig.nix
@ -1,15 +1,14 @@
 {
  config,
  lib,
-  pkgsFrom,
-  pkgFrom,
+flake,
  ...
 }:
 let
  inherit (lib) mkIfIn;
  cfg = config.oizys.languages;
-  zig = (pkgsFrom "zig2nix").zig.master.bin;
-  zls = (pkgFrom "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
+  zig = (flake.pkgs "zig2nix").zig.master.bin;
+  zls = (flake.pkg "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
 in
 {
  config = mkIfIn "zig" cfg {
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -3,7 +3,7 @@
  pkgs,
  lib,
  enabled,
-  pkgFrom,
+flake,
  ...
 }:
 let
@ -31,7 +31,7 @@ in
    pkgs.nixfmt-rfc-style
    pkgs.nix-output-monitor

-    (pkgFrom "self")
+    (flake.pkg "self")
  ];

  programs.nix-index-database.comma = enabled;