Compare commits
No commits in common. "5859a7232bf16e3cd922ba6bf983427fc27c8b4a" and "afd6aa4072c9d43bc3e7f5faaf13cf9128a29436" have entirely different histories.
5859a7232b
...
afd6aa4072
18 changed files with 220 additions and 491 deletions
78
flake.nix
78
flake.nix
|
|
@ -27,43 +27,31 @@
|
|||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
};
|
||||
outputs =
|
||||
inputs@{ flake-parts, ... }:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } (
|
||||
{ withSystem, self, ... }:
|
||||
{
|
||||
outputs = inputs@{ flake-parts, ... }:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } ({ self, ... }: {
|
||||
imports = [ inputs.devshell.flakeModule ];
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
systems = [ "x86_64-linux" "aarch64-linux" ];
|
||||
flake = {
|
||||
deploy = {
|
||||
sshUser = "root";
|
||||
fastConnection = true;
|
||||
nodes =
|
||||
withSystem "x86_64-linux" (
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nodes = {
|
||||
smolboi = {
|
||||
hostname = "smolboi";
|
||||
profiles.system.path = pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.smolboi;
|
||||
profiles.system.path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos
|
||||
self.nixosConfigurations.smolboi;
|
||||
};
|
||||
zeus = {
|
||||
hostname = "zeus";
|
||||
profiles.system.path = pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.zeus;
|
||||
profiles.system.path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos
|
||||
self.nixosConfigurations.zeus;
|
||||
};
|
||||
}
|
||||
)
|
||||
// withSystem "aarch64-linux" (
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
orangepihole = {
|
||||
hostname = "orangepihole";
|
||||
profiles.system.path = pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.orangepihole;
|
||||
profiles.system.path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos
|
||||
self.nixosConfigurations.orangepihole;
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
nixosConfigurations = {
|
||||
smolboi = inputs.nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -85,7 +73,8 @@
|
|||
inputs.home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.cdombroski = import ./systems/smolboi/home.nix;
|
||||
home-manager.users.cdombroski =
|
||||
import ./systems/smolboi/home.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
@ -116,31 +105,22 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
perSystem =
|
||||
{ pkgs, system, ... }:
|
||||
{
|
||||
_module.args.pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
inputs.deploy-rs.overlay
|
||||
(final: prev: {
|
||||
deploy-rs = {
|
||||
inherit (inputs.nixpkgs.legacyPackages.${system}) deploy-rs;
|
||||
lib = prev.deploy-rs.lib;
|
||||
};
|
||||
})
|
||||
];
|
||||
config = { };
|
||||
};
|
||||
devshells.default = {
|
||||
packages = with pkgs; [
|
||||
deploy-rs.deploy-rs
|
||||
sops
|
||||
];
|
||||
};
|
||||
perSystem = { pkgs, inputs', system, ... }: {
|
||||
# _module.args.pkgs = import inputs'.nixpkgs {
|
||||
# inherit system;
|
||||
# overlays = [
|
||||
# inputs.deploy-rs.overlay
|
||||
# (final: prev: {
|
||||
# deploy-rs = {
|
||||
# inherit (pkgs) deploy-rs;
|
||||
# lib = prev.deploy-rs.lib;
|
||||
# };
|
||||
# })
|
||||
# ];
|
||||
# };
|
||||
devshells.default = { packages = with pkgs; [ deploy-rs sops ]; };
|
||||
checks = inputs.deploy-rs.lib.${system}.deployChecks self.deploy;
|
||||
formatter = pkgs.nixfmt-rfc-style;
|
||||
formatter = pkgs.nixfmt;
|
||||
};
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
imports = builtins.map (n: ./common + "/${n}") (
|
||||
builtins.attrNames (
|
||||
lib.filterAttrs (k: v: v == "regular" && lib.hasSuffix ".nix" k) (builtins.readDir ./common)
|
||||
)
|
||||
);
|
||||
{ lib, ... }: {
|
||||
imports = builtins.map (n: ./common + "/${n}") (builtins.attrNames
|
||||
(lib.filterAttrs (k: v: v == "regular" && lib.hasSuffix ".nix" k)
|
||||
(builtins.readDir ./common)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{ ... }: {
|
||||
time.timeZone = "America/New_York";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
programs.vim.defaultEditor = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
{ config, ... }: {
|
||||
sops.secrets."gmail/password" = { };
|
||||
programs.msmtp = {
|
||||
enable = true;
|
||||
|
|
@ -24,3 +23,4 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{ ... }: {
|
||||
programs.git.enable = true;
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
|
|
@ -7,12 +6,7 @@
|
|||
clean.extraArgs = "--keep-since 7d";
|
||||
};
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
};
|
||||
settings = { experimental-features = [ "nix-command" "flakes" ]; };
|
||||
optimise.automatic = true;
|
||||
};
|
||||
nixpkgs.overlays = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
{ inputs, ... }: {
|
||||
imports = [ inputs.sops-nix.nixosModules.sops ];
|
||||
sops.defaultSopsFile = ../../secrets/secret.yaml;
|
||||
sops.age.sshKeyPaths = [ "/persist/etc/ssh/ssh_host_ed25519_key" ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
sops,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
sops.secrets."root/password" = {
|
||||
neededForUsers = true;
|
||||
};
|
||||
{ pkgs, sops, config, ... }: {
|
||||
sops.secrets."root/password" = { neededForUsers = true; };
|
||||
services.openssh.enable = true;
|
||||
users.mutableUsers = false;
|
||||
users.users.root = {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
{ pkgs, lib, ... }: {
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
themePackages = with pkgs; [ (adi1090x-plymouth-themes.override { selected_themes = [ "owl" ]; }) ];
|
||||
themePackages = with pkgs;
|
||||
[ (adi1090x-plymouth-themes.override { selected_themes = [ "owl" ]; }) ];
|
||||
theme = lib.mkForce "owl";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
inherit (lib)
|
||||
mkIf
|
||||
mkEnableOption
|
||||
mkOption
|
||||
types
|
||||
;
|
||||
inherit (lib) mkIf mkEnableOption mkOption types;
|
||||
cfg = config.services.zwave-js-ui;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.services.zwave-js-ui = {
|
||||
enable = mkEnableOption "zwave-js-ui";
|
||||
store = mkOption {
|
||||
|
|
@ -25,12 +14,10 @@ in
|
|||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertions = [{
|
||||
assertion = !config.services.zwave-js.enable;
|
||||
message = "zwave-js-ui conflicts with zwave-js";
|
||||
}
|
||||
];
|
||||
}];
|
||||
systemd.services.zwave-js-ui = {
|
||||
environment = {
|
||||
STORE_DIR = cfg.store;
|
||||
|
|
|
|||
|
|
@ -4,24 +4,20 @@ let
|
|||
arch = "x64";
|
||||
hash = "sha256:04vg1s86krg7baifcpnqr5zg6jd6nfw0jhjsq09zzpxwg5skxlf7";
|
||||
version = "7.2.1";
|
||||
in
|
||||
{
|
||||
in {
|
||||
recyclarr = prev.recyclarr.overrideAttrs (old: {
|
||||
inherit version;
|
||||
name = "recyclarr-${version}";
|
||||
src = prev.fetchurl {
|
||||
url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz";
|
||||
url =
|
||||
"https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz";
|
||||
inherit hash;
|
||||
};
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/recyclarr \
|
||||
--prefix PATH : ${prev.lib.makeBinPath [ prev.git ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
prev.lib.makeLibraryPath [
|
||||
prev.icu
|
||||
prev.openssl
|
||||
prev.zlib
|
||||
]
|
||||
prev.lib.makeLibraryPath [ prev.icu prev.openssl prev.zlib ]
|
||||
}
|
||||
'';
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
{ lib, buildNpmPackage, fetchFromGitHub }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-ui";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../modules/common.nix
|
||||
../../modules/networkd-base.nix
|
||||
|
|
@ -17,14 +16,8 @@
|
|||
};
|
||||
systemd.network.networks."40-end0" = {
|
||||
matchConfig.Name = "end0";
|
||||
address = [
|
||||
"10.42.69.2/24"
|
||||
"fd72:3dd5:21ae:3c97::2/64"
|
||||
];
|
||||
dns = [
|
||||
"10.42.69.2"
|
||||
"fd72:3dd5:21ae:3c97::2"
|
||||
];
|
||||
address = [ "10.42.69.2/24" "fd72:3dd5:21ae:3c97::2/64" ];
|
||||
dns = [ "10.42.69.2" "fd72:3dd5:21ae:3c97::2" ];
|
||||
domains = [ "icanttype.org" ];
|
||||
gateway = [ "10.42.69.1" ];
|
||||
networkConfig.DHCPServer = true;
|
||||
|
|
@ -34,10 +27,7 @@
|
|||
DNS = "10.42.69.2";
|
||||
EmitRouter = true;
|
||||
Router = "10.42.69.1";
|
||||
SendOption = [
|
||||
"15:string:icanttype.org"
|
||||
"119:string:icanttype.org"
|
||||
];
|
||||
SendOption = [ "15:string:icanttype.org" "119:string:icanttype.org" ];
|
||||
};
|
||||
networkConfig.IPv6SendRA = true;
|
||||
ipv6SendRAConfig.RouterLifetimeSec = 0;
|
||||
|
|
@ -45,12 +35,10 @@
|
|||
ipv6Prefixes = [{ ipv6PrefixConfig.Prefix = "fd72:3dd5:21ae:3c97::/64"; }];
|
||||
};
|
||||
zramSwap.enable = true;
|
||||
swapDevices = [
|
||||
{
|
||||
swapDevices = [{
|
||||
device = "/persist/swapfile";
|
||||
size = 1024;
|
||||
}
|
||||
];
|
||||
}];
|
||||
services = {
|
||||
unbound = {
|
||||
enable = true;
|
||||
|
|
@ -60,15 +48,9 @@
|
|||
do-ip6 = "no";
|
||||
qname-minimisation = "yes";
|
||||
interface = [ "end0" ];
|
||||
access-control = [
|
||||
"10.0.0.0/8 allow"
|
||||
"fc::/7 allow"
|
||||
];
|
||||
access-control = [ "10.0.0.0/8 allow" "fc::/7 allow" ];
|
||||
};
|
||||
include = [
|
||||
"/etc/unbound/ads.conf"
|
||||
"${./unbound-local.conf}"
|
||||
];
|
||||
include = [ "/etc/unbound/ads.conf" "${./unbound-local.conf}" ];
|
||||
};
|
||||
};
|
||||
journald.storage = "volatile";
|
||||
|
|
@ -78,10 +60,7 @@
|
|||
services.adblock = {
|
||||
startAt = "daily";
|
||||
postStop = "systemctl try-reload-or-restart unbound";
|
||||
path = with pkgs; [
|
||||
gawk
|
||||
wget
|
||||
];
|
||||
path = with pkgs; [ gawk wget ];
|
||||
script = ''
|
||||
wget -nv -O - https://raw.githubusercontent.com/hagezi/dns-blocklists/main/unbound/tif.blacklist.conf > /tmp/new.conf
|
||||
echo 'local-zone: "tiktok.com." always_nxdomain' >> /tmp/new.conf
|
||||
|
|
@ -100,11 +79,7 @@
|
|||
];
|
||||
persistence."/persist" = {
|
||||
hideMounts = true;
|
||||
directories = [
|
||||
"/var/lib/nixos"
|
||||
"/var/lib/systemd"
|
||||
"/tmp"
|
||||
];
|
||||
directories = [ "/var/lib/nixos" "/var/lib/systemd" "/tmp" ];
|
||||
files = [
|
||||
"/etc/machine-id"
|
||||
"/etc/adjtime"
|
||||
|
|
@ -118,34 +93,20 @@
|
|||
};
|
||||
|
||||
networking.firewall = {
|
||||
allowedUDPPorts = [
|
||||
53
|
||||
67
|
||||
68
|
||||
];
|
||||
allowedUDPPorts = [ 53 67 68 ];
|
||||
allowedTCPPorts = [ 53 ];
|
||||
};
|
||||
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
sops.secrets."nixremote/sshkey" = { };
|
||||
nix.buildMachines = [
|
||||
{
|
||||
nix.buildMachines = [{
|
||||
hostName = "zeus";
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
systems = [ "x86_64-linux" "aarch64-linux" ];
|
||||
protocol = "ssh-ng";
|
||||
sshKey = config.sops.secrets."nixremote/sshkey".path;
|
||||
sshUser = "nixremote";
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
];
|
||||
}
|
||||
];
|
||||
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
}];
|
||||
programs.ssh.extraConfig = ''
|
||||
Host zeus
|
||||
User nixremote
|
||||
|
|
@ -156,3 +117,4 @@
|
|||
nix.distributedBuilds = false;
|
||||
#nix.settings.max-jobs = 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
|
@ -12,21 +6,13 @@
|
|||
fileSystems."/" = {
|
||||
device = "none";
|
||||
fsType = "tmpfs";
|
||||
options = [
|
||||
"defaults"
|
||||
"mode=755"
|
||||
];
|
||||
options = [ "defaults" "mode=755" ];
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/6df53c4f-42b6-478b-8be4-f7887ad18b5b";
|
||||
fsType = "btrfs";
|
||||
neededForBoot = true;
|
||||
options = [
|
||||
"compress=lzo"
|
||||
"autodefrag"
|
||||
"defaults"
|
||||
"subvol=@nixos/root"
|
||||
];
|
||||
options = [ "compress=lzo" "autodefrag" "defaults" "subvol=@nixos/root" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/a4d76da9-b8eb-4615-9d64-a36e1383da80";
|
||||
|
|
@ -36,15 +22,11 @@
|
|||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/6df53c4f-42b6-478b-8be4-f7887ad18b5b";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"compress=lzo"
|
||||
"autodefrag"
|
||||
"defaults"
|
||||
"subvol=@nixos/nix"
|
||||
];
|
||||
options = [ "compress=lzo" "autodefrag" "defaults" "subvol=@nixos/nix" ];
|
||||
};
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../modules/common.nix
|
||||
../../modules/aarch64-emu.nix
|
||||
|
|
@ -30,17 +29,16 @@
|
|||
|
||||
networking = {
|
||||
hostName = "smolboi"; # Define your hostname.
|
||||
networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
networkmanager.enable =
|
||||
true; # Easiest to use and most distros use this by default.
|
||||
firewall.allowedTCPPorts = [ 22000 ];
|
||||
};
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"electron-25.9.0"
|
||||
"nix-2.16.2"
|
||||
];
|
||||
permittedInsecurePackages = [ "electron-25.9.0" "nix-2.16.2" ];
|
||||
packageOverrides = pkgs: {
|
||||
steam = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ winetricks ]; };
|
||||
steam =
|
||||
pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ winetricks ]; };
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -79,10 +77,7 @@
|
|||
resolved.enable = true;
|
||||
btrfs.autoScrub = {
|
||||
enable = true;
|
||||
fileSystems = [
|
||||
"/"
|
||||
"/home"
|
||||
];
|
||||
fileSystems = [ "/" "/home" ];
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
|
|
@ -180,39 +175,24 @@
|
|||
};
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
writebackDevice = "/dev/disk/by-partuuid/e8f5eaf8-46ca-40de-854a-f6dfe964b92d";
|
||||
writebackDevice =
|
||||
"/dev/disk/by-partuuid/e8f5eaf8-46ca-40de-854a-f6dfe964b92d";
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/persist".options = [
|
||||
"compress=lzo"
|
||||
"autodefrag"
|
||||
"discard=async"
|
||||
"defaults"
|
||||
];
|
||||
"/nix".options = [
|
||||
"compress=lzo"
|
||||
"autodefrag"
|
||||
"discard=async"
|
||||
"noatime"
|
||||
"defaults"
|
||||
];
|
||||
"/steam-library".options = [
|
||||
"compress=lzo"
|
||||
"autodefrag"
|
||||
"discard=async"
|
||||
"defaults"
|
||||
];
|
||||
"/home".options = [
|
||||
"compress=lzo"
|
||||
"autodefrag"
|
||||
"discard=async"
|
||||
"defaults"
|
||||
];
|
||||
"/persist".options =
|
||||
[ "compress=lzo" "autodefrag" "discard=async" "defaults" ];
|
||||
"/nix".options =
|
||||
[ "compress=lzo" "autodefrag" "discard=async" "noatime" "defaults" ];
|
||||
"/steam-library".options =
|
||||
[ "compress=lzo" "autodefrag" "discard=async" "defaults" ];
|
||||
"/home".options =
|
||||
[ "compress=lzo" "autodefrag" "discard=async" "defaults" ];
|
||||
};
|
||||
|
||||
stylix = {
|
||||
image = "${pkgs.kdePackages.breeze}/share/wallpapers/Next/contents/images_dark/2560x1440.png";
|
||||
image =
|
||||
"${pkgs.kdePackages.breeze}/share/wallpapers/Next/contents/images_dark/2560x1440.png";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/solarflare.yaml";
|
||||
fonts = {
|
||||
serif = {
|
||||
|
|
@ -237,3 +217,4 @@
|
|||
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,13 @@
|
|||
# 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,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
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 = [ ];
|
||||
|
|
@ -27,11 +15,7 @@
|
|||
fileSystems."/" = {
|
||||
device = "none";
|
||||
fsType = "tmpfs";
|
||||
options = [
|
||||
"defaults"
|
||||
"size=2g"
|
||||
"mode=755"
|
||||
];
|
||||
options = [ "defaults" "size=2g" "mode=755" ];
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
|
|
@ -75,5 +59,6 @@
|
|||
# networking.interfaces.wlp5s0.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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ pkgs, lib, config, ... }:
|
||||
|
||||
{
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
|
|
@ -102,7 +97,8 @@
|
|||
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "discord" ];
|
||||
permittedInsecurePackages = [ "electron-25.9.0" ];
|
||||
};
|
||||
xdg.configFile."autostart/yakuake.desktop".source = "${pkgs.yakuake}/share/applications/org.kde.yakuake.desktop";
|
||||
xdg.configFile."autostart/yakuake.desktop".source =
|
||||
"${pkgs.yakuake}/share/applications/org.kde.yakuake.desktop";
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../../modules/common.nix
|
||||
../../modules/aarch64-emu.nix
|
||||
|
|
@ -55,9 +54,7 @@
|
|||
Name = "bond0";
|
||||
Kind = "bond";
|
||||
};
|
||||
bondConfig = {
|
||||
Mode = "active-backup";
|
||||
};
|
||||
bondConfig = { Mode = "active-backup"; };
|
||||
};
|
||||
lan-shim = {
|
||||
netdevConfig = {
|
||||
|
|
@ -65,9 +62,7 @@
|
|||
Kind = "macvlan";
|
||||
MACAddress = "3e:53:37:25:08:ef";
|
||||
};
|
||||
macvlanConfig = {
|
||||
Mode = "bridge";
|
||||
};
|
||||
macvlanConfig = { Mode = "bridge"; };
|
||||
};
|
||||
};
|
||||
systemd.network.networks = {
|
||||
|
|
@ -81,10 +76,8 @@
|
|||
};
|
||||
lan-shim = {
|
||||
name = "lan-shim";
|
||||
address = [
|
||||
"10.42.69.100/24"
|
||||
"fd72:3dd5:21ae:3c97:101b:87ff:fe86:5f01/64"
|
||||
];
|
||||
address =
|
||||
[ "10.42.69.100/24" "fd72:3dd5:21ae:3c97:101b:87ff:fe86:5f01/64" ];
|
||||
dns = [ "10.42.69.2" ];
|
||||
domains = [ "icanttype.org" ];
|
||||
gateway = [ "10.42.69.1" ];
|
||||
|
|
@ -107,10 +100,7 @@
|
|||
CONTAINERS = "1";
|
||||
POST = "0";
|
||||
};
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
swag = {
|
||||
image = "lscr.io/linuxserver/swag:2.9.0-ls292";
|
||||
|
|
@ -122,7 +112,8 @@
|
|||
SUBDOMAINS = "wildcard";
|
||||
DNSPLUGIN = "cloudflare";
|
||||
DOCKER_HOST = "dockerproxy";
|
||||
DOCKER_MODS = "linuxserver/mods:swag-dashboard|linuxserver/mods:swag-auto-proxy|linuxserver/mods:universal-docker|linuxserver/mods:universal-cloudflared";
|
||||
DOCKER_MODS =
|
||||
"linuxserver/mods:swag-dashboard|linuxserver/mods:swag-auto-proxy|linuxserver/mods:universal-docker|linuxserver/mods:universal-cloudflared";
|
||||
CF_ZONE_ID = "4e68852334290a922718696a0986e75a";
|
||||
CF_ACCOUNT_ID = "5c1c252b9d9a9af6ea3a5de8590f36fa";
|
||||
CF_API_TOKEN = "mRfY8ubtFUxzVuehI6WFipSQFIcstCNds7RF5FTQ";
|
||||
|
|
@ -131,10 +122,7 @@
|
|||
FILE__CF_TUNNEL_CONFIG = "/config/tunnelconfig.yml";
|
||||
EMAIL = "cdombroski@gmail.com";
|
||||
};
|
||||
ports = [
|
||||
"80:80"
|
||||
"443:443"
|
||||
];
|
||||
ports = [ "80:80" "443:443" ];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
|
|
@ -160,14 +148,8 @@
|
|||
};
|
||||
environmentFiles = [ config.sops.templates."docker.env".path ];
|
||||
labels.swag = "enable";
|
||||
ports = [
|
||||
"1900:1900/udp"
|
||||
"7359:7359/udp"
|
||||
];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
ports = [ "1900:1900/udp" "7359:7359/udp" ];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
zwave-js-ui = {
|
||||
image = "my-zwave-js-ui:latest";
|
||||
|
|
@ -188,133 +170,79 @@
|
|||
swag_url = "zwave.icanttype.org";
|
||||
swag_port = "8091";
|
||||
};
|
||||
extraOptions = [
|
||||
"--network=www"
|
||||
"--device=/dev/ttyACM0:/dev/zwave"
|
||||
];
|
||||
extraOptions = [ "--network=www" "--device=/dev/ttyACM0:/dev/zwave" ];
|
||||
};
|
||||
homeassistant = {
|
||||
image = "lscr.io/linuxserver/homeassistant:latest";
|
||||
volumes = [ "homeassistant-config:/config" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
"--network=lan"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" "--network=lan" ];
|
||||
};
|
||||
postgres = {
|
||||
image = "docker.io/library/postgres:15";
|
||||
volumes = [ "postgres-15:/var/lib/postgresql/data" ];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
calibre = {
|
||||
image = "lscr.io/linuxserver/calibre:latest";
|
||||
volumes = [
|
||||
"calibre-config:/config"
|
||||
"/video-data:/data"
|
||||
];
|
||||
volumes = [ "calibre-config:/config" "/video-data:/data" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
calibre-web = {
|
||||
image = "lscr.io/linuxserver/calibre-web:latest";
|
||||
volumes = [
|
||||
"calibre-web-config:/config"
|
||||
"/video-data:/data"
|
||||
];
|
||||
volumes = [ "calibre-web-config:/config" "/video-data:/data" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
flaresolverr = {
|
||||
image = "ghcr.io/flaresolverr/flaresolverr:latest";
|
||||
environment.LOG_LEVEL = "info";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
qbittorrent = {
|
||||
image = "lscr.io/linuxserver/qbittorrent:latest";
|
||||
volumes = [
|
||||
"qbittorrent-config:/config"
|
||||
"/video-data/torrent:/data/torrent"
|
||||
];
|
||||
volumes =
|
||||
[ "qbittorrent-config:/config" "/video-data/torrent:/data/torrent" ];
|
||||
environment = {
|
||||
TZ = "America/New_York";
|
||||
UMASK_SET = "000";
|
||||
DELUGE_LOGLEVEL = "error";
|
||||
};
|
||||
labels.swag = "enable";
|
||||
ports = [
|
||||
"34996:34996"
|
||||
"34996:34996/udp"
|
||||
];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
ports = [ "34996:34996" "34996:34996/udp" ];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
prowlarr = {
|
||||
image = "lscr.io/linuxserver/prowlarr:latest";
|
||||
volumes = [ "prowlarr-config:/config" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
readarr = {
|
||||
image = "lscr.io/linuxserver/readarr:develop";
|
||||
volumes = [
|
||||
"readarr-config:/config"
|
||||
"/video-data:/data"
|
||||
];
|
||||
volumes = [ "readarr-config:/config" "/video-data:/data" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
radarr = {
|
||||
image = "lscr.io/linuxserver/radarr:latest";
|
||||
volumes = [
|
||||
"radarr-config:/config"
|
||||
"/video-data:/data"
|
||||
];
|
||||
volumes = [ "radarr-config:/config" "/video-data:/data" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
sonarr = {
|
||||
image = "lscr.io/linuxserver/sonarr:latest";
|
||||
volumes = [
|
||||
"sonarr-config:/config"
|
||||
"/video-data:/data"
|
||||
];
|
||||
volumes = [ "sonarr-config:/config" "/video-data:/data" ];
|
||||
environment.TZ = "America/New_York";
|
||||
labels.swag = "enable";
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
static = {
|
||||
image = "docker.io/library/nginx:alpine";
|
||||
|
|
@ -326,55 +254,31 @@
|
|||
swag = "enable";
|
||||
swag_url = "www.icanttype.org";
|
||||
};
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
forgejo = {
|
||||
image = "codeberg.org/forgejo/forgejo:8";
|
||||
volumes = [
|
||||
"forgejo-data:/data"
|
||||
"/etc/localtime:/etc/localtime:ro"
|
||||
];
|
||||
volumes = [ "forgejo-data:/data" "/etc/localtime:/etc/localtime:ro" ];
|
||||
labels = {
|
||||
swag = "enable";
|
||||
swag_url = "git.icanttype.org";
|
||||
swag_port = "3000";
|
||||
};
|
||||
ports = [ "10022:22" ];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
docker_dind = {
|
||||
image = "docker.io/library/docker:dind";
|
||||
cmd = [
|
||||
"dockerd"
|
||||
"-H"
|
||||
"tcp://0.0.0.0:2375"
|
||||
"--tls=false"
|
||||
];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--privileged"
|
||||
"--network=www"
|
||||
];
|
||||
cmd = [ "dockerd" "-H" "tcp://0.0.0.0:2375" "--tls=false" ];
|
||||
extraOptions = [ "--pull=newer" "--privileged" "--network=www" ];
|
||||
};
|
||||
runner = {
|
||||
image = "code.forgejo.org/forgejo/runner:3.4.1";
|
||||
dependsOn = [ "docker_dind" ];
|
||||
environment.DOCKER_HOST = "tcp://docker_dind:2375";
|
||||
volumes = [ "forgejo-runner:/data" ];
|
||||
cmd = [
|
||||
"forgejo-runner"
|
||||
"daemon"
|
||||
];
|
||||
extraOptions = [
|
||||
"--pull=newer"
|
||||
"--network=www"
|
||||
];
|
||||
cmd = [ "forgejo-runner" "daemon" ];
|
||||
extraOptions = [ "--pull=newer" "--network=www" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -383,14 +287,8 @@
|
|||
allowedUDPPorts = [ 53 ];
|
||||
allowedTCPPorts = [ 53 ];
|
||||
};
|
||||
allowedUDPPorts = [
|
||||
137
|
||||
138
|
||||
];
|
||||
allowedTCPPorts = [
|
||||
139
|
||||
445
|
||||
];
|
||||
allowedUDPPorts = [ 137 138 ];
|
||||
allowedTCPPorts = [ 139 445 ];
|
||||
};
|
||||
|
||||
users.users.nixremote = {
|
||||
|
|
@ -414,11 +312,7 @@
|
|||
persistence."/persist" = {
|
||||
enableWarnings = false;
|
||||
hideMounts = true;
|
||||
directories = [
|
||||
"/srv/docker"
|
||||
"/tmp"
|
||||
"/etc/containers/networks"
|
||||
];
|
||||
directories = [ "/srv/docker" "/tmp" "/etc/containers/networks" ];
|
||||
files = [
|
||||
"/etc/machine-id"
|
||||
"/etc/adjtime"
|
||||
|
|
@ -477,3 +371,4 @@
|
|||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
zramSwap.enable = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,13 @@
|
|||
# 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,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ohci_pci"
|
||||
"ehci_pci"
|
||||
"sata_nv"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "ohci_pci" "ehci_pci" "sata_nv" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
|
@ -25,10 +15,7 @@
|
|||
fileSystems."/" = {
|
||||
device = "none";
|
||||
fsType = "tmpfs";
|
||||
options = [
|
||||
"defaults"
|
||||
"mode=755"
|
||||
];
|
||||
options = [ "defaults" "mode=755" ];
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
|
|
@ -86,5 +73,6 @@
|
|||
networking.useDHCP = lib.mkDefault false;
|
||||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue