reorder packages

home/common.nix

@@ -34,28 +34,26 @@ in {
     };
 
     packages = with pkgs; [
-      # Add your global packages here
+      # see also: system/core.nix
+
+      # keygen
       duralumin
       duralumin-keygen
+
+      # terminal utilities
+      gh
+      yazi
       ranger
       neovim
-      bottom
+
-      git
+      nix-index
-      wget
+
-      curl
+      imagemagick
-      tree
-      htop
-      ripgrep
-      killall
-      xdg-utils
-      file
-      gh
 
       # for running wayland apps over ssh
       waypipe
 
-      blender
+      # my own screenshot utility
-
       screenshot
     ];
   };

home/desktop-apps.nix

@@ -28,6 +28,8 @@
     virt-manager
     foliate
 
+    blender
+
     # GUI File Manager
     nemo-with-extensions
   ];

home/emacs.nix

@@ -50,6 +50,9 @@ in {
     hunspellDicts.de-de
     hunspellDicts.da-dk
 
+    # English word lists for spell checking
+    scowl
+
     # jinx from emacsPackages
     emacsPackages.jinx
 

home/sway.nix

@@ -51,6 +51,15 @@ in {
           }// super-config.extraOutputConfig;
 
     startup = [
+      {
+        command = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP";
+      }
+      {
+        command = "gesttings set org.gnome.desktop.interface color-scheme 'prefer-dark'";
+      }
+      {
+        command = "gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'";
+      }
       {
         always = true;
         command = "${pkgs.gammastep}/bin/gammastep -l 54:10 -t 6500k:4500k";

home/theme.nix

@@ -24,14 +24,20 @@
   # GTK Setup
   gtk = {
     enable = true;
+    # theme = {
+    #   name = "catppuccin-mocha-standard-blue-dark";
+    #   package = pkgs.catppuccin-gtk.override {
+    #     accents = [ "blue" ];
+    #     size = "standard";
+    #     variant = "mocha";
+    #   };
+    # };
+
     theme = {
-      name = "catppuccin-mocha-standard-blue-dark";
+      name = "Adwaita-dark";
-      package = pkgs.catppuccin-gtk.override {
+      package = pkgs.gnome-themes-extra;
-        accents = [ "blue" ];
-        size = "standard";
-        variant = "mocha";
-      };
     };
+
     iconTheme = {
       name = "Papirus-Dark";
       package = pkgs.catppuccin-papirus-folders.override {
@@ -39,14 +45,19 @@
         accent = "blue";
       };
     };
-    cursorTheme = {
+    # cursorTheme = {
-      name = "catppuccin-mocha-lavender-cursors";
+    #   name = "catppuccin-mocha-lavender-cursors";
-      package = pkgs.catppuccin-cursors.mochaLavender;
+    #   package = pkgs.catppuccin-cursors.mochaLavender;
+    # };
+
+    gtk3.extraConfig = {
+      gtk-application-prefer-dark-theme = lib.mkIf (super-config.darkMode == true) 1;
     };
-    gtk3 = {
+    gtk4.extraConfig = {
-      extraConfig.gtk-application-prefer-dark-theme = super-config.darkMode == true;
+      gtk-application-prefer-dark-theme = lib.mkIf (super-config.darkMode == true) 1;
     };
   };
+
   dconf.settings = {
     "org/gtk/settings/file-chooser" = {
       sort-directories-first = true;
@@ -54,7 +65,7 @@
 
     # GTK4 Setup
     "org/gnome/desktop/interface" = {
-      gtk-theme = "catppuccin-mocha-standard-blue-dark";
+      # gtk-theme = "catppuccin-mocha-standard-blue-dark";
       color-scheme = lib.mkIf (super-config.darkMode == true) "prefer-dark";
     };
   };
@@ -88,13 +99,11 @@
 
   qt = {
     enable = true;
-    platformTheme.name = "qtct";
+    platformTheme.name = "gtk";
-    style = {
+    style.name = "adwaita-dark";
-      name = "kvantum";
-    };
   };
 
   systemd.user.sessionVariables = {
-    QT_STYLE_OVERRIDE = "kvantum";
+    QT_STYLE_OVERRIDE = "adwaita-dark";
   };
 }

home/zsh.nix

@@ -3,6 +3,12 @@ let
   aliases = import ../data/zsh-aliases.nix {};
 in {
   home.packages = with pkgs; [ pure-prompt ];
+
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
   programs.zsh = {
     enable = true;
     enableCompletion = true;

system/core.nix

@@ -4,10 +4,50 @@
     zsh
     wget
     curl
+    rsync
     git
     vim
+    jq
+    bat
+    ripgrep
+    ripgrep-all
+    zoxide
+    file
+    fd
+    tree
+    xdg-utils
 
+    # nixos util
+    nh
+
+    # compression
+    unzip
+    zip
+    zstd
+
+    # stats and monitoring
+    fastfetch
+    pciutils
+    usbutils
+    lsof
+    lm_sensors
+
+    # network tools
+    nmap
+    tcpdump
+    doggo
+    inetutils
+    iproute2
+    whois
+
+    # documentation
+    man-pages
+    man-db
+
+    # system monitoring
     htop
+    bottom
+    killall
 
     linux-firmware
     linuxHeaders