fix: rename pkg.gnome.* to pkg.*

misumisumi · Sep 14, 2024 · 2833384 · 2833384
1 parent 6293c14
commit 2833384
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 27 deletions.
diff --git a/apps/user/full/programs/thunar.nix b/apps/user/full/programs/thunar.nix
@@ -1,20 +1,28 @@
 { pkgs, ... }:
 let
-  thunar-with-plugins = with pkgs.xfce; (thunar.override { thunarPlugins = [ thunar-volman thunar-archive-plugin thunar-media-tags-plugin tumbler ]; });
+  thunar-with-plugins =
+    with pkgs.xfce;
+    (thunar.override {
+      thunarPlugins = [
+        thunar-volman
+        thunar-archive-plugin
+        thunar-media-tags-plugin
+        tumbler
+      ];
+    });
 in
 {
   home = {
-    packages = with pkgs;
-      with pkgs.xfce; [
-        thunar-with-plugins
-        xfconf
-        exo
+    packages = with pkgs; [
+      thunar-with-plugins
+      xfce.xfconf
+      xfce.exo
 
-        shared-mime-info # For FileManager
-        ffmpegthumbnailer
-        gnome.file-roller
-        lxde.lxmenu-data
-      ];
+      shared-mime-info # For FileManager
+      ffmpegthumbnailer
+      file-roller
+      lxde.lxmenu-data
+    ];
   };
   xdg = {
     mimeApps.defaultApplications."inode/directory" = "thunar.desktop";

diff --git a/apps/user/full/wm/qtile/default.nix b/apps/user/full/wm/qtile/default.nix
@@ -3,34 +3,38 @@
   NixOS is not manager Keyboard if you use this, so you must manage xkb keyboard from this.
   However, mouse and trackpad are managed from xserver. (conf is ./xserver.nix)
 */
-{ lib
-, hostname
-, pkgs
-, ...
+{
+  lib,
+  hostname,
+  pkgs,
+  ...
 }:
-with lib; {
+with lib;
+{
   home = {
     packages = with pkgs; [ xorg.xmodmap ];
   };
 
   xdg = {
     portal = {
       enable = true;
-      extraPortals = with pkgs; [ xdg-desktop-portal-wlr xdg-desktop-portal-gnome ];
-      configPackages = with pkgs; [ gnome.gnome-session ];
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-wlr
+        xdg-desktop-portal-gnome
+      ];
+      configPackages = with pkgs; [ gnome-session ];
     };
     configFile = {
       "qtile".source = ./conf;
     };
   };
 
-  xsession =
-    {
-      windowManager = {
-        # Not launch using dbus-launch because systemd manage dbus-user-message since ver.226
-        command = ''
-          ${pkgs.python3Packages.qtile}/bin/qtile start -b x11
-        ''; # You maybe have some probrem (ex fcitx5...) if you launch using it.
-      }; # You can see this in ArchWiki https://wiki.archlinux.jp/index.php/Systemd/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC#D-Bus
-    };
+  xsession = {
+    windowManager = {
+      # Not launch using dbus-launch because systemd manage dbus-user-message since ver.226
+      command = ''
+        ${pkgs.python3Packages.qtile}/bin/qtile start -b x11
+      ''; # You maybe have some probrem (ex fcitx5...) if you launch using it.
+    }; # You can see this in ArchWiki https://wiki.archlinux.jp/index.php/Systemd/%E3%83%A6%E3%83%BC%E3%82%B6%E3%83%BC#D-Bus
+  };
 }