chore: refactor

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

@@ -1,7 +1,15 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
+    ./git.nix
     ./irc.nix
     ./mpd.nix
+    ./nvim.nix
     ./remarkable.nix
+    ./ssh.nix
+    ./zsh.nix
+  ];
+
+  home.packages = with pkgs; [
+    pulsemixer
   ];
 }

home-manager/sajenim/features/cli/mpd.nix

@@ -1,4 +1,12 @@
 {pkgs, ...}: {
+
+  # Install some applications for managing mpd 
+  home.packages = with pkgs; [
+    mpc-cli
+    ncmpcpp
+  ];
+
+  # Setup our mpd client service
   services.mpd = {
     enable = true;
     musicDirectory = "nfs://viridian.home.arpa/srv/multimedia/library/music";
@@ -17,9 +25,4 @@
       }
     '';
   };
-
-  services.mpd-discord-rpc = {
-    enable = true;
-    package = pkgs.unstable.mpd-discord-rpc;
-  };
 }

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

@@ -1,14 +1,24 @@
-{inputs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
   imports = [
     ./cava
     ./dunst
     ./mpv
     ./picom
     ./rofi
-    ./thunar
     ./wezterm
   ];
 
+  # Install some packages for our desktop environment
+  home.packages = with pkgs; [
+    firefox
+    gimp
+    piper
+  ];
+
   home.file = {
     # Install patched fonts
     ".local/share/fonts" = {
@@ -20,4 +30,14 @@
     # Configure the initialization of xinit
     ".xinitrc".source = ./xinitrc;
   };
+
+  # 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";
+  };
 }

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

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