Compare commits

...

4 Commits

6 changed files with 93 additions and 62 deletions

View File

@@ -55,7 +55,6 @@
home-manager, home-manager,
nixgl, nixgl,
git-hooks, git-hooks,
colmena,
... ...
}@inputs: }@inputs:
let let

View File

@@ -27,6 +27,7 @@ in
../../modules/desktops/niri ../../modules/desktops/niri
../../modules/backups ../../modules/backups
../../modules/bluetooth ../../modules/bluetooth
../../modules/gaming
../../modules/keyboard ../../modules/keyboard
(import ../../modules/networking { inherit hostName; }) (import ../../modules/networking { inherit hostName; })
../../modules/users ../../modules/users
@@ -38,6 +39,7 @@ in
(import ../../modules/secrets { inherit lib inputs config; }) (import ../../modules/secrets { inherit lib inputs config; })
../../modules/docker ../../modules/docker
../../modules/syncthing ../../modules/syncthing
../../modules/nvidia
]; ];
home-manager.users.${username} = import ../../home/hosts/andromache { home-manager.users.${username} = import ../../home/hosts/andromache {
@@ -79,18 +81,7 @@ in
}; };
}; };
hardware = { hardware.cpu.intel.updateMicrocode = true;
cpu.intel.updateMicrocode = true;
graphics.enable = true;
nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = true;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
};
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
@@ -99,19 +90,15 @@ in
]; ];
services = { services = {
xserver = { locate = {
videoDrivers = [ "nvidia" ]; enable = true;
package = pkgs.plocate;
}; };
openssh = { openssh = {
enable = true; enable = true;
harden = true; harden = true;
}; };
locate = {
enable = true;
package = pkgs.plocate;
};
};
my.syncthing.enable = true; my.syncthing.enable = true;

View File

@@ -1,6 +1,9 @@
_:
{ {
nixpkgs.allowedUnfree = [
"spotify"
"spotify-unwrapped"
];
security.rtkit.enable = true; security.rtkit.enable = true;
services = { services = {
pulseaudio.enable = false; pulseaudio.enable = false;

View File

@@ -1,18 +1,25 @@
let
flakePath = "/home/h/nix";
in
{ {
inputs, inputs,
outputs, outputs,
dotsPath, dotsPath,
config,
... ...
}: }:
let
inherit (inputs.nixpkgs) lib;
in
{ {
imports = [ imports = [
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
options.nixpkgs.allowedUnfree = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
};
config = {
system.stateVersion = "25.05"; system.stateVersion = "25.05";
nix.settings.experimental-features = [ nix.settings.experimental-features = [
@@ -20,7 +27,8 @@ in
"flakes" "flakes"
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfreePredicate =
pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfree;
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
@@ -44,7 +52,6 @@ in
system.autoUpgrade = { system.autoUpgrade = {
enable = true; enable = true;
flake = flakePath;
flags = [ flags = [
"--recreate-lock-file" "--recreate-lock-file"
"--commit-lock-file" "--commit-lock-file"
@@ -55,4 +62,5 @@ in
randomizedDelaySec = "45min"; randomizedDelaySec = "45min";
allowReboot = false; allowReboot = false;
}; };
};
} }

View File

@@ -0,0 +1,12 @@
{
nixpkgs.allowedUnfree = [
"steam"
"steam-unwrapped"
];
programs.steam = {
enable = true;
remotePlay.openFirewall = false;
dedicatedServer.openFirewall = false;
};
}

View File

@@ -0,0 +1,22 @@
{ config, ... }:
{
nixpkgs.allowedUnfree = [
"nvidia-x11"
"nvidia-persistenced"
"nvidia-settings"
];
hardware.graphics.enable = true;
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
powerManagement.finegrained = false;
open = true;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
services.xserver.videoDrivers = [ "nvidia" ];
}