Merge pull request #919 from NobbZ/remove-sound

fix warnings
NobbZ · Jul 16, 2024 · 8059106 · 8059106
2 parents a149d93 + 85b4717
commit 8059106
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,9 @@ managed through nix or even run it.
 
 * `mimas`: My currently used main host.
 * `enceladeus`: A secondary laptop, rarely used but still updated.
-* `thetys`: A nixos VM solely used in the office for work related things, discontinued
-* `dione`: company provided android phone, discontinued
+* ~~`thetys`~~: A nixos VM solely used in the office for work related things, discontinued
+* ~~`dione`~~: company provided android phone, discontinued
 * `rhea`: self owned phone
-* `titan`: MacOS VM to play and experiment with
-* `hyperion`: Linux-Aarch64 VM to play and experiment with
+* ~~`titan`~~: MacOS VM to play and experiment with, discontinued
+* ~~`hyperion`~~: Linux-Aarch64 VM to play and experiment with, discontinued
+* `phoebe`: TuxedoOS (Ubuntu derivative) laptop, HM only.
diff --git a/home/configurations/default.nix b/home/configurations/default.nix
@@ -3,11 +3,5 @@ _: {
 
   nobbz.homeConfigurations."nmelzer@mimas".system = "x86_64-linux";
   nobbz.homeConfigurations."nmelzer@enceladeus".system = "x86_64-linux";
-  nobbz.homeConfigurations."nmelzer@hyperion".system = "aarch64-linux";
   nobbz.homeConfigurations."nmelzer@phoebe".system = "x86_64-linux";
-
-  nobbz.homeConfigurations."[email protected]" = {
-    system = "aarch64-darwin";
-    hostname = "titan";
-  };
 }
diff --git a/home/configurations/nmelzer_at_hyperion.nix b/home/configurations/nmelzer_at_hyperion.nix
diff --git a/home/configurations/nmelzer_at_mimas.nix b/home/configurations/nmelzer_at_mimas.nix
@@ -25,7 +25,7 @@
     home.packages = builtins.attrValues {
       inherit (pkgs) keybase-gui freerdp keepassxc nix-output-monitor discord;
       inherit (pkgs) obsidian;
-      inherit (pkgs.gnome) gnome-tweaks;
+      inherit (pkgs) gnome-tweaks;
       inherit (pkgs) vscode;
     };
 

diff --git a/home/configurations/nmelzer_at_titan.nix b/home/configurations/nmelzer_at_titan.nix
diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix
@@ -49,7 +49,7 @@ in {
     };
 
     gtk.enable = true;
-    gtk.theme.package = pkgs.gnome.gnome-themes-extra;
+    gtk.theme.package = pkgs.gnome-themes-extra;
     gtk.theme.name = "Adwaita-dark";
 
     home.keyboard.layout = "de";

diff --git a/nixos/configurations/enceladeus.nix b/nixos/configurations/enceladeus.nix
@@ -99,7 +99,6 @@ _: {
   # services.printing.enable = true;
 
   # Enable sound.
-  sound.enable = true;
   hardware.pulseaudio.enable = true;
 
   # Enable the X11 windowing system.

diff --git a/nixos/configurations/hardware/mimas.nix b/nixos/configurations/hardware/mimas.nix
@@ -92,7 +92,7 @@
   nix.settings.max-jobs = lib.mkDefault 4;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     vaapiIntel
     vaapiVdpau
     libvdpau-va-gl

diff --git a/nixos/configurations/mimas.nix b/nixos/configurations/mimas.nix
@@ -119,7 +119,6 @@ in {
   # networking.firewall.allowedTCPPorts = [ 3000 ];
 
   # Enable sound.
-  sound.enable = true;
   hardware.pulseaudio = {
     enable = true;
     package = pkgs.pulseaudioFull;
@@ -154,11 +153,8 @@ in {
     zsh.enableCompletion = false;
   };
 
-  hardware.opengl.driSupport32Bit = true;
-  hardware.pulseaudio.support32Bit = true;
-
-  hardware.opengl.enable = true;
-  hardware.opengl.extraPackages = [pkgs.vaapiIntel];
+  hardware.graphics.enable = true;
+  hardware.graphics.extraPackages = [pkgs.vaapiIntel];
 
   services.gitea = {
     enable = true;