From bd6220ee60abac7cddc21f637dfa5d31f9c8a753 Mon Sep 17 00:00:00 2001
From: merrinx <gako358@outlook.com>
Date: Sun, 24 Mar 2024 09:51:30 +0100
Subject: [PATCH] flake update

---
 flake.lock                             |  6 +++---
 home/programs/config/emacs/config.org  |  9 +--------
 home/programs/config/emacs/default.nix |  1 -
 home/programs/git.nix                  | 10 ++++++----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7c8f572d5..dbcadffce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -431,11 +431,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1711254688,
-        "narHash": "sha256-SRVaAGt3I26ZbmwZQa7pueZkToGKS1tVVxvihON2C3Y=",
+        "lastModified": 1711261672,
+        "narHash": "sha256-cunLshFqtSeqpqP1Wb5QPT2F6LYssWaoZxUJCVJ8pZo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a5a4532bb8923fd29a7a313b60d577211a16cf3a",
+        "rev": "bfb075d8578037260b80a69203a1d9fd391f3e34",
         "type": "github"
       },
       "original": {
diff --git a/home/programs/config/emacs/config.org b/home/programs/config/emacs/config.org
index 81aa0e096..c1847fd8d 100644
--- a/home/programs/config/emacs/config.org
+++ b/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
diff --git a/home/programs/config/emacs/default.nix b/home/programs/config/emacs/default.nix
index 1ee89d194..4b2eb7694 100644
--- a/home/programs/config/emacs/default.nix
+++ b/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
diff --git a/home/programs/git.nix b/home/programs/git.nix
index 68064c351..b2625b854 100644
--- a/home/programs/git.nix
+++ b/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 { });
 }