mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-09-19 14:37:19 -05:00
simplify flake accessors
This commit is contained in:
parent
152133641e
commit
6834a963ed
GPG key ID:
950D13E9719334AD
11 changed files with 46 additions and 45 deletions
19
flake.lock
19
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": {
|
||||
|
|
@ -307,7 +307,6 @@
|
|||
"locked": {
|
||||
"lastModified": 1721248202,
|
||||
"narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9",
|
||||
"revCount": 4930,
|
||||
"submodules": true,
|
||||
|
|
@ -628,11 +627,11 @@
|
|||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721985912,
|
||||
"narHash": "sha256-GYt49RaYYi09gVE8uwaoAzeN+RI0COQ5dQbIeaOUP2g=",
|
||||
"lastModified": 1722012218,
|
||||
"narHash": "sha256-Rnjo49C5/slnmcQW9c57IdiHJZ3YEFmUn3as/NIPD4E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "abfab7ae6234f1cb15803b90137e3f7590c652b6",
|
||||
"rev": "ac026940beb42f74c5666f6ed3989aca41eddeea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -743,11 +742,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1721933792,
|
||||
"narHash": "sha256-zYVwABlQnxpbaHMfX6Wt9jhyQstFYwN2XjleOJV3VVg=",
|
||||
"lastModified": 1722040881,
|
||||
"narHash": "sha256-NMDotPxtCNvmRnUo/YuxNOpN8+UMONBlNBnRFsGHADQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2122a9b35b35719ad9a395fe783eabb092df01b1",
|
||||
"rev": "48bacf585a51d953def8bff32087970f273052e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -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
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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") ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue