From 5f1728a0db0dff89736d9a034c44a86d1fbca3f7 Mon Sep 17 00:00:00 2001
From: Ranomier <>
Date: Thu, 5 Dec 2024 03:59:20 +0100
Subject: [PATCH] 275 current  2024-12-05 03:59:12  24.11.20241203.b681065 
 6.12.1                          *

---
 flake.lock                            | 24 ++++++++++++------------
 modules/software/nix-helper/index.nix | 17 +++++++++++++----
 modules/software/software.nix         |  1 +
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5dadc0b..cd0aea8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1732304879,
-        "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=",
+        "lastModified": 1733345341,
+        "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "c84579946c03c996916be0fb6e1340f444c277af",
+        "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1733217105,
+        "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732350895,
-        "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
+        "lastModified": 1733261153,
+        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
+        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1733212471,
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {
diff --git a/modules/software/nix-helper/index.nix b/modules/software/nix-helper/index.nix
index 2733242..9eabaa3 100644
--- a/modules/software/nix-helper/index.nix
+++ b/modules/software/nix-helper/index.nix
@@ -1,11 +1,20 @@
 {pkgs, ...}: {
+  # disable default command not found feature
+  programs.command-not-found.enable = false;
+
   environment.systemPackages = with pkgs; [
     nix-index
   ];
 
-  programs.command-not-found.enable = false;
+  programs.nix-index = {
+    enable = true;
+    enableZshIntegration = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+  };
+
   # for home-manager, use programs.bash.initExtra instead
-  programs.bash.interactiveShellInit = ''
-    source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
-  '';
+  #programs.bash.interactiveShellInit = ''
+  #  source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
+  #'';
 }
diff --git a/modules/software/software.nix b/modules/software/software.nix
index 167fe97..441ab74 100644
--- a/modules/software/software.nix
+++ b/modules/software/software.nix
@@ -50,6 +50,7 @@
       qemu
       home-manager
       dfc
+      p7zip
 
       # move to homemanager?
       unstable.mumble