changed formater

This commit is contained in:
k
2024-12-23 22:08:45 -05:00
parent 52fbee6322
commit 3995c29b03
18 changed files with 278 additions and 244 deletions

View File

@@ -1,44 +1,42 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ./hardware-configuration.nix ./service.nix ];
config,
pkgs,
inputs,
...
}: {
imports = [./hardware-configuration.nix ./service.nix];
powerManagement.enable = false;
system.autoUpgrade.enable = true;
networking.networkmanager.enable = true;
boot.kernelParams = [ "intel_pstate=active" ];
boot.kernelParams = ["intel_pstate=active"];
nix = {
gc.automatic = true;
settings = {
experimental-features = [ "nix-command" "flakes" ];
substituters = [
"http://nix.dhilton.xyz/"
"https://cache.nixos.org/"
];
trusted-public-keys = [
"nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="
];
experimental-features = ["nix-command" "flakes"];
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
};
};
programs = {
nix-ld.enable = true;
nix-ld.libraries = with pkgs; [ glibc glib ];
nix-ld.libraries = with pkgs; [glibc glib];
zsh.enable = true;
};
users.users.k = {
isNormalUser = true;
description = "k";
extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [ zsh ];
extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [zsh];
shell = pkgs.zsh;
};
home-manager = { users = { "k" = import ./home.nix; }; };
home-manager = {users = {"k" = import ./home.nix;};};
environment.systemPackages = with pkgs; [microcodeIntel];
environment.systemPackages = with pkgs; [ microcodeIntel ];
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
hardware.graphics = {
@@ -54,7 +52,7 @@
];
};
services.xserver.videoDrivers = [ "intel" ];
services.xserver.videoDrivers = ["intel"];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
@@ -63,5 +61,4 @@
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
}

View File

@@ -1,16 +1,19 @@
# 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, pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules =
[ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@@ -27,8 +30,7 @@
fsType = "vfat";
};
swapDevices =
[{ device = "/dev/disk/by-uuid/ecde85bd-abea-4926-80d5-810b01d0e364"; }];
swapDevices = [{device = "/dev/disk/by-uuid/ecde85bd-abea-4926-80d5-810b01d0e364";}];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -1,11 +1,9 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ../home/home_common.nix ];
home = {
packages = with pkgs; [
docker
docker-compose
];
};
config,
pkgs,
inputs,
...
}: {
imports = [../home/home_common.nix];
home = {packages = with pkgs; [docker docker-compose];};
}

View File

@@ -1,9 +1,12 @@
{ pkgs, lib, ... }: {
{
pkgs,
lib,
...
}: {
networking.firewall = {
enable = true;
allowedTCPPorts = [ 80 443 22 26615 ];
allowedUDPPorts = [ 26615 ];
allowedTCPPorts = [80 443 22 26615];
allowedUDPPorts = [26615];
};
security.acme = {
@@ -11,18 +14,18 @@
defaults.email = "markers711@gmail.com";
};
virtualisation.docker = { enable = true; };
virtualisation.docker = {enable = true;};
services = {
openssh = { enable = true; };
openssh = {enable = true;};
jellyfin = { enable = true; };
jellyfin = {enable = true;};
fail2ban = { enable = true; };
fail2ban = {enable = true;};
postgresql = { enable = true; };
postgresql = {enable = true;};
i2p = { enable = true; };
i2p = {enable = true;};
nix-serve = {
enable = true;
@@ -32,7 +35,7 @@
ollama = {
enable = true;
package = pkgs.ollama-intel;
};
};
gitea = {
enable = true;
@@ -64,13 +67,13 @@
home-assistant = {
enable = true;
extraComponents = [ "wiz" "fail2ban" "ollama" "wyoming" ];
extraComponents = ["wiz" "fail2ban" "ollama" "wyoming"];
config = {
default_config = { };
default_config = {};
"automation ui" = "!include automations.yaml";
http = {
use_x_forwarded_for = "true";
trusted_proxies = [ "127.0.0.1" ];
trusted_proxies = ["127.0.0.1"];
server_port = 8003;
};
};
@@ -79,13 +82,13 @@
wyoming = {
piper.servers."piperNix" = {
enable = true;
uri = "tcp://0.0.0.0:10200";
voice = "en-us-ryan-low";
uri = "tcp://0.0.0.0:10200";
voice = "en-us-ryan-low";
};
faster-whisper.servers."whisperNix" = {
enable = true;
uri = "tcp://0.0.0.0:10300";
language = "en";
uri = "tcp://0.0.0.0:10300";
language = "en";
};
};
@@ -94,7 +97,7 @@
settings = {
server.port = 8005;
server.secret_key = "secretlol";
search.formats = ["html" "json"];
search.formats = ["html" "json"];
};
};
@@ -109,7 +112,7 @@
email = "markers711@gmail.com";
registration_open = false;
};
"Pleroma.Web.Endpoint" = { url.host = "fed.dhilton.xyz"; };
"Pleroma.Web.Endpoint" = {url.host = "fed.dhilton.xyz";};
};
};
nginx = {
@@ -124,7 +127,6 @@
recommendedTlsSettings = true;
virtualHosts = {
"dhilton.xyz" = {
enableACME = true;
forceSSL = true;
@@ -167,9 +169,9 @@
};
};
"nix.dhilton.xyz" = {
locations."/".proxyPass = "http://127.0.0.1:5000";
};
"nix.dhilton.xyz" = {
locations."/".proxyPass = "http://127.0.0.1:5000";
};
};
};
};