feat(nixos/kompakt): add basic options

3 files changed, 34 insertions, 3 deletions

diff --git a/home/profiles/base/config/sway.nix b/home/profiles/base/config/sway.nix
index 6daa3fd..728292b 100644
--- a/home/profiles/base/config/sway.nix
+++ b/home/profiles/base/config/sway.nix
@@ -191,11 +191,30 @@ with neotheme.colors;
   output "*" scale 1
   output "*" scale_filter nearest
 
+  # MacBook screen
+  output "Unknown-1" {
+    scale 2
+    scale_filter smart
+  }
+
   input type:touchpad {
     tap enabled
     natural_scroll enabled
   }
 
+
+  input "1452:641:Apple_Internal_Keyboard_/_Trackpad" {
+    dwt enabled                 #Disable while typing
+    tap enabled                 #Tap registers as a click
+    accel_profile adaptive      #adaptive/flat cursor acceleration
+    pointer_accel 0             #From -1 to 1: Speed of cursor
+    natural_scroll enabled      #Direction of Scroll
+    scroll_factor 0.3           #Speed of Scrolling gets multiplied by this factor
+    scroll_method two_finger    #none|two_finger|edge|on_button_down
+    middle_emulation enabled    #Enables middle click
+    tap_button_map lmr          #1Finger > Left Click , 2Finger > Right Click, 3Fingers > MiddleClick
+  }
+
   input type:keyboard {
     repeat_rate 40
     repeat_delay 350
diff --git a/home/profiles/base/config/waybar/settings.nix b/home/profiles/base/config/waybar/settings.nix
index 12b65a4..07bf8a9 100644
--- a/home/profiles/base/config/waybar/settings.nix
+++ b/home/profiles/base/config/waybar/settings.nix
@@ -48,7 +48,7 @@ with neotheme.colors;
   };
 
   "battery" = {
-    format = "<span foreground='#${color6}'>BATT</span> AA {capacity}%";
+    format = "<span foreground='#${color6}'>BATT</span> {capacity}%";
     format-alt = "<span foreground='#${color6}'>PWR</span> {power}Wh";
   };
 
diff --git a/nixos/kompakt/configuration.nix b/nixos/kompakt/configuration.nix
index 0f303b9..554d830 100644
--- a/nixos/kompakt/configuration.nix
+++ b/nixos/kompakt/configuration.nix
@@ -19,7 +19,10 @@
   # hardware.asahi.extractPeripheralFirmware = false;
 
   # Enable GPU acceleration
-  hardware.asahi.useExperimentalGPUDriver = true;
+  # TODO: Fix scaling issue
+  # hardware.asahi.useExperimentalGPUDriver = true;
+  # hardware.asahi.experimentalGPUInstallMode = "overlay";
+  hardware.opengl.enable = true;
 
   boot.kernelParams = [
     "console=tty1"
@@ -35,6 +38,7 @@
   '';
 
   networking.wireless.iwd.enable = true;
+  hardware.bluetooth.enable = true;
 
   time.timeZone = "Asia/Seoul";
 
@@ -46,7 +50,15 @@
 
   services.printing.enable = true;
 
-  sound.enable = true;
+  sound.enable = false;
+
+  services.pipewire = {
+    enable = true;
+
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
 
   # Backlight control
   programs.light.enable = true;