daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-01-22 03:07:31 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix iso

Browse source
This commit is contained in:
Daylin Morgan 2025-01-16 17:12:11 -06:00
parent bc32477b4b
commit 39cdee742d
Signed by: daylin
GPG key ID: 950D13E9719334AD
5 changed files with 95 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/generators.nix
View file

@ -5,7 +5,6 @@
...
}:
let
inherit (builtins) filter;
inherit (lib)
nixosSystem
mkDefaultOizysModule
@ -21,13 +20,12 @@ let
nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);
selfModules = names: names |> listify |> map (n: self.nixosModules.${n});
# generate anonymous module to set oizys settings from existing plaintext files
commonSpecialArgs = {
inherit
self
inputs
lib
flake
enabled
;
};
@ -38,7 +36,7 @@ let
{ nixpkgs.hostPlatform = "x86_64-linux"; }
]
++ (nixosModules "lix-module")
++ (selfModules "nix|essentials|iso");
++ (selfModules "essentials|iso");
specialArgs = commonSpecialArgs;
};
@ -55,7 +53,6 @@ let
specialArgs = commonSpecialArgs // {
inherit
flake
mkDefaultOizysModule
mkOizysModule
listify

44
modules/essentials.nix
View file

@ -1,6 +1,8 @@
{
inputs,
pkgs,
self,
flake,
enabled,
...
}:
@ -19,5 +21,47 @@
wget
curl
htop
(flake.pkg "self")
pkgs.nix-output-monitor
];
nixpkgs.config.allowUnfree = true;
nix = {
optimise.automatic = true;
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
# use the same nixpkgs for nix run "nixpkgs#hello" style commands
registry.nixpkgs.flake = inputs.nixpkgs;
};
nix = {
settings = {
experimental-features = [
"nix-command"
"flakes"
"pipe-operator"
];
use-xdg-base-directories = true;
trusted-users = [ "@wheel" ];
accept-flake-config = true;
extra-substituters = [
"https://attic.dayl.in/oizys"
"https://nixpkgs-wayland.cachix.org"
# "https://hyprland.cachix.org"
# "https://daylin.cachix.org"
];
extra-trusted-public-keys = [
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
# "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
# "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
];
};
};
}

47
modules/nix-improved.nix Normal file
View file

@ -0,0 +1,47 @@
{
inputs,
pkgs,
lib,
enabled,
...
}:
let
inherit (lib) makeBinPath;
in
{
imports = [ inputs.nix-index-database.nixosModules.nix-index ];
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
# use the same nixpkgs for nix-shell -p hello style commands
# I don't know that this is necesary...
# nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
# environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
environment.systemPackages = [
pkgs.nixd
pkgs.nixfmt-rfc-style
];
programs.nix-index-database.comma = enabled;
# nix-index didn't like this being enabled?
programs.command-not-found.enable = false;
# I'm getting errors related to a non-existent nix-index?
programs.nix-index.enableZshIntegration = false;
programs.nix-index.enableBashIntegration = false;
programs.nix-index.enableFishIntegration = false;
system.activationScripts.diff = ''
if [[ -e /run/current-system ]]; then
PATH=$PATH:${
makeBinPath [
pkgs.nvd
pkgs.nix
]
}
nvd diff /run/current-system "$systemConfig"
fi
'';
}

89
modules/nix.nix
View file

@ -1,89 +0,0 @@
{
inputs,
pkgs,
lib,
enabled,
flake,
...
}:
let
inherit (lib) makeBinPath;
in
{
imports = [ inputs.nix-index-database.nixosModules.nix-index ];
nixpkgs.config.allowUnfree = true;
# nix.package = pkgs.nixVersions.latest;
nix = {
settings = {
experimental-features = [
"nix-command"
"flakes"
"pipe-operator"
];
use-xdg-base-directories = true;
};
optimise.automatic = true;
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
# use the same nixpkgs for nix run "nixpkgs#hello" style commands
registry.nixpkgs.flake = inputs.nixpkgs;
};
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
# use the same nixpkgs for nix-shell -p hello style commands
# I don't know that this is necesary...
# nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
# environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
environment.systemPackages = [
pkgs.nixd
pkgs.nixfmt-rfc-style
pkgs.nix-output-monitor
(flake.pkg "self")
];
programs.nix-index-database.comma = enabled;
# nix-index didn't like this being enabled?
programs.command-not-found.enable = false;
# I'm getting errors related to a non-existent nix-index?
programs.nix-index.enableZshIntegration = false;
programs.nix-index.enableBashIntegration = false;
programs.nix-index.enableFishIntegration = false;
system.activationScripts.diff = ''
if [[ -e /run/current-system ]]; then
PATH=$PATH:${
makeBinPath [
pkgs.nvd
pkgs.nix
]
}
nvd diff /run/current-system "$systemConfig"
fi
'';
nix.settings = {
trusted-users = [ "@wheel" ];
accept-flake-config = true;
extra-substituters = [
"https://attic.dayl.in/oizys"
"https://nixpkgs-wayland.cachix.org"
# "https://hyprland.cachix.org"
# "https://daylin.cachix.org"
];
extra-trusted-public-keys = [
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
# "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
# "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
];
};
}

4
modules/oizys.nix
View file

@ -19,9 +19,9 @@ in
imports = with self.nixosModules; [
users
runes
nix
essentials
nix-improved
cli
nvim
vpn