From e9371c3a15f0f363dc1ac604140ce1122f99fc9c Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Mon, 13 May 2024 15:46:44 +0900
Subject: [PATCH] fix: thunderbird & sway

Fix problems with sway & thunderbird configs.

For some reason thunderbird doesn't like the profile name to be specified.
---
 home/default.nix                | 13 ++++---------
 home/sway/default.nix           |  3 +--
 home/thunderbird/default.nix    |  5 +----
 hosts/xps9510/configuration.nix |  7 +++----
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 65202c0..f89d83a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,17 +2,11 @@
 , ... }:
 let scripts = import ./scripts { inherit pkgs; };
 in {
-  imports = [
-    ./firefox
-    ./fish
-    #./sway
-    ./neovim
-    ./rofi
-    #./thunderbird
-  ];
+  imports = [ ./firefox ./fish ./sway ./neovim ./rofi ./thunderbird ];
 
   xdg.configFile."gtk-4.0/gtk.css".source =
     "${pkgs.catppuccin-gtk}/share/themes/Catppuccin-Frappe-Standard-Blue-Dark/gtk-4.0/gtk.css";
+
   dconf = {
     enable = true;
     settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
@@ -21,10 +15,11 @@ in {
       uris = [ "qemu:///system" ];
     };
   };
+
   services.blueman-applet.enable = true;
 
   qt.enable = true;
-  qt.platformTheme = "gtk";
+  qt.platformTheme.name = "gtk";
 
   home = {
     inherit stateVersion;
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 475f4ac..cbdfa9a 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -148,8 +148,7 @@
           '';
         }
         {
-          command =
-            "${scripts.set-background}/bin/set-background -f ${wallpaper}";
+          command = "${set-background}/bin/set-background -f ${wallpaper}";
           always = true;
         }
         {
diff --git a/home/thunderbird/default.nix b/home/thunderbird/default.nix
index 0101c6a..b570124 100644
--- a/home/thunderbird/default.nix
+++ b/home/thunderbird/default.nix
@@ -2,9 +2,6 @@
   programs.thunderbird = {
     enable = true;
     #settings = { mailnews.wraplength = 80; };
-    profiles.nico = {
-      isDefault = true;
-      name = "nico";
-    };
+    profiles.nico = { isDefault = true; };
   };
 }
diff --git a/hosts/xps9510/configuration.nix b/hosts/xps9510/configuration.nix
index b9f9879..4c55cfb 100644
--- a/hosts/xps9510/configuration.nix
+++ b/hosts/xps9510/configuration.nix
@@ -35,9 +35,9 @@ in {
   time.timeZone = "Asia/Seoul";
 
   # Configure keymap in X11
-  services.xserver = {
+  services.xserver.xkb = {
     layout = "fr";
-    xkbVariant = "";
+    variant = "";
   };
 
   services.logind = {
@@ -137,6 +137,7 @@ in {
       };
       enable = true;
     };
+    config.common.default = "*";
     # gtk portal needed to make gtk apps happy
     extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
@@ -218,11 +219,9 @@ in {
     dotter
     sassc
     glib
-    stylua
     pamixer
     wireguard-tools
     dconf
-    nixfmt
     pavucontrol
     xdg-utils
     htop