Merge branch 'main' into cosmic

nix-os/account.nix

@@ -21,7 +21,7 @@
         proprietaryCodecs = true;
         commandLineArgs = [ "--ozone-platform=wayland" ];
       })
-      discord-canary
+      vesktop
       unstablePkgs.vscode
       gimp
       inkscape

nix-os/core.nix

@@ -5,23 +5,7 @@
 { inputs, lib, pkgs, ... }:
 
 let
-  /*
-   * pkg: package - nixpkgs package
-   * exe: string - executable (under bin) in pkgs
-   * wrapperArgs: string[] - arguments to pass to the wrapper
-   */
-  mkWrappedExecutable = {pkg, exe ? pkg.meta.mainProgram, wrapperArgs}: let inherit (pkgs) lib makeWrapper; in lib.hiPrio (
-      pkgs.stdenv.mkDerivation {
-      inherit wrapperArgs;
-      name = "${pkg.name}-wrap-${exe}";
-      nativeBuildInputs = [ makeWrapper ];
-      phases = ["installPhase"];
-      installPhase = ''
-        mkdir -p $out/bin
-        makeWrapper ${pkg}/bin/${exe} $out/bin/${exe} $wrapperArgs
-      '';
-    }
-  );
+  inherit (pkgs) mkWrappedExecutable;
 
   # bool -> nixpkgs[]
   wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; [
@@ -79,6 +63,21 @@ in
     rerere.enabled = true;
   };
 
+  # Use nix-index for command-not-found handler
+  programs.command-not-found.enable = false;
+  programs.nix-index = {
+    package = pkgs.nix-index.override {
+      nix-index-unwrapped = pkgs.nix-index-unwrapped.overrideAttrs (oldAttrs: {
+        patches = oldAttrs.patches or [] ++ [
+          ../pkgs/by-name/ni/nix-index/cnfOutput.patch
+        ];
+      });
+
+    };
+    enable = true;
+    enableBashIntegration = true;
+  };
+
   # Enable fail2ban because of the OpenSSH server
   services.fail2ban = {
     enable = true;

nix-os/gnupg.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  config = {
+    # Use pcscd for smartcard support
+    services.pcscd.enable = true;
+
+    environment.systemPackages = [(
+      pkgs.gnupg.overrideAttrs (superAttrs: {
+        configureFlags = superAttrs.configureFlags or []
+          ++ [ "--disable-ccid-driver" ];
+      })
+    )];
+  };
+}

nix-os/nvidia.nix

@@ -13,10 +13,12 @@
     open = false;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "555.42.02";
-      sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
-      settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
-      persistencedSha256 = "";
+      version = "555.58.02";
+      sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8=";
+      openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY=";
+      settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw=";
     };
   };
   nixpkgs.config.nvidia.acceptLicense = true;