chore: refactor

home-manager/sajenim/features/desktop/default.nix

@@ -1,27 +1,23 @@
-{
+{inputs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   imports = [
     ./cava
     ./discord
     ./dunst
-    ./gtk
     ./picom
     ./rofi
+    ./thunar
     ./wezterm
   ];
 
-  home.packages = with pkgs; [
-    feh
-  ];
-
   home.file = {
+    # Install patched fonts
     ".local/share/fonts" = {
       recursive = true;
       source = "${inputs.self}/pkgs/patched-fonts";
     };
+    # https://www.sainnhe.dev/post/patch-fonts-with-cursive-italic-styles/
+
+    # Configure the initialization of xinit
     ".xinitrc".source = ./xinitrc;
   };
 }

home-manager/sajenim/features/desktop/gtk/default.nix

@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Gruvbox-Material-Dark";
-      package = pkgs.unstable.gruvbox-material-gtk-theme;
-    };
-    iconTheme.name = "Gruvbox-Material-Dark";
-  };
-
-  home.packages = with pkgs; [
-    xfce.thunar
-    xfce.ristretto
-  ];
-}

home-manager/sajenim/features/desktop/thunar/default.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    xfce.thunar
+    xfce.ristretto
+  ];
+}

home-manager/sajenim/fuchsia.nix

@@ -9,18 +9,27 @@
     ./features/university
   ];
 
-  home = {
+  # Packages for our user environment
-    packages = with pkgs; [
+  home.packages = with pkgs; [
-      # Graphics
+    # Graphics
-      gimp
+    gimp
-      # Hardware
+    # Hardware
-      piper
+    piper
-      pulsemixer
+    pulsemixer
-      # Multimedia
+    # Multimedia
-      mpc-cli
+    mpc-cli
-      ncmpcpp
+    ncmpcpp
-      # Browsers
+    # Browsers
-      firefox
+    firefox
-    ];
+  ];
+
+  # Configure GTK 2/3 applications to use gruvbox-material
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Gruvbox-Material-Dark";
+      package = pkgs.unstable.gruvbox-material-gtk-theme;
+    };
+    iconTheme.name = "Gruvbox-Material-Dark";
   };
 }

nixos/common/global/env.nix

@@ -19,7 +19,8 @@
       nmap # network mapper
       xclip # clipboard
       ripgrep # searches the current directory for a regex pattern
-      sshfs # Mount filesystems over SSH
+      sshfs # mount filesystems over SSH
+      feh # image viewer
 
       # HTTP
       curl # transfer dato to/from server

nixos/common/users/sajenim/xmonad/default.nix

@@ -3,7 +3,21 @@
   inputs,
   ...
 }: {
+  # Install our XMonad and Xmobar configuration
   environment = {
     systemPackages = [inputs.xmonad-config.packages.${pkgs.system}.default];
   };
+
+  # Required dependencies for our xfce/gtk programs
+  programs = {
+    # Configuration storage system for xfce
+    xfconf.enable = true;
+  };
+
+  services = {
+    # Mount, trash, and other functionalities
+    gvfs.enable = true;
+    # Thumbnail support for images
+    tumbler.enable = true;
+  };
 }

nixos/fuchsia/configuration.nix

@@ -37,18 +37,12 @@
     direnv.enable = true;
     # Android debug bridge: communicate with devices
     adb.enable = true;
-    # Configuration storage system for xfce
-    xfconf.enable = true;
   };
 
   # Configure services
   services = {
     # Access smart cards using SCard API
     pcscd.enable = true;
-    # Mount, trash, and other functionalities
-    gvfs.enable = true;
-    # Thumbnail support for images
-    tumbler.enable = true;
   };
 
   # Manage linux containers