Make a hosts folder for system and home, remove legacy.nix cause I never used it, change some comments
This commit is contained in:
Jimbo
parent
1a096662e1
commit
d9469fc321
36 changed files with 380 additions and 402 deletions
|
|
@ -14,10 +14,8 @@
|
|||
outputs.overlays.finalprev
|
||||
];
|
||||
|
||||
# Configure your nixpkgs instance
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
# Allow unfree apps
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
# Enable flakes and garbage collection
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./base.nix
|
||||
|
||||
# Import users and groups
|
||||
./users/jimbo.nix
|
||||
./users/groups.nix
|
||||
|
||||
# Desktop only
|
||||
./desktop/misc.nix
|
||||
./desktop/sway.nix
|
||||
./desktop/greetd-sway.nix
|
||||
./desktop/printing.nix
|
||||
./desktop/gaming.nix
|
||||
./desktop/pipewire.nix
|
||||
./desktop/bluetooth.nix
|
||||
./desktop/firewall.nix
|
||||
./desktop/fonts.nix
|
||||
./desktop/qt.nix
|
||||
|
||||
# Modules
|
||||
./modules/security.nix
|
||||
./modules/legacy.nix
|
||||
|
||||
# Hardware
|
||||
./hardware/machines/desktop.nix
|
||||
./hardware/systemdboot.nix
|
||||
./hardware/opengl.nix
|
||||
./hardware/filesystems.nix
|
||||
./hardware/nvidia.nix
|
||||
#./hardware/nouveau.nix
|
||||
|
||||
# Services
|
||||
./services/openssh.nix
|
||||
./services/gnome-keyring.nix
|
||||
./services/qemukvm.nix
|
||||
#./services/waydroid.nix
|
||||
./services/udev.nix
|
||||
./services/sunshine.nix
|
||||
./services/mpd.nix
|
||||
];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimDesktop";
|
||||
|
||||
# Force Electron to use Wayland
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
# Forces the function keys to work right on Macbooks
|
||||
boot.extraModprobeConfig = ''
|
||||
options hid_apple fnmode=2
|
||||
'';
|
||||
}
|
||||
51
system/hosts/JimDesktop/configuration.nix
Normal file
51
system/hosts/JimDesktop/configuration.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./../../base.nix
|
||||
|
||||
# Import users and groups
|
||||
./../../users/jimbo.nix
|
||||
./../../users/groups.nix
|
||||
|
||||
# Desktop
|
||||
./../../desktop/misc.nix
|
||||
./../../desktop/sway.nix
|
||||
./../../desktop/greetd-sway.nix
|
||||
./../../desktop/printing.nix
|
||||
./../../desktop/gaming.nix
|
||||
./../../desktop/pipewire.nix
|
||||
./../../desktop/bluetooth.nix
|
||||
./../../desktop/firewall.nix
|
||||
./../../desktop/fonts.nix
|
||||
./../../desktop/qt.nix
|
||||
|
||||
# Modules
|
||||
./../../modules/security.nix
|
||||
|
||||
# Hardware
|
||||
./hardware-configuration.nix
|
||||
./../../modules/systemdboot.nix
|
||||
./../../modules/opengl.nix
|
||||
./../../modules/filesystems.nix
|
||||
./../../modules/nvidia.nix
|
||||
#./../../modules/nouveau.nix
|
||||
|
||||
# Services
|
||||
./../../services/openssh.nix
|
||||
./../../services/gnome-keyring.nix
|
||||
./../../services/qemukvm.nix
|
||||
./../../services/udev.nix
|
||||
./../../services/sunshine.nix
|
||||
./../../services/mpd.nix
|
||||
#./../../services/waydroid.nix
|
||||
];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimDesktop";
|
||||
|
||||
# Force Electron to use Wayland
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
45
system/hosts/JimLenovo/configuration.nix
Normal file
45
system/hosts/JimLenovo/configuration.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./../../base.nix
|
||||
|
||||
# Import users and groups
|
||||
./../../users/jimbo.nix
|
||||
./../../users/groups.nix
|
||||
|
||||
# Desktop
|
||||
./../../desktop/misc.nix
|
||||
./../../desktop/sway.nix
|
||||
./../../desktop/greetd-sway.nix
|
||||
./../../desktop/printing.nix
|
||||
./../../desktop/gaming.nix
|
||||
./../../desktop/pipewire.nix
|
||||
./../../desktop/bluetooth.nix
|
||||
./../../desktop/firewall.nix
|
||||
./../../desktop/fonts.nix
|
||||
./../../desktop/qt.nix
|
||||
|
||||
# Laptop/Portable only
|
||||
./../../modules/wireless.nix
|
||||
|
||||
# Modules
|
||||
./../../modules/security.nix
|
||||
|
||||
# Hardware
|
||||
./hardware-configuration.nix
|
||||
./../../modules/systemdboot.nix
|
||||
./../../modules/opengl.nix
|
||||
|
||||
# Services
|
||||
./../../services/openssh.nix
|
||||
./../../services/gnome-keyring.nix
|
||||
./../../services/udev.nix
|
||||
./../../services/mpd.nix
|
||||
];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimLenovo";
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
49
system/hosts/JimPine/configuration.nix
Normal file
49
system/hosts/JimPine/configuration.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{lib, outputs, ...}: {
|
||||
imports = [
|
||||
# Base configs
|
||||
./../../base.nix
|
||||
|
||||
# Import users and groups
|
||||
./../../users/jimbo.nix
|
||||
./../../users/groups.nix
|
||||
|
||||
# Desktop
|
||||
./../../desktop/misc.nix
|
||||
./../../desktop/sway.nix
|
||||
./../../desktop/greetd-sway.nix
|
||||
./../../desktop/printing.nix
|
||||
./../../desktop/pipewire.nix
|
||||
./../../desktop/bluetooth.nix
|
||||
./../../desktop/firewall.nix
|
||||
./../../desktop/fonts.nix
|
||||
./../../desktop/qt.nix
|
||||
./../../desktop/wireguard.nix
|
||||
|
||||
# Modules
|
||||
./../../modules/security.nix
|
||||
|
||||
# Hardware
|
||||
./hardware-configuration.nix
|
||||
./../../modules/extlinux.nix
|
||||
./../../modules/opengl.nix
|
||||
./../../modules/filesystems.nix
|
||||
./../../modules/wireless.nix
|
||||
|
||||
# Services
|
||||
./../../services/openssh.nix
|
||||
./../../services/gnome-keyring.nix
|
||||
./../../services/mpd.nix
|
||||
];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimPine";
|
||||
|
||||
# Disable 32 bit graphics
|
||||
hardware.opengl.driSupport32Bit = lib.mkForce false;
|
||||
|
||||
# Set the VPN IP per machine
|
||||
networking.wireguard.interfaces."${outputs.ips.wgInt}".ips = [ "${outputs.ips.wgSpan}.17/24" ];
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
63
system/hosts/JimServer/configuration.nix
Normal file
63
system/hosts/JimServer/configuration.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./../../base.nix
|
||||
|
||||
# Import users and groups
|
||||
./../../users/jimbo.nix
|
||||
./../../users/nextcloud.nix
|
||||
./../../users/nginx.nix
|
||||
./../../users/liquidsoap.nix
|
||||
./../../users/groups.nix
|
||||
|
||||
# Modules
|
||||
./../../modules/security.nix
|
||||
|
||||
# Hardware
|
||||
./hardware-configuration.nix
|
||||
./../../hardware/systemdboot.nix
|
||||
|
||||
# Services
|
||||
./../../services/openssh.nix
|
||||
./../../server/acme.nix
|
||||
./../../server/ddclient.nix
|
||||
./../../server/icecast.nix
|
||||
./../../server/firewall.nix
|
||||
./../../server/forgejo.nix
|
||||
./../../server/mailserver.nix
|
||||
./../../server/mariadb.nix
|
||||
./../../server/nginx.nix
|
||||
./../../server/owncast.nix
|
||||
./../../server/photoprism.nix
|
||||
./../../server/minecraft
|
||||
./../../server/vaultwarden.nix
|
||||
./../../server/transmission.nix
|
||||
./../../server/wireguard.nix
|
||||
./../../server/misc.nix
|
||||
|
||||
# File server
|
||||
./../../server/nextcloud.nix
|
||||
./../../server/nfs.nix
|
||||
./../../server/samba.nix
|
||||
|
||||
# Matrix
|
||||
./../../server/synapse.nix
|
||||
./../../server/element.nix
|
||||
./../../server/coturn.nix
|
||||
./../../server/matrix-discord.nix
|
||||
|
||||
# Federation
|
||||
./../../server/lemmy.nix
|
||||
./../../server/mastodon.nix
|
||||
./../../server/pixelfed.nix
|
||||
];
|
||||
|
||||
# Set custom openssh port
|
||||
services.openssh.ports = [ 2222 ];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimServer";
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./base.nix
|
||||
|
||||
# Import users and groups
|
||||
./users/jimbo.nix
|
||||
./users/groups.nix
|
||||
|
||||
# Desktop only
|
||||
./desktop/misc.nix
|
||||
./desktop/sway.nix
|
||||
./desktop/greetd-sway.nix
|
||||
./desktop/printing.nix
|
||||
./desktop/gaming.nix
|
||||
./desktop/pipewire.nix
|
||||
./desktop/bluetooth.nix
|
||||
./desktop/firewall.nix
|
||||
./desktop/fonts.nix
|
||||
./desktop/qt.nix
|
||||
|
||||
# Laptop/Portable only
|
||||
./hardware/wireless.nix
|
||||
|
||||
# Modules
|
||||
./modules/security.nix
|
||||
./modules/legacy.nix
|
||||
|
||||
# Hardware
|
||||
./hardware/machines/lenovo.nix
|
||||
./hardware/systemdboot.nix
|
||||
./hardware/opengl.nix
|
||||
|
||||
# Services
|
||||
./services/openssh.nix
|
||||
./services/gnome-keyring.nix
|
||||
./services/udev.nix
|
||||
./services/mpd.nix
|
||||
];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimLenovo";
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{config, inputs, lib, ...}: {
|
||||
# This will add each flake input as a registry to make nix commands consistent with your flake
|
||||
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
||||
|
||||
# This will add your inputs to the system's legacy channels making legacy nix commands consistent
|
||||
nix.nixPath = ["/etc/nix/path"];
|
||||
environment.etc =
|
||||
lib.mapAttrs'
|
||||
(name: value: {
|
||||
name = "nix/path/${name}";
|
||||
value.source = value.flake;
|
||||
})
|
||||
config.nix.registry;
|
||||
}
|
||||
|
|
@ -5,8 +5,7 @@
|
|||
doas = {
|
||||
enable = true;
|
||||
extraRules = [
|
||||
# Give wheel root access, allow persistant session
|
||||
{
|
||||
{ # Give wheel root access
|
||||
groups = ["wheel"];
|
||||
keepEnv = true;
|
||||
persist = true;
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
{lib, outputs, ...}: {
|
||||
imports = [
|
||||
# Base configs
|
||||
./base.nix
|
||||
|
||||
# Import users and groups
|
||||
./users/jimbo.nix
|
||||
./users/groups.nix
|
||||
|
||||
# Desktop
|
||||
./desktop/misc.nix
|
||||
./desktop/sway.nix
|
||||
./desktop/greetd-sway.nix
|
||||
./desktop/printing.nix
|
||||
./desktop/pipewire.nix
|
||||
./desktop/bluetooth.nix
|
||||
./desktop/firewall.nix
|
||||
./desktop/fonts.nix
|
||||
./desktop/qt.nix
|
||||
./desktop/wireguard.nix
|
||||
|
||||
# Laptop/Portable
|
||||
./hardware/wireless.nix
|
||||
|
||||
# Modules
|
||||
./modules/security.nix
|
||||
./modules/legacy.nix
|
||||
|
||||
# Hardware
|
||||
./hardware/machines/pinebook.nix
|
||||
./hardware/extlinux.nix
|
||||
./hardware/opengl.nix
|
||||
./hardware/filesystems.nix
|
||||
|
||||
# Services
|
||||
./services/openssh.nix
|
||||
./services/gnome-keyring.nix
|
||||
./services/mpd.nix
|
||||
];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimPine";
|
||||
|
||||
# Disable 32 bit graphics
|
||||
hardware.opengl.driSupport32Bit = lib.mkForce false;
|
||||
|
||||
# Set the VPN IP per machine
|
||||
networking.wireguard.interfaces."${outputs.ips.wgInt}".ips = [ "${outputs.ips.wgSpan}.17/24" ];
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
# Base configs
|
||||
./base.nix
|
||||
|
||||
# Import users and groups
|
||||
./users/jimbo.nix
|
||||
./users/nextcloud.nix
|
||||
./users/nginx.nix
|
||||
./users/liquidsoap.nix
|
||||
./users/groups.nix
|
||||
|
||||
# Modules
|
||||
./modules/security.nix
|
||||
./modules/legacy.nix
|
||||
|
||||
# Hardware
|
||||
./hardware/machines/server.nix
|
||||
./hardware/systemdboot.nix
|
||||
|
||||
# Services
|
||||
./services/openssh.nix
|
||||
./server/acme.nix
|
||||
./server/ddclient.nix
|
||||
./server/icecast.nix
|
||||
./server/firewall.nix
|
||||
./server/forgejo.nix
|
||||
./server/mailserver.nix
|
||||
./server/mariadb.nix
|
||||
./server/nginx.nix
|
||||
./server/owncast.nix
|
||||
./server/photoprism.nix
|
||||
./server/minecraft
|
||||
./server/vaultwarden.nix
|
||||
./server/transmission.nix
|
||||
./server/wireguard.nix
|
||||
./server/misc.nix
|
||||
|
||||
# File server
|
||||
./server/nextcloud.nix
|
||||
./server/nfs.nix
|
||||
./server/samba.nix
|
||||
|
||||
# Matrix
|
||||
./server/synapse.nix
|
||||
./server/element.nix
|
||||
./server/coturn.nix
|
||||
./server/matrix-discord.nix
|
||||
|
||||
# Federation
|
||||
./server/lemmy.nix
|
||||
./server/mastodon.nix
|
||||
./server/pixelfed.nix
|
||||
];
|
||||
|
||||
# Set custom openssh port
|
||||
services.openssh.ports = [ 2222 ];
|
||||
|
||||
# Set hostname
|
||||
networking.hostName = "JimServer";
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "24.05";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue