Apply patches

This commit is contained in:
muon 2025-01-02 12:22:18 +00:00
parent 94e92b1c75
commit 9033ab614d
4 changed files with 36 additions and 12 deletions

View file

@ -17,9 +17,34 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import inputs.nixpkgs { inherit system; }; pkgs' = (import inputs.nixpkgs { inherit system; }).applyPatches {
name = "nixpkgs-unstable-patched";
src = inputs.nixpkgs;
patches = [
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/369042.patch";
sha256 =
"sha256:08asxmd34rzaxb8dr4nccy26k3vxnx7psy2imnp40fdplqna0a85";
})
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368790.patch";
sha256 =
"sha256:1blsawm4l30wkrdkvvq0fw2aki7v921isdwrk9dw8yh09cglbfd9";
})
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368091.patch";
sha256 =
"sha256:11qnwrq8sgbmxiy9qvv7q2lbl824x90p2iklf3kjf9yb3c2dx9nj";
})
];
};
pkgs = import pkgs' { inherit system; };
nixpkgs = import pkgs { inherit system; };
utils = import ./utils.nix { inherit inputs system pkgs; }; utils = import ./utils.nix { inherit inputs system pkgs nixpkgs; };
in { in {
nixosConfigurations = { nixosConfigurations = {
# desktop # desktop

View file

@ -17,6 +17,7 @@ in {
# Modules # Modules
mods.desktop.enable = false; mods.desktop.enable = false;
mods.desktop.gaming.enable = false; mods.desktop.gaming.enable = false;
mods.boot.enable = true; mods.boot.enable = true;
mods.theme.enable = true; mods.theme.enable = true;

View file

@ -4,14 +4,14 @@ in {
# Modules # Modules
mods.xdg.enable = true; mods.xdg.enable = true;
mods.social.enable = true; mods.social.enable = true;
mods.i3.enable = true; mods.i3.enable = false;
mods.terminal.zsh.enable = true; mods.terminal.zsh.enable = true;
mods.terminal.emulator.enable = true; mods.terminal.emulator.enable = false;
mods.terminal.development.enable = true; mods.terminal.development.enable = true;
mods.terminal.tools.enable = true; mods.terminal.tools.enable = true;
mods.desktop.development.enable = true; mods.desktop.development.enable = false;
mods.desktop.productivity.enable = true; mods.desktop.productivity.enable = false;
mods.desktop.media.enable = true; mods.desktop.media.enable = false;
# Hardware preferences # Hardware preferences

View file

@ -1,9 +1,7 @@
{ inputs, system, pkgs, ... }: { inputs, system, pkgs, nixpkgs, ... }: {
let nixpkgs = inputs.nixpkgs;
in {
mkHost = host: mkHost = host:
nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs system; }; specialArgs = { inherit inputs system pkgs nixpkgs; };
modules = [ modules = [
host host