summaryrefslogtreecommitdiff
path: root/os/core
diff options
context:
space:
mode:
Diffstat (limited to 'os/core')
-rw-r--r--os/core/core.nix4
-rw-r--r--os/core/drivers.nix11
-rw-r--r--os/core/networking.nix1
-rw-r--r--os/core/ssh.nix2
-rw-r--r--os/core/storage.nix4
5 files changed, 11 insertions, 11 deletions
diff --git a/os/core/core.nix b/os/core/core.nix
index b1753ad..f13396e 100644
--- a/os/core/core.nix
+++ b/os/core/core.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
- cfg = config.sys.core;
+ cfg = config.os.core;
in
{
imports = [
@@ -20,7 +20,7 @@ in
./users.nix
];
- options.sys.core = {
+ options.os.core = {
allowUnfree.enable = lib.mkEnableOption "unfree software";
flatpak.enable = lib.mkEnableOption "Flatpak support";
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 21e726c..32a848e 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -5,7 +5,7 @@ in
{
options.os.core.drivers = {
enable = lib.mkEnableOption "enables hardware drivers";
- amd.enable = lib.mkEnableOption "AMD specific drivers and microcode";
+ amdgpu.enable = lib.mkEnableOption "AMD specific drivers and microcode";
stability = lib.mkOption {
type = lib.types.enum [ "stable" "unstable" ];
default = "stable";
@@ -23,7 +23,7 @@ in
};
}
- (lib.mkIf cfg.amd.enable {
+ (lib.mkIf cfg.amdgpu.enable {
services.xserver.videoDrivers = [ "amdgpu" ];
hardware.amdgpu = {
initrd.enable = true;
@@ -31,16 +31,17 @@ in
};
})
- (lib.mkIf (cfg.amd.enable && cfg.stability == "unstable") {
+ (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") {
services.lact.enable = true;
- boot.kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4;
+ # boot.kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4;
+ boot.kernelPackages = pkgs.linuxPackages_latest;
chaotic.mesa-git = {
enable = true;
extraPackages = [ pkgs.mesa_git.opencl ];
};
})
- (lib.mkIf (cfg.amd.enable && cfg.stability == "stable") {
+ (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") {
boot.kernelPackages = pkgs.linuxPackages_latest;
})
]);
diff --git a/os/core/networking.nix b/os/core/networking.nix
index 1f7e268..51b9196 100644
--- a/os/core/networking.nix
+++ b/os/core/networking.nix
@@ -13,6 +13,7 @@ in
};
firewall = {
enable = true;
+ allowedTCPPorts = [ 5222 ]; # SimpleX Chat
};
};
systemd.services."NetworkManager-wait-online".enable = false;
diff --git a/os/core/ssh.nix b/os/core/ssh.nix
index b2cf411..43ea660 100644
--- a/os/core/ssh.nix
+++ b/os/core/ssh.nix
@@ -12,8 +12,6 @@ in
services.openssh = {
enable = true;
- PasswordAuthentication = false;
- KbdInteractiveAuthentication = false;
};
programs.gnupg.agent = {
diff --git a/os/core/storage.nix b/os/core/storage.nix
index e4e282b..fde9399 100644
--- a/os/core/storage.nix
+++ b/os/core/storage.nix
@@ -7,7 +7,7 @@ in
enable = lib.mkEnableOption "enables storage management";
cleanDates = lib.mkOption {
- type = lib.types.int;
+ type = lib.types.str;
default = "weekly";
description = "how often to clean the system of old generations";
};
@@ -20,7 +20,7 @@ in
clean = {
enable = true;
dates = "${toString cfg.cleanDates}";
- clean.extraArgs = "--keep 5";
+ extraArgs = "--keep 5";
};
};