gerarchia modificata (sono pazzo)

31 files changed, 196 insertions, 41 deletions

diff --git a/flake.nix b/flake.nix
index 43365f9..ec60154 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,25 +24,36 @@
     # NixOS
     nixosConfigurations."hermes" = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs system; };
-      modules = [ ./systems/hermes/nixos ];
+      modules = [ ./systems/hermes ];
+    };
+
+    nixosConfigurations."afrodite" = nixpkgs.lib.nixosSystem {
+      specialArgs = { inherit inputs system; };
+      modules = [ ./systems/afrodite ];
     };
 
     nixosConfigurations."odino" = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs system; };
-      modules = [ ./systems/odino/nixos ];
+      modules = [ ./systems/odino ];
     };
 
     # Home manager
     homeConfigurations."hermes" = home-manager.lib.homeManagerConfiguration {
       extraSpecialArgs = { inherit inputs; };
       pkgs = pkgs;
-      modules = [ ./systems/hermes/home-manager ];
+      modules = [ ./homes/desktop ];
+    };
+
+    homeConfigurations."afrodite" = home-manager.lib.homeManagerConfiguration {
+      extraSpecialArgs = { inherit inputs; };
+      pkgs = pkgs;
+      modules = [ ./homes/server ];
     };
 
     homeConfigurations."odino" = home-manager.lib.homeManagerConfiguration {
       extraSpecialArgs = { inherit inputs; };
       pkgs = pkgs;
-      modules = [ ./systems/odino/home-manager ];
+      modules = [ ./homes/server ];
     };
   };
 }
diff --git a/systems/hermes/home-manager/default.nix b/homes/desktop/default.nix
index bb6ef28..bb6ef28 100644
--- a/systems/hermes/home-manager/default.nix
+++ b/homes/desktop/default.nix
diff --git a/systems/hermes/home-manager/leo/home.nix b/homes/desktop/leo/home.nix
index e0c3d6f..e0c3d6f 100644
--- a/systems/hermes/home-manager/leo/home.nix
+++ b/homes/desktop/leo/home.nix
diff --git a/homes/desktop/leo/programs.nix b/homes/desktop/leo/programs.nix
new file mode 100644
index 0000000..55c0659
--- /dev/null
+++ b/homes/desktop/leo/programs.nix
@@ -0,0 +1,20 @@
+{...}: {
+  imports = [
+    ../../../components/programs/keepassxc.nix
+    ../../../components/programs/alacritty.nix
+    ../../../components/programs/zed.nix
+
+    ../../../components/programs/zsh.nix
+    ../../../components/programs/tmux.nix
+    ../../../components/programs/fastfetch.nix
+  ];
+
+  # Custom modules
+  keepassxc.enable = false;
+  alacritty.enable = true;
+  zed.enable = true;
+
+  zsh.enable = true;
+  tmux.enable = true;
+  fastfetch.enable = true;
+}
diff --git a/systems/odino/home-manager/default.nix b/homes/server/default.nix
index bb6ef28..bb6ef28 100644
--- a/systems/odino/home-manager/default.nix
+++ b/homes/server/default.nix
diff --git a/systems/odino/home-manager/leo/home.nix b/homes/server/leo/default.nix
index e0c3d6f..e0c3d6f 100644
--- a/systems/odino/home-manager/leo/home.nix
+++ b/homes/server/leo/default.nix
diff --git a/homes/server/leo/programs.nix b/homes/server/leo/programs.nix
new file mode 100644
index 0000000..fc7e940
--- /dev/null
+++ b/homes/server/leo/programs.nix
@@ -0,0 +1,12 @@
+{...}: {
+  imports = [
+    ../../../components/programs/zsh.nix
+    ../../../components/programs/tmux.nix
+    ../../../components/programs/fastfetch.nix
+  ];
+
+  # Custom modules
+  zsh.enable = true;
+  tmux.enable = true;
+  fastfetch.enable = true;
+}
diff --git a/systems/afrodite/boot.nix b/systems/afrodite/boot.nix
new file mode 100644
index 0000000..fccaeac
--- /dev/null
+++ b/systems/afrodite/boot.nix
@@ -0,0 +1,19 @@
+{pkgs, ...}: {
+  boot = {
+    kernelPackages = pkgs.linuxPackages_6_18; # NOTE: soltanto versioni LTS per il server
+    #kernelModules = [ "kvm-intel" ];
+    kernelParams = [ "boot.shell_on_fail" ];
+
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+      kernelModules = [ ];
+    };
+
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    extraModulePackages = [ ];
+  };
+}
diff --git a/systems/afrodite/default.nix b/systems/afrodite/default.nix
new file mode 100644
index 0000000..c404d81
--- /dev/null
+++ b/systems/afrodite/default.nix
@@ -0,0 +1,37 @@
+{pkgs, ...}: {
+  imports = [
+    ./hardware.nix
+    ./boot.nix
+    ./networking.nix
+    ./locales.nix
+
+    ./services.nix
+    ./programs.nix
+  ];
+
+  # Experimental features
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  # Users
+  users.users.leo = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+
+    extraGroups = [ "wheel" "networkmanager" ];
+  };
+
+  programs.zsh.enable = true;
+
+  environment.shellAliases = {
+    ls = "eza";
+    l = "ls -lh";
+    ll = "ls -lah";
+
+    update-boot = "sudo nixos-rebuild boot --flake ~/nixos#afrodite";
+    update-system = "sudo nixos-rebuild switch --flake ~/nixos#afrodite";
+    update-home = "home-manager switch --flake ~/nixos#afrodite";
+  };
+
+  # Version
+  system.stateVersion = "25.05";
+}
diff --git a/systems/afrodite/hardware.nix b/systems/afrodite/hardware.nix
new file mode 100644
index 0000000..51ddcd0
--- /dev/null
+++ b/systems/afrodite/hardware.nix
@@ -0,0 +1,7 @@
+{config, lib, modulesPath, ...}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
diff --git a/systems/hermes/nixos/locales.nix b/systems/afrodite/locales.nix
index 2d2363d..2d2363d 100644
--- a/systems/hermes/nixos/locales.nix
+++ b/systems/afrodite/locales.nix
diff --git a/systems/afrodite/networking.nix b/systems/afrodite/networking.nix
new file mode 100644
index 0000000..78fdc57
--- /dev/null
+++ b/systems/afrodite/networking.nix
@@ -0,0 +1,24 @@
+{lib, ...}: {
+  networking = {
+    hostName = "afrodite";
+    useDHCP = lib.mkDefault true;
+
+    nameservers = [ "208.67.222.222" "208.67.220.220" ];
+
+    firewall = {
+      enable = true;
+
+      allowedTCPPorts = [ 22 ];
+      allowedUDPPorts = [ 51820 ];
+    };
+
+    networkmanager.enable = true;
+
+    wg-quick.interfaces."tunnel" = {
+      privateKeyFile = "/home/leo/.wireguard/private.key";
+      address = [ "10.69.0.1/24" ];
+
+      peers = [];
+    };
+  };
+}
diff --git a/systems/odino/nixos/programs.nix b/systems/afrodite/programs.nix
index 965e31b..34c0eaa 100644
--- a/systems/odino/nixos/programs.nix
+++ b/systems/afrodite/programs.nix
@@ -1,6 +1,6 @@
 {inputs, pkgs, ...}: {
   imports = [
-    ../../../components/programs/git.nix
+    ../../components/programs/git.nix
 
     inputs.home-manager.nixosModules.home-manager
   ];
diff --git a/systems/afrodite/services.nix b/systems/afrodite/services.nix
new file mode 100644
index 0000000..f7f8644
--- /dev/null
+++ b/systems/afrodite/services.nix
@@ -0,0 +1,9 @@
+{...}: {
+  imports = [
+    ../../components/services/openssh.nix
+  ];
+
+  # Custom modules
+  openssh.enable = true;
+  caddy.enable = true;
+}
diff --git a/systems/hermes/nixos/boot.nix b/systems/hermes/boot.nix
index f7ff6b4..f7ff6b4 100644
--- a/systems/hermes/nixos/boot.nix
+++ b/systems/hermes/boot.nix
diff --git a/systems/hermes/nixos/default.nix b/systems/hermes/default.nix
index 9b491d7..9b491d7 100644
--- a/systems/hermes/nixos/default.nix
+++ b/systems/hermes/default.nix
diff --git a/systems/hermes/nixos/gui.nix b/systems/hermes/gui.nix
index 9890032..5bde952 100644
--- a/systems/hermes/nixos/gui.nix
+++ b/systems/hermes/gui.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    ../../../components/gui/xfce.nix
+    ../../components/gui/xfce.nix
   ];
 
   # Graphics
diff --git a/systems/hermes/nixos/hardware.nix b/systems/hermes/hardware.nix
index 52ab29c..52ab29c 100644
--- a/systems/hermes/nixos/hardware.nix
+++ b/systems/hermes/hardware.nix
diff --git a/systems/hermes/home-manager/leo/programs.nix b/systems/hermes/home-manager/leo/programs.nix
deleted file mode 100644
index 06458b6..0000000
--- a/systems/hermes/home-manager/leo/programs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{...}: {
-  imports = [
-    ../../../../components/programs/keepassxc.nix
-    ../../../../components/programs/alacritty.nix
-    ../../../../components/programs/zed.nix
-
-    ../../../../components/programs/zsh.nix
-    ../../../../components/programs/tmux.nix
-    ../../../../components/programs/fastfetch.nix
-  ];
-
-  keepassxc.enable = false;
-  alacritty.enable = true;
-  zed.enable = true;
-
-  zsh.enable = true;
-  tmux.enable = true;
-  fastfetch.enable = true;
-}
diff --git a/systems/odino/nixos/locales.nix b/systems/hermes/locales.nix
index 2d2363d..2d2363d 100644
--- a/systems/odino/nixos/locales.nix
+++ b/systems/hermes/locales.nix
diff --git a/systems/hermes/nixos/networking.nix b/systems/hermes/networking.nix
index 17b9617..17b9617 100644
--- a/systems/hermes/nixos/networking.nix
+++ b/systems/hermes/networking.nix
diff --git a/systems/hermes/nixos/programs.nix b/systems/hermes/programs.nix
index f4925a0..15091fa 100644
--- a/systems/hermes/nixos/programs.nix
+++ b/systems/hermes/programs.nix
@@ -1,8 +1,8 @@
 {inputs, pkgs, ...}: {
   imports = [
-    ../../../components/programs/git.nix
-    ../../../components/programs/fonts.nix
-    ../../../components/programs/games.nix
+    ../../components/programs/git.nix
+    ../../components/programs/fonts.nix
+    ../../components/programs/games.nix
 
     inputs.home-manager.nixosModules.home-manager
   ];
diff --git a/systems/hermes/nixos/services.nix b/systems/hermes/services.nix
index 58a1007..48c4d80 100644
--- a/systems/hermes/nixos/services.nix
+++ b/systems/hermes/services.nix
@@ -1,6 +1,6 @@
 {...}: {
   imports = [
-    ../../../components/services/i2pd.nix
+    ../../components/services/i2pd.nix
   ];
 
   services = {
diff --git a/systems/odino/nixos/boot.nix b/systems/odino/boot.nix
index 52b2d3e..52b2d3e 100644
--- a/systems/odino/nixos/boot.nix
+++ b/systems/odino/boot.nix
diff --git a/systems/odino/nixos/default.nix b/systems/odino/default.nix
index fca67b9..fca67b9 100644
--- a/systems/odino/nixos/default.nix
+++ b/systems/odino/default.nix
diff --git a/systems/odino/nixos/hardware.nix b/systems/odino/hardware.nix
index 4bb260c..4bb260c 100644
--- a/systems/odino/nixos/hardware.nix
+++ b/systems/odino/hardware.nix
diff --git a/systems/odino/home-manager/leo/programs.nix b/systems/odino/home-manager/leo/programs.nix
deleted file mode 100644
index eac28b0..0000000
--- a/systems/odino/home-manager/leo/programs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ../../../../components/programs/zsh.nix
-    ../../../../components/programs/tmux.nix
-    ../../../../components/programs/fastfetch.nix
-  ];
-
-  zsh.enable = true;
-  tmux.enable = true;
-  fastfetch.enable = true;
-}
diff --git a/systems/odino/locales.nix b/systems/odino/locales.nix
new file mode 100644
index 0000000..2d2363d
--- /dev/null
+++ b/systems/odino/locales.nix
@@ -0,0 +1,20 @@
+{...}: {
+  time.timeZone = "Europe/Rome";
+  console.keyMap = "it";
+
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+
+    extraLocaleSettings = {
+      LC_ADDRESS = "it_IT.UTF-8";
+      LC_IDENTIFICATION = "it_IT.UTF-8";
+      LC_MEASUREMENT = "it_IT.UTF-8";
+      LC_MONETARY = "it_IT.UTF-8";
+      LC_NAME = "it_IT.UTF-8";
+      LC_NUMERIC = "it_IT.UTF-8";
+      LC_PAPER = "it_IT.UTF-8";
+      LC_TELEPHONE = "it_IT.UTF-8";
+      LC_TIME = "it_IT.UTF-8";
+    };
+  };
+}
diff --git a/systems/odino/nixos/networking.nix b/systems/odino/networking.nix
index 3ab8e46..3ab8e46 100644
--- a/systems/odino/nixos/networking.nix
+++ b/systems/odino/networking.nix
diff --git a/systems/odino/programs.nix b/systems/odino/programs.nix
new file mode 100644
index 0000000..34c0eaa
--- /dev/null
+++ b/systems/odino/programs.nix
@@ -0,0 +1,26 @@
+{inputs, pkgs, ...}: {
+  imports = [
+    ../../components/programs/git.nix
+
+    inputs.home-manager.nixosModules.home-manager
+  ];
+
+  nixpkgs.config.allowUnfree = true;
+
+  # Packages
+  environment.systemPackages = with pkgs; [
+    ascii file fastfetch eza btop dysk
+    openssh rsync wireguard-tools dig
+    tmux vim
+
+    # Home manager
+    inputs.home-manager.packages.${stdenv.hostPlatform.system}.home-manager
+  ];
+
+  # Docker
+  virtualisation.docker.enable = true;
+  users.extraGroups."docker".members = [ "leo" ];
+
+  # Custom modules
+  git.enable = true;
+}
diff --git a/systems/odino/nixos/services.nix b/systems/odino/services.nix
index 534073a..6b25e0d 100644
--- a/systems/odino/nixos/services.nix
+++ b/systems/odino/services.nix
@@ -1,6 +1,6 @@
 {...}: {
   imports = [
-    ../../../components/services/openssh.nix
+    ../../components/services/openssh.nix
   ];
 
   # Custom modules