8 files changed, 21 insertions, 37 deletions
diff --git a/systems/hermes/nixos/default.nix b/systems/hermes/nixos/default.nix
index 2d9c9a8..9b491d7 100644
--- a/systems/hermes/nixos/default.nix
+++ b/systems/hermes/nixos/default.nix
@@ -24,8 +24,9 @@
   programs.zsh.enable = true;
 
   environment.shellAliases = {
-    l = "eza -lh";
-    ll = "eza -lah";
+    ls = "eza";
+    l = "ls -lh";
+    ll = "ls -lah";
 
     update-boot = "sudo nixos-rebuild boot --flake ~/nixos#hermes";
     update-system = "sudo nixos-rebuild switch --flake ~/nixos#hermes";
diff --git a/systems/hermes/nixos/gui.nix b/systems/hermes/nixos/gui.nix
index df28557..9890032 100644
--- a/systems/hermes/nixos/gui.nix
+++ b/systems/hermes/nixos/gui.nix
@@ -47,5 +47,6 @@
     polkit.enable = true;
   };
 
+  # Custom modules
   xfce.enable = true;
 }
diff --git a/systems/hermes/nixos/networking.nix b/systems/hermes/nixos/networking.nix
index 0558b03..17b9617 100644
--- a/systems/hermes/nixos/networking.nix
+++ b/systems/hermes/nixos/networking.nix
@@ -11,29 +11,8 @@
       enable = true;
       plugins = with pkgs; [ networkmanager-fortisslvpn ];
     };
-
-    wg-quick.interfaces."home" = {
-      privateKeyFile = "/home/leo/.wireguard/private.key";
-      address = [ "10.69.0.3/24" ];
-      dns = [ "38.242.201.177" ];
-
-      peers = [
-        {
-          publicKey = "rwUMCdhjQbQt9uGjljfdABj4DSJFgL62bzT13sg8LmU=";
-          allowedIPs = [ "10.69.0.0/24" ];
-          endpoint = "leoflo.me:51820";
-          persistentKeepalive = 25;
-        }
-      ];
-    };
   };
 
-  # Disables the wg-quick-home service from starting up
-  systemd.services."wg-quick-home".wantedBy = lib.mkForce [];
-
   # Bluetooth
   hardware.bluetooth.enable = true;
-
-  # Packages
-  environment.systemPackages = with pkgs; [ openfortivpn ];
 }
diff --git a/systems/hermes/nixos/programs.nix b/systems/hermes/nixos/programs.nix
index d973800..f4925a0 100644
--- a/systems/hermes/nixos/programs.nix
+++ b/systems/hermes/nixos/programs.nix
@@ -21,7 +21,7 @@
     librewolf thunderbird feather
 
     # Secret management
-    keepassxc libsecret veracrypt
+    keepassxc veracrypt
 
     # Media
     vlc ffmpeg yt-dlp
@@ -35,7 +35,7 @@
     inputs.obdautodoctor-nix.packages.${stdenv.hostPlatform.system}.default
   ];
 
-  # Dynamic linking
+  # Nix linker
   programs.nix-ld.enable = true;
 
   # AppImages
@@ -44,19 +44,21 @@
     binfmt = true;
   };
 
-  # Docker
-  virtualisation.docker.enable = true;
-  users.extraGroups."docker".members = [ "leo" ];
-
-  # Virt manager
+  # Virtualisation
   virtualisation = {
+    docker.enable = true;
     libvirtd.enable = true;
     spiceUSBRedirection.enable = true;
   };
-  users.groups."libvirtd".members = [ "leo" ];
+
+  users.extraGroups = {
+    "docker".members = [ "leo" ];
+    "libvirtd".members = [ "leo" ];
+  };
+
   programs.virt-manager.enable = true;
 
-  # Custom
+  # Custom modules
   git.enable = true;
   fonts.enable = true;
   games.enable = true;
diff --git a/systems/hermes/nixos/services.nix b/systems/hermes/nixos/services.nix
index 7c674e6..58a1007 100644
--- a/systems/hermes/nixos/services.nix
+++ b/systems/hermes/nixos/services.nix
@@ -23,6 +23,6 @@
     };
   };
 
-  # Custom
+  # Custom modules
   i2pd.enable = true;
 }
diff --git a/systems/odino/nixos/default.nix b/systems/odino/nixos/default.nix
index e58ea6a..fca67b9 100644
--- a/systems/odino/nixos/default.nix
+++ b/systems/odino/nixos/default.nix
@@ -23,8 +23,9 @@
   programs.zsh.enable = true;
 
   environment.shellAliases = {
-    l = "eza -lh";
-    ll = "eza -lah";
+    ls = "eza";
+    l = "ls -lh";
+    ll = "ls -lah";
 
     update-boot = "sudo nixos-rebuild boot --flake ~/nixos#odino";
     update-system = "sudo nixos-rebuild switch --flake ~/nixos#odino";
diff --git a/systems/odino/nixos/programs.nix b/systems/odino/nixos/programs.nix
index 3e890cb..965e31b 100644
--- a/systems/odino/nixos/programs.nix
+++ b/systems/odino/nixos/programs.nix
@@ -21,6 +21,6 @@
   virtualisation.docker.enable = true;
   users.extraGroups."docker".members = [ "leo" ];
 
-  # Custom
+  # Custom modules
   git.enable = true;
 }
diff --git a/systems/odino/nixos/services.nix b/systems/odino/nixos/services.nix
index 36c8515..534073a 100644
--- a/systems/odino/nixos/services.nix
+++ b/systems/odino/nixos/services.nix
@@ -3,6 +3,6 @@
     ../../../components/services/openssh.nix
   ];
 
-  # Custom
+  # Custom modules
   openssh.enable = true;
 }