From 825d9e557d5f3fcd9a97f7b41c52fe111baafce5 Mon Sep 17 00:00:00 2001 From: Husky Date: Wed, 31 Dec 2025 14:11:15 +0100 Subject: [PATCH] update --- flake.nix | 2 +- hosts/common/global/default.nix | 31 +++++++++++++++++++++++++++++++ hosts/orpheus/default.nix | 8 ++++---- overlays/default.nix | 6 ++++++ 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 overlays/default.nix diff --git a/flake.nix b/flake.nix index 3e1835f..7414d7d 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ nixosModules = import ./modules/nixos; #homeManagerModules = import ./modules/home-manager; - #overlays = import ./overlays {inherit inputs outputs;}; + overlays = import ./overlays {inherit inputs outputs;}; hydraJobs = import ./hydra.nix {inherit inputs outputs;}; packages = forEachSystem (pkgs: import ./pkgs {inherit pkgs;}); diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index 884bdfa..6f4afa3 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -3,8 +3,39 @@ outputs, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ] ++ (builtins.attrValues outputs.nixosModules); + home-manager.useGlobalpkgs = true; home-manager.extraSpecialArgs = { inherit inputs outputs; }; + + nixpkgs = { + overlays = builtins.attrValues outputs.overlays; + config = { + allowUnfree = true; + }; + }; + + hardware.enableRedistrubutableFirmware = true; + networking.domain = "wessels.local"; + + security.pam.loginLimits = [ + { + domain = "@wheel"; + item = "nofile"; + type = "soft"; + value = "524288"; + } + { + domain = "@wheel"; + item = "nofile"; + type = "hard"; + value = "1048576"; + } + ]; + + services.speechd.enable = false; } diff --git a/hosts/orpheus/default.nix b/hosts/orpheus/default.nix index 71fc0f8..d60a44f 100644 --- a/hosts/orpheus/default.nix +++ b/hosts/orpheus/default.nix @@ -4,9 +4,9 @@ ... }: { imports = [ - inputs.hardware.nixosModules.common-cpu-amd - inputs.hardware.nixosModules.common-gpu-amd - inputs.hardware.nixosModules.common-pc-ssd + #inputs.hardware.nixosModules.common-cpu-amd + #inputs.hardware.nixosModules.common-gpu-amd + #inputs.hardware.nixosModules.common-pc-ssd ./hardware-configuration.nix ../common/global @@ -27,5 +27,5 @@ dconf.enable = true; }; - system.stateVersion = "22.11"; + system.stateVersion = "25.11"; } diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..e80c68a --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,6 @@ +{ + outputs, + inputs, +}: { + +}