1
0
Fork 0
mirror of https://git.sr.ht/~neverness/ultima synced 2024-12-29 01:13:53 +00:00

ya v ahue, ono workaet

This commit is contained in:
neverness 2024-12-22 11:09:51 +09:00
parent 37173ef36a
commit d828b0a628
3 changed files with 51 additions and 54 deletions

View file

@ -1,7 +1,7 @@
{ inputs, lib, ... }: { inputs, lib, ... }:
let let
# CONFIGURATION # CONFIGURATION
X = import ../libx/builder.nix { flake = import ../libx/builder.nix {
inherit inputs lib; inherit inputs lib;
disk = "/dev/disk/by-uuid/d8440438-2f95-4854-b139-bf0a3e91a81f"; disk = "/dev/disk/by-uuid/d8440438-2f95-4854-b139-bf0a3e91a81f";
# VARIABLES # VARIABLES
@ -22,5 +22,5 @@ let
}; };
in in
{ {
flake = X.flake; inherit flake;
} }

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
with pkgs;
{ {
module.wm.hyprland = { module.wm.hyprland = {
autostart = [ "mako" ]; autostart = [ "mako" ];
@ -8,6 +7,7 @@ with pkgs;
c = "--class"; c = "--class";
pic = "$(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')"; pic = "$(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')";
in in
with pkgs;
[ [
# PROGRAMS # PROGRAMS
"$m, $rt, exec, kitty" "$m, $rt, exec, kitty"

View file

@ -14,56 +14,53 @@
dev, dev,
... ...
}: }:
{ let
flake = # OTHER
let inherit (inputs.nixpkgs.lib) nixosSystem;
# OTHER inherit (inputs.home-manager.lib) homeManagerConfiguration;
inherit (inputs.nixpkgs.lib) nixosSystem; pkgs = inputs.nixpkgs.legacyPackages.${plfrm};
inherit (inputs.home-manager.lib) homeManagerConfiguration; # NEEDS
pkgs = inputs.nixpkgs.legacyPackages.${plfrm}; sec = import ./secrets.nix;
# NEEDS x =
sec = import ./secrets.nix; import ./options.nix {
x = inherit
import ./options.nix { theme
inherit inputs
theme pkgs
inputs lib
pkgs ;
lib }
; // {
} inherit
// { disk
inherit hostName
disk userName
hostName flakeDir
userName is
flakeDir plfrm
is ver
plfrm dev
ver sec
dev ;
sec
;
};
# ARGS
args = { inherit x inputs; };
in
{
# CONFIGURATION
nixosConfigurations.${hostName} = nixosSystem {
modules = [
../modules/nixos
../${hostName}/host
];
specialArgs = args;
};
homeConfigurations.${userName} = homeManagerConfiguration {
modules = [
../modules/home
../${hostName}/home
];
extraSpecialArgs = args;
inherit pkgs;
};
}; };
# ARGS
args = { inherit x inputs; };
in
{
# CONFIGURATION
nixosConfigurations.${hostName} = nixosSystem {
modules = [
../modules/nixos
../${hostName}/host
];
specialArgs = args;
};
homeConfigurations.${userName} = homeManagerConfiguration {
modules = [
../modules/home
../${hostName}/home
];
extraSpecialArgs = args;
inherit pkgs;
};
} }