Merge remote-tracking branch 'origin/main' into thinkpad

home-manager/default-applications.nix

@@ -6,6 +6,7 @@
       let
         browser = "zen.desktop";
         imageViewer = "org.gnome.Loupe.desktop";
+        pdfReader = "org.gnome.Papers.desktop";
       in
       {
         "text/html" = browser;
@@ -17,6 +18,7 @@
         "image/jpeg" = imageViewer;
         "image/png" = imageViewer;
         "image/gif" = imageViewer;
+        "application/pdf" = pdfReader;
       };
   };
 }

home-manager/development/git.nix

@@ -5,6 +5,7 @@
     userEmail = "git@martials.no";
 
     aliases = {
+      amend = "commit --amend";
       cm = "commit";
       s = "status";
     };

home-manager/development/zed.nix

@@ -7,9 +7,10 @@
     extensions = [
       "html"
       "catppuccin"
+      "catppuccin-icons"
       "toml"
       "nix"
-      "git_firefly"
+      "git-firefly"
     ];
     userSettings =
       let
@@ -20,10 +21,15 @@
       {
         autosave = "on_focus_change";
         base_keymap = "JetBrains";
-        ui_font_family = font;
         buffer_font_family = font;
+        icon-theme = "Catppuccin Mocha"; # TODO doesn't work?
+        ui_font_family = font;
         ui_font_size = fontSize;
         buffer_font_size = fontSize;
+        tabs = {
+          file_icons = true;
+          git_status = true;
+        };
         theme = {
           mode = theme.mode;
           light = "Catppuccin Latte";

home-manager/hyprland/hypridle/default.nix

@@ -5,7 +5,6 @@ let
   suspendAfter = 7200;
 in
 {
-  wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
   services.hypridle = {
     enable = true;
     settings = {
@@ -35,4 +34,5 @@ in
       ];
     };
   };
+  wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
 }

home-manager/hyprland/settings.nix

@@ -1,8 +1,8 @@
 { lib, ... }:
 let
   common = import ../../common.nix;
-  app = common.default;
   theme = import ../../theme.nix;
+  app = common.default;
 in
 {
   wayland.windowManager.hyprland.settings = {