alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-22 09:13:55 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

move host-specific config from baseModules -> hosts/common.nix

Browse source
This commit is contained in:
Aly Raffauf 2024-07-08 00:21:51 -04:00
parent 0a58af6500
commit c57efa7063
2 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
baseModules/default.nix
View file

@ -6,26 +6,6 @@ inputs: {
}: { }: {
console.useXkbConfig = true; console.useXkbConfig = true;
environment.systemPackages = with pkgs; [
inputs.agenix.packages.${pkgs.system}.default
inxi
];
i18n = {
defaultLocale = lib.mkDefault "en_US.UTF-8";
extraLocaleSettings = {
LC_ADDRESS = config.i18n.defaultLocale;
LC_IDENTIFICATION = config.i18n.defaultLocale;
LC_MEASUREMENT = config.i18n.defaultLocale;
LC_MONETARY = config.i18n.defaultLocale;
LC_NAME = config.i18n.defaultLocale;
LC_NUMERIC = config.i18n.defaultLocale;
LC_PAPER = config.i18n.defaultLocale;
LC_TELEPHONE = config.i18n.defaultLocale;
LC_TIME = config.i18n.defaultLocale;
};
};
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
programs = { programs = {
@ -97,21 +77,6 @@ inputs: {
sound.enable = true; sound.enable = true;
system.autoUpgrade = {
allowReboot = true;
dates = "04:00";
randomizedDelaySec = "20min";
enable = true;
flake = "github:alyraffauf/nixcfg";
operation = "boot";
rebootWindow = {
lower = "02:00";
upper = "05:00";
};
};
time.timeZone = "America/New_York";
zramSwap = { zramSwap = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
memoryPercent = lib.mkDefault 50; memoryPercent = lib.mkDefault 50;

39
hosts/common.nix
View file

@ -10,7 +10,29 @@
wifi.file = ../secrets/wifi.age; wifi.file = ../secrets/wifi.age;
}; };
environment.variables.FLAKE = "github:alyraffauf/nixcfg"; environment = {
systemPackages = with pkgs; [
inputs.agenix.packages.${pkgs.system}.default
inxi
];
variables.FLAKE = "github:alyraffauf/nixcfg";
};
i18n = {
defaultLocale = lib.mkDefault "en_US.UTF-8";
extraLocaleSettings = {
LC_ADDRESS = config.i18n.defaultLocale;
LC_IDENTIFICATION = config.i18n.defaultLocale;
LC_MEASUREMENT = config.i18n.defaultLocale;
LC_MONETARY = config.i18n.defaultLocale;
LC_NAME = config.i18n.defaultLocale;
LC_NUMERIC = config.i18n.defaultLocale;
LC_PAPER = config.i18n.defaultLocale;
LC_TELEPHONE = config.i18n.defaultLocale;
LC_TIME = config.i18n.defaultLocale;
};
};
fileSystems = lib.attrsets.optionalAttrs (config.networking.hostName != "mauville") { fileSystems = lib.attrsets.optionalAttrs (config.networking.hostName != "mauville") {
"/mnt/Archive" = { "/mnt/Archive" = {
@ -140,4 +162,19 @@
openFirewall = true; openFirewall = true;
authKeyFile = config.age.secrets.tailscaleAuthKey.path; authKeyFile = config.age.secrets.tailscaleAuthKey.path;
}; };
system.autoUpgrade = {
allowReboot = true;
dates = "04:00";
randomizedDelaySec = "20min";
enable = true;
flake = "github:alyraffauf/nixcfg";
operation = "boot";
rebootWindow = {
lower = "02:00";
upper = "05:00";
};
};
time.timeZone = "America/New_York";
} }