Move machines config into relevant hosts section

This commit is contained in:
Evie Litherland-Smith 2023-06-22 09:27:39 +01:00
parent cb9ff03a5b
commit 2b5a31d1bf
3 changed files with 38 additions and 10 deletions

View file

@ -28,7 +28,12 @@
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
./hosts/N0245/configuration.nix ./hosts/N0245/configuration.nix
./machines/N0245 ./common.nix
./hardware/audio.nix
./hardware/bluetooth.nix
./locales/en_GB.nix
./wm/sway.nix
./services/syncthing/N0245.nix
]; ];
}; };
}; };

View file

@ -1,14 +1,11 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{pkgs, ...}: {
{ config, pkgs, ... }: imports = [
# Include the results of the hardware scan.
{ ./hardware-configuration.nix
imports = ];
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
nix.package = pkgs.nixUnstable; nix.package = pkgs.nixUnstable;
nix.extraOptions = '' nix.extraOptions = ''
@ -28,6 +25,33 @@
boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd"; boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd";
boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".keyFile = "/crypto_keyfile.bin"; boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".keyFile = "/crypto_keyfile.bin";
networking.hostName = "N0245"; # Define your hostname.
system.autoUpgrade = {
enable = false;
allowReboot = false;
};
environment.etc."ppp/options".text = ''
ipcp-accept-remote
'';
users.users.elitherl = {
isNormalUser = true;
description = "Evie Litherland-Smith";
extraGroups = ["networkmanager" "wheel"];
shell = pkgs.fish;
};
home-manager.users.elitherl = import ./home.nix;
services.greetd = {
enable = true;
settings = rec {
initial_session = {
command = "sway";
user = "elitherl";
};
default_session = initial_session;
};
};
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave # on your system were taken. Its perfectly fine and recommended to leave
@ -35,5 +59,4 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
} }