punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: MarleyNet fixes

Browse source
This commit is contained in:
punkfairie 2025-03-01 18:38:36 -08:00
parent 1dd2885896
commit 863dc77e3d
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
6 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
homes/x86_64-linux/marley@marleynet/default.nix Normal file
View file

@ -0,0 +1,9 @@
{lib, ...}: let
inherit (lib.marleyos) enabled;
in {
marleyos = {
bundles.server = enabled;
};
home.stateVersion = "24.05";
}

2
modules/nixos/base/boot/default.nix
View file

@ -5,4 +5,6 @@
... ...
}: { }: {
boot.kernelPackages = lib.mkIf (!config.marleyos.isServer) pkgs.linuxPackages_xanmod; boot.kernelPackages = lib.mkIf (!config.marleyos.isServer) pkgs.linuxPackages_xanmod;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
} }

2
modules/nixos/bundles/desktop/default.nix
View file

@ -11,6 +11,8 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
marleyos = { marleyos = {
isDesktop = lib.mkDefault true;
mounts = { mounts = {
automounts = enabled; automounts = enabled;
babeshare = enabled; babeshare = enabled;

2
modules/nixos/bundles/server/default.nix
View file

@ -11,6 +11,8 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
marleyos = { marleyos = {
isServer = lib.mkDefault true;
appearance = { appearance = {
base = enabled; base = enabled;
console = enabled; console = enabled;

9
systems/x86_64-linux/marleynet/default.nix
View file

@ -3,15 +3,18 @@
in { in {
imports = [./hardware-configuration.nix]; imports = [./hardware-configuration.nix];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "marleynet"; networking.hostName = "marleynet";
marleyos = {
bundles.server = enabled;
};
users.users.marley.openssh.authorizedKeys.keys = [ users.users.marley.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcKsDGK8C5W6eRsJQSdAOTFVZnkKRWjnyn4iDR8zMi7 marley@nyx" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcKsDGK8C5W6eRsJQSdAOTFVZnkKRWjnyn4iDR8zMi7 marley@nyx"
# iphone # iphone
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius"
]; ];
system.stateVersion = "24.05";
} }

3
systems/x86_64-linux/nyx/default.nix
View file

@ -3,9 +3,6 @@
in { in {
imports = [./hardware-configuration.nix ./mounts.nix ./autorandr.nix]; imports = [./hardware-configuration.nix ./mounts.nix ./autorandr.nix];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "nyx"; networking.hostName = "nyx";
# For local dev. # For local dev.