From 9017e9e97da7024ebc243e3958b515fa1803ab84 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sun, 24 Dec 2023 08:49:24 +0300
Subject: [PATCH] Update celerrime host

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 common/networking.nix            |  1 +
 common/user.nix                  |  4 +++-
 machines/celerrime/default.nix   |  1 +
 machines/celerrime/hardware.nix  | 14 ++++++--------
 machines/rubusidaeus/default.nix |  6 +++---
 roles/graphical.nix              | 10 ++--------
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/common/networking.nix b/common/networking.nix
index 5e4c0f7..33881a3 100644
--- a/common/networking.nix
+++ b/common/networking.nix
@@ -23,6 +23,7 @@
 
   services.avahi = {
     enable = true;
+    nssmdns4 = true;
   };
 
   services.chrony.enable = true;
diff --git a/common/user.nix b/common/user.nix
index 20bc5f6..ea13e42 100644
--- a/common/user.nix
+++ b/common/user.nix
@@ -3,8 +3,10 @@
 let
   cfg = config.my.users;
   keys = [
-    # Celerrime
+    # Celerrime macOS
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF0GX4/09I5B7nVeU3EKw58VyKNsbwpi4KzuJrgpoVfR ivabus@celerrime-x"
+    # Celerrime NixOS
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKp/t0ImyVYqaxVda8XP6fcxJVkf+Sc4oo3x5a5j2Gk ivabus@celerrime"
   ];
 in rec {
   options.my.users = {
diff --git a/machines/celerrime/default.nix b/machines/celerrime/default.nix
index b5d1eaf..082220b 100644
--- a/machines/celerrime/default.nix
+++ b/machines/celerrime/default.nix
@@ -39,6 +39,7 @@ in {
   hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware;
   hardware.asahi.addEdgeKernelConfig = true;
   hardware.asahi.useExperimentalGPUDriver = true;
+  hardware.asahi.setupAsahiSound = true;
 
   environment.systemPackages = with pkgs;
     [ (retroarch.override { cores = with libretro; [ np2kai ]; }) ];
diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix
index 157b54e..ae6f538 100644
--- a/machines/celerrime/hardware.nix
+++ b/machines/celerrime/hardware.nix
@@ -9,25 +9,23 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/aed0b311-8954-4164-afc3-9e7c6a2d8c2a";
-    fsType = "ext4";
+    device = "/dev/disk/by-uuid/679b5c29-3e7f-4449-96f0-7e5890302e32";
+    fsType = "btrfs";
   };
 
-  boot.initrd.luks.devices."cryptroot".device =
-    "/dev/disk/by-uuid/8551d309-afe6-4a25-b571-b2cb1eff7c09";
+  boot.initrd.luks.devices."nixos-root".device =
+    "/dev/disk/by-uuid/845370c8-5841-4c9e-b50b-c3a70f6fd2b6";
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/771E-1309";
+    device = "/dev/disk/by-uuid/2AC0-1B04";
     fsType = "vfat";
   };
 
   swapDevices = [{
-    device = "/dev/disk/by-partuuid/dace6477-697e-4bba-aede-eb0e9f7a28ff";
+    device = "/dev/disk/by-partuuid/8bd4586f-e44b-41b3-a060-52ba7773237f";
     randomEncryption.enable = true;
   }];
 
   networking.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }
diff --git a/machines/rubusidaeus/default.nix b/machines/rubusidaeus/default.nix
index 8a56e0f..ae6ee0d 100644
--- a/machines/rubusidaeus/default.nix
+++ b/machines/rubusidaeus/default.nix
@@ -94,10 +94,10 @@ in {
   };
 
   # 2 gig of ram is not enough
-  swapDevices = [ {
+  swapDevices = [{
     device = "/var/lib/swapfile";
-    size = 16*1024;
-  } ];
+    size = 16 * 1024;
+  }];
 
   # Semi-static configuration, needs rethinking
   services.nginx = {
diff --git a/roles/graphical.nix b/roles/graphical.nix
index 8c9231c..271b200 100644
--- a/roles/graphical.nix
+++ b/roles/graphical.nix
@@ -63,7 +63,7 @@ in {
         gtk = {
           enable = true;
           theme = {
-            name = "Catppuccin-Macchiato-Standard-Blue-dark";
+            name = "Catppuccin-Macchiato-Standard-Blue-Dark";
             package = pkgs.catppuccin-gtk.override {
               accents = [ "blue" ];
               tweaks = [ "rimless" ];
@@ -106,13 +106,7 @@ in {
       };
     })
     (lib.mkIf (cfg.basic.enable || cfg.enable) {
-      services.pipewire = {
-        enable = true;
-        alsa.enable = true;
-        pulse.enable = true;
-        alsa.support32Bit = true;
-      };
-
+      sound.enable = true;
       qt = {
         enable = true;
         platformTheme = "gtk2";