From 476026efc9563fffbe26687f419d07f15135a161 Mon Sep 17 00:00:00 2001
From: Martin Fischer <martin@push-f.com>
Date: Fri, 15 Aug 2025 18:16:49 +0200
Subject: deps: update nixos

chromium: 138.0.7204.100 -> 139.0.7258.66
element-desktop: 1.11.105 -> 1.11.109
firefox: 140.0.4 -> 141.0.3
gcc-wrapper: 14.2.1.20250322 -> 14.3.0
git: 2.49.0 -> 2.50.1
go: 1.24.4 -> 1.24.5
jujutsu: 0.29.0 -> 0.31.0
krita: 5.2.9 -> 5.2.11
mkpasswd: 5.6.2 -> 5.6.4
networkmanager: 1.52.0 -> 1.52.1
nodejs: 22.16.0 -> 22.17.1
pipewire: 1.4.5 -> 1.4.7
skim: 0.18.0 -> 0.20.4
sudo: 1.9.17p1 -> 1.9.17p2
systemd: 257.6 -> 257.7
thunderbird: 139.0.2 -> 141.0
util-linux(bin): 2.41 -> 2.41.1
util-linux(man): 2.41 -> 2.41.1
vim: 9.1.1336 -> 9.1.1566
vim-full: 9.1.1336 -> 9.1.1566
---
 nixos/profiles/common/nixpkgs/overlays.nix         |  8 ---
 .../profiles/workstation/patches/skim-blank.patch  | 73 ----------------------
 2 files changed, 81 deletions(-)
 delete mode 100644 nixos/profiles/workstation/patches/skim-blank.patch

(limited to 'nixos/profiles')

diff --git a/nixos/profiles/common/nixpkgs/overlays.nix b/nixos/profiles/common/nixpkgs/overlays.nix
index 2834325..40f9041 100644
--- a/nixos/profiles/common/nixpkgs/overlays.nix
+++ b/nixos/profiles/common/nixpkgs/overlays.nix
@@ -13,14 +13,6 @@
       };
     });
   })
-  (final: prev: {
-    skim = prev.skim.overrideAttrs (old: {
-      patches = old.patches ++ [
-        # https://github.com/skim-rs/skim/issues/803
-        ../../workstation/patches/skim-blank.patch
-      ];
-    });
-  })
 
   # bug fixes
   (final: prev: {
diff --git a/nixos/profiles/workstation/patches/skim-blank.patch b/nixos/profiles/workstation/patches/skim-blank.patch
deleted file mode 100644
index 590515c..0000000
--- a/nixos/profiles/workstation/patches/skim-blank.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit bd0a387d9a4c6ad2cea1a3270e2897f2b740ece4
-Author: Martin Fischer <martin@push-f.com>
-Date:   Sun Jun 15 08:37:25 2025 +0200
-
-    feat: add --blank option
-
-diff --git a/skim/src/model/mod.rs b/skim/src/model/mod.rs
-index ff9ec6c..c3d2966 100644
---- a/skim/src/model/mod.rs
-+++ b/skim/src/model/mod.rs
-@@ -93,6 +93,7 @@ pub struct Model {
-     info: InfoDisplay,
-     no_clear_if_empty: bool,
-     theme: Arc<ColorTheme>,
-+    hide_results_for_empty_query: bool,
- 
-     // timer thread for scheduled events
-     timer: Timer,
-@@ -177,6 +178,7 @@ impl Model {
-             info: InfoDisplay::Default,
-             no_clear_if_empty: false,
-             theme,
-+            hide_results_for_empty_query: false,
-             timer: Timer::new(),
-             hb_timer_guard: None,
- 
-@@ -201,6 +203,7 @@ impl Model {
-         } else {
-             options.info.clone()
-         };
-+        self.hide_results_for_empty_query = options.blank;
- 
-         self.use_regex = options.regex;
- 
-@@ -316,7 +319,9 @@ impl Model {
-                 }
-             };
-             self.num_options += matched.len();
--            self.selection.append_sorted_items(matched);
-+            if !self.hide_results_for_empty_query || !self.query.get_query().is_empty() {
-+                self.selection.append_sorted_items(matched);
-+            }
-         }
- 
-         let items_consumed = self.item_pool.num_not_taken() == 0;
-diff --git a/skim/src/options.rs b/skim/src/options.rs
-index 657130a..b78b3e7 100644
---- a/skim/src/options.rs
-+++ b/skim/src/options.rs
-@@ -650,6 +650,10 @@ pub struct SkimOptions {
-     #[arg(long, default_value = "0", help_heading = "Display")]
-     pub header_lines: usize,
- 
-+    /// Don't show results if the query is empty.
-+    #[arg(long, help_heading = "Display")]
-+    pub blank: bool,
-+
-     //  --- History ---
-     /// History file
-     ///
-diff --git a/skim/src/query.rs b/skim/src/query.rs
-index 7a09091..9e9ff24 100644
---- a/skim/src/query.rs
-+++ b/skim/src/query.rs
-@@ -170,7 +170,7 @@ impl Query {
-             .collect()
-     }
- 
--    fn get_query(&mut self) -> String {
-+    pub fn get_query(&mut self) -> String {
-         match self.mode {
-             QueryMode::Query => self.get_fz_query(),
-             QueryMode::Cmd => self.get_cmd_query(),
-- 
cgit v1.2.3