From d53f9250d65890dd539d22e03f4b8a1a39500b2a Mon Sep 17 00:00:00 2001
From: 0xTux <0xtux@pm.me>
Date: Thu, 1 Aug 2024 04:53:47 +0530
Subject: [PATCH] refactor flake

---
 hosts/canopus/default.nix    |  1 +
 hosts/controller/default.nix | 53 ++----------------------------------
 hosts/wsl/default.nix        | 31 +--------------------
 3 files changed, 4 insertions(+), 81 deletions(-)

diff --git a/hosts/canopus/default.nix b/hosts/canopus/default.nix
index 9f6af80..fbc146c 100755
--- a/hosts/canopus/default.nix
+++ b/hosts/canopus/default.nix
@@ -6,6 +6,7 @@
   imports = [
     inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503
     ./hardware-configuration.nix
+    ../../modules/nixos/default.nix
     ../../modules/nixos/desktop/awesome
     ../../modules/nixos/desktop/hyprland
     ../../modules/nixos/virtualisation
diff --git a/hosts/controller/default.nix b/hosts/controller/default.nix
index a17aa31..c66bfb8 100644
--- a/hosts/controller/default.nix
+++ b/hosts/controller/default.nix
@@ -1,11 +1,7 @@
-{
-  outputs,
-  pkgs,
-  username,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./hardware-configuration.nix
+    ../../modules/nixos/default.nix
     ../../modules/nixos/headscale.nix
     ../../modules/nixos/vaultwarden.nix
     ../../modules/nixos/uptime-kuma.nix
@@ -15,27 +11,6 @@
     ../../modules/nixos/monitoring/promtail.nix
   ];
 
-  nixpkgs = {
-    overlays = [
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-      outputs.overlays.nur
-    ];
-
-    config = {
-      allowUnfree = true;
-      joypixels.acceptLicense = true;
-    };
-  };
-
-  nix = {
-    settings = {
-      experimental-features = "nix-command flakes";
-      auto-optimise-store = true;
-    };
-  };
-
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
     initrd.systemd.enable = true;
@@ -60,30 +35,6 @@
     dconf.enable = true;
   };
 
-  services = {
-    openssh = {
-      enable = true;
-      settings = {
-        PermitRootLogin = "no";
-      };
-    };
-  };
-
-  users = {
-    defaultUserShell = pkgs.zsh;
-    users.${username} = {
-      initialPassword = "${username}";
-      isNormalUser = true;
-      extraGroups = ["networkmanager" "wheel" "storage"];
-      openssh.authorizedKeys.keys = [
-        ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me''
-      ];
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-  ];
-
   fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})];
 
   system.stateVersion = "23.11";
diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix
index 14bb143..0971521 100644
--- a/hosts/wsl/default.nix
+++ b/hosts/wsl/default.nix
@@ -7,13 +7,9 @@
 }: {
   imports = [
     inputs.nixos-wsl.nixosModules.wsl
+    ../../modules/nixos/default.nix
   ];
 
-  nixpkgs = {
-    config.cudaSupport = true;
-    hostPlatform = "x86_64-linux";
-  };
-
   wsl = {
     enable = true;
     defaultUser = "${username}";
@@ -21,13 +17,6 @@
     useWindowsDriver = true;
   };
 
-  nix = {
-    settings = {
-      experimental-features = "nix-command flakes";
-      auto-optimise-store = true;
-    };
-  };
-
   networking.hostName = "wsl";
 
   programs = {
@@ -48,27 +37,9 @@
       host = "0.0.0.0";
       port = 11434;
     };
-    openssh = {
-      enable = true;
-      settings = {
-        PasswordAuthentication = false;
-      };
-    };
     tailscale.enable = true;
   };
 
-  users = {
-    defaultUserShell = pkgs.zsh;
-    users.${username} = {
-      initialPassword = "${username}";
-      isNormalUser = true;
-      extraGroups = ["networkmanager" "wheel" "storage"];
-      openssh.authorizedKeys.keys = [
-        ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me''
-      ];
-    };
-  };
-
   fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})];
 
   system.stateVersion = "23.11";