From 000c3ac2dc4cc676800b9b45c88ff8dd9af303e2 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 15 Jul 2023 10:33:52 +0100
Subject: [PATCH] Move audio settings from common to desktop

---
 hosts/common.nix  | 19 ++++---------------
 hosts/desktop.nix | 44 +++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/hosts/common.nix b/hosts/common.nix
index 9d890dbe..e7b0df2e 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   inputs,
+  common,
   ...
 }: {
   imports = [inputs.home-manager.nixosModules.home-manager];
@@ -43,7 +44,7 @@
       roboto
 
       # nerdfonts
-      (nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})
+      (nerdfonts.override {fonts = ["FiraCode"];})
     ];
 
     # use fonts specified by user rather than default ones
@@ -56,7 +57,7 @@
       defaultFonts = {
         serif = ["Noto Serif" "Noto Color Emoji"];
         sansSerif = ["Noto Sans" "Noto Color Emoji"];
-        monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"];
+        monospace = ["FiraCode Nerd Font" "Noto Color Emoji"];
         emoji = ["Noto Color Emoji"];
       };
     };
@@ -94,25 +95,13 @@
     LC_TIME = "en_GB.UTF-8";
   };
 
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-  programs.noisetorch.enable = true;
-
   # Home manager common configuration
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = false;
     extraSpecialArgs = {inputs = inputs;};
     users.root = {
-      imports = [../home/env/bash.nix ../home/env/starship.nix];
+      imports = [common.home.env];
       home = {
         username = "root";
         homeDirectory = "/root";
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 84851dc3..11483510 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -1,15 +1,31 @@
-{pkgs, inputs, ...}: {
-  imports = [inputs.hyprland.nixosModules.default];
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.hyprland.nixosModules.default
+    ./common.nix
+  ];
   environment.systemPackages = with pkgs; [
     gsettings-desktop-schemas
     pavucontrol
-    pamixer
-    pulseaudio
     grim
     slurp
   ];
-  security.pam.services.swaylock = {};
+  security = {
+    pam.services.swaylock = {};
+    rtkit.enable = true;
+  };
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
   services = {
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
     blueman.enable = true;
     gvfs.enable = true;
     tumbler.enable = true;
@@ -22,23 +38,5 @@
         thunar-volman
       ];
     };
-    chromium = {
-      enable = true;
-      extensions = [
-        "cjpalhdlnbpafiamejdnhcphjbkeiagm" # uBlock Origin
-        "fnaicdffflnofjppbagibeoednhnbjhg" # Floccus
-        "nngceckbapebfimnlniiiahkandclblb" # Bitwarden
-        "dphilobhebphkdjbpfohgikllaljmgbn" # Simplelogin
-      ];
-      extraOpts = {
-        "BrowserSignin" = 0;
-        "SyncDisabled" = true;
-        "PasswordManagerEnabled" = false;
-        "SpellcheckEnabled" = true;
-        "SpellcheckLanguage" = ["en-GB"];
-      };
-      defaultSearchProviderSearchURL = "https://duckduckgo.com/?q={searchTerms}";
-      defaultSearchProviderEnabled = true;
-    };
   };
 }