fixed formatting

config/bash.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   programs.bash = {
@@ -8,7 +13,10 @@
     # History configuration
     historySize = 1000;
     historyFileSize = 2000;
-    historyControl = [ "ignoredups" "ignorespace" ];
+    historyControl = [
+      "ignoredups"
+      "ignorespace"
+    ];
 
     # Bash options and extra configuration
     bashrcExtra = ''
@@ -120,7 +128,8 @@
       "docker-compose" = "docker compose";
 
       # Modern tools aliases
-      "l" = "eza --header --long --git --group-directories-first --group --icons --color=always --sort=name --hyperlink -o --no-permissions";
+      "l" =
+        "eza --header --long --git --group-directories-first --group --icons --color=always --sort=name --hyperlink -o --no-permissions";
       "ll" = "l";
       "la" = "l -a";
       "cat" = "bat";
@@ -139,8 +148,10 @@
       "dcps" = "docker compose ps";
       "dcpr" = "dcp && dcd && dcu -d && dcl -f";
       "dcr" = "dcd && dcu -d && dcl -f";
-      "ddpul" = "docker compose down && docker compose pull && docker compose up -d && docker compose logs -f";
+      "ddpul" =
-      "docker-nuke" = "docker kill $(docker ps -q) && docker rm $(docker ps -a -q) && docker system prune --all --volumes --force && docker volume prune --force";
+        "docker compose down && docker compose pull && docker compose up -d && docker compose logs -f";
+      "docker-nuke" =
+        "docker kill $(docker ps -q) && docker rm $(docker ps -a -q) && docker system prune --all --volumes --force && docker volume prune --force";
 
       # Git aliases
       "g" = "git";
@@ -267,5 +278,4 @@
     ];
   };
 
-
 }

config/git.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   programs.git = {

config/starship.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   programs.starship = {

flake.nix

@@ -18,28 +18,36 @@
       opnix,
     }:
     let
-      supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-      pkgsFor = system: import nixpkgs {
+      pkgsFor =
-        inherit system;
+        system:
-        config.allowUnfree = true;
+        import nixpkgs {
-      };
+          inherit system;
+          config.allowUnfree = true;
+        };
     in
     {
-      homeConfigurations = let
+      homeConfigurations =
-        mkHomeConfig = system: hostname: isServer:
+        let
-          home-manager.lib.homeManagerConfiguration {
+          mkHomeConfig =
-            pkgs = pkgsFor system;
+            system: hostname: isServer:
-            modules = [ ./home.nix ];
+            home-manager.lib.homeManagerConfiguration {
-            extraSpecialArgs = {
               pkgs = pkgsFor system;
-              inherit opnix isServer hostname;
+              modules = [ ./home.nix ];
+              extraSpecialArgs = {
+                pkgs = pkgsFor system;
+                inherit opnix isServer hostname;
+              };
             };
-          };
+        in
-      in {
+        {
-        "mennos-vps" = mkHomeConfig "aarch64-linux" "mennos-vps" true;
+          "mennos-vps" = mkHomeConfig "aarch64-linux" "mennos-vps" true;
-        "mennos-desktop" = mkHomeConfig "x86_64-linux" "mennos-desktop" false;
+          "mennos-desktop" = mkHomeConfig "x86_64-linux" "mennos-desktop" false;
-        "mennos-laptop" = mkHomeConfig "x86_64-linux" "mennos-laptop" false;
+          "mennos-laptop" = mkHomeConfig "x86_64-linux" "mennos-laptop" false;
-      };
+        };
     };
 }

home.nix

@@ -13,24 +13,23 @@
     allowUnfreePredicate = pkg: true;
   };
 
-  imports =
+  imports = [
-    [
+    opnix.homeManagerModules.default
-      opnix.homeManagerModules.default
+    ./config/default.nix
-      ./config/default.nix
+    ./packages/common/default.nix
-      ./packages/common/default.nix
+  ]
-    ]
+  ++ (
-    ++ (
+    if isServer then
-      if isServer then
+      [
-        [
+        ./packages/server/default.nix
-          ./packages/server/default.nix
+        ./server/default.nix
-          ./server/default.nix
+      ]
-        ]
+    else
-      else
+      [
-        [
+        ./packages/workstation/default.nix
-          ./packages/workstation/default.nix
+        ./workstation/default.nix
-          ./workstation/default.nix
+      ]
-        ]
+  );
-    );
 
   home = {
     username = "menno";