flake update

home/programs/config/emacs/config.org

@@ -84,13 +84,6 @@ Using dashboard and doom-theme with modeline.
   (add-to-list 'default-frame-alist '(height . 64))
   (add-to-list 'default-frame-alist '(width . 370))
 
-  (use-package vertico-posframe
-    :ensure t
-    :custom
-    (vertico-posframe-parameters
-      '((left-fringe . 8)
-        (right-fringe . 8))))
-
 #+end_src
 
 #+RESULTS:
@@ -518,7 +511,7 @@ Keys that I have binded to my keyboard for easy navigation in emacs
   (global-set-key (kbd "S-<down>") 'move-text-down)
   (global-set-key (kbd "C-<tab>") 'previous-buffer)
   (global-set-key (kbd "C-S-i") 'move-right-and-open-todo)
-  (global-set-key (kbd "C-n") 'treemacs)
+  (global-set-key (kbd "C-S-n") 'treemacs)
 
   (use-package which-key
     :ensure t

home/programs/config/emacs/default.nix

@@ -75,7 +75,6 @@ in
         treemacs-persp # Perspective integration for treemacs
         tree-sitter # Incremental parsing system for Emacs
         tree-sitter-langs # Tree-sitter grammar for various languages
-        vertico-posframe # Display vertico in a posframe
         vterm # Fully-featured terminal emulator
         multi-vterm # Multiple vterm buffers
         web-mode # Major mode for editing web templates

home/programs/git.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   gitConfig = {
     core = {
       editor = "nvim";
@@ -29,7 +30,7 @@
     };
     color.ui = true;
     fetch.prune = true;
-    pull.rebase = true;
+    pull.rebase = false;
     push.default = "upstream";
     push.autoSetupRemote = true;
     url = {
@@ -40,7 +41,8 @@
   };
 
   rg = "${pkgs.ripgrep}/bin/rg";
-in {
+in
+{
   home.packages = with pkgs.gitAndTools; [
     diff-so-fancy # git diff with colors
     git-crypt # git files encryption
@@ -88,5 +90,5 @@ in {
         }
       ];
     }
-    // (pkgs.sxm.git or {});
+    // (pkgs.sxm.git or { });
 }