From e1b874c563dd30b45fbb81a84c39d07703db8b0e Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Fri, 16 Feb 2024 13:47:38 +1300
Subject: [PATCH] feat: ooksmicro host added to system & home

---
 flake.nix                                     |  11 ++
 home/user/ooks/ooksmicro/default.nix          |  23 ++++
 system/hosts/ooks-micro/default.nix           | 116 ------------------
 system/hosts/ooksmicro/default.nix            |  26 ++++
 .../hardware-configuration.nix                |   0
 5 files changed, 60 insertions(+), 116 deletions(-)
 create mode 100644 home/user/ooks/ooksmicro/default.nix
 delete mode 100644 system/hosts/ooks-micro/default.nix
 create mode 100644 system/hosts/ooksmicro/default.nix
 rename system/hosts/{ooks-micro => ooksmicro}/hardware-configuration.nix (100%)

diff --git a/flake.nix b/flake.nix
index c40c61c..e8e1a29 100644
--- a/flake.nix
+++ b/flake.nix
@@ -97,6 +97,11 @@
           modules = [ ./system/hosts/ooksdesk ];
           specialArgs = { inherit inputs outputs; };
         };
+        # GPD Micro-PC
+        ooksmicro =  lib.nixosSystem {
+          modules = [ ./system/hosts/ooksmicro ];
+          specialArgs = { inherit inputs outputs; };
+        };
       };
       homeConfigurations = {
         # T480s
@@ -111,6 +116,12 @@
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
       };
+        # Main Desktop
+        "ooks@ooksmicro" = lib.homeManagerConfiguration {
+          modules = [ ./home/user/ooks/ooksmicro ];
+          pkgs = pkgsFor.x86_64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
+      };
     };
   };
 }
diff --git a/home/user/ooks/ooksmicro/default.nix b/home/user/ooks/ooksmicro/default.nix
new file mode 100644
index 0000000..fb6b7e1
--- /dev/null
+++ b/home/user/ooks/ooksmicro/default.nix
@@ -0,0 +1,23 @@
+{ inputs, outputs, config, ... }:
+
+{
+  imports = [
+    ../../../profile
+  ];
+
+  activeProfiles = ["base" "hyprland"];
+
+  home.sessionVariables.HN = "ooksmicro";
+
+  monitors = [{
+    name = "DSI-1";
+    width = 720;
+    height = 1280;
+    workspace = "1";
+    primary = true;
+    transform = 3;
+  }];
+
+  colorscheme = inputs.nix-colors.colorSchemes.gruvbox-material-dark-soft;
+}
+
diff --git a/system/hosts/ooks-micro/default.nix b/system/hosts/ooks-micro/default.nix
deleted file mode 100644
index 344674c..0000000
--- a/system/hosts/ooks-micro/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-{ config, inputs, pkgs, ... }:
-
-# Imports
-# -------------------------------------------------------------------------------------------------
-
-{
-	imports = [
-    inputs.hardware.nixosModules.gpd-micropc
-
-		./hardware-configuration.nix
-    
-    ../common/user/ooks
-    ../common/base
-    ../common/features/bluetooth.nix
-    ../common/features/vm.nix
-    ../common/features/greetd.nix
-
-		];
-
-# Hostname and networking
-# -------------------------------------------------------------------------------------------------
-
-	networking = {
-		hostName = "ooksmicro"; 		
-    networkmanager.enable = true;
-		};
-
-
-# Printing
-# -------------------------------------------------------------------------------------------------
-
-  services.printing.enable = true;
-
-# Kernel
-# ------------------------------------------------------------------------------------------------
-
-  boot = {
-    kernelPackages = pkgs.linuxKernel.packages.linux_zen;
-    kernelParams = [ "fbcon=rotate:1" ];
-  };
-
-
-# Laptop Programs
-# -------------------------------------------------------------------------------------------------
-
-  powerManagement.powertop.enable = true;
-  
-  programs = {
-    light.enable = true;
-    dconf.enable = true;
-    kdeconnect.enable = true;
-  };
-
-# XDG Portal
-# ------------------------------------------------------------------------------------------------
-
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-  };
-  
-  hardware = {
-    opengl = {
-      enable = true;
-    };
-  };
-
-# gnupg
-# -------------------------------------------------------------------------------------------------
-
-	programs.gnupg.agent = {
-		enable = true;
-		enableSSHSupport = true;
- 	};
-
-# Services
-# -------------------------------------------------------------------------------------------------
-
-  services = {
-    thermald = {
-      enable = true;
-    };
-    logind = {
-      lidSwitch = "suspend";
-    };
-    dbus = {
-      enable = true;
-      packages = [ pkgs.gcr ];
-    };
-    auto-cpufreq = {
-      enable = true;
-      settings = {
-        battery = {
-	        governor = "powersave";
-	        turbo = "never";
-        };
-        charger = {
-	        governor = "performance";
-	        turbo = "auto";
-        };
-      };
-    };
-  };	
-
-
-# System Version
-# -------------------------------------------------------------------------------------------------
-
-	system = {
-		stateVersion = "22.05";
-	};
-}
diff --git a/system/hosts/ooksmicro/default.nix b/system/hosts/ooksmicro/default.nix
new file mode 100644
index 0000000..0475323
--- /dev/null
+++ b/system/hosts/ooksmicro/default.nix
@@ -0,0 +1,26 @@
+{ config, inputs, pkgs, ... }:
+
+{
+	imports = [
+    inputs.hardware.nixosModules.gpd-micropc
+		./hardware-configuration.nix
+    ../../profiles
+		];
+
+    activeProfiles = ["base" "laptop"];
+
+		systemModules.user = {
+			ooks.enable = true;
+			shell.fish.enable = true;
+		};
+  	
+		networking = {
+  		hostName = "ooksmicro";
+		};
+		
+    boot = {
+      kernelPackages = pkgs.linuxKernel.packages.linux_zen;
+	    kernelParams = [ "fbcon=rotate:1" ];
+
+    };
+}
diff --git a/system/hosts/ooks-micro/hardware-configuration.nix b/system/hosts/ooksmicro/hardware-configuration.nix
similarity index 100%
rename from system/hosts/ooks-micro/hardware-configuration.nix
rename to system/hosts/ooksmicro/hardware-configuration.nix