bump versions, switch from cnf to nix-index, add gtkcord4 to navi pacakges

2 files changed, 56 insertions, 58 deletions

diff --git a/mixins/cli.nix b/mixins/cli.nix
index 936098d..6c784eb 100644
--- a/mixins/cli.nix
+++ b/mixins/cli.nix
@@ -7,15 +7,10 @@
 }: {
   config = {
     home-manager.users.tzlil = {
-      pkgs,
-      config,
-      nixosConfig,
-      ...
-    }: {
       imports = [
         inputs.viper-nix-common.homeModules.xdg
+        inputs.nix-index-database.hmModules.nix-index
       ];
-      programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.system}.programs-sqlite;
       home = {
         packages = with pkgs; [
           rsync
@@ -52,9 +47,6 @@
               ''
           )
         ];
-        #sessionVariables = {
-        #EDITOR = "nvim";
-        #};
       };
       programs = {
         git = {
@@ -86,7 +78,7 @@
               end
               nix shell $p
             '';
-            fish_command_not_found = "nix shell nixpkgs#(command-not-found $argv[1] &| sed -nr 's/.*-p (.*)$/\\1/p' | ${lib.getExe pkgs.fzf} || return 0) -c $argv[1]";
+            # fish_command_not_found = "nix shell nixpkgs#(command-not-found $argv[1] &| sed -nr 's/.*-p (.*)$/\\1/p' | ${lib.getExe pkgs.fzf} || return 0) -c $argv[1]";
           };
         };
         neovim = {
@@ -98,6 +90,14 @@
             set clipboard+=unnamedplus
           '';
         };
+
+        # nix-locate
+        command-not-found.enable = lib.mkForce false;
+        nix-index = {
+          enable = true;
+          enableFishIntegration = true;
+        };
+
         # gpg = {
         #   enable = true;
         #   mutableKeys = false;
diff --git a/mixins/multimedia.nix b/mixins/multimedia.nix
index 9b82a4f..dbd258c 100644
--- a/mixins/multimedia.nix
+++ b/mixins/multimedia.nix
@@ -5,59 +5,57 @@
   inputs,
   ...
 }: {
-  config = {
-    home-manager.users.tzlil = {config, ...}: {
-      fonts.fontconfig.enable = true;
-      home.packages = with pkgs; [
-        ffmpeg
-        gimp
-        transmission
-        xdg-utils
-        xdg-user-dirs
-      ];
-      xdg = {
+  home-manager.users.tzlil = {
+    fonts.fontconfig.enable = true;
+    home.packages = with pkgs; [
+      ffmpeg
+      gimp
+      transmission
+      xdg-utils
+      xdg-user-dirs
+    ];
+    xdg = {
+      enable = true;
+      mime.enable = true;
+      mimeApps = {
         enable = true;
-        mime.enable = true;
-        mimeApps = {
-          enable = true;
-          defaultApplications = {
-            "application/pdf" = ["${pkgs.zathura}/share/applications/org.pwmt.zathura.desktop"];
-            "image/png" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"];
-            "image/jpeg" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"];
-          };
+        defaultApplications = {
+          "application/pdf" = ["${pkgs.zathura}/share/applications/org.pwmt.zathura.desktop"];
+          "image/png" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"];
+          "image/jpeg" = ["${pkgs.swayimg}/share/applications/swayimg.desktop"];
         };
-        userDirs = {
-          createDirectories = true;
-          desktop = "${config.home.homeDirectory}/desktop";
-          download = "${config.home.homeDirectory}/downloads";
-        };
-        #portal = {
-        #  enable = true;
-        #  extraPortals = with pkgs; [
-        #    xdg-desktop-portal-wlr
-        #    xdg-desktop-portal-gtk
-        #  ];
-        #};
       };
+      userDirs = {
+        createDirectories = true;
+        desktop = "${config.home.homeDirectory}/desktop";
+        download = "${config.home.homeDirectory}/downloads";
+      };
+      #portal = {
+      #  enable = true;
+      #  extraPortals = with pkgs; [
+      #    xdg-desktop-portal-wlr
+      #    xdg-desktop-portal-gtk
+      #  ];
+      #};
+    };
 
-      programs = {
-        mpv = {
-          enable = true;
-          scripts = with pkgs.mpvScripts; [
-            mpris
-            #youtube-quality
-            (pkgs.callPackage ./youtube-quality.nix {})
-          ];
-          config = {
-            sub-auto = "fuzzy";
-            ytdl-raw-options = "write-auto-sub=,sub-lang=en";
-          };
+    programs = {
+      mpv = {
+        enable = true;
+        scripts = with pkgs.mpvScripts; [
+          mpris
+          #youtube-quality
+          (pkgs.callPackage ./youtube-quality.nix {})
+        ];
+        config = {
+          sub-auto = "fuzzy";
+          ytdl-raw-options = "write-auto-sub=,sub-lang=en";
         };
-        zathura = {
-          enable = true;
-          options = {
-            selection-clipboard = "clipboard";
-          };
+      };
+      zathura = {
+        enable = true;
+        options = {
+          selection-clipboard = "clipboard";
         };
       };
     };