mirror of
https://git.sr.ht/~neverness/ultima
synced 2025-05-13 06:35:15 +00:00
chiko chiks
This commit is contained in:
parent
84bdc89a42
commit
7a9cec9636
6 changed files with 55 additions and 30 deletions
machines/embrace/home
modules
xlib
|
@ -60,7 +60,6 @@ in
|
|||
gtk = on; # GTK APPS
|
||||
qt = on; # QT APPS
|
||||
stylix = on // {
|
||||
icon = "adwaita";
|
||||
cursor.size = 24;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -16,7 +16,7 @@ in
|
|||
options = {
|
||||
module.themes.stylix = {
|
||||
enable = mkBool false;
|
||||
icon = mkStr "breeze";
|
||||
icon = mkNull.str null;
|
||||
cursor.size = mkInt 12;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -44,7 +44,7 @@ in
|
|||
];
|
||||
initrd = {
|
||||
compressor = "zstd";
|
||||
compressorArgs = [ "-9" ];
|
||||
compressorArgs = [ "-16" ];
|
||||
verbose = false;
|
||||
availableKernelModules = [
|
||||
"nvme"
|
||||
|
|
|
@ -4,33 +4,46 @@
|
|||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
nu = types.nullOr;
|
||||
in
|
||||
|
||||
rec {
|
||||
# types and mk*
|
||||
mkOpt = type: default: mkOption { inherit type default; };
|
||||
mkBool = mkOpt types.bool;
|
||||
mkStr = mkOpt types.str;
|
||||
mkLines = mkOpt types.lines;
|
||||
mkPkg = mkOpt types.package;
|
||||
mkInt = mkOpt types.int;
|
||||
mkEnum = mkOpt types.enum;
|
||||
mkPath = mkOpt types.path;
|
||||
# mk two sided idk
|
||||
mkList = {
|
||||
pkgs = mkOpt (types.listOf types.package);
|
||||
str = mkOpt (types.listOf types.str);
|
||||
};
|
||||
mkAttrs = {
|
||||
pkgs = mkOpt (types.attrsOf types.package);
|
||||
str = mkOpt (types.attrsOf types.str);
|
||||
any = mkOpt (types.attrsOf types.anything);
|
||||
};
|
||||
mkNull = {
|
||||
bool = mkOpt (nu types.bool);
|
||||
str = mkOpt (nu types.str);
|
||||
pkg = mkOpt (nu types.package);
|
||||
int = mkOpt (nu types.int);
|
||||
enum = mkOpt (nu types.enum);
|
||||
};
|
||||
mkList =
|
||||
let
|
||||
mk = types.listOf;
|
||||
in
|
||||
{
|
||||
pkgs = mkOpt (mk types.package);
|
||||
str = mkOpt (mk types.str);
|
||||
};
|
||||
mkAttrs =
|
||||
let
|
||||
mk = types.attrsOf;
|
||||
in
|
||||
{
|
||||
pkgs = mkOpt (mk types.package);
|
||||
str = mkOpt (mk types.str);
|
||||
any = mkOpt (mk types.anything);
|
||||
};
|
||||
mkNull =
|
||||
let
|
||||
mk = types.nullOr;
|
||||
in
|
||||
{
|
||||
bool = mkOpt (mk types.bool);
|
||||
str = mkOpt (mk types.str);
|
||||
lines = mkOpt (mk types.lines);
|
||||
pkg = mkOpt (mk types.package);
|
||||
int = mkOpt (mk types.int);
|
||||
enum = mkOpt (mk types.enum);
|
||||
path = mkOpt (mk types.path);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ inputs@{
|
|||
|
||||
let
|
||||
inherit (inputs) nixpkgs;
|
||||
pkgs = import inputs.nix { system = "x86_64-linux"; };
|
||||
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
|
||||
build = import ./builder { inherit self inputs; };
|
||||
devShells = import ./devShells.nix { inherit pkgs; };
|
||||
|
||||
|
|
|
@ -3,15 +3,28 @@
|
|||
...
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
inherit (pkgs) mkShell;
|
||||
mk =
|
||||
p:
|
||||
mkShell {
|
||||
shellHook = ''exec fish'';
|
||||
packages = p;
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
nixDev = mkShell {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
nixfmt-rfc-style
|
||||
cachix
|
||||
];
|
||||
};
|
||||
nixDev = mk [
|
||||
nixfmt-rfc-style
|
||||
cachix
|
||||
];
|
||||
rust = mk [
|
||||
rustfmt
|
||||
rustc
|
||||
cargo
|
||||
];
|
||||
python = mk [
|
||||
python3
|
||||
pipx
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue