home/home.nix

@@ -10,21 +10,17 @@ in {
 
     ./programs/aria2.nix
     ./programs/atuin.nix
-    ./programs/beets.nix
     ./programs/comma.nix
     ./programs/direnv
     ./programs/gdb.nix
     ./programs/gh.nix
-    ./programs/gh-dash.nix
     ./programs/git
     ./programs/gpg
-    ./programs/jq.nix
     ./programs/less.nix
     ./programs/neovim
     ./programs/nix-index
     ./programs/ssh
     ./programs/tealdeer
-    ./programs/thunderbird.nix
     ./programs/tmux.nix
     ./programs/zsh
 
@@ -105,13 +101,6 @@ in {
     };
   };
 
-  xsession = {
-    enable = true;
-    # TODO: declare using xdg config home
-    scriptPath = ".config/X11/xsession";
-    profilePath = ".config/X11/xprofile";
-  };
-
   xdg.configFile = {
     "ghc/ghci.conf".text = ''
       :set prompt "${extendedLib.termColors.front.magenta "[GHCi]λ"} "
@@ -185,7 +174,10 @@ in {
 
   qt = mkIf graphics {
     enable = true;
-    platformTheme.name = "adwaita";
-    style.name = "adwaita-dark";
+    platformTheme.name = "gtk";
+    style = {
+      name = "adwaita-dark";
+      package = pkgs.adwaita-qt;
+    };
   };
 }

home/packages.nix

@@ -1,6 +1,7 @@
 { pkgs, config, machineVars, ... }:
 {
   home.packages = with pkgs; [
+    beets
     binutils
     cloc
     cyme
@@ -11,6 +12,7 @@
     duff
     ffmpeg
     file
+    gh-dash
     glances
     gpg-tui
     gping
@@ -18,6 +20,7 @@
     hexyl
     httpie
     imagemagick
+    jq
     kepubify
     # keybase
     keymapviz
@@ -32,6 +35,7 @@
     mtr
     neofetch
     nix-diff
+    nix-index
     nix-output-monitor
     nix-tree
     nix-update
@@ -81,6 +85,7 @@
       alsa-utils
       anki
       ark
+      birdtray
       calibre
       cool-retro-term
       darktable
@@ -109,7 +114,6 @@
       mopidy-youtube
       mpc_cli
       naps2
-      nsxiv
       nyxt
       obsidian
       # pcloud
@@ -120,9 +124,11 @@
       slack
       # sublime3
       # swiPrologWithGui
+      sxiv
       tagainijisho
 
       tenacity
+      thunderbird
       # transcribe
       wireshark
       xcalib

home/programs/beets.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.beets.enable = true;
-}

home/programs/gh-dash.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.gh-dash.enable = true;
-}

home/programs/jq.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.jq.enable = true;
-}

home/programs/thunderbird.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, lib, machineVars, ... }:
-let
-  cfg = config.programs.thunderbird;
-in
-{
-  programs.thunderbird = {
-    enable = !machineVars.headless;
-    profiles.h7x4 = {
-      isDefault = true;
-      withExternalGnupg = true;
-    };
-  };
-
-
-  home.packages = lib.mkIf cfg.enable (with pkgs; [
-    birdtray
-  ]);
-}