update tlp and bar

home/programs/firefox/default.nix

@@ -49,7 +49,7 @@
       search = {
         force = true;
         default = "Searx";
-        order = [ "Searx" "Google" ];
+        order = [ "Searx" "google" ];
         engines = {
           "Nix Packages" = {
             urls = [{
@@ -73,7 +73,7 @@
             urls = [{
               template = "https://nixos.wiki/index.php?search={searchTerms}";
             }];
-            iconUpdateURL = "https://nixos.wiki/favicon.png";
+            icon = "https://nixos.wiki/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = [ "@nw" ];
           };
@@ -81,12 +81,12 @@
             urls = [{
               template = "https://searx.aicampground.com/?q={searchTerms}";
             }];
-            iconUpdateURL = "https://nixos.wiki/favicon.png";
+            icon = "https://nixos.wiki/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = [ "@searx" ];
           };
-          "Bing".metaData.hidden = true;
-          "Google".metaData.alias =
+          bing.metaData.hidden = true;
+          google.metaData.alias =
             "@g"; # builtin engines only support specifying one additional alias
         };
       };
@@ -100,4 +100,5 @@
         ];
     };
   };
+  stylix.targets.firefox.profileNames = [ "dark" ];
 }

home/programs/ghostty/default.nix

@@ -0,0 +1,8 @@
+{
+  programs.ghostty = {
+    enable = true;
+    enableZshIntegration = true;
+    installVimSyntax = true;
+    installBatSyntax = true;
+  };
+}

home/programs/nvim/plugins/cmp.nix

@@ -1,6 +1,7 @@
 {
   programs.nixvim.plugins = {
     luasnip.enable = true;
+    friendly-snippets.enable = true;
     cmp-buffer = { enable = true; };
     cmp-emoji = { enable = true; };
     cmp-nvim-lsp = { enable = true; };

home/programs/nvim/plugins/lsp.nix

@@ -53,7 +53,7 @@
           shfmt.enable = true;
           # golines.enable = true;
           # gofumpt.enable = true;
-          phpcsfixer.enable = true;
+          # phpcsfixer.enable = true;
           elm_format.enable = true;
           blade_formatter = {
             enable = true;

home/programs/nvim/plugins/ui.nix

@@ -3,6 +3,7 @@
   programs.nixvim.plugins = {
     web-devicons.enable = true;
     noice.enable = true;
+    glance.enable = true;
     gitsigns = {
       enable = true;
       settings.current_line_blame = false;

home/programs/nvim/plugins/utils.nix

@@ -8,7 +8,7 @@
       flash.enable = true;
       image = {
         enable = false;
-        integrations.markdown = {
+        settings.integrations.markdown = {
           clearInInsertMode = true;
           onlyRenderImageAtCursor = true;
         };
@@ -17,23 +17,6 @@
       comment.enable = true;
       nvim-autopairs.enable = true;
       todo-comments.enable = true;
-      harpoon = {
-        enable = true;
-        enableTelescope = true;
-        keymapsSilent = true;
-        keymaps = {
-          addFile = "<leader>ha";
-          toggleQuickMenu = "<leader>hu";
-          navNext = "<leader>hl";
-          navPrev = "<leader>hh";
-          navFile = {
-            "1" = "<leader>h1";
-            "2" = "<leader>h2";
-            "3" = "<leader>h3";
-            "4" = "<leader>h4";
-          };
-        };
-      };
       orgmode.enable = false;
       treesitter-context.enable = true;
       nvim-surround.enable = true;

home/programs/pass/default.nix

@@ -11,6 +11,6 @@
     enableZshIntegration = true;
     verbose = true;
     enableScDaemon = false;
-    pinentryPackage = pkgs.pinentry-all;
+    pinentry.package = pkgs.pinentry-all;
   };
 }

home/programs/shell/zsh.nix

@@ -14,7 +14,7 @@ in {
       batdiff
       batgrep
       batwatch
-      prettybat
+      # prettybat
     ];
   };
 
@@ -26,7 +26,7 @@ in {
     syntaxHighlighting.enable = true;
     historySubstringSearch.enable = true;
 
-    initExtraFirst = ''
+    initContent = lib.mkBefore ''
       bindkey -e
       ${if fetch == "neofetch" then
         pkgs.neofetch + "/bin/neofetch"
@@ -95,7 +95,7 @@ in {
       gcu = "git add . && git commit -m 'Update'";
       gp = "git push";
       gpl = "git pull";
-      gs = "git status";
+      gst = "git status";
       gd = "git diff";
       gco = "git checkout";
       gcb = "git checkout -b";