prepare kaworu host for new pc

4 files changed, 37 insertions, 32 deletions

diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix
index 940f3fc..f20f400 100644
--- a/hosts/kaworu/default.nix
+++ b/hosts/kaworu/default.nix
@@ -1,24 +1,23 @@
 # Kaworu
 # System configuration for my desktop
-_: {
+{ inputs, ... }: {
   imports = [
     ./hardware.nix
   ];
 
   # options
   hostName = "kaworu";
-  monitors = [
-    {
-      name = "HDMI-A-1";
-      scale = 1.0;
-    }
+  monitors = with inputs.self.lib.monitors; [
+    asus
+    acer
   ];
 
   # modules
   apps = {
-    astal.enable = true;
+    caelestia.enable = true;
     hyprlock.enable = true;
     kitty.enable = true;
+    obs.enable = true;
   };
   browsers = {
     firefox.enable = true;
@@ -28,18 +27,15 @@ _: {
     hyprland.enable = true;
     ly.enable = true;
   };
-  development = {
-    c.enable = true;
-    rust.enable = true;
-    web.enable = true;
-  };
   gaming = {
+    enable = true;
     homestuck.enable = true;
     minecraft.enable = true;
     steam.enable = true;
   };
 
   # modules
-  bluetooth = true;
-  network = true;
+  amdgpu.enable = true;
+  bluetooth.enable = true;
+  network.enable = true;
 }
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 6c1ff38..28c9658 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -1,13 +1,13 @@
 # Shinji
 # System configuration for my laptop
-{pkgs, ...}: {
+{pkgs, inputs, ...}: {
   imports = [
     ./hardware.nix
   ];
 
   # options
   hostName = "shinji";
-  monitors = [
+  monitors = with inputs.self.lib.monitors; [
     {
       port = "eDP-1";
       laptop = true;
@@ -15,22 +15,8 @@
       bitdepth = 10;
     }
     # desktop when docked
-    {
-      desc = "ASUSTek COMPUTER INC ASUS VA24E LALMTF215939";
-      position = {
-        enabled = true;
-        x = 2048;
-        y = 240;
-      };
-    }
-    {
-      desc = "Acer Technologies EB321HQU 0x00000698";
-      position = {
-        enabled = true;
-        x = 3968;
-        y = 0;
-      };
-    }
+    asus
+    acer
   ];
 
   # set power btn to suspend
diff --git a/lib/default.nix b/lib/default.nix
index 21031c8..dcfb442 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -2,9 +2,11 @@
   callLibs = file: import file inputs;
   files = callLibs ./files.nix;
   colors = callLibs ./colors.nix;
+  monitors = callLibs ./monitors.nix;
 in {
   inherit (files) getFiles certs sshKeys gpgKeys;
   inherit (colors) colorToInt colorToHex darkenColor lightenColor mixColor;
+  inherit monitors;
 
   # set of options we want to copy from a system
   # config to home manager
diff --git a/lib/monitors.nix b/lib/monitors.nix
new file mode 100644
index 0000000..603b491
--- /dev/null
+++ b/lib/monitors.nix
@@ -0,0 +1,21 @@
+_: let
+	asus = {
+      desc = "ASUSTek COMPUTER INC ASUS VA24E LALMTF215939";
+      position = {
+        enabled = true;
+        x = 2048;
+        y = 240;
+      };
+    };
+
+    acer = {
+      desc = "Acer Technologies EB321HQU 0x00000698";
+      position = {
+        enabled = true;
+        x = 3968;
+        y = 0;
+      };
+    };
+in {
+	inherit asus acer;
+}