Compare commits

...

7 commits

Author SHA1 Message Date
05196cc93b
flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    '53f3e39815.tar.gz?narHash=sha256-M7Zb3UfjQ0o3qXHolhykIk%2BQzfhEBcEYK9QAPSiBtW4%3D' (2024-07-23)
  → '8d12e0fbb7.tar.gz?narHash=sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es%3D' (2024-07-24)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/79e1f9e956c60af6520c5f9d9e451e555a82da6f' (2024-07-22)
  → 'github:nix-community/nixpkgs-wayland/0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26' (2024-07-25)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe' (2024-07-21)
  → 'github:nixos/nixpkgs/dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f' (2024-07-23)
2024-07-25 10:26:48 -05:00
58825dc6eb
pin zls + zig2nix 2024-07-25 10:16:14 -05:00
de50002f38
add overlayFrom to generator 2024-07-25 10:06:12 -05:00
5fc5e370be
deadnix cleanup 2024-07-25 10:00:59 -05:00
98fe8b392f
formatting 2024-07-25 10:00:42 -05:00
1996233a7f
add overlayfrom 2024-07-25 10:00:34 -05:00
4da9ef467c
custom package function 2024-07-25 09:57:26 -05:00
14 changed files with 107 additions and 85 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
final: prev: inputs: final: prev:
let let
inherit (builtins) listToAttrs substring filter; inherit (builtins) listToAttrs substring filter;
inherit (final) inherit (final)
@ -71,6 +71,11 @@ let
filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths; filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir); 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 in
{ {
inherit inherit
@ -85,5 +90,8 @@ in
isNixFile isNixFile
listNixFilesRecursive listNixFilesRecursive
flakeVer flakeVer
pkgsFromSystem
pkgFromSystem
overlayFrom
; ;
} }

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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