passing all tests for all systems

This commit is contained in:
Anish Lakhwara
2022-12-07 02:01:17 +10:00
parent 07b611690e
commit 4f2bb9479e
18 changed files with 142 additions and 97 deletions
-1
View File
@@ -2,7 +2,6 @@
{
imports = [
./configuration.nix
../users/anish
../profiles/core
../profiles/server
../profiles/taskd
+1
View File
@@ -49,4 +49,5 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nixpkgs.hostPlatform = "x86_64-linux";
}
+7 -3
View File
@@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
[
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
@@ -14,16 +15,19 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/9233d8be-539f-43c8-9b83-84b5b4d72a93";
{
device = "/dev/disk/by-uuid/9233d8be-539f-43c8-9b83-84b5b4d72a93";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E00D-9070";
{
device = "/dev/disk/by-uuid/E00D-9070";
fsType = "vfat";
};
swapDevices = [ ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nixpkgs.hostPlatform = "x86_64-linux";
}
+1 -1
View File
@@ -1,4 +1,4 @@
{ self, inputs, pkgs, ... }:
{ self, pkgs, ... }:
{
imports = [
./configuration.nix
+1
View File
@@ -47,4 +47,5 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nixpkgs.hostPlatform = "x86_64-linux";
}
+1 -12
View File
@@ -10,18 +10,6 @@
../profiles/wireguard-server
];
# Capsul specific
users.users.cyberian = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
mossnet.wg = {
enable = true;
ips = [ "10.0.69.5/24" ];
privateKeyFile = "/home/anish/wg/wg-priv";
};
# mossnet.backup = {
# enable = false;
# name = "sealight";
@@ -34,4 +22,5 @@
# databases = [ "matrix-synapse" "gitea" ];
# location = "/var/backup/postgresql";
# };
}
+1
View File
@@ -23,4 +23,5 @@
swapDevices = [ ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nixpkgs.hostPlatform = "x86_64-linux";
}
+12 -1
View File
@@ -2,7 +2,6 @@
{
imports = [
./configuration.nix
../users/anish
../profiles/core
../profiles/server
../profiles/metrics
@@ -12,4 +11,16 @@
../profiles/freshrss
];
# Capsul specific
users.users.cyberian = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
mossnet.wg = {
enable = true;
ips = [ "10.0.69.5/24" ];
privateKeyFile = "/home/anish/wg/wg-priv";
};
}
+1
View File
@@ -23,4 +23,5 @@
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 1;
nixpkgs.hostPlatform = "x86_64-linux";
}
+1 -1
View File
@@ -2,7 +2,7 @@
let inherit (lib) fileContents;
in
{
imports = [ ../cachix ];
imports = [ ../../users/anish ];
fonts = {
+2 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ self, config, lib, pkgs, ... }:
{
age.secrets.freshrss-dbpass.file = "${self}/secrets/freshrss-dbpass.age";
@@ -7,6 +7,7 @@
enable = true;
virtualHost = "rss.sealight.xyz";
baseUrl = "https://rss.sealight.xyz/";
passwordFile = "/run/agenix/freshrss-dbpass";
database = {
type = "pgsql";
passFile = "/run/agenix/freshrss-dbpass";
+6 -4
View File
@@ -2,9 +2,11 @@
# grafana configuration
services.grafana = {
enable = true;
domain = "stats.mossnet.lan";
port = 2342;
addr = "127.0.0.1";
settings.server = {
domain = "stats.mossnet.lan";
http_port = 2342;
http_addr = "127.0.0.1";
};
};
# nginx reverse proxy
@@ -26,7 +28,7 @@
port = 9002;
};
dnsmasq = {
enable = true;
enable = false;
port = 9153;
};
};
+1
View File
@@ -5,6 +5,7 @@
serviceConfig.Type = "oneshot";
path = [
pkgs.git
pkgs.openssh
pkgs.coreutils
];
script = ''
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, inputs, ... }:
{ pkgs, ... }:
{
systemd.services.website-deploy = {
@@ -8,7 +8,7 @@
pkgs.coreutils
pkgs.nixUnstable
pkgs.openssh
inputs.deploy.packages.${pkgs.system}.deploy-rs
pkgs.deploy
];
script = ''
cd /etc/nixos/ # TODO make variable
+1 -15
View File
@@ -1,8 +1,6 @@
{ hmUsers, pkgs, ... }:
{ pkgs, ... }:
{
#home-manager.users = { inherit (hmUsers) anish; };
users.users.anish = {
description = "Personal user for Anish";
hashedPassword = "$y$j9T$y3DPt/dWaPE.gRazQqw1w0$1RMH5sl/Nu8kW3ZMywYCPRniHD/jF5qRh0VKrdJ.bV2";
@@ -16,16 +14,4 @@
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtU2GMYjXj6RGO1+mwM4TDGOo0qrKLTL4Di8+QgDX0p5vUEsnE1PS9wnuqCmSu75U8g0XIAMtvtdYyGk1N+Bx01erAZpT8DLYtIXFCyaiN28PVu5T1D0T+TQ7xgIH1qenXZR2DOQdf6kpvKEfm7+7bWhCo0N/KFMpmReubyzHDQcq/1qQasxTL+YALQFOjwKqsOTBXbHwZ103AEAcQX4ftBFEOfVli4/1aKIK4dNSZYB7J9Htq707YnsEqo9RLAMh0aOTTYgTx9AoSUDeqGuh/AGkcB7NcS7EEtI6d5YUGylwZh/gF6hqE0jl8kn2m5jMKXL3CRohZvjifue8x/GIjpu5WRabUuhBEbrfTQQaC7taHnt5rvYCGzKZx09TexUzhuz2CL480DRoxSG+P+lCNm1dIg/EZrnGEzXCSr36PlOqS5t5gm8tPkzCmZf2wU15A3ZIYUPmnYLqsn4WmIV7rKmdqt2ctWELUXow3PPiZXBucP9P3xpsYEfF1SB2SGNc= u0_a139@localhost"
];
};
home-manager.users.anish.home.stateVersion = "22.05";
# home-manager.users.anish.programs.git = {
# userName = "Anish Lakhwara";
# userEmail = "anish+git@lakhwara.com";
# delta.enable = true;
# };
#home-manager.users.anish = { suites, ... }: {
# imports = suites.gui;
#};
}