Koen/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First test of all machines

Browse source
This commit is contained in:
KoenDR06 2025-02-27 22:12:26 +01:00
parent b963380a0a
commit 1d0209fac3
16 changed files with 268 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1736373539,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"lastModified": 1739757849,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1739055578,
"narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
"lastModified": 1740603184,
"narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
"rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
"type": "github"
},
"original": {
@ -47,11 +47,11 @@
]
},
"locked": {
"lastModified": 1736549395,
"narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
"lastModified": 1740569341,
"narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
"owner": "pjones",
"repo": "plasma-manager",
"rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
"rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
"type": "github"
},
"original": {

15
flake.nix
View file

@ -41,7 +41,10 @@
nixosConfigurations = {
luna = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
headless = false;
};
modules = [
./machines/luna/configuration.nix
home-manager.nixosModules.home-manager
@ -52,7 +55,10 @@
];
};
terra = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
headless = false;
};
modules = [
./machines/terra/configuration.nix
home-manager.nixosModules.home-manager
@ -63,7 +69,10 @@
];
};
solis = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = {
inherit inputs outputs;
headless = true;
};
modules = [
./machines/solis/configuration.nix
sops-nix.nixosModules.sops

4
machines/luna/configuration.nix
View file

@ -9,8 +9,12 @@
imports = [
./hardware-configuration.nix
./modules.nix
../../modules
];
horseman.username = "horseman";
networking.hostName = "luna";
system.stateVersion = "24.11";

13
machines/luna/modules.nix
View file

@ -6,12 +6,13 @@
pkgs,
...
}: {
imports = [../../modules];
imports = [
../../modules
../../modules/boot/loader/systemd.nix
];
config.horseman = {
username = "horseman";
users.horseman.enable = true;
users.default.enable = true;
base = {
nix.enable = true;
@ -45,5 +46,9 @@
visual.enable = true;
terminal.enable = true;
};
terminal = {
zsh.enable = true;
};
};
}

28
machines/solis/configuration.nix
View file

@ -6,7 +6,33 @@
pkgs,
...
}: {
imports = [];
imports = [
./hardware-configuration.nix
./modules.nix
../../modules
];
horseman.username = "horseman";
networking.hostName = "solis";
systemd.timers."backupSyncthing" = {
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = "weekly";
Persistent = true;
};
};
systemd.services."backupSyncthing" = {
script = ''
/home/horseman/nix-config/misc/backup.sh
'';
serviceConfig = {
Type = "oneshot";
User = "horseman";
};
};
system.stateVersion = "24.11";
}

37
machines/solis/modules.nix Normal file
View file

@ -0,0 +1,37 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
../../modules
../../modules/boot/loader/grub.nix
];
config.horseman = {
users.default.enable = true;
base = {
nix.enable = true;
locale.enable = true;
};
boot = {
loader.grub.enable = true;
};
network = {
mullvad.enable = true;
ssh.enable = true;
syncthing.enable = true;
tailscale.enable = true;
};
apps = {
terminal.enable = true;
};
};
}

10
machines/terra/configuration.nix
View file

@ -6,7 +6,15 @@
pkgs,
...
}: {
imports = [];
imports = [
./hardware-configuration.nix
./modules.nix
../../modules
];
horseman.username = "horseman";
networking.hostName = "terra";
system.stateVersion = "24.11";
}

50
machines/terra/modules.nix Normal file
View file

@ -0,0 +1,50 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
../../modules
../../modules/boot/loader/systemd.nix
];
config.horseman = {
users.default.enable = true;
base = {
nix.enable = true;
locale.enable = true;
};
boot = {
loader.systemd.enable = true;
greeter.sddm.enable = true;
refind.enable = true;
};
wm = {
plasma.enable = true;
};
hardware = {
gpu.nvidia.enable = true;
audio.enable = true;
};
network = {
mullvad.enable = true;
ssh.enable = true;
syncthing.enable = true;
tailscale.enable = true;
};
apps = {
dev.enable = true;
visual.enable = true;
terminal.enable = true;
};
};
}

6
modules/boot/default.nix
View file

@ -1,6 +1,8 @@
{inputs, ...}: {
{inputs, headless, ...}: {
imports = [
./loader/systemd.nix
./greeter/sddm.nix
./refind.nix
( if headless then ./loader/grub.nix else ./loader/systemd.nix )
];
}

23
modules/boot/loader/grub.nix Normal file
View file

@ -0,0 +1,23 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkIf mkOption types;
cfg = config.horseman.boot.loader.grub;
in {
options = {
horseman.boot.loader.grub = {
enable = mkEnableOption "Sets grub as the bootloader";
};
};
config = {
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
boot.loader.grub.configurationLimit = 10;
};
}

24
modules/boot/refind.nix Normal file
View file

@ -0,0 +1,24 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkIf mkOption types;
cfg = config.horseman.boot.refind;
in {
options = {
horseman.boot.refind = {
enable = mkEnableOption "Enables rEFInd, the boot manager";
};
};
config = {
environment.systemPackages = with pkgs; [
refind
efibootmgr
];
};
}

4
modules/default.nix
View file

@ -1,10 +1,10 @@
{inputs, ...}: {
{inputs, headless, ...}: {
imports = [
./apps
./hardware
./network
./terminal
./wm
( if !headless then ./wm else ./empty.nix )
./users
./boot
./base

11
modules/empty.nix Normal file
View file

@ -0,0 +1,11 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkIf mkOption types;
in {
}

2
modules/terminal/zsh.nix
View file

@ -27,7 +27,7 @@ in {
shellAliases = {
clone-dotfiles = "cp -r /home/horseman/nix-config/config/dotfiles/.\* /home/horseman/";
rebuild = "clone-dotfiles && sudo nixos-rebuild switch --flake";
rebuild = "nix fmt && clone-dotfiles && sudo nixos-rebuild switch --flake";
update = "sudo nix flake update && rebuild";
compose = "sudo docker compose";
wolpc = "wakeonlan D8:5E:D3:A8:B1:0A";

48
modules/users/default.nix
View file

@ -1,5 +1,47 @@
{inputs, ...}: {
imports = [
./horseman.nix
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkIf mkOption types;
cfg = config.horseman.users.default;
homeCfg = config.horseman;
in {
options = {
horseman.users.default = {
enable = mkEnableOption "Default user";
};
};
config = {
home-manager = {
extraSpecialArgs = {inherit inputs outputs;};
users.${homeCfg.username} = {
home = {
username = "${homeCfg.username}";
homeDirectory = "/home/${homeCfg.username}";
stateVersion = "24.11";
};
programs = {
home-manager.enable = true;
};
};
};
users.users.horseman = {
initialPassword = "1234";
isNormalUser = true;
openssh.authorizedKeys.keyFiles = [
../../config/ssh/authorized_keys
];
extraGroups = [
"wheel"
"docker"
];
};
};
}

46
modules/users/horseman.nix
View file

@ -1,46 +0,0 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkIf mkOption types;
cfg = config.horseman.users.horseman;
in {
options = {
horseman.users.horseman = {
enable = mkEnableOption "Default user";
};
};
config = {
home-manager = {
extraSpecialArgs = {inherit inputs outputs;};
users.horseman = {
home = {
username = "horseman";
homeDirectory = "/home/horseman";
stateVersion = "24.11";
};
programs = {
home-manager.enable = true;
};
};
};
users.users.horseman = {
initialPassword = "1234";
isNormalUser = true;
openssh.authorizedKeys.keyFiles = [
../../config/ssh/authorized_keys
];
extraGroups = [
"wheel"
"docker"
];
};
};
}