Compare commits

..

No commits in common. "8a765f001b496a331641495351615d0cfa121615" and "e6380d441fac29046c4ad4027f4be55ae5c90543" have entirely different histories.

4 changed files with 26 additions and 37 deletions

View file

@ -238,17 +238,7 @@
in in
{ {
formatter."${system}" = pkgs.nixpkgs-fmt; formatter."${system}" = pkgs.nixpkgs-fmt;
packages."${system}" = packages."${system}" = import ./pkgs { inherit pkgs lib config; };
import ./pkgs { inherit pkgs lib config; }
// {
rescue-iso =
let
mod = "${inputs.nixos-images}/nix/image-installer/module.nix";
os = nixpkgs.legacyPackages.${system}.nixos [ mod ];
iso = os.config.system.build.isoImage;
in
iso;
};
diskoConfigurations = { diskoConfigurations = {
nixos-desk = import ./systems/nixos-desk/disko.nix; nixos-desk = import ./systems/nixos-desk/disko.nix;
nixos-pulse = import ./systems/nixos-pulse/disko.nix; nixos-pulse = import ./systems/nixos-pulse/disko.nix;

View file

@ -363,7 +363,6 @@ in
imagemagick imagemagick
libtool libtool
neofetch neofetch
fastfetch
nil nil
nixpkgs-fmt nixpkgs-fmt
nodejs_20 nodejs_20

View file

@ -18,6 +18,7 @@
, relyUdev ? true , relyUdev ? true
, ,
}: }:
let let
gstreamerPluginPaths = lib.concatMapStrings (pth: pth + "/lib/gstreamer-1.0:") [ gstreamerPluginPaths = lib.concatMapStrings (pth: pth + "/lib/gstreamer-1.0:") [
(lib.getLib gst_all_1.gstreamer) (lib.getLib gst_all_1.gstreamer)

View file

@ -129,13 +129,13 @@
specialisation = { specialisation = {
linux-latest.configuration = { linux-latest.configuration = {
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; # bootstrap
};
linux-lts.configuration = {
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_lts; # bootstrap
}; };
linux-zen.configuration = { linux-zen.configuration = {
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_zen; boot.kernelPackages = lib.mkForce pkgs.linuxPackages_zen; # bootstrap
};
linux-cachyos.configuration = {
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
}; };
}; };
boot = { boot = {
@ -145,7 +145,7 @@
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
# 6.14 rc wohooo # 6.14 rc wohooo
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_cachyos;
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos-rc; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos-rc;
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
# kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos; # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
@ -225,25 +225,24 @@
''; '';
interfaces = { interfaces = {
eth0 = { eth0 = {
# useDHCP = false; useDHCP = false;
useDHCP = true; ipv4.addresses = [
# ipv4.addresses = [ {
# { address = "192.168.0.21";
# address = "192.168.0.21"; prefixLength = 24;
# prefixLength = 24; }
# } ];
# ]; ipv4.routes = [
# ipv4.routes = [ {
# { address = "192.168.0.0";
# address = "192.168.0.0"; prefixLength = 24;
# prefixLength = 24; }
# } {
# { address = "0.0.0.0";
# address = "0.0.0.0"; prefixLength = 0;
# prefixLength = 0; via = "192.168.0.5";
# via = "192.168.0.5"; }
# } ];
# ];
}; };
}; };
}; };