Gonna revert and modify the original flake, add back overlays from a shared file, and figure things out after

This commit is contained in:
Jimbo 2024-10-12 19:41:05 -04:00
parent 65f90a0bf3
commit 4ad26636a7
17 changed files with 116 additions and 14 deletions

View file

@ -1,9 +1,5 @@
{ ... }:
{
imports = [
./users
];
nixpkgs.config.allowUnfree = true;
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

View file

@ -1,5 +1,8 @@
{pkgs, ...}: {
home.file = {
"VMs" = {
source = config.lib.file.mkOutOfStoreSymlink "/etc/libvirt/VMs";
};
".face" = {
source = ./assets/user-icon.png;
};

View file

@ -0,0 +1,12 @@
{ ... }:
{
imports = [
../../../home
../../../home/users
../../../home/files
../../../home/settings
../../../home/programs
../../../home/sway
../../../home/utils
];
}

View file

@ -0,0 +1,17 @@
{ ... }:
{
imports = [
../../../system
../../../system/accounts
../../../system/desktop
../../../system/devices
../../../system/devices/networking/firewall/server
../../../system/programs
../../../system/services
];
networking.hostName = "firefly";
# Force Electron to use Wayland
environment.sessionVariables.NIXOS_OZONE_WL = "1";
}

View file

@ -0,0 +1,14 @@
{ ... }:
{
imports = [
../../../home
../../../home/users
../../../home/programs/fastfetch
../../../home/programs/git
../../../home/programs/ncmpcpp
../../../home/programs/neovim
../../../home/programs/ranger
../../../home/programs/tmux
../../../home/utils/zsh
];
}

View file

@ -0,0 +1,17 @@
{ ... }:
{
imports = [
../../../system
../../../system/accounts
../../../system/devices/filesystems
../../../system/devices/networking
../../../system/devices/networking/firewall/server
../../../system/devices/networking/wireguard/server
../../../system/programs/git
../../../system/programs/security
../../../system/services/common
../../../system/services/server
];
networking.hostName = "cyberspark";
}

View file

@ -1,4 +1,6 @@
{ ... }:
{
users.groups.nfsShare = {};
users.groups.nfsShare = {
gid = 983;
};
}

View file

@ -4,6 +4,7 @@
nextcloud = {
extraGroups = [ "nginx" ];
isSystemUser = true;
uid = 155;
};
};
}

View file

@ -3,6 +3,7 @@
nextcloud = {
extraGroups = [ "nfsShare" ];
isSystemUser = true;
uid = 995;
};
};
}

View file

@ -4,6 +4,7 @@
nginx = {
extraGroups = [ "turnserver" "virtualMail" ];
isSystemUser = true;
uid = 60;
};
};
}

View file

@ -1,12 +1,5 @@
{ outputs, config, pkgs, ... }: {
imports = [
./accounts
./modules/networking
./modules/overlays
./programs/git
./services/garbage-collection
];
{ outputs, config, pkgs, ... }:
{
nix = {
settings = {
experimental-features = "nix-command flakes";
@ -36,5 +29,9 @@
packages = with pkgs; [ terminus_font ];
};
nixpkgs.config.allowUnfree = true;
hardware.enableRedistributableFirmware = true;
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "24.05";
}

View file

@ -0,0 +1,6 @@
{ ... }:
{
imports = [
./ssh
];
}

View file

@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./common
./pc
];
}

View file

@ -0,0 +1,10 @@
{ ... }:
{
imports = [
./mpd
./networkfs
./school
./sunshine
./virtualization/qemu
];
}

View file

@ -0,0 +1,18 @@
{ ... }:
{
imports = [
./acme
./ddclient
./fileserver
./forgejo
./icecast
./mailserver
./minecraft
./misc
./mysql
./nginx
./social
./transmission
./vaultwarden
];
}