Merge branch 'main' of github.com:asosnovsky/nixos-setup

This commit is contained in:
ari committed 2024-10-31 07:08:34 -04:00
commit f703c93d3a
41 files changed
+692 -279

No files matched your search

+2 -2
View File
@@ -14,7 +14,7 @@ in
default = [ ];
};
skyg.user = {
enabled = mkEnableOption "";
enable = mkEnableOption "";
name = mkOption {
type = types.str;
};
@@ -45,7 +45,7 @@ in
stateVersion = cfg.home-manager.version;
});
in
mkIf cfg.user.enabled
mkIf cfg.user.enable
{
programs.zsh.enable = true;
home-manager.users.root =
+3 -3
View File
@@ -30,6 +30,6 @@ sync = "!f() { \
clean-branches = "!f() { \
git for-each-ref --format '%(refname:short)' refs/heads| grep -v 'master\\|main' | xargs git branch -D ; \
}; f";
# aliases = "!f() { \
# git config --get-regexp alias | awk '{print $1}' | sed 's/alias\./ - /' \
# }; f"
aliases = "!f() { \
git config --get-regexp alias | awk '{print $1}' | sed 's/alias\\./ - /' ; \
}; f";
+5 -1
View File
@@ -22,8 +22,12 @@
skyg.core.hostName = hostName;
skyg.home-manager.version = homeManagerVersion;
skyg.core.substituters = localNixCaches;
skyg.networkDrives.enabled = enableNetworkDrives;
skyg.networkDrives.enable = enableNetworkDrives;
skyg.nixos.common.containers = (if os.enable then os.containers else { });
skyg.nixos.server.k8s = {
masterIP = "10.0.10.8";
masterHostName = "terra1.lab.internal";
};
system.stateVersion = systemStateVersion;
nixpkgs.config.allowUnfree = true;
nix = {
+2 -2
View File
@@ -9,11 +9,11 @@ in
{
options = {
skyg.networkDrives = {
enabled = mkEnableOption
enable = mkEnableOption
"Network Drives";
};
};
config = mkIf cfg.enabled {
config = mkIf cfg.enable {
fileSystems."/torrents" = {
device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents";
fsType = "nfs";
+1
View File
@@ -8,5 +8,6 @@
./user.nix
./fonts.nix
./ssh-server.nix
./qemu.nix
];
}
@@ -4,6 +4,7 @@
./fan2go.nix
./fancontrol.nix
./sound.nix
./laptop-power.nix
];
# Firmware Updater
services.fwupd.enable = true;
@@ -0,0 +1,70 @@
{ lib
, config
, ...
}:
let
cfg = config.skyg.nixos.common.hardware.laptop-power-mgr;
in
{
options.skyg.nixos.common.hardware.laptop-power-mgr = with lib; {
enable = mkEnableOption "Settings for laptop power management";
};
config = lib.mkIf cfg.enable {
# Advance Power Management
powerManagement.powertop.enable = true;
powerManagement.enable = true;
services.thermald.enable = true;
services.power-profiles-daemon.enable = false;
services.tlp = {
enable = true;
settings = {
TLP_DEFAULT_MODE = "BAT";
TLP_PERSISTENT_DEFAULT = 1;
CPU_BOOST_ON_BAT = 0;
RUNTIME_PM_ON_BAT = "auto";
PLATFORM_PROFILE_ON_AC = "balanced";
PLATFORM_PROFILE_ON_BAT = "low-power";
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 20;
START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge
STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging
};
};
services.auto-cpufreq.enable = true;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Logind
services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitch = "suspend-then-hibernate";
powerKey = "lock";
extraConfig = ''
LidSwitchIgnoreInhibited=yes
HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate
IdleActionSec=2m
'';
};
};
}
+30
View File
@@ -0,0 +1,30 @@
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.core.qemu;
in
{
options = {
skyg.core.qemu = {
enable = lib.mkEnableOption
"Enable qemu";
};
};
config = lib.mkIf cfg.enable {
environment = {
systemPackages = with pkgs; [
qemu
quickemu
win-spice
spice
spice-vdagent
spice-autorandr
virt-viewer
];
};
services.spice-vdagentd.enable = true;
services.spice-autorandr.enable = true;
services.spice-webdavd.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
};
}
+2 -2
View File
@@ -7,7 +7,7 @@ in
{
options = {
skyg.nixos.common.ssh-server = {
enabled = mkEnableOption
enable = mkEnableOption
"enable ssh server";
masterPubKey = mkOption {
type = types.str;
@@ -15,7 +15,7 @@ in
};
};
};
config = mkIf cfg.enabled {
config = mkIf cfg.enable {
services.openssh = {
enable = true;
openFirewall = true;
+6 -3
View File
@@ -1,15 +1,18 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.nixos.desktop.cosmic;
in
{
options = {
skyg.nixos.desktop.cosmic = {
enabled = lib.mkEnableOption
enable = lib.mkEnableOption
"Cosmic";
};
};
config = lib.mkIf cfg.enabled {
config = lib.mkIf cfg.enable {
environment.systemPackages = [
pkgs.cosmic-icons
];
services.desktopManager.cosmic.enable = true;
# services.displayManager.cosmic-greeter.enable = true;
};
+2 -2
View File
@@ -7,11 +7,11 @@ in
{
options = {
skyg.nixos.desktop.crypto = {
enabled = mkEnableOption
enable = mkEnableOption
"Enable crypto wallets";
};
};
config = mkIf cfg.enabled {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
trezor-suite
trezord
+2 -2
View File
@@ -15,11 +15,11 @@ in
options = {
skyg.nixos.desktop = {
enabled = lib.mkEnableOption
enable = lib.mkEnableOption
"Enable Desktop";
};
};
config = lib.mkIf cfg.desktop.enabled {
config = lib.mkIf cfg.desktop.enable {
services.displayManager.sddm.enable = false;
services.displayManager.sddm.wayland.enable = false;
services.xserver.displayManager.gdm.enable = true;
+1 -1
View File
@@ -10,7 +10,7 @@ in
else pkgs
;
in
lib.mkIf cfg.enabled {
lib.mkIf cfg.enable {
programs.hyprland = {
enable = true;
package = hyprpkgs.hyprland;
+1 -1
View File
@@ -7,7 +7,7 @@
];
options = {
skyg.nixos.desktop.hyprland = with lib; {
enabled = mkEnableOption
enable = mkEnableOption
"Hyprland";
useNWG = mkEnableOption
"nwg-shell experience";
+5 -17
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop.hyprland;
in
{
config = lib.mkIf (cfg.enabled && !cfg.useNWG) {
config = lib.mkIf (cfg.enable && !cfg.useNWG) {
home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
@@ -32,22 +32,10 @@ in
nwg-bar # logout window
]);
system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/hypr"
if [[ ! -h "$HOME/.config/hypr" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
fi
rm -f "$HOME/.config/waybar"
if [[ ! -h "$HOME/.config/waybar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
fi
rm -f "$HOME/.config/nwg-bar"
if [[ ! -h "$HOME/.config/nwg-bar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar"
fi
rm -f "$HOME/.config/dunst"
if [[ ! -h "$HOME/.config/dunst" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst"
fi
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar"
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst"
'';
};
}
+1 -1
View File
@@ -5,7 +5,7 @@ let
cfg = config.skyg.nixos.desktop.hyprland;
in
{
config = mkIf (cfg.enabled && cfg.useNWG) {
config = mkIf (cfg.enable && cfg.useNWG) {
programs.hyprlock.enable = true;
environment.systemPackages = with pkgs; [
# general utilities
+2 -2
View File
@@ -5,11 +5,11 @@ in
{
options = {
skyg.nixos.desktop.kde = {
enabled = lib.mkEnableOption
enable = lib.mkEnableOption
"KDE";
};
};
config = lib.mkIf cfg.enabled {
config = lib.mkIf cfg.enable {
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
environment.plasma6.excludePackages = with pkgs.kdePackages; [
+2 -2
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop;
in
{
config = lib.mkIf cfg.enabled {
config = lib.mkIf cfg.enable {
# Flatpak
services.flatpak.enable = true;
# Mobile Connect
@@ -21,7 +21,7 @@ in
xclip
# socials
slack
#slack
zoom-us
betterdiscordctl
discord
+1 -1
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop;
in
{
config = lib.mkIf cfg.enabled {
config = lib.mkIf cfg.enable {
# Flatpak
environment.systemPackages = with pkgs; [
wayland
+12 -2
View File
@@ -1,13 +1,23 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.nixos.desktop;
in
{
config = lib.mkIf cfg.enabled {
config = lib.mkIf cfg.enable {
services.xserver = {
enable = true;
xkb.layout = "us";
xkb.variant = "";
};
users.users.${config.skyg.user.name}.extraGroups = [ "input" ];
environment.systemPackages = with pkgs; [
# These are used to handle touchpad gestures
libinput-gestures
wmctrl
xdotool
];
system.userActivationScripts.hyprlandMineConfig.text = ''
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/libinput-gestures.conf" "$HOME/.config/libinput-gestures.conf"
'';
};
}
+30
View File
@@ -0,0 +1,30 @@
{ config, lib, ... }:
let
cfg = config.skyg.server.arrs;
ifAdd = cond: add: if cond then [ add ] else [ ];
mkEnsureUser = name: {
inherit name;
ensureDBOwnership = true;
ensureClauses.login = true;
ensureClauses.createdb = true;
};
in
{
config = lib.mkIf cfg.enable {
services.postgresql = {
enable = true;
settings.port = cfg.database.port;
dataDir = "${cfg.rootDataDir}/db";
ensureDatabases =
(ifAdd cfg.prowlarr.enable cfg.prowlarr.user) ++
(ifAdd cfg.radarr.enable cfg.radarr.user) ++
(ifAdd cfg.sonarr.enable cfg.sonarr.user)
;
ensureUsers =
(ifAdd cfg.prowlarr.enable (mkEnsureUser cfg.prowlarr.user)) ++
(ifAdd cfg.radarr.enable (mkEnsureUser cfg.radarr.user)) ++
(ifAdd cfg.sonarr.enable (mkEnsureUser cfg.sonarr.user))
;
};
};
}
+84
View File
@@ -0,0 +1,84 @@
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.server.arrs;
dbPort = 5432;
rootDataDir = "/var/lib/arrs";
makeConfig = { port, name, uid, gid }: {
enable = lib.mkEnableOption "Enable ${name}";
package = lib.mkPackageOption pkgs name { };
openFirewall = lib.mkEnableOption "Open port for ${name}";
user = lib.mkOption {
type = lib.types.str;
default = name;
};
group = lib.mkOption {
type = lib.types.str;
default = name;
};
uid = lib.mkOption {
type = lib.types.number;
default = uid;
};
gid = lib.mkOption {
type = lib.types.number;
default = gid;
};
port = lib.mkOption {
type = lib.types.int;
default = port;
description = "Port for ${name}";
};
};
in
{
imports = [
./db.nix
./prowlarr.nix
];
options = {
skyg.server.arrs = {
enable = lib.mkEnableOption
"Enable Arr Stack Store";
openFirewall = lib.mkEnableOption
"Open Firewall ports for services";
rootDataDir = lib.mkOption {
type = lib.types.str;
default = rootDataDir;
};
};
skyg.server.arrs.database = {
port = lib.mkOption {
type = lib.types.int;
default = dbPort;
};
};
skyg.server.arrs.prowlarr = makeConfig {
name = "prowlarr";
port = 9096;
uid = 9000;
gid = 9000;
};
skyg.server.arrs.sonarr = makeConfig {
name = "sonarr";
port = 8989;
uid = 9001;
gid = 9001;
};
skyg.server.arrs.radarr = makeConfig {
name = "radarr";
port = 7878;
uid = 9002;
gid = 9002;
};
};
config = lib.mkIf cfg.enable {
networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [
];
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
];
};
}
+71
View File
@@ -0,0 +1,71 @@
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.server.arrs.prowlarr;
dataDir = "${config.skyg.server.arrs.rootDataDir}/prowlarr";
configXMLFile = pkgs.writeTextFile {
name = "config.xml";
text = ''
<Config>
<LogLevel>info</LogLevel>
<EnableSsl>False</EnableSsl>
<Port>${toString(cfg.port)}</Port>
<UrlBase></UrlBase>
<BindAddress>*</BindAddress>
<UpdateMechanism>BuiltIn</UpdateMechanism>
<LaunchBrowser>False</LaunchBrowser>
<Branch>main</Branch>
<PostgresUser>prowlarr</PostgresUser>
<PostgresPort>${toString(config.skyg.server.arrs.database.port)}</PostgresPort>
<PostgresHost>0.0.0.0</PostgresHost>
<PostgresMainDb>prowlarr</PostgresMainDb>
<PostgresLogDb>prowlarr-log</PostgresLogDb>
<InstanceName>SkyG Prowlarr</InstanceName>
<AuthenticationMethod>External</AuthenticationMethod>
<AuthenticationRequired>Enabled</AuthenticationRequired>
</Config>
'';
};
in
{
config = lib.mkIf cfg.enable {
users.users.${cfg.user} = {
uid = cfg.uid;
isSystemUser = true;
group = cfg.group;
};
users.groups.${cfg.group} = {
gid = cfg.gid;
members = [
cfg.user
config.skyg.user.name
];
};
users.groups.www-data.members = [
cfg.user
];
systemd.services.prowlarr = {
description = "Prowlarr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
ln -sfn "${dataDir}/config.xml" "${configXMLFile}"
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
WorkingDirectory = dataDir;
Type = "simple";
DynamicUser = true;
StateDirectory = "prowlarr";
ExecStart = "${lib.getExe cfg.package} -nobrowser -data=${dataDir}";
Restart = "on-failure";
};
environment.HOME = "/var/empty";
};
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
};
};
}
+2
View File
@@ -7,5 +7,7 @@
./ai-services.nix
./jellyfin.nix
./admin.nix
./arrs
./k8s
];
}
+64
View File
@@ -0,0 +1,64 @@
{ config, pkgs, lib, ... }:
let
cfg = config.skyg.nixos.server.k8s;
in
{
imports = [
./master.nix
./node.nix
];
options = {
skyg.nixos.server.k8s = {
enable = lib.mkEnableOption
"Enable K8s";
isMaster = lib.mkEnableOption
"Enable as master";
masterIP = lib.mkOption {
type = lib.types.str;
};
masterHostName = lib.mkOption {
type = lib.types.str;
};
masterAPIPort = lib.mkOption {
type = lib.types.number;
default = 6443;
};
};
};
config =
let
ports = [
cfg.masterAPIPort # k8s api server
10250 # kubelet api
10259 # kubelet scheduler
10257 # kubelet controller
8888 # no idea what this is
];
portRanges = [
{ from = 2379; to = 2380; } # etcd
];
in
lib.mkIf cfg.enable {
# resolve master hostname
networking.extraHosts = "${cfg.masterIP} ${cfg.masterHostName}";
networking.firewall.allowedUDPPorts = ports;
networking.firewall.allowedUDPPortRanges = portRanges;
networking.firewall.allowedTCPPorts = ports;
networking.firewall.allowedTCPPortRanges = portRanges;
# packages for administration tasks
environment.systemPackages = with pkgs; [
kubectl
kubernetes
];
services.kubernetes = {
proxy.hostname = cfg.masterHostName;
masterAddress = cfg.masterHostName;
easyCerts = true;
apiserverAddress = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}";
addons.dns.enable = true;
kubelet.extraOpts = "--fail-swap-on=false";
};
};
}
+15
View File
@@ -0,0 +1,15 @@
{ config, lib, ... }:
let
cfg = config.skyg.nixos.server.k8s;
in
{
config = lib.mkIf (cfg.enable && cfg.isMaster) {
services.kubernetes = {
roles = [ "master" ];
apiserver = {
securePort = cfg.masterAPIPort;
advertiseAddress = cfg.masterIP;
};
};
};
}
+12
View File
@@ -0,0 +1,12 @@
{ config, lib, ... }:
let
cfg = config.skyg.nixos.server.k8s;
in
{
config = lib.mkIf (cfg.enable && (!cfg.isMaster)) {
services.kubernetes = {
roles = [ "node" ];
kubelet.kubeconfig.server = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}";
};
};
}