form: switch to gnome

3 files changed, 20 insertions, 9 deletions

diff --git a/form/configuration.nix b/form/configuration.nix
index 911dffd..5d685fe 100644
--- a/form/configuration.nix
+++ b/form/configuration.nix
@@ -30,7 +30,7 @@
     boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
     # boot.kernelParams = [];
     services.xserver.videoDrivers = [ "nvidia" ];
-    services.desktopManager.plasma6.enable = true;
+    # services.desktopManager.plasma6.enable = true;
     # services.displayManager.sddm = {
     #   enable = false;
     # };
@@ -44,6 +44,7 @@
     hardware.opengl.extraPackages = with pkgs; [
       vaapiVdpau
     ];
+    # services.openssh.enable = true;
 
     services.xserver = {
       enable = true;
@@ -51,6 +52,7 @@
         defaultSession = "sway";
         gdm.enable = true;
       };
+      desktopManager.gnome.enable = true;
     };
     virtualisation.docker = {
       enable = true;
diff --git a/modules/global.nix b/modules/global.nix
index 9a323c0..51b0e21 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -98,6 +98,12 @@ in
         "org/gnome/desktop/interface" = {
           color-scheme = "${if scheme.light then "prefer-light" else "prefer-dark"}";
         };
+        "org/gnome/shell" = {
+          disable-user-extensions = false;
+          enabled-extensions = with pkgs.gnomeExtensions; [
+            blur-my-shell.extensionUuid
+          ];
+        };
       };
     };
 
@@ -109,18 +115,18 @@ in
         name = "${if scheme.light then "Adwaita" else "Adwaita-dark"}";
         package = pkgs.gnome-themes-extra;
       };
-      iconTheme = {
-        name = "Adwaita-dark";
-        package = pkgs.adwaita-icon-theme;
-      };
+      # iconTheme = {
+      #   name = "Adwaita-dark";
+      #   package = pkgs.adwaita-icon-theme;
+      # };
     };
 
     qt = {
       enable = true;
-      platformTheme.name = "Adwaita";
+      platformTheme.name = "adwaita";
       style = {
         package = pkgs.adwaita-qt;
-        name = "${if scheme.light then "Adwaita" else "Adwaita-Dark"}";
+        name = "${if scheme.light then "adwaita" else "adwaita-dark"}";
       };
     };
 
diff --git a/nixos/default.nix b/nixos/default.nix
index 18286fe..0f6812f 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -14,6 +14,7 @@ in
     ./osu.nix
     ./keyd.nix
     ./yubikey.nix
+    ./libvirt.nix
   ];
 
   options.nixos = with lib.options; {
@@ -49,8 +50,9 @@ in
   };
 
   config = {
-    # nixos = {
-    # };
+    nixos = {
+      libvirt.enable = true;
+    };
     nix = {
       settings.experimental-features = [
         "nix-command"
@@ -130,6 +132,7 @@ in
         cage
         zsh
         discord-ptb
+        gnomeExtensions.blur-my-shell
       ]
       ++ (lib.optional cfg.wifi networkmanagerapplet); # TODO