From beae263c50e2b6b596a7b38996bb633308f47977 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 26 Dec 2023 22:07:20 +0100
Subject: separate apps for icewm and wayfire/sway

---
 nixos/icewm.nix     | 13 +++++++++++++
 nixos/wayfire.nix   |  9 +++++++++
 nixos/wmonly.nix    |  9 ---------
 nixpkgs/icewm.nix   |  7 +++++++
 nixpkgs/wayfire.nix |  7 +++++++
 nixpkgs/wmonly.nix  | 12 +++++++-----
 sway/config         |  3 ++-
 7 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/nixos/icewm.nix b/nixos/icewm.nix
index b8b3e51..c90e8e6 100644
--- a/nixos/icewm.nix
+++ b/nixos/icewm.nix
@@ -11,4 +11,17 @@
   nixpkgs.config.packageOverrides = pkgs: {
     chicago95 = import ./pkg_chicago95.nix { inherit pkgs; };
   };
+
+  environment.systemPackages = with pkgs; [
+    i3lock
+
+    epdfview
+    pcmanfm
+    xfce.ristretto
+    netsurf.browser
+    sylpheed
+    xfe
+    xarchiver
+    leafpad
+  ];
 }
diff --git a/nixos/wayfire.nix b/nixos/wayfire.nix
index d0e9803..772902d 100644
--- a/nixos/wayfire.nix
+++ b/nixos/wayfire.nix
@@ -18,6 +18,15 @@
 
     swayfx
     swaybg
+    swayimg
     bemenu
+
+    gnome.adwaita-icon-theme
+
+    gnome.nautilus
+    gnome.eog
+    gnome.gedit
+    gnome.file-roller
+    evince
   ];
 }
diff --git a/nixos/wmonly.nix b/nixos/wmonly.nix
index c9bde38..d45c176 100644
--- a/nixos/wmonly.nix
+++ b/nixos/wmonly.nix
@@ -4,7 +4,6 @@
   services.gvfs.enable = true;
 
   environment.systemPackages = with pkgs; [
-    i3lock
     brightnessctl
     pulseaudio
     pavucontrol
@@ -16,15 +15,7 @@
     dmenu
     feh
     acpi
-    netsurf.browser
-    sylpheed
-    xfe
     libreoffice-still
-    pcmanfm
-    xfce.ristretto
-    xarchiver
-    epdfview
-    leafpad
     geany
   ];
 }
diff --git a/nixpkgs/icewm.nix b/nixpkgs/icewm.nix
index 225c8fc..6bb963c 100644
--- a/nixpkgs/icewm.nix
+++ b/nixpkgs/icewm.nix
@@ -49,4 +49,11 @@
   };
 
   home.packages = with pkgs; [ chicago95 ];
+
+  xdg.mimeApps.defaultApplications = {
+    "application/pdf" = [ "epdfview.desktop" ];
+    "image/jpeg" = [ "org.xfce.ristretto.desktop" ];
+    "image/png" = [ "org.xfce.ristretto.desktop" ];
+    "text/plain" = [ "leafpad.desktop" ];
+  };
 }
diff --git a/nixpkgs/wayfire.nix b/nixpkgs/wayfire.nix
index 3824327..b0e26b7 100644
--- a/nixpkgs/wayfire.nix
+++ b/nixpkgs/wayfire.nix
@@ -9,4 +9,11 @@
 
     ".config/sway/config".source = ../sway/config;
   };
+
+  xdg.mimeApps.defaultApplications = {
+    "application/pdf" = [ "org.gnome.Evince.desktop" ];
+    "image/jpeg" = [ "org.gnome.eog.desktop" ];
+    "image/png" = [ "org.gnome.eog.desktop" ];
+    "text/plain" = [ "org.gnome.gedit.desktop" ];
+  };
 }
diff --git a/nixpkgs/wmonly.nix b/nixpkgs/wmonly.nix
index 7096c69..fbc5324 100644
--- a/nixpkgs/wmonly.nix
+++ b/nixpkgs/wmonly.nix
@@ -10,11 +10,13 @@
     mimeType = [ "application/pdf" "application/x-pdf" ];
     type = "Application";
   };
+
   xdg.mimeApps.enable = true;
-  xdg.mimeApps.defaultApplications = {
-    "application/pdf" = [ "epdfview.desktop" ];
-    "image/jpeg" = [ "org.xfce.ristretto.desktop" ];
-    "image/png" = [ "org.xfce.ristretto.desktop" ];
-    "text/plain" = [ "leafpad.desktop" ];
+
+  home.sessionVariables = {
+    XMODIFIERS = "@im=fcitx";
+    XMODIFIER = "@im=fcitx";
+    GTK_IM_MODULE = "fcitx";
+    QT_IM_MODULE = "fcitx";
   };
 }
diff --git a/sway/config b/sway/config
index 29c4b02..2eff8fa 100644
--- a/sway/config
+++ b/sway/config
@@ -204,11 +204,12 @@ exec waybar
 #exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Constant Deceleration' 2
 #exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Adaptive Deceleration' 2
 #exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Velocity Scaling' 5
-#exec nm-applet
 #exec nextcloud
 #exec seafile-applet
 #exec redshift-gtk -l 48.8567:2.3508
 #exec ~/.i3/notify-serv.sh
 #exec xset -b # disable bell
 
+exec nm-applet
+exec fcitx5
 
-- 
cgit v1.2.3