chore: update to nixos 25.05

This commit is contained in:
Nickolaj Jepsen 2025-05-20 19:25:57 +02:00
parent e3b550bd82
commit d25e24c15b
11 changed files with 160 additions and 184 deletions

View file

@ -21,11 +21,6 @@ with lib; let
}:
withSystem system (
{system, ...}: let
pkgs = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
pkgsUnstable = import inputs.nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
@ -33,7 +28,7 @@ with lib; let
in
inputs.nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {inherit inputs hostname username pkgs pkgsUnstable;};
specialArgs = {inherit inputs hostname username pkgsUnstable;};
modules =
[
inputs.disko.nixosModules.disko
@ -48,6 +43,7 @@ with lib; let
inputs.zwift.nixosModules.zwift
../modules/base/user.nix
(mkSystemImports hostname)
{ nixpkgs.config.allowUnfree = true; }
]
++ modules
++ (

View file

@ -4,25 +4,19 @@ _: {
name = "DP-3";
resolution = "2560x1440";
refreshRate = 144;
position = "2560x1080";
}
{
name = "HDMI-A-1";
resolution = "2560x1440";
refreshRate = 60;
position = "0x1080";
position = "1920x0";
}
{
name = "DP-1";
resolution = "2560x1440";
refreshRate = 144;
position = "5120x1080";
position = "4480x0";
}
{
name = "DP-2";
name = "HDMI-A-1";
resolution = "1920x1080";
refreshRate = 60;
position = "2880x0";
position = "0x0";
}
];
}

View file

@ -2,8 +2,8 @@ _: {
fireproof.home-manager.programs.niri.settings.outputs = {
"DP-3" = {
position = {
x = 0;
y = 1080;
x = 1920;
y = 0;
};
mode = {
refresh = 164.998;
@ -13,8 +13,8 @@ _: {
};
"DP-1" = {
position = {
x = 2560;
y = 1080;
x = 4480;
y = 0;
};
mode = {
refresh = 165.000;
@ -22,14 +22,16 @@ _: {
height = 1440;
};
};
"DP-2" = {
"HDMI-A-1" = {
position = {
x = (2560 - 1920) / 2;
x = 0;
y = 0;
};
};
"HDMI-A-1" = {
enable = false;
mode = {
refresh = 60.000;
width = 1920;
height = 1080;
};
};
};
}

View file

@ -1,6 +1,5 @@
{
config,
pkgsUnstable,
...
}: {
hardware = {
@ -13,7 +12,6 @@
package = config.boot.kernelPackages.nvidiaPackages.beta;
};
};
boot.kernelPackages = pkgsUnstable.linuxPackages_6_14;
services.xserver.videoDrivers = ["nvidia"];
fireproof.home-manager.wayland.windowManager.hyprland.settings = {

View file

@ -14,7 +14,7 @@ _: {
};
ESP = {
size = "512M";
size = "1G";
type = "EF00";
content = {
type = "filesystem";
@ -23,6 +23,14 @@ _: {
mountOptions = ["defaults"];
};
};
windows = {
size = "150G";
type = "0700"; # for Microsoft basic data
content = {
type = "filesystem";
format = "ntfs";
};
};
luks = {
size = "100%";
content = {