45 files changed, 255 insertions, 256 deletions
diff --git a/flake.nix b/flake.nix
index a9b396c..b2a93f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,6 @@
       libssh
       libxml2
       libz
-      musl
       openssl
       util-linux
       xz
@@ -69,28 +68,15 @@
           backupFileExtension = "backup";
         };
       }
-      ./modules/common
-    ];
-
-    ClientModules = [
-      flatpaks.nixosModules.nix-flatpak
-      ./modules/client
-    ];
-
-    ServerModules = [
-      ./modules/server
-      (
-        {
-          pkgs,
-          ...
-        }:
-        {
-          environment.systemPackages = with pkgs; [
-            winapps.packages."x86_64-linux".winapps
-            winapps.packages."x86_64-linux".winapps-launcher # optional
-          ];
-        }
-      )
+      ./modules/bluetooth
+      ./modules/doas
+      ./modules/fonts
+      ./modules/gnupg
+      ./modules/i18n
+      ./modules/nh
+      ./modules/pipewire
+      ./modules/ssh
+      ./modules/users
     ];
 
     mkHost = { hostPath, extraModules }: 
@@ -103,17 +89,34 @@
     nixosConfigurations = {
       pad = mkHost {
         hostPath = ./hosts/pad;
-        extraModules = commonModules ++ ClientModules;
+        extraModules = commonModules ++ [ ];
       };
 
       station = mkHost {
         hostPath = ./hosts/station;
-        extraModules = commonModules ++ ClientModules ++ ServerModules;
+        extraModules = commonModules ++ [ ];
+      };
+
+      work = mkHost {
+        hostPath = ./hosts/work;
+        extraModules = commonModules ++ [
+          flatpaks.nixosModules.nix-flatpak
+          ./modules/1password
+          ./modules/adguard
+          ./modules/cinnamon
+          ./modules/flatpak
+          ./modules/monero
+          ./modules/nginx
+          ./modules/nvidia
+          ./modules/ollama
+          ./modules/searx
+          ./modules/open-webui
+        ];
       };
 
       server = mkHost {
         hostPath = ./hosts/server;
-        extraModules = commonModules ++ ServerModules;
+        extraModules = commonModules ++ [ ];
       };
     };
 
@@ -132,9 +135,8 @@
 
         shellHook = ''
           echo "$(python --version)"
-          echo ""
           echo "$(poetry --version)"
-          echo ""
+          echo "$(pylsp --version)"
         '';
 
         env.LD_LIBRARY_PATH = commonLibs;
@@ -143,7 +145,6 @@
       nim = pkgs.mkShell {
         name = "nim";
         packages = with pkgs; [
-          musl
           nim
           nimble
           nimlangserver
@@ -160,19 +161,6 @@
 
         env.LD_LIBRARY_PATH = commonLibs;
       };
-
-      js = pkgs.mkShell {
-        name = "js";
-        packages = with pkgs; [
-          bun
-        ];
-
-        shellHook = ''
-          echo "$(bun --version)"
-        '';
-
-        env.LD_LIBRARY_PATH = commonLibs;
-      };
     };
   };
 }
diff --git a/hosts/pad/default.nix b/hosts/pad/default.nix
index 738e407..575f8e9 100644
--- a/hosts/pad/default.nix
+++ b/hosts/pad/default.nix
@@ -5,14 +5,14 @@
 
 {
   imports = [ 
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
 
-      # Base modules
-      ./boot.nix
-      ./hardware.nix
-      ./network.nix      
-    ];
+    # Base modules
+    ../../modules/intel
+    ./boot.nix
+    ./network.nix      
+  ];
 
   system = {
     autoUpgrade = {
diff --git a/hosts/station/boot.nix b/hosts/station/boot.nix
index 603ebf7..0d643ea 100644
--- a/hosts/station/boot.nix
+++ b/hosts/station/boot.nix
@@ -13,8 +13,6 @@
 
     initrd = {
       luks.devices."luks-4d8ffefc-fb74-4628-9779-abc535146374".device = "/dev/disk/by-uuid/4d8ffefc-fb74-4628-9779-abc535146374";
-
-      kernelModules = ["amdgpu"];
     };
   };
 }
diff --git a/hosts/station/default.nix b/hosts/station/default.nix
index bcd4615..628c43a 100644
--- a/hosts/station/default.nix
+++ b/hosts/station/default.nix
@@ -5,14 +5,14 @@
 
 {
   imports = [ 
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
 
-      # Base modules
-      ./boot.nix
-      ./hardware.nix
-      ./network.nix
-    ];
+    # Base modules
+    ../../modules/amd
+    ./boot.nix
+    ./network.nix
+  ];
 
   system = {
     autoUpgrade = {
diff --git a/modules/client/1password/default.nix b/modules/1password/default.nix
index 7d01e3d..5e650cd 100644
--- a/modules/client/1password/default.nix
+++ b/modules/1password/default.nix
@@ -1,14 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 {
-  programs = {
-    _1password.enable = true;
-    _1password-gui = {
-      enable = true;
-      polkitPolicyOwners = [ "aethrvmn" ];
-    };
-  };
-
   environment.etc ={
     "1password/custom_allowed_browsers" = {
       text = ''
@@ -18,5 +10,17 @@
       mode = "0755";
     };
   };
+
+  nixpkgs.config = {
+    allowUnfree = lib.mkForce true;
+  };
+
+  programs = {
+    _1password.enable = true;
+    _1password-gui = {
+      enable = true;
+      polkitPolicyOwners = [ "aethrvmn" ];
+    };
+  };
 }
 
diff --git a/modules/common/adguard/default.nix b/modules/adguard/default.nix
index 9cb7cc2..9cb7cc2 100644
--- a/modules/common/adguard/default.nix
+++ b/modules/adguard/default.nix
diff --git a/modules/amd/default.nix b/modules/amd/default.nix
new file mode 100644
index 0000000..c4842e6
--- /dev/null
+++ b/modules/amd/default.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, lib, ... }:
+{
+  boot = {
+    initrd = {
+      kernelModules = [ "amdgpu" ];
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    rocmPackages.rocminfo
+    rocm.Packages.rocm-smi
+    rocmPackages.hipcc  
+  ];
+
+  hardware = {
+    graphics = {
+      enable = true;
+      extraPackages = with pkgs; [
+        rocmPackages.clr
+      ];
+    };
+  };
+  
+  nixpkgs.config = {
+    allowUnfree = lib.mkForce true;
+    rocmSupport = true;
+    rocmTargets = [ "gfx1031" ];  
+  };
+  
+  services = {
+    ollama = {
+      environmentVariables = {
+        HCC_AMDGPU_TARGET = "gfx1031";
+      };
+      rocmOverrideGfx = "10.3.0";
+    };
+
+    xserver.videoDrivers = [
+      "amdgpu"
+    ];
+  };
+}
diff --git a/modules/bluetooth/default.nix b/modules/bluetooth/default.nix
new file mode 100644
index 0000000..6550349
--- /dev/null
+++ b/modules/bluetooth/default.nix
@@ -0,0 +1,3 @@
+{
+  services.blueman.enable = false;
+}
diff --git a/modules/server/calibre/default.nix b/modules/calibre/default.nix
index d177ac1..d177ac1 100644
--- a/modules/server/calibre/default.nix
+++ b/modules/calibre/default.nix
diff --git a/modules/server/cgit/default.nix b/modules/cgit/default.nix
index 08784fe..08784fe 100644
--- a/modules/server/cgit/default.nix
+++ b/modules/cgit/default.nix
diff --git a/modules/server/cgit/static/cgit.css b/modules/cgit/static/cgit.css
index d2ee006..d2ee006 100644
--- a/modules/server/cgit/static/cgit.css
+++ b/modules/cgit/static/cgit.css
diff --git a/modules/server/cgit/static/favicon.png b/modules/cgit/static/favicon.png
index a9c1396..a9c1396 100755
--- a/modules/server/cgit/static/favicon.png
+++ b/modules/cgit/static/favicon.png
diff --git a/modules/server/cgit/static/logo.png b/modules/cgit/static/logo.png
index a9c1396..a9c1396 100755
--- a/modules/server/cgit/static/logo.png
+++ b/modules/cgit/static/logo.png
diff --git a/modules/client/cinnamon/default.nix b/modules/cinnamon/default.nix
index b73cda5..c75cf0d 100644
--- a/modules/client/cinnamon/default.nix
+++ b/modules/cinnamon/default.nix
@@ -1,12 +1,14 @@
 { pkgs, lib, ... }:
 {
-  imports = [
-    ../xserver
-  ];
-
   services = {
-    xserver = {
+    ## Just in case this needs to be enabled 
+    # cinnamon.apps.enable = true;
+ 
+    gnome = {
+      gnome-keyring.enable = true;
+    };
 
+    xserver = {
       desktopManager.cinnamon = {
         enable = true;
       };
@@ -20,15 +22,13 @@
           enable = true;
         };
       };
-    };
 
-    ## Just in case this needs to be enabled 
-    # cinnamon.apps.enable = true;
+      wacom.enable = true;
 
-    gnome = {
-      gnome-keyring.enable = true;
-      # disable gNOME's "usecase?" ssh-agent
-      gcr-ssh-agent.enable = lib.mkForce false;
+      xkb = {
+        layout = "us, gr";
+        options = "grp:alt_shift_toggle";
+      };
     };
   };
 
diff --git a/modules/client/bluetooth/default.nix b/modules/client/bluetooth/default.nix
deleted file mode 100644
index 2dfd66d..0000000
--- a/modules/client/bluetooth/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.blueman.enable = true;
-}
diff --git a/modules/client/default.nix b/modules/client/default.nix
deleted file mode 100644
index ea3f803..0000000
--- a/modules/client/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./1password
-    ./bluetooth
-    ./cinnamon
-    ./flatpak
-    # ./labwc
-  ];
-}
diff --git a/modules/client/xserver/default.nix b/modules/client/xserver/default.nix
deleted file mode 100644
index 6cd0252..0000000
--- a/modules/client/xserver/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-# XServer
-{
-  services.xserver = {
-    enable = lib.mkForce true;
-    xkb = {
-      layout = "us, gr";
-      options = "grp:alt_shift_toggle";
-    };
-
-    wacom.enable = true;
-  };
-}
diff --git a/modules/common/default.nix b/modules/common/default.nix
deleted file mode 100644
index b2c7196..0000000
--- a/modules/common/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports =[
-    # names are self explanatory
-    ./adguard
-    ./doas
-    ./fonts
-    ./gnupg
-    ./i18n 
-    ./nh   
-    ./pipewire
-    ./searx
-    ./ssh
-    ./sudo
-    ./users
-  ];
-
-  nix = {
-    settings = {
-      # Enable flakes
-      experimental-features = [ "nix-command" "flakes" ];
-
-      # Optimize storage
-      auto-optimise-store = true;
-
-      # substituters = lib.mkForce [ ];
-      # trusted-substituters = lib.mkForce [ ];
-      # require-sigs = false;
-    };
-  };
-
-  # Allow unfree packages
-  nixpkgs = {
-    config.allowUnfree = true;
-  };
-
-  # List packages installed in system profile. 
-  # These should be tools in case user tools brake.
-  # To search, run:
-  # $ nix search <pkgname>
-  # or
-  # $ nh search <pkgname>
-  environment.systemPackages = with pkgs; [
-  	alacritty
-    git
-    helix
-    xdg-utils
-  ];
-}
diff --git a/modules/common/doas/default.nix b/modules/common/doas/default.nix
deleted file mode 100644
index bc528d1..0000000
--- a/modules/common/doas/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  security.doas = {
-    enable = true;
-
-    extraRules = [
-      {
-        users = [ "aethrvmn" ];
-        keepEnv = true;
-        persist = true;
-      }
-    ];
-  };
-}
diff --git a/modules/common/sudo/default.nix b/modules/common/sudo/default.nix
deleted file mode 100644
index 8ad7bf9..0000000
--- a/modules/common/sudo/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  security.sudo = {
-    enable = false;
-  };
-}
diff --git a/modules/doas/default.nix b/modules/doas/default.nix
new file mode 100644
index 0000000..938377c
--- /dev/null
+++ b/modules/doas/default.nix
@@ -0,0 +1,17 @@
+{
+  security = {
+    doas = {
+      enable = true;
+
+      extraRules = [
+        {
+          users = [ "aethrvmn" ];
+          keepEnv = true;
+          persist = true;
+        }
+      ];
+    };
+
+    sudo.enable = false;
+  };
+}
diff --git a/modules/client/flatpak/default.nix b/modules/flatpak/default.nix
index e5a636f..e5a636f 100644
--- a/modules/client/flatpak/default.nix
+++ b/modules/flatpak/default.nix
diff --git a/modules/common/fonts/default.nix b/modules/fonts/default.nix
index d8696e7..d8696e7 100644
--- a/modules/common/fonts/default.nix
+++ b/modules/fonts/default.nix
diff --git a/modules/server/forgejo/default.nix b/modules/forgejo/default.nix
index 0294279..0294279 100644
--- a/modules/server/forgejo/default.nix
+++ b/modules/forgejo/default.nix
diff --git a/modules/server/gemini/default.nix b/modules/gemini/default.nix
index d59f65f..d59f65f 100644
--- a/modules/server/gemini/default.nix
+++ b/modules/gemini/default.nix
diff --git a/modules/common/gnupg/default.nix b/modules/gnupg/default.nix
index fc6e537..fc6e537 100644
--- a/modules/common/gnupg/default.nix
+++ b/modules/gnupg/default.nix
diff --git a/modules/server/grafana/default.nix b/modules/grafana/default.nix
index 41905cd..41905cd 100644
--- a/modules/server/grafana/default.nix
+++ b/modules/grafana/default.nix
diff --git a/modules/common/i18n/default.nix b/modules/i18n/default.nix
index 786332c..786332c 100644
--- a/modules/common/i18n/default.nix
+++ b/modules/i18n/default.nix
diff --git a/modules/server/immich/default.nix b/modules/immich/default.nix
index fac75f9..fac75f9 100644
--- a/modules/server/immich/default.nix
+++ b/modules/immich/default.nix
diff --git a/modules/intel/default.nix b/modules/intel/default.nix
new file mode 100644
index 0000000..f500dde
--- /dev/null
+++ b/modules/intel/default.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, lib, ... }
+{
+  hardware = {
+    graphics = {
+      enable = lib.mkForce = true;
+    };
+  };
+}
diff --git a/modules/server/jellyfin/default.nix b/modules/jellyfin/default.nix
index 424b4d8..424b4d8 100644
--- a/modules/server/jellyfin/default.nix
+++ b/modules/jellyfin/default.nix
diff --git a/modules/server/monero/default.nix b/modules/monero/default.nix
index 4860353..d8631ef 100644
--- a/modules/server/monero/default.nix
+++ b/modules/monero/default.nix
@@ -25,7 +25,7 @@
         cpu = {
           rx = {
             enabled = true;
-            threads = 6;
+            threads = 12;
           };
         };
 
diff --git a/modules/server/default.nix b/modules/nginx/default.nix
index 150cd4d..151a934 100644
--- a/modules/server/default.nix
+++ b/modules/nginx/default.nix
@@ -1,16 +1,4 @@
 {
-	imports = [
-		./calibre
-		./cgit
-		./forgejo
-		./gemini
-		./grafana
-		./immich
-		./jellyfin
-		./monero
-		./ollama
-	];
-	
 	services = {
 		nginx = {
 			enable = true;
diff --git a/modules/common/nh/default.nix b/modules/nh/default.nix
index a5e09ac..a5e09ac 100644
--- a/modules/common/nh/default.nix
+++ b/modules/nh/default.nix
diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix
new file mode 100644
index 0000000..77678c1
--- /dev/null
+++ b/modules/nvidia/default.nix
@@ -0,0 +1,56 @@
+{ config, pkgs, lib, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    linuxPackages.nvidia_x11
+    cudaPackages.cudnn
+    cudaPackages.cudatoolkit
+  ];
+
+  hardware = {
+    graphics = {
+      enable = lib.mkForce true;
+    };
+
+    nvidia = {
+      open = true;
+      prime = {
+        sync.enable = true;
+        intelBusId = "PCI:0:2:0";
+        nvidiaBusId = "PCI:2:0:0";
+      };
+    };
+  };
+
+  nix = {
+    settings = {
+      substituters = [
+        # "https://cache.nixos.org/" # set by default
+        "https://cache.nixos-cuda.org"
+      ];
+
+      trusted-public-keys = [
+        # "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # set by default
+        "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
+      ];
+    };
+  };
+
+  nixpkgs.config = {
+    allowUnfree = lib.mkForce true;
+    cudaSupport = true;
+    cudaForwardCompat = true;
+  };
+
+  services = {
+    ollama = {
+      acceleration = "cuda";
+    };
+
+    xserver = {
+      enable = true;
+      videoDrivers =[
+        "nvidia"
+      ];
+    };
+  };
+}
diff --git a/modules/ollama/default.nix b/modules/ollama/default.nix
new file mode 100644
index 0000000..9f966af
--- /dev/null
+++ b/modules/ollama/default.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, lib, ... }:
+{
+  services = {
+    ollama = {
+      enable = true;
+      loadModels = [
+        "gemma3:12b"
+        "qwen3-coder:30b"
+      ];
+    };
+
+    nginx.virtualHosts = {
+      "ollama.internal" = {
+        locations."/" = {
+          proxyPass = "http://127.0.0.1:11434";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}
diff --git a/modules/open-webui/default.nix b/modules/open-webui/default.nix
new file mode 100644
index 0000000..b8c0938
--- /dev/null
+++ b/modules/open-webui/default.nix
@@ -0,0 +1,24 @@
+{
+  services = {
+    open-webui = {
+      enable = false;
+      port = 3030;
+      environment = {
+        ANONYMIZED_TELEMETRY = "False";
+        DO_NOT_TRACK = "True";
+        SCARF_NO_ANALYTICS = "True";
+        WEBUI_AUTH = "False";
+        OLLAMA_API_BASE_URL = "http://localhost:11434";
+      };
+    };
+
+    nginx.virtualHosts = {
+      "chat.internal" = {
+        locations."/" = {
+          proxyPass = "http://127.0.0.1:3030";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}
diff --git a/modules/common/pipewire/default.nix b/modules/pipewire/default.nix
index 3c65b82..3c65b82 100644
--- a/modules/common/pipewire/default.nix
+++ b/modules/pipewire/default.nix
diff --git a/modules/common/searx/default.nix b/modules/searx/default.nix
index e8b3873..e8b3873 100644
--- a/modules/common/searx/default.nix
+++ b/modules/searx/default.nix
diff --git a/modules/server/ollama/default.nix b/modules/server/ollama/default.nix
deleted file mode 100644
index 8342df8..0000000
--- a/modules/server/ollama/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services = {
-    ollama = {
-      enable = true;
-      loadModels = [
-        "qwen3:14b"
-        "qwen3-coder:30b"
-        "gemma3:12b"
-        "gpt-oss:20b"
-        "deepseek-r1:14b"
-        "phi4-reasoning:14b"
-      ];
-
-      acceleration = "rocm";
-      environmentVariables = {
-        HCC_AMDGPU_TARGET = "gfx1031";
-      };
-      rocmOverrideGfx = "10.3.0";
-    };
-
-    open-webui = {
-      enable = false;
-      port = 3030;
-      environment = {
-        ANONYMIZED_TELEMETRY = "False";
-        DO_NOT_TRACK = "True";
-        SCARF_NO_ANALYTICS = "True";
-        WEBUI_AUTH = "False";
-        OLLAMA_API_BASE_URL = "http://localhost:11434";
-
-        #dir stuff
-    		STATIC_DIR = "${config.services.open-webui.stateDir}/static";
-    		DATA_DIR = "${config.services.open-webui.stateDir}/data";
-    		HF_HOME = "${config.services.open-webui.stateDir}/hf_home";
-    		SENTENCE_TRANSFORMERS_HOME = "${config.services.open-webui.stateDir}/transformers_home";
-      };
-    };
-
-    xserver.videoDrivers = [ "amdgpu" ];
-
-    nginx.virtualHosts = {
-      "chat.internal" = {
-        locations."/" = {
-          proxyPass = "http://127.0.0.1:3030";
-          proxyWebsockets = true;
-        };
-      };
-
-      "ollama.internal" = {
-        locations."/" = {
-          proxyPass = "http://127.0.0.1:11434";
-          proxyWebsockets = true;
-        };
-      };
-    };
-  };
-
-  nixpkgs.config = {
-    allowUnfree = lib.mkForce true;
-    rocmSupport = lib.mkForce true;
-    rocmTargets = [ "gfx1031" ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    rocmPackages.rocminfo
-    rocmPackages.rocm-smi
-    rocmPackages.hipcc
-  ];
-}
diff --git a/modules/common/ssh/default.nix b/modules/ssh/default.nix
index 70b67e2..70b67e2 100644
--- a/modules/common/ssh/default.nix
+++ b/modules/ssh/default.nix
diff --git a/modules/client/thunar/default.nix b/modules/thunar/default.nix
index 0caaabf..0caaabf 100644
--- a/modules/client/thunar/default.nix
+++ b/modules/thunar/default.nix
diff --git a/modules/common/users/default.nix b/modules/users/default.nix
index 460fb8a..db3d759 100644
--- a/modules/common/users/default.nix
+++ b/modules/users/default.nix
@@ -5,6 +5,10 @@
   users = {
     defaultUserShell = pkgs.zsh;
   
+    groups.aethrvmn = {
+      members = [ "aethrvmn" ];
+    };
+
     users.aethrvmn = {
       isNormalUser = true;
       extraGroups = [
@@ -13,7 +17,9 @@
         "video"
         "wheel"
       ];
-      password = "gg";
+      home = "/home/aethrvmn";
+      
+      group = "aethrvmn";
 
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF3R0qrWQ9omz87lt4YRCdI+QV55KxMqxU+Vz1mUM4ye me@aethrvmn.gr"
diff --git a/modules/client/waybar/default.nix b/modules/waybar/default.nix
index ec27a77..ec27a77 100644
--- a/modules/client/waybar/default.nix
+++ b/modules/waybar/default.nix
diff --git a/modules/winapps/default.nix b/modules/winapps/default.nix
new file mode 100644
index 0000000..243e851
--- /dev/null
+++ b/modules/winapps/default.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    winapps.packages."x86_64-linux".winapps
+    winapps.packages."x86_64-linux".winapps-launcher # optional
+  ];
+}