Merge branch 'main' of github.com:asosnovsky/nixos-setup
This commit is contained in:
commit
7bd24844e5
11 files changed
+253
-66
No files matched your search
@@ -28,7 +28,7 @@
|
||||
homepath = "/Users/${name}";
|
||||
extraGitConfigs = [{ path = "${homepath}/.config/mysumo/gitconfig"; }];
|
||||
};
|
||||
homeMangerVersion = "24.05";
|
||||
homeManagerVersion = "24.05";
|
||||
lib = (import modules/lib.nix {
|
||||
nixpkgs = nixpkgs;
|
||||
home-manager = home-manager;
|
||||
@@ -50,7 +50,8 @@
|
||||
hostName = "fwbook";
|
||||
home-manager = {
|
||||
enable = true;
|
||||
version = homeMangerVersion;
|
||||
version = homeManagerVersion;
|
||||
enableDevelopmentKit = true;
|
||||
};
|
||||
desktop = {
|
||||
enable = true;
|
||||
@@ -64,7 +65,7 @@
|
||||
enable = true;
|
||||
firewall = { enable = false; };
|
||||
enableFonts = true;
|
||||
enableNetowrking = true;
|
||||
enableNetworking = true;
|
||||
enableSSH = false;
|
||||
hardware = { enable = true; };
|
||||
containerRuntime = "docker";
|
||||
@@ -86,7 +87,8 @@
|
||||
hostName = "asosnovsky-mac";
|
||||
home-manager = {
|
||||
enable = true;
|
||||
version = homeMangerVersion;
|
||||
enableDevelopmentKit = true;
|
||||
version = homeManagerVersion;
|
||||
};
|
||||
configuration =
|
||||
(import ./hosts/asosnovsky-mac.nix { user = sumoUser; });
|
||||
@@ -101,17 +103,44 @@
|
||||
hostName = "hl-bigbox1";
|
||||
home-manager = {
|
||||
enable = true;
|
||||
version = homeMangerVersion;
|
||||
enableDevelopmentKit = false;
|
||||
version = homeManagerVersion;
|
||||
};
|
||||
enableNetworkDrives = true;
|
||||
os = {
|
||||
enable = true;
|
||||
firewall = { enable = false; };
|
||||
enableFonts = true;
|
||||
enableNetowrking = true;
|
||||
enableNetworking = true;
|
||||
enableSSH = true;
|
||||
hardware = { enable = true; };
|
||||
};
|
||||
configuration = (import ./hosts/hl-bigbox1.nix { user = user; });
|
||||
};
|
||||
|
||||
# NIXOS Homelab - minipc1
|
||||
# -------------
|
||||
nixosConfigurations."hl-minipc1" = lib.makeNixOsModule {
|
||||
system = "x86_64-linux";
|
||||
user = user;
|
||||
systemStateVersion = "23.11";
|
||||
hostName = "hl-minipc1";
|
||||
enableNetworkDrives = true;
|
||||
enableHomelabServices = true;
|
||||
home-manager = {
|
||||
enable = true;
|
||||
version = homeManagerVersion;
|
||||
enableDevelopmentKit = false;
|
||||
};
|
||||
os = {
|
||||
enable = true;
|
||||
firewall = { enable = false; };
|
||||
enableFonts = true;
|
||||
enableNetworking = true;
|
||||
enableSSH = true;
|
||||
hardware = { enable = false; };
|
||||
};
|
||||
configuration = (import ./hosts/hl-minipc1.nix { user = user; });
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -4,40 +4,26 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/f2732ab2-ea52-4f61-b55a-6617d496bf39";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/mnt/EightTerra/DownloadedTorrents" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents";
|
||||
fsType = "nfs";
|
||||
options = [ "x-systemd.automount" "noauto" ];
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/f2732ab2-ea52-4f61-b55a-6617d496bf39";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/mnt/EightTerra/k3s-cluster" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster";
|
||||
fsType = "nfs";
|
||||
options = [ "x-systemd.automount" "noauto" ];
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/9222-7B1D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/9222-7B1D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
+5
-14
@@ -8,31 +8,22 @@
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.tmp.useTmpfs = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
environment.systemPackages = with pkgs; [
|
||||
nvtopPackages.nvidia
|
||||
cudaPackages.cudnn
|
||||
];
|
||||
# Ollama
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "cuda";
|
||||
# environmentVariables = {
|
||||
# OLLAMA_LLM_LIBRARY = "cuda";
|
||||
# LD_LIBRARY_PATH = "run/opengl-driver/lib";
|
||||
# NVARCH = "x86_64";
|
||||
# NV_CUDA_CUDART_VERSION = "11.3.1";
|
||||
# NVIDIA_VISIBLE_DEVICES = "all";
|
||||
# };
|
||||
host = "0.0.0.0";
|
||||
};
|
||||
# Nvidia Settings
|
||||
services.xserver.videoDrivers = [ "nvidia" "modesetting" "fbdev" ];
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
services.xserver.enable = true;
|
||||
hardware.graphics = { enable = true; };
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = false;
|
||||
powerManagement.finegrained = false;
|
||||
open = false;
|
||||
open = true;
|
||||
nvidiaSettings = false;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.production;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/142c88f4-b1bc-4ed9-92ee-2c52cdfa4274";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/01FE-EDCC";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{ user }:
|
||||
{ pkgs, lib, config, ... }: {
|
||||
imports = [ ./hl-minipc1.hardware-configuration.nix ];
|
||||
# firmware updater
|
||||
services.fwupd.enable = true;
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
# Data
|
||||
fileSystems."/mnt/Data" = {
|
||||
device = "/dev/sda1";
|
||||
fsType = "ext4";
|
||||
options = [ "nofail" ];
|
||||
};
|
||||
homelab.services.audiobookshelf = {
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
openFirewall = true;
|
||||
port = 8000;
|
||||
configDir = "/mnt/Data/audiobookshelf/config";
|
||||
metadtaDir = "/mnt/Data/audiobookshelf/metadata";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.homelab.services.audiobookshelf;
|
||||
in {
|
||||
options = {
|
||||
homelab.services.audiobookshelf = {
|
||||
enable = mkEnableOption
|
||||
"Audiobookshelf, self-hosted audiobook and podcast server.";
|
||||
|
||||
package = mkPackageOption pkgs "audiobookshelf" { };
|
||||
|
||||
configDir = mkOption {
|
||||
description =
|
||||
"Path to Audiobookshelf config folder";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
metadtaDir = mkOption {
|
||||
description =
|
||||
"Path to Audiobookshelf config folder";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
description = "The host Audiobookshelf binds to.";
|
||||
default = "127.0.0.1";
|
||||
example = "0.0.0.0";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
description = "The TCP port Audiobookshelf will listen on.";
|
||||
default = 8000;
|
||||
type = types.port;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
description = "User account under which Audiobookshelf runs.";
|
||||
default = "audiobookshelf";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
description = "Group under which Audiobookshelf runs.";
|
||||
default = "audiobookshelf";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
description =
|
||||
"Open ports in the firewall for the Audiobookshelf web interface.";
|
||||
default = false;
|
||||
type = types.bool;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.audiobookshelf = {
|
||||
description =
|
||||
"Audiobookshelf is a self-hosted audiobook and podcast server";
|
||||
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
StateDirectory = cfg.dataDir;
|
||||
WorkingDirectory = "/var/lib/${cfg.dataDir}";
|
||||
ExecStart =
|
||||
"${cfg.package}/bin/audiobookshelf --host ${cfg.host} --port ${
|
||||
toString cfg.port
|
||||
} --config ${cfg.configDir} --metadata ${cfg.metadtaDir}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
||||
users.users = mkIf (cfg.user == "audiobookshelf") {
|
||||
audiobookshelf = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
home = "/var/lib/${cfg.dataDir}";
|
||||
};
|
||||
};
|
||||
|
||||
users.groups =
|
||||
mkIf (cfg.group == "audiobookshelf") { audiobookshelf = { }; };
|
||||
|
||||
networking.firewall =
|
||||
mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ wietsedv ];
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./audiobookshelf.nix
|
||||
];
|
||||
}
|
||||
@@ -1,4 +1,8 @@
|
||||
{ hostName, homeMangerVersion, user }:
|
||||
{ hostName
|
||||
, homeManagerVersion
|
||||
, user
|
||||
, enableDevelopmentKit ? false
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
gitconfigs =
|
||||
@@ -7,7 +11,7 @@ let
|
||||
in
|
||||
{
|
||||
home-manager.users.root = {
|
||||
home.stateVersion = homeMangerVersion;
|
||||
home.stateVersion = homeManagerVersion;
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "root";
|
||||
@@ -22,7 +26,7 @@ in
|
||||
home-manager.users.${user.name} = {
|
||||
home = {
|
||||
sessionVariables = { MAMBA_ROOT_PREFIX = "$HOME/.local/micromamba"; };
|
||||
stateVersion = homeMangerVersion;
|
||||
stateVersion = homeManagerVersion;
|
||||
shellAliases = {
|
||||
cat = "bat";
|
||||
conda = "micromamba";
|
||||
@@ -30,17 +34,17 @@ in
|
||||
packages = with pkgs; [
|
||||
jq
|
||||
nixfmt-classic
|
||||
kubectl
|
||||
terraform
|
||||
rye
|
||||
devenv
|
||||
micromamba
|
||||
neofetch
|
||||
ipfetch
|
||||
nixd
|
||||
devbox
|
||||
] ++ (if enableDevelopmentKit then [
|
||||
rye
|
||||
uv
|
||||
];
|
||||
devbox
|
||||
micromamba
|
||||
terraform
|
||||
kubectl
|
||||
] else [ ]);
|
||||
};
|
||||
programs = {
|
||||
bat.enable = true;
|
||||
@@ -78,10 +82,10 @@ in
|
||||
zsh = {
|
||||
enable = true;
|
||||
autosuggestion.enable = true;
|
||||
initExtra = ''
|
||||
initExtra = (if enableDevelopmentKit then ''
|
||||
export MAMBA_ROOT_PREFIX="$HOME/.local/micromamba"
|
||||
source <(micromamba shell hook --root-prefix=$MAMBA_ROOT_PREFIX)
|
||||
'';
|
||||
'' else "");
|
||||
};
|
||||
zsh.oh-my-zsh = {
|
||||
enable = true;
|
||||
+13
-6
@@ -2,6 +2,8 @@
|
||||
, systemStateVersion
|
||||
, hostName
|
||||
, system
|
||||
, enableNetworkDrives ? false
|
||||
, enableHomelabServices ? false
|
||||
# Desktop Module
|
||||
, desktop ? {
|
||||
enable = false;
|
||||
@@ -11,7 +13,10 @@
|
||||
enable = false;
|
||||
}
|
||||
# Home Manager
|
||||
, home-manager ? { enable = false; }
|
||||
, home-manager ? {
|
||||
enable = false;
|
||||
enableDevelopmentKit = false;
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
{ ... }: {
|
||||
@@ -38,21 +43,23 @@
|
||||
hostName = hostName;
|
||||
firewall = os.firewall;
|
||||
enableFonts = os.enableFonts;
|
||||
enableNetowrking = os.enableNetowrking;
|
||||
enableNetworking = os.enableNetworking;
|
||||
enableSSH = os.enableSSH;
|
||||
hardware = os.hardware;
|
||||
containerRuntime = os.containerRuntime;
|
||||
})
|
||||
]
|
||||
else
|
||||
[ ]) ++ (if home-manager.enable then
|
||||
[
|
||||
(import ./home-manager/common.nix {
|
||||
(import ./home-manager {
|
||||
user = user;
|
||||
homeMangerVersion = home-manager.version;
|
||||
homeManagerVersion = home-manager.version;
|
||||
enableDevelopmentKit = home-manager.enableDevelopmentKit;
|
||||
hostName = hostName;
|
||||
})
|
||||
]
|
||||
else
|
||||
[ ]);
|
||||
[ ])
|
||||
++ (if enableNetworkDrives then [ (import ./network-drives.nix) ] else [ ])
|
||||
++ (if enableHomelabServices then [ (import ./hl-services) ] else [ ]);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
{ ... }: {
|
||||
fileSystems."/mnt/EightTerra/DownloadedTorrents" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents";
|
||||
fsType = "nfs";
|
||||
options = [ "x-systemd.automount" "noauto" ];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/EightTerra/k3s-cluster" = {
|
||||
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster";
|
||||
fsType = "nfs";
|
||||
options = [ "x-systemd.automount" "noauto" ];
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
, hostName
|
||||
, firewall
|
||||
, enableFonts ? true
|
||||
, enableNetowrking ? true
|
||||
, enableNetworking ? true
|
||||
, enableSSH ? true
|
||||
, containerRuntime ? null
|
||||
, hardware ? { enable = false; }
|
||||
@@ -18,7 +18,7 @@
|
||||
})
|
||||
] ++ (if enableFonts then [ ./fonts.nix ] else [ ])
|
||||
++ (if hardware.enable then [ ./hardware.nix ] else [ ])
|
||||
++ (if enableNetowrking then
|
||||
++ (if enableNetworking then
|
||||
[
|
||||
(import ./networking.nix {
|
||||
hostName = hostName;
|
||||
|
||||
Reference in new issue
Block a user