daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-09 20:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:78742fdccf45fb1fe9f26eab32e5f76c7bc5de15
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:6834a963ede2a9843e52e6f3dd70e5c4c3a1e86e
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

2 commits
78742fdccf ... 6834a963ed

Author SHA1 Message Date
Daylin Morgan
6834a963ed
simplify flake accessors 2024-07-27 11:45:03 -05:00
daylin-bot
152133641e 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-07-26 15:14:10 +00:00
11 changed files with 56 additions and 54 deletions
Show stats Expand all files Collapse all files

38
flake.lock
View file

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

16
lib/checks.nix
View file

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

6
lib/extended.nix
View file

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

13
lib/generators.nix
View file

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

4
modules/desktop/gui.nix
View file

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

10
modules/desktop/window-managers/hyprland.nix
View file

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

4
modules/development/cli.nix
View file

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

4
modules/languages/python.nix
View file

@ -2,7 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
pkgFrom, flake,
... ...
}: }:
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 = pkgFrom "pixi"; pixi = flake.pkg "pixi";
in in
{ {
config = mkIfIn "python" cfg { config = mkIfIn "python" cfg {

4
modules/languages/roc.nix
View file

@ -2,7 +2,7 @@
config, config,
lib, lib,
inputs, inputs,
pkgsFrom, flake,
... ...
}: }:
let let
@ -10,7 +10,7 @@ let
version = flakeVer inputs.roc; version = flakeVer inputs.roc;
cfg = config.oizys.languages; 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 # 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;

7
modules/languages/zig.nix
View file

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

4
modules/nix.nix
View file

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