diff --git a/flake.nix b/flake.nix index ac6bdf1..5e9ce6f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,34 @@ let 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 { nixosConfigurations = { # desktop diff --git a/hosts/muho/configuration.nix b/hosts/muho/configuration.nix index 8afe0ac..735e33b 100644 --- a/hosts/muho/configuration.nix +++ b/hosts/muho/configuration.nix @@ -17,6 +17,7 @@ in { # Modules mods.desktop.enable = false; mods.desktop.gaming.enable = false; + mods.boot.enable = true; mods.theme.enable = true; diff --git a/hosts/muho/home.nix b/hosts/muho/home.nix index 72a9f7d..6e991ea 100644 --- a/hosts/muho/home.nix +++ b/hosts/muho/home.nix @@ -4,14 +4,14 @@ in { # Modules mods.xdg.enable = true; mods.social.enable = true; - mods.i3.enable = true; + mods.i3.enable = false; mods.terminal.zsh.enable = true; - mods.terminal.emulator.enable = true; + mods.terminal.emulator.enable = false; mods.terminal.development.enable = true; mods.terminal.tools.enable = true; - mods.desktop.development.enable = true; - mods.desktop.productivity.enable = true; - mods.desktop.media.enable = true; + mods.desktop.development.enable = false; + mods.desktop.productivity.enable = false; + mods.desktop.media.enable = false; # Hardware preferences diff --git a/utils.nix b/utils.nix index 76489c2..45198f0 100644 --- a/utils.nix +++ b/utils.nix @@ -1,9 +1,7 @@ -{ inputs, system, pkgs, ... }: -let nixpkgs = inputs.nixpkgs; -in { +{ inputs, system, pkgs, nixpkgs, ... }: { mkHost = host: - nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system; }; + inputs.nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system pkgs nixpkgs; }; modules = [ host